diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 721d56d99c76..248477989a6e 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -20,7 +20,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_ALPHA 15 #define ACCESS_MARINE_BRAVO 16 -#define ACCESS_MARINE_CHARLIE 17 +#define ACCESS_MARINE_SUPPORT 17 #define ACCESS_MARINE_DELTA 18 #define ACCESS_MARINE_COMMAND 19 diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index f7871c2fa3cc..1c970f702777 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -8,6 +8,8 @@ #define SQUAD_MARINE_3 "Charlie" #define SQUAD_MARINE_4 "Delta" #define SQUAD_MARINE_5 "Echo" +#define SQUAD_MARINE_6 "Kilo" +#define SQUAD_MARINE_7 "Oscar" #define SQUAD_MARINE_CRYO "Foxtrot" #define SQUAD_MARINE_INTEL "Intel" #define SQUAD_SOF "SOF" @@ -16,6 +18,11 @@ #define SQUAD_SOLAR "Solar Devils" #define SQUAD_ARMY "US Army" +// Squad Roles +#define SQUAD_ROLE_ASSAULT "Assault" +#define SQUAD_ROLE_SUPPORT "Support" +#define SQUAD_ROLE_SECURITY "Security" + // Job name defines #define JOB_SQUAD_MARINE "Rifleman" #define JOB_SQUAD_LEADER "Squad Leader" diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index cadfd46867d0..5a8206408931 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -41,6 +41,8 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_DRAWING_YELLOW "#FFFF00" #define MINIMAP_DRAWING_PURPLE "#A020F0" #define MINIMAP_DRAWING_BLUE "#0000FF" +#define MINIMAP_DRAWING_TEAL "#059e96" +#define MINIMAP_DRAWING_LIME "#d6ffb2" //Turf colors #define MINIMAP_BLACK "#111111d0" @@ -81,6 +83,8 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_CHARLIE "#76418a" #define MINIMAP_SQUAD_DELTA "#0c0cae" #define MINIMAP_SQUAD_ECHO "#00b043" +#define MINIMAP_SQUAD_KILO "#059e96" +#define MINIMAP_SQUAD_OSCAR "#d6ffb2" #define MINIMAP_SQUAD_FOXTROT "#fe7b2e" #define MINIMAP_SQUAD_SOF "#400000" #define MINIMAP_SQUAD_ARMY "#349c30" diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm index 064e166b85ff..3c8f7d4a2a87 100644 --- a/code/__DEFINES/mob_hud.dm +++ b/code/__DEFINES/mob_hud.dm @@ -89,6 +89,8 @@ #define TRACKER_CSL "_csl" // Charlie Squad Leader #define TRACKER_DSL "_dsl" // Delta Squad Leader #define TRACKER_ESL "_esl" // Echo Squad Leader +#define TRACKER_KSL "_ksl" // Kilo Squad Leader +#define TRACKER_OSL "_osl" // Oscar Squad Leader #define TRACKER_FSL "_fsl" // Cryo Squad Leader #define TRACKER_ISL "_isl" // Intel Squad Leader diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 6282c43090fa..6185188c484b 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(ROLES_MEDICAL, list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_FI GLOBAL_LIST_INIT(ROLES_MEDICAL_ANTAG, list(JOB_UPP_LT_DOKTOR)) GLOBAL_LIST_INIT(ROLES_MARINES, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)) GLOBAL_LIST_INIT(ROLES_MARINES_ANTAG, list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER)) -GLOBAL_LIST_INIT(ROLES_SQUAD_ALL, list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL)) +GLOBAL_LIST_INIT(ROLES_SQUAD_ALL, list()) GLOBAL_LIST_INIT(ROLES_WO, list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_WARDEN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER, JOB_XENOMORPH_QUEEN)) /// Roles not intended to be spawned. GLOBAL_LIST_INIT(ROLES_NOSPAWN, list(JOB_POLICE_HG)) diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index d9d3fbe1ff03..81bc860c5e2a 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -156,7 +156,9 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency #define CHARLIE_FREQ 1493 #define DELTA_FREQ 1494 #define ECHO_FREQ 1495 -#define CRYO_FREQ 1496 +#define KILO_FREQ 1496 +#define OSCAR_FREQ 1497 +#define CRYO_FREQ 1498 //Civilian channels #define COLONY_FREQ 1469 @@ -189,18 +191,6 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_JTAC = JTAC_FREQ, RADIO_CHANNEL_INTEL = INTEL_FREQ, - SQUAD_MARINE_1 = ALPHA_FREQ, - SQUAD_MARINE_2 = BRAVO_FREQ, - SQUAD_MARINE_3 = CHARLIE_FREQ, - SQUAD_MARINE_4 = DELTA_FREQ, - SQUAD_MARINE_5 = ECHO_FREQ, - SQUAD_MARINE_CRYO = CRYO_FREQ, - SQUAD_SOF = SOF_FREQ, - SQUAD_CBRN = CBRN_FREQ, - SQUAD_FORECON = FORECON_FREQ, - SQUAD_SOLAR = SOF_FREQ, - SQUAD_ARMY = ARMY_FREQ, - RADIO_CHANNEL_ALAMO = DS1_FREQ, RADIO_CHANNEL_NORMANDY = DS2_FREQ, RADIO_CHANNEL_SAIPAN = DS3_FREQ, @@ -261,7 +251,7 @@ GLOBAL_LIST_INIT(radiochannels, list( #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) +#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, KILO_FREQ, OSCAR_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ) //Bonus frequencies for special survivor factions #define SURVIVOR_FREQS list(SOF_FREQ, ARMY_FREQ) @@ -332,6 +322,8 @@ SUBSYSTEM_DEF(radio) "[CHARLIE_FREQ]" = "charlieradio", "[DELTA_FREQ]" = "deltaradio", "[ECHO_FREQ]" = "echoradio", + "[KILO_FREQ]" = "kiloradio", + "[OSCAR_FREQ]" = "oscarradio", "[CRYO_FREQ]" = "cryoradio", "[CBRN_FREQ]" = "hcradio", "[FORECON_FREQ]" = "hcradio", diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index d6b287a4c777..70a953ce7bf8 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -1831,6 +1831,16 @@ SUBSYSTEM_DEF(minimaps) active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_blue.dmi' color = MINIMAP_DRAWING_BLUE +/atom/movable/screen/minimap_tool/draw_tool/teal + screen_loc = "14,12" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_blue.dmi' + color = MINIMAP_DRAWING_TEAL + +/atom/movable/screen/minimap_tool/draw_tool/lime + screen_loc = "14,11" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_green.dmi' + color = MINIMAP_DRAWING_LIME + /atom/movable/screen/minimap_tool/draw_tool/erase icon_state = "erase" desc = "Drag to erase freely, middle click to erase a dot. Middle click this button to unselect." diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0979e6bd6858..e2f57419f0df 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -244,9 +244,10 @@ SUBSYSTEM_DEF(ticker) var/roles_to_roll = null if(length(mode.roles_to_roll)) roles_to_roll = mode.roles_to_roll - GLOB.RoleAuthority.setup_candidates_and_roles(roles_to_roll) //Distribute jobs + var/list/random_players = shuffle(GLOB.player_list) + GLOB.RoleAuthority.setup_candidates_and_roles(roles_to_roll, random_players) //Distribute jobs if(mode.flags_round_type & MODE_NEW_SPAWN) - create_characters() // Create and equip characters + create_characters(random_players) // Create and equip characters else old_create_characters() //Create player characters and transfer them equip_characters() @@ -404,17 +405,17 @@ SUBSYSTEM_DEF(ticker) world.Reboot() -/datum/controller/subsystem/ticker/proc/create_characters() +/datum/controller/subsystem/ticker/proc/create_characters(list/random_players) if(!GLOB.RoleAuthority) return - var/list/random_players = shuffle(GLOB.player_list) for(var/mob/new_player/player in random_players) if(!player || !player.ready || !player.mind || !player.job) continue INVOKE_ASYNC(src, PROC_REF(spawn_and_equip_char), player) + /datum/controller/subsystem/ticker/proc/spawn_and_equip_char(mob/new_player/player) var/datum/job/J = GLOB.RoleAuthority.roles_for_mode[player.job] @@ -470,6 +471,7 @@ SUBSYSTEM_DEF(ticker) msg_admin_niche("NEW PLAYER: [key_name(player, 1, 1, 0)]. IP: [player.lastKnownIP], CID: [player.computer_id]") if(C.player_data && C.player_data.playtime_loaded && ((round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1)) <= 5)) msg_sea(("NEW PLAYER: [key_name(player, 0, 1, 0)] only has [(round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1))] hours as a human. Current role: [get_actual_job_name(player)] - Current location: [get_area(player)]"), TRUE) + if(captainless) for(var/mob/M in GLOB.player_list) if(!istype(M,/mob/new_player)) diff --git a/code/datums/components/tacmap.dm b/code/datums/components/tacmap.dm index 6a37d8db9c11..754454b95047 100644 --- a/code/datums/components/tacmap.dm +++ b/code/datums/components/tacmap.dm @@ -43,6 +43,8 @@ /atom/movable/screen/minimap_tool/draw_tool/blue, /atom/movable/screen/minimap_tool/draw_tool/green, /atom/movable/screen/minimap_tool/draw_tool/black, + /atom/movable/screen/minimap_tool/draw_tool/teal, + /atom/movable/screen/minimap_tool/draw_tool/lime, /atom/movable/screen/minimap_tool/draw_tool/erase, /atom/movable/screen/minimap_tool/label, /atom/movable/screen/minimap_tool/clear, diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 23a06949e107..037960a1b823 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -782,8 +782,8 @@ icon_state = "bravo" fake_zlevel = 2 // lowerdeck -/area/almayer/squads/charlie - name = "\improper Squad Charlie Preparation" +/area/almayer/squads/support + name = "\improper Support Squad Preparation" icon_state = "charlie" fake_zlevel = 2 // lowerdeck @@ -792,14 +792,14 @@ icon_state = "delta" fake_zlevel = 2 // lowerdeck -/area/almayer/squads/alpha_bravo_shared - name = "\improper Alpha Bravo Equipment Preparation" - icon_state = "ab_shared" +/area/almayer/squads/platoon1_shared + name = "\improper 1st Platoon Equipment Preparation" + icon_state = "p1_shared" fake_zlevel = 2 // lowerdeck -/area/almayer/squads/charlie_delta_shared - name = "\improper Charlie Delta Equipment Preparation" - icon_state = "cd_shared" +/area/almayer/squads/platoon2_shared + name = "\improper 2nd Platoon Equipment Preparation" + icon_state = "p2_shared" fake_zlevel = 2 // lowerdeck /area/almayer/squads/req diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index fa9cb649cb74..1e6cd1b09572 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -132,10 +132,16 @@ Additional game mode variables. surv_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/surv_number_divider)), 2, 8) //this doesn't run marine_starting_num = length(GLOB.player_list) - xeno_starting_num - surv_starting_num for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) + if(!target_squad) + continue + + if(target_squad.dynamic_scaling) target_squad.roles_cap[JOB_SQUAD_ENGI] = engi_slot_formula(marine_starting_num) target_squad.roles_cap[JOB_SQUAD_MEDIC] = medic_slot_formula(marine_starting_num) + if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients)) + target_squad.roles_cap = target_squad.initial_roles_cap + for(var/i in GLOB.RoleAuthority.roles_by_name) var/datum/job/J = GLOB.RoleAuthority.roles_by_name[i] if(J.scaled) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 1b6849a6f9b5..23a4814c1ef3 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -135,7 +135,7 @@ ACCESS_MARINE_TL_PREP, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_PILOT, ACCESS_MARINE_DROPSHIP, @@ -338,7 +338,7 @@ ACCESS_MARINE_KITCHEN, ) if(7)//Squads - return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA) if(8)//Civilian return list( ACCESS_CIVILIAN_PUBLIC, @@ -431,8 +431,8 @@ return "Alpha Squad" if(ACCESS_MARINE_BRAVO) return "Bravo Squad" - if(ACCESS_MARINE_CHARLIE) - return "Charlie Squad" + if(ACCESS_MARINE_SUPPORT) + return "Support Squads" if(ACCESS_MARINE_DELTA) return "Delta Squad" if(ACCESS_MARINE_CARGO) diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index e07c1edd3138..a3268e514d89 100644 --- a/code/game/jobs/job/marine/marine.dm +++ b/code/game/jobs/job/marine/marine.dm @@ -15,6 +15,24 @@ if(!Check_WO()) current_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) //Start hungry for the default marine. +/datum/job/marine/proc/calculate_extra_slots(latejoin, slots) + var/extra_slots = 0 + + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(!target_squad) + continue + + if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients)) + target_squad.roles_cap = target_squad.initial_roles_cap + + if(target_squad.dynamic_scaling) + if(latejoin) + target_squad.roles_cap[title] = slots + else + extra_slots += target_squad.roles_cap[title] + + return extra_slots + /datum/timelock/squad name = "Squad Roles" diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index 66b667aa133c..d917915dce75 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -9,7 +9,7 @@ /datum/job/marine/engineer/set_spawn_positions(count) for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) + if(target_squad && target_squad.dynamic_scaling) target_squad.roles_cap[title] = engi_slot_formula(count) /datum/job/marine/engineer/get_total_positions(latejoin=0) @@ -20,12 +20,7 @@ else total_positions_so_far = slots - if(latejoin) - for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) - target_squad.roles_cap[title] = slots - - return (slots*4) + return slots * 2 + calculate_extra_slots(latejoin, slots) /datum/job/marine/engineer/whiskey title = JOB_WO_SQUAD_ENGINEER @@ -40,19 +35,3 @@ AddTimelock(/datum/job/marine/engineer, list( name = JOB_SQUAD_ENGI icon_state = "engi_spawn" job = /datum/job/marine/engineer - -/obj/effect/landmark/start/marine/engineer/alpha - icon_state = "engi_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/engineer/bravo - icon_state = "engi_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/engineer/charlie - icon_state = "engi_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/engineer/delta - icon_state = "engi_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index be78438db3d6..3e50e424ec72 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -7,6 +7,18 @@ gear_preset = /datum/equipment_preset/uscm/leader entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way." +/datum/job/marine/leader/get_total_positions(latejoin=0) + var/extra_slots = 0 + + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(!target_squad) + continue + + if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients)) + target_squad.roles_cap = target_squad.initial_roles_cap + extra_slots++ + return extra_slots + spawn_positions + /datum/job/marine/leader/whiskey title = JOB_WO_SQUAD_LEADER flags_startup_parameters = ROLE_ADD_TO_SQUAD @@ -20,19 +32,3 @@ AddTimelock(/datum/job/marine/leader, list( name = JOB_SQUAD_LEADER icon_state = "leader_spawn" job = /datum/job/marine/leader - -/obj/effect/landmark/start/marine/leader/alpha - icon_state = "leader_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/leader/bravo - icon_state = "leader_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/leader/charlie - icon_state = "leader_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/leader/delta - icon_state = "leader_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 9161ee082d8c..f1f070ae1912 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -9,7 +9,7 @@ /datum/job/marine/medic/set_spawn_positions(count) for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) + if(target_squad && target_squad.dynamic_scaling) target_squad.roles_cap[title] = medic_slot_formula(count) /datum/job/marine/medic/get_total_positions(latejoin=0) @@ -20,12 +20,7 @@ else total_positions_so_far = slots - if(latejoin) - for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) - target_squad.roles_cap[title] = slots - - return (slots*4) + return slots * 2 + calculate_extra_slots(latejoin, slots) /datum/job/marine/medic/whiskey title = JOB_WO_SQUAD_MEDIC @@ -41,19 +36,3 @@ AddTimelock(/datum/job/marine/medic, list( name = JOB_SQUAD_MEDIC icon_state = "medic_spawn" job = /datum/job/marine/medic - -/obj/effect/landmark/start/marine/medic/alpha - icon_state = "medic_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/medic/bravo - icon_state = "medic_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/medic/charlie - icon_state = "medic_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/medic/delta - icon_state = "medic_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 1a89abf5d3be..d30895e2bccf 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -36,19 +36,3 @@ AddTimelock(/datum/job/marine/smartgunner, list( name = JOB_SQUAD_SMARTGUN icon_state = "smartgunner_spawn" job = /datum/job/marine/smartgunner - -/obj/effect/landmark/start/marine/smartgunner/alpha - icon_state = "smartgunner_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/smartgunner/bravo - icon_state = "smartgunner_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/smartgunner/charlie - icon_state = "smartgunner_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/smartgunner/delta - icon_state = "smartgunner_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 38f7a38cbedc..a8b62f7690df 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -42,19 +42,3 @@ AddTimelock(/datum/job/marine/specialist, list( name = JOB_SQUAD_SPECIALIST icon_state = "spec_spawn" job = /datum/job/marine/specialist - -/obj/effect/landmark/start/marine/spec/alpha - icon_state = "spec_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/spec/bravo - icon_state = "spec_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/spec/charlie - icon_state = "spec_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/spec/delta - icon_state = "spec_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm index a926c3370a4b..beb6742156f7 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -23,19 +23,3 @@ name = JOB_SQUAD_MARINE icon_state = "marine_spawn" job = /datum/job/marine/standard - -/obj/effect/landmark/start/marine/alpha - icon_state = "marine_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/bravo - icon_state = "marine_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/charlie - icon_state = "marine_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/delta - icon_state = "marine_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index 2b0cff3ea3ed..678280a4f5db 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -1,7 +1,7 @@ /datum/job/marine/tl title = JOB_SQUAD_TEAM_LEADER - total_positions = 8 - spawn_positions = 8 + total_positions = 6 + spawn_positions = 6 allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl @@ -11,6 +11,19 @@ . = ..() spawning_human.important_radio_channels += JTAC_FREQ +/datum/job/marine/tl/get_total_positions(latejoin=0) + var/extra_slots = 0 + + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(!target_squad) + continue + + if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients)) + target_squad.roles_cap = target_squad.initial_roles_cap + extra_slots++ + + return extra_slots + spawn_positions + AddTimelock(/datum/job/marine/tl, list( JOB_SQUAD_ROLES = 8 HOURS )) @@ -19,19 +32,3 @@ AddTimelock(/datum/job/marine/tl, list( name = JOB_SQUAD_TEAM_LEADER icon_state = "tl_spawn" job = /datum/job/marine/tl - -/obj/effect/landmark/start/marine/tl/alpha - icon_state = "tl_spawn_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/start/marine/tl/bravo - icon_state = "tl_spawn_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/start/marine/tl/charlie - icon_state = "tl_spawn_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/start/marine/tl/delta - icon_state = "tl_spawn_delta" - squad = SQUAD_MARINE_4 diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 8d6f74f22bc3..7c02700cdd56 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -1,3 +1,100 @@ +// These defines add the peripheral objects needed for a squad so you don't have to do it each time you define a new squad in 20 different files +#define SQUAD_LANDMARKS(_name, _tag) \ +/obj/effect/landmark/start/marine/engineer/_name {\ + icon_state = "engi_spawn_" + #_name; \ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/medic/_name{\ + icon_state = "medic_spawn_" + #_name;\ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/leader/_name{\ + icon_state = "leader_spawn_" + #_name;\ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/smartgunner/_name{\ + icon_state = "smartgunner_spawn_" + #_name;\ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/spec/_name{\ + icon_state = "spec_spawn_" + #_name;\ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/_name{\ + icon_state = "marine_spawn_" + #_name;\ + squad = #_tag; \ +}\ +\ +/obj/effect/landmark/start/marine/tl/_name{\ + icon_state = "tl_spawn_" + #_name;\ + squad = #_tag;\ +}\ +/obj/effect/landmark/late_join/_name{\ + name = #_name + " late join";\ + icon_state = "late_join_" + #_name;\ + squad = #_tag;\ +} + + +#define SQUAD_CRYOSTORAGE(_name, _tag) \ +/obj/structure/machinery/computer/cryopod/_name {\ + cryotype = #_tag;\ +} + +#define SQUAD_DROPPAD(_name, _tag) \ +/obj/structure/supply_drop/_name{\ + icon_state = #_name + "drop";\ + squad = #_tag;\ +} + +#define SQUAD_VENDORS(_name, _access, _tag) \ +/obj/structure/machinery/cm_vending/clothing/engi/_name {\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_ENGPREP, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/leader/_name{\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_LEADER, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/medic/_name{\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_MEDPREP, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/marine/_name{\ + squad_tag = #_tag;\ + req_access = list(_access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/smartgun/_name{\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_SMARTPREP, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/specialist/_name{\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_SPECPREP, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +}\ +\ +/obj/structure/machinery/cm_vending/clothing/tl/_name{\ + squad_tag = #_tag;\ + req_access = list(ACCESS_MARINE_TL_PREP, _access);\ + headset_type = /obj/item/device/radio/headset/almayer/marine/self_setting;\ +} + //This datum keeps track of individual squads. New squads can be added without any problem but to give them //access you must add them individually to access.dm with the other squads. Just look for "access_alpha" and add the new one @@ -53,6 +150,12 @@ JOB_SQUAD_TEAM_LEADER = 2, JOB_SQUAD_LEADER = 1, ) + /// Saves the initial roles cap, since byond doesn't like initial() on lists + var/list/initial_roles_cap + /// Do this squad's roles scale with pop + var/dynamic_scaling = TRUE + /// At which amount of clients does this squad become playable + var/pop_lock = 0 /// Squad roles actual number of players list var/list/roles_in = list() /// Squad headsets default radio frequency @@ -114,7 +217,17 @@ ///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman var/prepend_squad_name_to_assignment = TRUE + ///Will it have a category in cryostorage + var/has_cryostorage = FALSE + + ///Add to role squad glob list (adds it to the manifest) + var/add_to_glob_squad_list = FALSE + ///Flavor desc found on the squad specific beret + var/beret_flavortext + + ///The squad's role from Assault / Support / Security + var/squad_role = SQUAD_ROLE_ASSAULT /datum/squad/marine name = "Root" @@ -131,6 +244,22 @@ radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA background_icon = "background_alpha" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "Often found atop heads, slightly less found on those still attached." + roles_cap = list( + JOB_SQUAD_MARINE = null, + JOB_SQUAD_ENGI = 3, + JOB_SQUAD_MEDIC = 4, + JOB_SQUAD_SMARTGUN = 2, + JOB_SQUAD_SPECIALIST = 2, + JOB_SQUAD_TEAM_LEADER = 2, + JOB_SQUAD_LEADER = 1, + ) +SQUAD_LANDMARKS(alpha, Alpha) +SQUAD_CRYOSTORAGE(alpha, Alpha) +SQUAD_VENDORS(alpha, ACCESS_MARINE_ALPHA, Alpha) +SQUAD_DROPPAD(alpha, Alpha) /datum/squad/marine/bravo name = SQUAD_MARINE_2 @@ -140,15 +269,56 @@ radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO background_icon = "background_bravo" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "It has quite a lot of debris on it, the person wearing this probably moves less than a wall." + + roles_cap = list( + JOB_SQUAD_MARINE = 8, + JOB_SQUAD_ENGI = 2, + JOB_SQUAD_MEDIC = 2, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 1, + JOB_SQUAD_LEADER = 1, + ) + dynamic_scaling = FALSE + + squad_role = SQUAD_ROLE_SECURITY + + +SQUAD_LANDMARKS(bravo, Bravo) +SQUAD_CRYOSTORAGE(bravo, Bravo) +SQUAD_VENDORS(bravo, ACCESS_MARINE_BRAVO, Bravo) +SQUAD_DROPPAD(bravo, Bravo) /datum/squad/marine/charlie name = SQUAD_MARINE_3 equipment_color = "#c864c8" chat_color = "#ff96ff" - access = list(ACCESS_MARINE_CHARLIE) + access = list(ACCESS_MARINE_SUPPORT) radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE background_icon = "background_charlie" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "Still has some morning toast crumbs on it." + + roles_cap = list( + JOB_SQUAD_MARINE = 4, + JOB_SQUAD_ENGI = 1, + JOB_SQUAD_MEDIC = 1, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 1, + JOB_SQUAD_LEADER = 1, + ) + dynamic_scaling = FALSE + squad_role = SQUAD_ROLE_SUPPORT + +SQUAD_LANDMARKS(charlie, Charlie) +SQUAD_CRYOSTORAGE(charlie, Charlie) +SQUAD_DROPPAD(charlie, Charlie) /datum/squad/marine/delta name = SQUAD_MARINE_4 @@ -158,28 +328,112 @@ radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA background_icon = "background_delta" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "Hard to consider protection, but these types of people don't seek protection." + + roles_cap = list( + JOB_SQUAD_MARINE = null, + JOB_SQUAD_ENGI = 3, + JOB_SQUAD_MEDIC = 4, + JOB_SQUAD_SMARTGUN = 2, + JOB_SQUAD_SPECIALIST = 2, + JOB_SQUAD_TEAM_LEADER = 2, + JOB_SQUAD_LEADER = 1, + ) + +SQUAD_LANDMARKS(delta, Delta) +SQUAD_CRYOSTORAGE(delta, Delta) +SQUAD_VENDORS(delta, ACCESS_MARINE_DELTA, Delta) +SQUAD_DROPPAD(delta, Delta) /datum/squad/marine/echo name = SQUAD_MARINE_5 equipment_color = "#67d692" chat_color = "#67d692" - access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA) radio_freq = ECHO_FREQ omni_squad_vendor = TRUE minimap_color = MINIMAP_SQUAD_ECHO background_icon = "background_echo" + beret_flavortext = "Tightly Woven, as it should be." active = FALSE roundstart = FALSE locked = TRUE + add_to_glob_squad_list = TRUE + squad_role = SQUAD_ROLE_SECURITY + +SQUAD_DROPPAD(echo, Echo) + +/datum/squad/marine/kilo + name = SQUAD_MARINE_6 + equipment_color = "#059e96" + chat_color = "#059e96" + access = list(ACCESS_MARINE_SUPPORT) + radio_freq = KILO_FREQ + minimap_color = MINIMAP_SQUAD_KILO + background_icon = "background_kilo" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "Still has some morning toast crumbs on it." + + roles_cap = list( + JOB_SQUAD_MARINE = 4, + JOB_SQUAD_ENGI = 1, + JOB_SQUAD_MEDIC = 1, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 1, + JOB_SQUAD_LEADER = 1, + ) + pop_lock = 90 + squad_role = SQUAD_ROLE_SUPPORT + dynamic_scaling = FALSE + +SQUAD_LANDMARKS(kilo, Kilo) +SQUAD_CRYOSTORAGE(kilo, Kilo) +SQUAD_DROPPAD(kilo, Kilo) + +/datum/squad/marine/oscar + name = SQUAD_MARINE_7 + equipment_color = "#d6ffb2" + chat_color = "#678650" + access = list(ACCESS_MARINE_SUPPORT) + radio_freq = OSCAR_FREQ + minimap_color = MINIMAP_SQUAD_OSCAR + background_icon = "background_oscar" + has_cryostorage = TRUE + add_to_glob_squad_list = TRUE + beret_flavortext = "Still has some morning toast crumbs on it." + + roles_cap = list( + JOB_SQUAD_MARINE = 4, + JOB_SQUAD_ENGI = 1, + JOB_SQUAD_MEDIC = 1, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 1, + JOB_SQUAD_LEADER = 1, + ) + dynamic_scaling = FALSE + pop_lock = 130 + squad_role = SQUAD_ROLE_SUPPORT + +SQUAD_LANDMARKS(oscar, Oscar) +SQUAD_CRYOSTORAGE(oscar, Oscar) +SQUAD_DROPPAD(oscar, Oscar) + +SQUAD_VENDORS(support, ACCESS_MARINE_SUPPORT, null) /datum/squad/marine/cryo name = SQUAD_MARINE_CRYO equipment_color = "#c47a50" chat_color = "#c47a50" - access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA) minimap_color = MINIMAP_SQUAD_FOXTROT background_icon = "background_foxtrot" + beret_flavortext = "Looks and feels starched, cold to the touch." omni_squad_vendor = TRUE radio_freq = CRYO_FREQ @@ -187,6 +441,7 @@ active = FALSE roundstart = FALSE locked = TRUE + add_to_glob_squad_list = TRUE /datum/squad/marine/intel name = SQUAD_MARINE_INTEL @@ -195,6 +450,7 @@ minimap_color = MINIMAP_SQUAD_INTEL radio_freq = INTEL_FREQ background_icon = "background_intel" + beret_flavortext = "Looks more intellegent than the person wearing it." roundstart = FALSE prepend_squad_name_to_assignment = FALSE @@ -209,6 +465,9 @@ JOB_SQUAD_LEADER = 0, ) + squad_role = SQUAD_ROLE_SECURITY + add_to_glob_squad_list = TRUE + /datum/squad/marine/sof name = SQUAD_SOF equipment_color = "#400000" @@ -373,6 +632,33 @@ SStracking.setup_trackers(null, "FT3") update_all_squad_info() + if(pop_lock > 0) + initial_roles_cap = roles_cap.Copy() + roles_cap = list( + JOB_SQUAD_MARINE = 0, + JOB_SQUAD_ENGI = 0, + JOB_SQUAD_MEDIC = 0, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 0, + JOB_SQUAD_LEADER = 0, + ) + + if (!(name in GLOB.radiochannels)) + var/found = FALSE + for(var/name in GLOB.radiochannels) + if(GLOB.radiochannels[name] == radio_freq) + found = TRUE + break + + if(!found) + GLOB.radiochannels[name] = radio_freq + + if(has_cryostorage && !(name in GLOB.frozen_items)) + GLOB.frozen_items[name] = list() + + if(add_to_glob_squad_list && !(name in GLOB.ROLES_SQUAD_ALL)) + GLOB.ROLES_SQUAD_ALL += name RegisterSignal(SSdcs, COMSIG_GLOB_MODE_POSTSETUP, PROC_REF(setup_supply_drop_list)) /datum/squad/proc/setup_supply_drop_list() @@ -606,7 +892,7 @@ id_card = target_mob.get_active_hand() if(!istype(id_card)) - return FALSE //No ID found + id_card = new var/assignment = target_mob.job var/paygrade @@ -728,7 +1014,7 @@ if(!istype(id_card)) id_card = target_mob.get_idcard() if(!istype(id_card)) - return FALSE //Abort, no ID found + return FALSE id_card.access -= src.access id_card.assignment = target_mob.job diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index f8bbfa3c859d..2cfdc441769d 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -120,7 +120,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou */ -/datum/authority/branch/role/proc/setup_candidates_and_roles(list/overwritten_roles_for_mode) +/datum/authority/branch/role/proc/setup_candidates_and_roles(list/overwritten_roles_for_mode, list/random_players) //===============================================================\\ //PART I: Get roles relevant to the mode @@ -249,6 +249,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou // Assign the roles, this time for real, respecting limits we have established. var/list/roles_left = assign_roles(temp_roles_for_mode, unassigned_players) + test_squads(random_players) + var/alternate_option_assigned = 0; for(var/mob/new_player/M in unassigned_players) switch(M.client.prefs.alternate_option) @@ -279,6 +281,41 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou /*===============================================================*/ +// Assigns players to squads to check if they should be returned to lobby +/datum/authority/branch/role/proc/test_squads(list/random_players) + var/list/mob/living/carbon/human/test_humans = list() + var/list/mob/new_player/player_refs = alist() + for(var/mob/new_player/player in random_players) + if(!player || !player.ready || !player.mind || !player.job) + continue + + var/mob/living/carbon/human/test_human = new + var/datum/job/job = GLOB.RoleAuthority.roles_for_mode[player.job] + + if(!job || !job.gear_preset) + qdel(test_human) + continue + + var/datum/equipment_preset/preset = new job.gear_preset + test_human.faction = preset.faction + test_human.job = job.title + if(job.flags_startup_parameters & ROLE_ADD_TO_SQUAD && test_human.job != JOB_INTEL) + test_humans += test_human + player_refs[test_human] = player + GLOB.RoleAuthority.randomize_squad(test_human, force_client=player.client) + + for(var/mob/living/carbon/human/test_human in test_humans) + if(istype(test_human.assigned_squad, /datum/squad/marine/cryo)) + test_human.assigned_squad.forget_marine_in_squad(test_human) + free_role(GLOB.RoleAuthority.roles_for_mode[test_human.job], force = TRUE) + unassigned_players += player_refs[test_human] + player_refs[test_human].job = null + else + test_human.assigned_squad.forget_marine_in_squad(test_human) + qdel(test_human) + + for(var/datum/squad/squad in squads) + squad.roles_in = list() /** * Assign roles to the players. Return roles that are still avialable. * If count is true, return role balancing weight instead. @@ -406,8 +443,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou return TRUE -/datum/authority/branch/role/proc/free_role(datum/job/J, latejoin = 1) //Want to make sure it's a job, and nothing like a MODE or special role. - if(istype(J) && J.total_positions != -1 && J.get_total_positions(latejoin) >= J.current_positions) +/datum/authority/branch/role/proc/free_role(datum/job/J, latejoin = 1, force = FALSE) //Want to make sure it's a job, and nothing like a MODE or special role. + if((istype(J) && J.total_positions != -1 && J.get_total_positions(latejoin) >= J.current_positions) || force) J.current_positions-- return 1 @@ -494,6 +531,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou if(new_job.flags_startup_parameters & ROLE_ADD_TO_SQUAD) //Are we a muhreen? Randomize our squad. This should go AFTER IDs. //TODO Robust this later. randomize_squad(new_human) + if(!late_join) prioritize_specialist(new_human) @@ -551,7 +589,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou SSround_recording.recorder.track_player(new_human) //This proc is a bit of a misnomer, since there's no actual randomization going on. -/datum/authority/branch/role/proc/randomize_squad(mob/living/carbon/human/human, skip_limit = FALSE) +/datum/authority/branch/role/proc/randomize_squad(mob/living/carbon/human/human, skip_limit = FALSE, client/force_client = null) if(!human) return @@ -576,24 +614,31 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou slot_check = GET_DEFAULT_ROLE(human.job) //we make a list of squad that is randomized so alpha isn't always lowest squad. - var/list/mixed_squads = list() + var/list/usable_squads = list() for(var/datum/squad/squad in squads) if(squad.roundstart && squad.usable && squad.faction == human.faction && squad.name != "Root") - mixed_squads += squad - - var/preferred_squad = human.client?.prefs?.preferred_squad - if(preferred_squad == "None") - preferred_squad = null + usable_squads += squad + + var/has_squad_pref = FALSE + var/list/preferred_squads = force_client ? force_client.prefs?.preferred_squad : human.client?.prefs?.preferred_squad + if(islist(preferred_squads) && length(preferred_squads)) + var/list/ordered_squads = list() + for(var/squad_in_pref in preferred_squads) + for(var/datum/squad/squad_in_usable in usable_squads) + if(squad_in_usable.name == squad_in_pref || squad_in_usable.equivalent_name == squad_in_pref) + ordered_squads += squad_in_usable + continue + has_squad_pref = TRUE + usable_squads = ordered_squads var/datum/squad/lowest - for(var/datum/squad/squad in mixed_squads) + for(var/datum/squad/squad in usable_squads) if(slot_check && !isnull(squad.roles_cap[slot_check]) && !skip_limit) if(squad.roles_in[slot_check] >= squad.roles_cap[slot_check]) continue - if(preferred_squad && (squad.name == preferred_squad || squad.equivalent_name == preferred_squad)) //fav squad or faction equivalent has a spot for us, no more searching needed. - if(squad.put_marine_in_squad(human)) - return + if(has_squad_pref && squad.put_marine_in_squad(human)) + return if(!lowest || (slot_check && lowest.roles_in[slot_check] > squad.roles_in[slot_check])) lowest = squad diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index d5a3e2679213..8feae46a4e05 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -5,6 +5,13 @@ count++ return count +/proc/get_total_squad_marines() + var/count = 0 + for(var/mob/living/carbon/human/cur_human in GLOB.human_mob_list) + if(cur_human.faction == FACTION_MARINE && cur_human.assigned_squad) + count++ + return count + // https://docs.google.com/spreadsheets/d/1PlnIwKhq-bVWWFPoBrzWYh1mWK04pyBSQUtUMEw3qSw/edit#gid=1290768907 /proc/job_slot_formula(marine_count, factor, c, min, max) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 00d6651b2a2b..cd1d1a09ea8e 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(), "Responders" = list())) +GLOBAL_LIST_INIT(frozen_items, list("MP" = list(), "REQ" = list(), "Eng" = list(), "Med" = list(), "Yautja" = list(), "Responders" = list())) //Main cryopod console. @@ -34,18 +34,6 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li /obj/structure/machinery/computer/cryopod/eng cryotype = "Eng" -/obj/structure/machinery/computer/cryopod/alpha - cryotype = SQUAD_MARINE_1 - -/obj/structure/machinery/computer/cryopod/bravo - cryotype = SQUAD_MARINE_2 - -/obj/structure/machinery/computer/cryopod/charlie - cryotype = SQUAD_MARINE_3 - -/obj/structure/machinery/computer/cryopod/delta - cryotype = SQUAD_MARINE_4 - /obj/structure/machinery/computer/cryopod/yautja cryotype = "Yautja" icon = 'icons/obj/structures/machinery/yautja_machines.dmi' diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 2452c4449ce8..e101939926df 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -738,49 +738,49 @@ opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie - name = "\improper Charlie Squad Preparations" - icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' +/obj/structure/machinery/door/airlock/almayer/marine/support + name = "\improper Support Squad Preparations" + icon = 'icons/obj/structures/doors/prepdoor.dmi' req_access = list(ACCESS_MARINE_PREP) - req_one_access = list(ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_CHARLIE) + req_one_access = list(ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_SUPPORT) opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie/sl - name = "\improper Charlie Squad Leader Preparations" - req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_CHARLIE) +/obj/structure/machinery/door/airlock/almayer/marine/support/sl + name = "\improper Support Squad Leader Preparations" + req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SUPPORT) req_one_access = list() dir = SOUTH opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie/spec - name = "\improper Charlie Squad Specialist Preparations" - req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_CHARLIE) +/obj/structure/machinery/door/airlock/almayer/marine/support/spec + name = "\improper Support Squad Specialist Preparations" + req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_SUPPORT) req_one_access = list() dir = SOUTH opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie/engineer - name = "\improper Charlie Squad ComTech Preparations" - req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_CHARLIE) +/obj/structure/machinery/door/airlock/almayer/marine/support/engineer + name = "\improper Support Squad ComTech Preparations" + req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SUPPORT) req_one_access = list() dir = SOUTH opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie/medic - name = "\improper Charlie Squad Medical Preparations" - req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_CHARLIE) +/obj/structure/machinery/door/airlock/almayer/marine/support/medic + name = "\improper Support Squad Medical Preparations" + req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_SUPPORT) req_one_access = list() dir = SOUTH opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/charlie/smart - name = "\improper Charlie Squad Smartgunner Preparations" - req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_CHARLIE) +/obj/structure/machinery/door/airlock/almayer/marine/support/smart + name = "\improper Support Squad Smartgunner Preparations" + req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_SUPPORT) req_one_access = list() dir = SOUTH opacity = FALSE @@ -848,10 +848,10 @@ req_one_access = list(ACCESS_MARINE_TL_PREP) dir = SOUTH -/obj/structure/machinery/door/airlock/almayer/marine/charlie/tl - name = "\improper Charlie Squad Fireteam Leader Preparations" +/obj/structure/machinery/door/airlock/almayer/marine/support/tl + name = "\improper Support Squad Fireteam Leader Preparations" req_access = list() - req_one_access = list(ACCESS_MARINE_TL_PREP) + req_one_access = list(ACCESS_MARINE_TL_PREP, ACCESS_MARINE_SUPPORT) dir = SOUTH /obj/structure/machinery/door/airlock/almayer/marine/delta/tl @@ -865,25 +865,25 @@ /obj/structure/machinery/door/airlock/almayer/marine/shared name = "\improper Squads Preparations" icon = 'icons/obj/structures/doors/prepdoor.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA) opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/almayer/marine/shared/alpha_bravo - name = "\improper Alpha-Bravo Squads Preparations" +/obj/structure/machinery/door/airlock/almayer/marine/shared/alpha_delta + name = "\improper 1st Platoon Squads Preparations" icon = 'icons/obj/structures/doors/prepdoor_alpha.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO) + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_DELTA) /obj/structure/machinery/door/airlock/almayer/marine/shared/alpha_bravo/yellow icon = 'icons/obj/structures/doors/prepdoor_bravo.dmi' -/obj/structure/machinery/door/airlock/almayer/marine/shared/charlie_delta - name = "\improper Charlie-Delta Squads Preparations" - icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) +/obj/structure/machinery/door/airlock/almayer/marine/shared/support_bravo + name = "\improper 2nd Platoon Squads Preparations" + icon = 'icons/obj/structures/doors/prepdoor.dmi' + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_BRAVO) -/obj/structure/machinery/door/airlock/almayer/marine/shared/charlie_delta/blue - icon = 'icons/obj/structures/doors/prepdoor_delta.dmi' +/obj/structure/machinery/door/airlock/almayer/marine/shared/support_bravo/yellow + icon = 'icons/obj/structures/doors/prepdoor_bravo.dmi' //DROPSHIP SIDE AIRLOCKS diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index b6fbe25f214c..d34bfd92ad84 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -649,11 +649,11 @@ req_access = list(ACCESS_MARINE_PREP) req_one_access = list(ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_BRAVO) -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie - name = "\improper Charlie Squad Preparations" - icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/support + name = "\improper Support Squad Preparations" + icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' req_access = list(ACCESS_MARINE_PREP) - req_one_access = list(ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_CHARLIE) + req_one_access = list(ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_SUPPORT) /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta name = "\improper Delta Squad Preparations" @@ -664,25 +664,25 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared name = "\improper Squads Preparations" icon = 'icons/obj/structures/doors/prepdoor.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA) opacity = FALSE glass = TRUE -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo - name = "\improper Alpha-Bravo Squads Preparations" +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_delta + name = "\improper 1st Platooon Squads Preparations" icon = 'icons/obj/structures/doors/2x1prepdoor_alpha.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO) + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_DELTA) -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow - icon = 'icons/obj/structures/doors/2x1prepdoor_bravo.dmi' +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_delta/blue + icon = 'icons/obj/structures/doors/2x1prepdoor_delta.dmi' -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta - name = "\improper Charlie-Delta Squads Preparations" - icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' - req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/bravo_support + name = "\improper 2nd Platoon Squads Preparations" + icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' + req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_BRAVO) -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue - icon = 'icons/obj/structures/doors/2x1prepdoor_delta.dmi' +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/bravo_support/yellow + icon = 'icons/obj/structures/doors/2x1prepdoor_bravo.dmi' /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2 diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 1eafc222a52a..891ce139886d 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -440,7 +440,7 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers) id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ) + freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, KILO_FREQ, OSCAR_FREQ) //--PRESET RIGHT--// @@ -478,7 +478,7 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers) /obj/structure/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ) + freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, KILO_FREQ, OSCAR_FREQ, CRYO_FREQ) autolinkers = list("processor2","squads") /obj/structure/machinery/telecomms/bus/preset_three @@ -543,7 +543,7 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers) /obj/structure/machinery/telecomms/server/presets/squads id = "Squad Server" - freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ) + freq_listening = list(ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, KILO_FREQ, OSCAR_FREQ) autolinkers = list("squads") /obj/structure/machinery/telecomms/server/presets/medical diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 2f4af649f049..0293e1459029 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -575,7 +575,7 @@ GLOBAL_LIST_EMPTY(vending_products) vendor_successful_vend(itemspec, user) add_fingerprint(user) return TRUE - if((!human_user.assigned_squad && squad_tag) || (!human_user.assigned_squad?.omni_squad_vendor && (squad_tag && human_user.assigned_squad.name != squad_tag))) + if((!human_user.assigned_squad && squad_tag) || (!human_user.assigned_squad?.omni_squad_vendor && (squad_tag && human_user.assigned_squad.name != squad_tag)) && squad_tag != "null") to_chat(user, SPAN_WARNING("This machine isn't for your squad.")) vend_fail() return FALSE @@ -1469,6 +1469,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( user.equip_to_appropriate_slot(new_item) new_item.update_icon() + if(istype(new_item, /obj/item/device/radio/headset/almayer/marine/self_setting)) + var/obj/item/device/radio/headset/almayer/marine/self_setting/new_headset = new_item + new_headset.self_set() + + new_item.post_vendor_spawn_hook(user) /obj/structure/machinery/cm_vending/proc/handle_vend(list/listed_products, mob/living/carbon/human/vending_human) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index eb6d07a99c07..d3eb9010887f 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -521,6 +521,8 @@ list("Charlie Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/charlie, VENDOR_ITEM_REGULAR), list("Delta Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/delta, VENDOR_ITEM_REGULAR), list("Echo Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/echo, VENDOR_ITEM_REGULAR), + list("Kilo Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/kilo, VENDOR_ITEM_REGULAR), + list("Oscar Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/oscar, VENDOR_ITEM_REGULAR), list("Engineering Radio Encryption Key", 5, /obj/item/device/encryptionkey/engi, VENDOR_ITEM_REGULAR), list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, VENDOR_ITEM_REGULAR), list("JTAC Radio Encryption Key", 5, /obj/item/device/encryptionkey/jtac, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 50ecbef3b1a7..835582614e91 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -197,26 +197,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( /obj/structure/machinery/cm_vending/clothing/engi/get_listed_products(mob/user) return GLOB.cm_vending_clothing_engi -/obj/structure/machinery/cm_vending/clothing/engi/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha/engi - -/obj/structure/machinery/cm_vending/clothing/engi/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo/engi - -/obj/structure/machinery/cm_vending/clothing/engi/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie/engi - -/obj/structure/machinery/cm_vending/clothing/engi/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_ENGPREP, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta/engi - //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/engi diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index a622e04675f2..ab4d4939fe3b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -195,26 +195,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( /obj/structure/machinery/cm_vending/clothing/leader/get_listed_products(mob/user) return GLOB.cm_vending_clothing_leader -/obj/structure/machinery/cm_vending/clothing/leader/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha/lead - -/obj/structure/machinery/cm_vending/clothing/leader/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo/lead - -/obj/structure/machinery/cm_vending/clothing/leader/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie/lead - -/obj/structure/machinery/cm_vending/clothing/leader/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta/lead - //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/leader diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index aff6d853d87b..14d58c3cf5d4 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -199,26 +199,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( /obj/structure/machinery/cm_vending/clothing/medic/get_listed_products(mob/user) return GLOB.cm_vending_clothing_medic -/obj/structure/machinery/cm_vending/clothing/medic/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha/med - -/obj/structure/machinery/cm_vending/clothing/medic/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo/med - -/obj/structure/machinery/cm_vending/clothing/medic/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie/med - -/obj/structure/machinery/cm_vending/clothing/medic/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_MEDPREP, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta/med - //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/medic diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index e5f472260823..3e5f7e0a56c2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -241,11 +241,11 @@ list("Marine Bravo Radio Headset", 10, /obj/item/device/radio/headset/almayer/marine/bravo, VENDOR_ITEM_REGULAR), ) -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/charlie +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/support req_access = list(ACCESS_MARINE_PREP) - req_one_access = list(ACCESS_MARINE_CHARLIE, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO) + req_one_access = list(ACCESS_MARINE_SUPPORT, ACCESS_MARINE_GENERAL, ACCESS_MARINE_CARGO) -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/charlie/populate_product_list(scale) +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/support/populate_product_list(scale) ..() listed_products += list( list("HEADSET", -1, null, null), @@ -273,12 +273,9 @@ hackable = TRUE vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_STOCK_DYNAMIC - vend_x_offset = 2 - /obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/ui_state(mob/user) return GLOB.not_incapacitated_and_adjacent_strict_state - /obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/populate_product_list(scale) listed_products = list( list("ARMOR-PIERCING AMMUNITION", -1, null, null), @@ -309,6 +306,69 @@ list("M74 AGM-H Hornet Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR), ) +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/platoon1/populate_product_list(scale) + listed_products = list( + list("ARMOR-PIERCING AMMUNITION", -1, null, null), + list("M4RA AP Magazine (10x24mm)", 3.5, /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), + list("M10 AP Magazine (10x20mm-APC)", floor(scale * 4), /obj/item/ammo_magazine/pistol/m10/ap , VENDOR_ITEM_REGULAR), + list("M10 AP Extended Magazine (10x20mm-APC)", floor(scale * 2), /obj/item/ammo_magazine/pistol/m10/ap/extended , VENDOR_ITEM_REGULAR), + list("M39 AP Magazine (10x20mm)", floor(scale * 3), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), + list("M41A AP Magazine (10x24mm)", floor(scale * 3), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), + + list("EXTENDED AMMUNITION", -1, null, null), + list("M4RA Extended Magazine (10x24mm)", 1.8, /obj/item/ammo_magazine/rifle/m4ra/extended, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 1.8, /obj/item/ammo_magazine/smg/m39/extended, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 1.9, /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), + list("M10 HV extended magazine (10x20mm)", floor(scale * 5), /obj/item/ammo_magazine/pistol/m10/extended , VENDOR_ITEM_REGULAR), + + list("SPECIAL AMMUNITION", -1, null, null), + list("M56 Smartgun Drum", 2, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), + list("M44 Heavy Speed Loader (.44)", floor(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", floor(scale * 2), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), + list("M4A3 AP Magazine", floor(scale * 2), /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), + + list("RESTRICTED FIREARM AMMUNITION", -1, null, null), + list("VP78 Magazine", floor(scale * 5), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", floor(scale * 5), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), + list("M240 Incinerator Tank", floor(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), + list("M56D Drum Magazine", floor(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), + list("M2C Box Magazine", floor(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), + list("HIRR Baton Slugs", floor(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR), + list("M74 AGM-S Star Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR), + list("M74 AGM-H Hornet Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR), + ) + +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/platoon2/populate_product_list(scale) + listed_products = list( + list("ARMOR-PIERCING AMMUNITION", -1, null, null), + list("M4RA AP Magazine (10x24mm)", 3.5, /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), + list("M10 AP Magazine (10x20mm-APC)", floor(scale * 4), /obj/item/ammo_magazine/pistol/m10/ap , VENDOR_ITEM_REGULAR), + list("M10 AP Extended Magazine (10x20mm-APC)", floor(scale * 2), /obj/item/ammo_magazine/pistol/m10/ap/extended , VENDOR_ITEM_REGULAR), + list("M39 AP Magazine (10x20mm)", floor(scale * 3), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), + list("M41A AP Magazine (10x24mm)", floor(scale * 3), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), + + list("EXTENDED AMMUNITION", -1, null, null), + list("M4RA Extended Magazine (10x24mm)", 1.8, /obj/item/ammo_magazine/rifle/m4ra/extended, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 1.8, /obj/item/ammo_magazine/smg/m39/extended, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 1.9, /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), + list("M10 HV extended magazine (10x20mm)", floor(scale * 5), /obj/item/ammo_magazine/pistol/m10/extended , VENDOR_ITEM_REGULAR), + + list("SPECIAL AMMUNITION", -1, null, null), + list("M44 Heavy Speed Loader (.44)", floor(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", floor(scale * 2), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), + list("M4A3 AP Magazine", floor(scale * 2), /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), + + list("RESTRICTED FIREARM AMMUNITION", -1, null, null), + list("VP78 Magazine", floor(scale * 5), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", floor(scale * 5), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), + list("M240 Incinerator Tank", floor(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), + list("M56D Drum Magazine", floor(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), + list("M2C Box Magazine", floor(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), + list("HIRR Baton Slugs", floor(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR), + list("M74 AGM-S Star Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR), + list("M74 AGM-H Hornet Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR), + ) + //--------------SQUAD ARMAMENTS VENDOR-------------- /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad @@ -327,10 +387,6 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/populate_product_list(scale) listed_products = list( - list("FOOD", -1, null, null), - list("MRE", floor(scale * 5), /obj/item/storage/box/mre, VENDOR_ITEM_REGULAR), - list("MRE Box", floor(scale * 1), /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR), - list("TOOLS", -1, null, null), list("Entrenching Tool (ET)", floor(scale * 2), /obj/item/tool/shovel/etool/folded, VENDOR_ITEM_REGULAR), list("Screwdriver", floor(scale * 5), /obj/item/tool/screwdriver, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 5fda20f0117a..ab4f3371d315 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -147,23 +147,3 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( /obj/structure/machinery/cm_vending/clothing/marine/get_listed_products(mob/user) return GLOB.cm_vending_clothing_marine - -/obj/structure/machinery/cm_vending/clothing/marine/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha - -/obj/structure/machinery/cm_vending/clothing/marine/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo - -/obj/structure/machinery/cm_vending/clothing/marine/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie - -/obj/structure/machinery/cm_vending/clothing/marine/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index d089218c2759..5834201a4dde 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -131,24 +131,4 @@ GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list( /obj/structure/machinery/cm_vending/clothing/smartgun/get_listed_products(mob/user) return GLOB.cm_vending_clothing_smartgun -/obj/structure/machinery/cm_vending/clothing/smartgun/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha - -/obj/structure/machinery/cm_vending/clothing/smartgun/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo - -/obj/structure/machinery/cm_vending/clothing/smartgun/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie - -/obj/structure/machinery/cm_vending/clothing/smartgun/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta - //------------ESSENTIAL SETS--------------- diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 35cd1dffa73f..67d034a45482 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec_heavy, list( return if(!user.skills.get_skill_level(SKILL_SPEC_WEAPONS) == SKILL_SPEC_TRAINED) return - if((!human_user.assigned_squad && squad_tag) || (!human_user.assigned_squad?.omni_squad_vendor && (squad_tag && human_user.assigned_squad.name != squad_tag))) + if((!human_user.assigned_squad && squad_tag) || (!human_user.assigned_squad?.omni_squad_vendor && (squad_tag && human_user.assigned_squad.name != squad_tag)) && squad_tag != "null") to_chat(user, SPAN_WARNING("This machine isn't for your squad.")) return var/datum/specialist_set/chosen_set = get_specialist_set(user) @@ -220,26 +220,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( /obj/structure/machinery/cm_vending/clothing/specialist/get_listed_products(mob/user) return GLOB.cm_vending_clothing_specialist -/obj/structure/machinery/cm_vending/clothing/specialist/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha - -/obj/structure/machinery/cm_vending/clothing/specialist/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo - -/obj/structure/machinery/cm_vending/clothing/specialist/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie - -/obj/structure/machinery/cm_vending/clothing/specialist/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_SPECPREP, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta - //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/hedp_6_pack diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 71ba527ed47e..fb52751b6b57 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -158,26 +158,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( /obj/structure/machinery/cm_vending/clothing/tl/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tl -/obj/structure/machinery/cm_vending/clothing/tl/alpha - squad_tag = SQUAD_MARINE_1 - req_access = list(ACCESS_MARINE_TL_PREP, ACCESS_MARINE_ALPHA) - headset_type = /obj/item/device/radio/headset/almayer/marine/alpha/tl - -/obj/structure/machinery/cm_vending/clothing/tl/bravo - squad_tag = SQUAD_MARINE_2 - req_access = list(ACCESS_MARINE_TL_PREP, ACCESS_MARINE_BRAVO) - headset_type = /obj/item/device/radio/headset/almayer/marine/bravo/tl - -/obj/structure/machinery/cm_vending/clothing/tl/charlie - squad_tag = SQUAD_MARINE_3 - req_access = list(ACCESS_MARINE_TL_PREP, ACCESS_MARINE_CHARLIE) - headset_type = /obj/item/device/radio/headset/almayer/marine/charlie/tl - -/obj/structure/machinery/cm_vending/clothing/tl/delta - squad_tag = SQUAD_MARINE_4 - req_access = list(ACCESS_MARINE_TL_PREP, ACCESS_MARINE_DELTA) - headset_type = /obj/item/device/radio/headset/almayer/marine/delta/tl - //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/tl spawned_gear_list = list( diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 9b1b0fbab52f..17faee29d7b7 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -500,26 +500,6 @@ var/job var/job_list -/obj/effect/landmark/late_join/alpha - name = "alpha late join" - icon_state = "late_join_alpha" - squad = SQUAD_MARINE_1 - -/obj/effect/landmark/late_join/bravo - name = "bravo late join" - icon_state = "late_join_bravo" - squad = SQUAD_MARINE_2 - -/obj/effect/landmark/late_join/charlie - name = "charlie late join" - icon_state = "late_join_charlie" - squad = SQUAD_MARINE_3 - -/obj/effect/landmark/late_join/delta - name = "delta late join" - icon_state = "late_join_delta" - squad = SQUAD_MARINE_4 - /obj/effect/landmark/late_join/synthetic name = "synthetic late join" icon_state = "late_join_misc" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index de276a6ad9f1..2f5b321c589c 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -60,22 +60,22 @@ /obj/item/device/encryptionkey/cmpcom/cdrcom name = "\improper Marine Senior Command Radio Encryption Key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_6 = TRUE, SQUAD_MARINE_7 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/mcom name = "\improper Marine Command Radio Encryption Key" icon_state = "cap_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_6 = TRUE, SQUAD_MARINE_7 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/mcom/alt - channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) // MARINE ENGINEERING /obj/item/device/encryptionkey/ce name = "Chief Engineer's Encryption Key" icon_state = "ce_key" - channels = list(RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/engi name = "Engineering Radio Encryption Key" @@ -87,7 +87,7 @@ /obj/item/device/encryptionkey/cmo name = "Chief Medical Officer's Encryption Key" icon_state = "cmo_key" - channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_INTEL = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE) + channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_INTEL = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE) /obj/item/device/encryptionkey/med name = "Medical Radio Encryption Key" @@ -104,12 +104,12 @@ /obj/item/device/encryptionkey/cmpcom name = "\improper Marine Chief MP Radio Encryption Key" icon_state = "cmp_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/mmpo name = "\improper Military Police Radio Encryption Key" icon_state = "sec_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_6 = TRUE, SQUAD_MARINE_7 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,) /obj/item/device/encryptionkey/sec name = "Security Radio Encryption Key" @@ -121,7 +121,7 @@ /obj/item/device/encryptionkey/qm name = "Requisition Officer's Encryption Key" icon_state = "ce_key" - channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = FALSE, RADIO_CHANNEL_MEDSCI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = FALSE, RADIO_CHANNEL_MEDSCI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/req/ct name = "Supply Radio Encryption Key" @@ -137,7 +137,7 @@ /obj/item/device/encryptionkey/cmpcom/synth name = "\improper Marine Synth Radio Encryption Key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_6 = TRUE, SQUAD_MARINE_7 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/mcom/cl name = "\improper Corporate Liaison radio encryption key" @@ -157,7 +157,7 @@ /obj/item/device/encryptionkey/io name = "\improper Marine Intelligence Officer Radio Encryption Key" icon_state = "cap_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/vc name = "\improper Marine Vehicle Crewman Radio Encryption Key" @@ -171,7 +171,7 @@ /obj/item/device/encryptionkey/cmpcom/synth/ai //AI only. name = "AI Integrated Radio Encryption Key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_WY = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_6 = TRUE, SQUAD_MARINE_7 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_WY = TRUE) translate_apollo = TRUE translate_artemis = TRUE @@ -215,10 +215,20 @@ icon_state = "cryo_key" channels = list(SQUAD_MARINE_CRYO = TRUE) +/obj/item/device/encryptionkey/kilo + name = "\improper Kilo Squad Radio Encryption Key" + icon_state = "kilo_key" + channels = list(SQUAD_MARINE_6 = TRUE) + +/obj/item/device/encryptionkey/oscar + name = "\improper Oscar Squad Radio Encryption Key" + icon_state = "oscar_key" + channels = list(SQUAD_MARINE_7 = TRUE) + /obj/item/device/encryptionkey/soc name = "\improper SOF Radio Encryption Key" icon_state = "binary_key" - channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/soc/forecon channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COLONY = TRUE) @@ -340,12 +350,12 @@ /obj/item/device/encryptionkey/highcom name = "\improper USCM High Command Radio Encryption Key" icon_state = "binary_key" - channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE) + channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE) /obj/item/device/encryptionkey/provost name = "\improper USCM Provost Radio Encryption Key" icon_state = "sec_key" - channels = list(RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE) + channels = list(RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE) /obj/item/device/encryptionkey/contractor @@ -360,7 +370,7 @@ /obj/item/device/encryptionkey/cia icon_state = "sl_key" - channels = list(RADIO_CHANNEL_CIA = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_CIA = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_6 = FALSE, SQUAD_MARINE_7 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/cmb name = "\improper Colonial Marshal Bureau Radio Encryption Key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 1912e4a4fe97..c85066bfc60d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -482,7 +482,6 @@ if(add_medal_recommendation(usr)) to_chat(usr, SPAN_NOTICE("Recommendation successfully submitted.")) - /obj/item/device/radio/headset/almayer/mt name = "engineering radio headset" desc = "Useful for coordinating maintenance bars and orbital bombardments. Of robust and sturdy construction. To access the engineering channel, use :n." @@ -571,7 +570,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/mcom/alt @@ -729,7 +730,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/mcom/cdrcom/co @@ -744,7 +747,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/mcom/sea @@ -805,7 +810,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/alpha/tl @@ -849,7 +856,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/bravo/tl @@ -893,7 +902,9 @@ "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/charlie/tl @@ -937,7 +948,9 @@ "Charlie SL" = TRACKER_CSL, "Echo SL" = TRACKER_ESL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/delta/tl @@ -981,7 +994,9 @@ "Charlie SL" = TRACKER_CSL, "Delta SL" = TRACKER_DSL, "Foxtrot SL" = TRACKER_FSL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/echo/tl @@ -1005,7 +1020,7 @@ /obj/item/device/radio/headset/almayer/marine/cryo name = "marine foxtrot radio headset" desc = "This is used by Foxtrot squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window." - icon_state = "cryo_headset" + icon_state = "foxtrot_headset" frequency = CRYO_FREQ /obj/item/device/radio/headset/almayer/marine/cryo/lead @@ -1026,7 +1041,9 @@ "Charlie SL" = TRACKER_CSL, "Delta SL" = TRACKER_DSL, "Echo SL" = TRACKER_ESL, - "Intel SL" = TRACKER_ISL + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL, ) /obj/item/device/radio/headset/almayer/marine/cryo/tl @@ -1061,40 +1078,33 @@ var/mob/living/carbon/human/H = loc if(istype(H, /mob/living/carbon/human)) if(H.assigned_squad) - switch(H.assigned_squad.name) - if(SQUAD_MARINE_1) - name = "[SQUAD_MARINE_1] radio headset" - desc = "This is used by [SQUAD_MARINE_1] squad members." - icon_state = "alpha_headset" - frequency = ALPHA_FREQ - if(SQUAD_MARINE_2) - name = "[SQUAD_MARINE_2] radio headset" - desc = "This is used by [SQUAD_MARINE_2] squad members." - icon_state = "bravo_headset" - frequency = BRAVO_FREQ - if(SQUAD_MARINE_3) - name = "[SQUAD_MARINE_3] radio headset" - desc = "This is used by [SQUAD_MARINE_3] squad members." - icon_state = "charlie_headset" - frequency = CHARLIE_FREQ - if(SQUAD_MARINE_4) - name = "[SQUAD_MARINE_4] radio headset" - desc = "This is used by [SQUAD_MARINE_4] squad members." - icon_state = "delta_headset" - frequency = DELTA_FREQ - if(SQUAD_MARINE_5) - name = "[SQUAD_MARINE_5] radio headset" - desc = "This is used by [SQUAD_MARINE_5] squad members." - frequency = ECHO_FREQ - if(SQUAD_MARINE_CRYO) - name = "[SQUAD_MARINE_CRYO] radio headset" - desc = "This is used by [SQUAD_MARINE_CRYO] squad members." - frequency = CRYO_FREQ + name = "[lowertext(H.assigned_squad.name)] radio headset" + desc = "This is used by [H.assigned_squad.name] squad members." + icon_state = "[lowertext(H.assigned_squad.name)]_headset" + frequency = H.assigned_squad.radio_freq switch(GET_DEFAULT_ROLE(H.job)) if(JOB_SQUAD_LEADER) name = "marine leader " + name keys += new /obj/item/device/encryptionkey/squadlead(src) + inbuilt_tracking_options = list( + "Squad Leader" = TRACKER_SL, + "Fireteam Leader" = TRACKER_FTL, + "Landing Zone" = TRACKER_LZ, + "Commanding Officer" = TRACKER_CO, + "Executive Officer" = TRACKER_XO, + "Alpha SL" = TRACKER_ASL, + "Bravo SL" = TRACKER_BSL, + "Charlie SL" = TRACKER_CSL, + "Delta SL" = TRACKER_DSL, + "Echo SL" = TRACKER_ESL, + "Foxtrot SL" = TRACKER_FSL, + "Intel SL" = TRACKER_ISL, + "Kilo SL" = TRACKER_KSL, + "Oscar SL" = TRACKER_OSL + ) + inbuilt_tracking_options -= "[H.assigned_squad.name] SL" + locate_setting = TRACKER_LZ volume = RADIO_VOLUME_CRITICAL if(JOB_SQUAD_MEDIC) name = "marine hospital corpsman " + name diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm index 2e1a42a25d69..b508e8a9ed4c 100644 --- a/code/game/objects/structures/hybrisa_props.dm +++ b/code/game/objects/structures/hybrisa_props.dm @@ -1787,6 +1787,52 @@ // Coffee Machine (Works with Empty Coffee cups, Mugs ect.) +/obj/structure/mug_rack + icon = 'icons/obj/structures/mug_rack.dmi' + name = "mug rack" + desc = "A rack, for mugs." + icon_state = "mug-rack" + var/amount = 50 + +/obj/structure/mug_rack/Initialize(mapload, ...) + update_icon() + + . = ..() + +/obj/structure/mug_rack/update_icon() + overlays.Cut() + if(!amount) + return + + if(amount < initial(amount) / 3) + overlays += image(icon=icon, icon_state="mugs-3") + return + + if(amount < 2 * initial(amount) / 3) + overlays += image(icon=icon, icon_state="mugs-2") + return + + overlays += image(icon=icon, icon_state="mugs-1") + +/obj/structure/mug_rack/attackby(obj/item/item, mob/user) + if(istype(item, /obj/item/reagent_container/food/drinks/coffeecup)) + if(user.drop_held_item()) + amount++ + to_chat(user, SPAN_NOTICE("You put [item] in [src].")) + update_icon() + qdel(item) + +/obj/structure/mug_rack/attack_hand(mob/user) + if(amount >= 1) + amount-- + + var/obj/item/reagent_container/food/drinks/coffeecup/cup = new(loc) + + cup.forceMove(user.loc) + user.put_in_hands(cup) + to_chat(user, SPAN_NOTICE("You take [cup] out of [src].")) + update_icon() + /obj/structure/machinery/hybrisa/coffee_machine icon = 'icons/obj/structures/machinery/coffee_machine.dmi' name = "coffee machine" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 69eb96de68a4..fad775b567f9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -311,6 +311,16 @@ name = "Delta squad chair" desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Delta squad blue. This chair is most likely to be the first to fight and first to die." +/obj/structure/bed/chair/comfy/kilo + icon_state = "comfychair_teal" + name = "Kilo squad chair" + desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Delta squad blue. This chair is most likely to be the first to fight and first to die." + +/obj/structure/bed/chair/comfy/oscar + icon_state = "comfychair_lime" + name = "Oscar squad chair" + desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Delta squad blue. This chair is most likely to be the first to fight and first to die." + /obj/structure/bed/chair/comfy/ares icon_state = "comfychair_ares" name = "AI core chair" diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index b3eec820b688..85771ec9e960 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -5037,3 +5037,9 @@ /turf/open/gm/grass/grass2/pred icon_state = "grass2" + +/turf/open/floor/almayer/tealfull + icon_state = "tealfull" + +/turf/open/floor/almayer/limefull + icon_state = "limefull" diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index b5da3562c512..502fbc83a91d 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -79,6 +79,9 @@ var/minimap_flag = MINIMAP_FLAG_USCM var/drawing = TRUE +/obj/structure/machinery/prop/almayer/CICmap/dumb + drawing = FALSE + /obj/structure/machinery/prop/almayer/CICmap/Initialize(mapload, ...) . = ..() AddComponent(/datum/component/tacmap, has_drawing_tools=drawing, minimap_flag=minimap_flag, has_update=drawing, drawing=drawing) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bb40cf255eb6..897c91d80984 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/body_size = BODY_SIZE_AVERAGE // Body Size var/body_type = BODY_TYPE_LEAN // Body Type var/language = "None" //Secondary language - var/preferred_squad = "None" + var/preferred_squad = list() var/preferred_spec = list() var/night_vision_preference = "Green" var/list/nv_color_list = list( @@ -513,7 +513,14 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Religion: [religion]
" dat += "Corporate Relation: [weyland_yutani_relation]
" - dat += "Preferred Squad: [preferred_squad]
" + var/squad_detail = "No preference" + if(length(preferred_squad) && islist(preferred_squad)) + squad_detail = "" + for(var/squad in preferred_squad) + squad_detail += copytext(squad, 1, 2) + ", " + squad_detail = copytext(squad_detail, 1, length(squad_detail) - 1) + + dat += "Squad Priority: [squad_detail]
" var/spec_detail switch(length(preferred_spec)) if(0) @@ -1657,9 +1664,19 @@ GLOBAL_LIST_INIT(be_special_flags, list( weyland_yutani_relation = new_relation if("prefsquad") - var/new_pref_squad = input(user, "Choose your preferred squad.", "Character Preference") as null|anything in list("Alpha", "Bravo", "Charlie", "Delta", "None") - if(new_pref_squad) - preferred_squad = new_pref_squad + var/list/choices + if(preferred_squad && islist(preferred_squad) && length(preferred_squad)) + choices = preferred_squad + + for(var/squad in list("Alpha", "Bravo", "Charlie", "Delta", "Oscar", "Kilo")) + if(!(squad in choices)) + choices += squad + else + choices = list("Alpha", "Bravo", "Charlie", "Delta", "Oscar", "Kilo") + var/new_pref_squad = tgui_priority_input(user, "Choose your preferred squads in order of priority or none for 'No Preference'.", "Squad Preference", choices) + if(isnull(new_pref_squad)) + return // Canceled + preferred_squad = new_pref_squad if("prefspec") var/new_pref_spec = tgui_input_checkboxes(user, "Choose your preferred spec in order of priority or none for 'No Preference'.", "Specialist Preference", GLOB.specialist_set_name_dict, min_checked=0) diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 5a44201edc61..ef4ec29e191a 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -175,28 +175,8 @@ var/mob/living/carbon/human/H = loc if(istype(H)) if(H.assigned_squad) - switch(H.assigned_squad.name) - if(SQUAD_MARINE_1) - icon_state = "beret_alpha" - desc = "Often found atop heads, slightly less found on those still attached." - if(SQUAD_MARINE_2) - icon_state = "beret_bravo" - desc = "It has quite a lot of debris on it, the person wearing this probably moves less than a wall." - if(SQUAD_MARINE_3) - icon_state = "beret_charlie" - desc = "Still has some morning toast crumbs on it." - if(SQUAD_MARINE_4) - icon_state = "beret_delta" - desc = "Hard to consider protection, but these types of people don't seek protection." - if(SQUAD_MARINE_5) - icon_state = "beret_echo" - desc = "Tightly Woven, as it should be." - if(SQUAD_MARINE_CRYO) - icon_state = "beret_foxtrot" - desc = "Looks and feels starched, cold to the touch." - if(SQUAD_MARINE_INTEL) - icon_state = "beret_intel" - desc = "Looks more intellegent than the person wearing it." + icon_state = "beret_[lowertext(H.assigned_squad.name)]" + desc = H.assigned_squad.beret_flavortext else icon_state = "beret" desc = initial(desc) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index ca40e1fa8b6d..f2d9dfe42e72 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -1050,18 +1050,23 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) JOB_CHIEF_REQUISITION = 60, JOB_CARGO_TECH = 61, JOB_MESS_SERGEANT = 62, - // 70-149: SQUADS (look below) + // 70-169: SQUADS (look below) JOB_SYNTH_K9 = 71, // 150+: Civilian/other JOB_CORPORATE_LIAISON = 150, JOB_CORPORATE_BODYGUARD = 151, JOB_CIA = 152, JOB_PASSENGER = 153, + // 170+: Civilian/other + JOB_CORPORATE_LIAISON = 170, + JOB_CORPORATE_BODYGUARD = 171, + JOB_CIA = 172, + JOB_PASSENGER = 173, // Non Almayer jobs lower then registered - JOB_SYNTH_SURVIVOR = 160, - JOB_SURVIVOR = 161, - JOB_COLONIST = 162, - JOB_WORKING_JOE = 163, + JOB_SYNTH_SURVIVOR = 180, + JOB_SURVIVOR = 181, + JOB_COLONIST = 182, + JOB_WORKING_JOE = 183, // WO jobs // 10-19: Command diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 01d277572ee7..5871ddf91cf2 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -58,6 +58,8 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp var/add_pmcs = FALSE var/show_command_squad = FALSE var/tgui_interaction_distance = 1 + /// Can this overwatch console override / not care about the current overwatch officer + var/can_override_overwatch_officer = FALSE var/list/invalid_turfs = list(/turf/open/space, /turf/open_space, /turf/open/slippery) @@ -79,6 +81,15 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp no_skill_req = TRUE show_command_squad = TRUE tgui_interaction_distance = 3 + can_override_overwatch_officer = TRUE + /// Squad role within Assault, Support and Security - decides which section it will be able to watch. If it stays as null it will allow to view all of them + var/role + +/obj/structure/machinery/computer/overwatch/groundside_operations/section + name = "Section Overwatch Console" + icon_state = "overwatch" + no_skill_req = FALSE + req_access = list(ACCESS_MARINE_COMMAND) /obj/structure/machinery/computer/overwatch/Initialize() . = ..() @@ -221,7 +232,8 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(current_squad.squad_leader) var/turf/SL_turf = get_turf(current_squad.squad_leader) - SL_z = SL_turf.z + if(SL_turf) + SL_z = SL_turf.z for(var/marine in current_squad.marines_list) if(!marine) @@ -277,7 +289,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp else if(marine_human.job != JOB_SQUAD_LEADER) acting_sl = " (acting SL)" is_squad_leader = TRUE - else if(current_turf && (current_turf.z == SL_z)) + else if(current_turf && SL_z && (current_turf.z == SL_z)) distance = "[get_dist(marine_human, current_squad.squad_leader)] ([dir2text_short(Get_Compass_Dir(current_squad.squad_leader, marine_human))])" @@ -525,7 +537,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp /obj/structure/machinery/computer/overwatch/groundside_operations/ui_data(mob/user) var/list/data = list() - + data["executive"] = isnull(role) data["theme"] = ui_theme data = pack_radio_data() @@ -533,14 +545,14 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(!current_squad) data["squad_list"] = list() for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads) - if(current_squad.active && !current_squad.overwatch_officer && current_squad.faction == faction && current_squad.name != "Root") + if(current_squad.active && (role ? current_squad.squad_role == role : TRUE) &&!current_squad.overwatch_officer && current_squad.faction == faction && current_squad.name != "Root") data["squad_list"] += current_squad.name return data data["current_squad"] = current_squad.name for(var/datum/squad/index_squad in GLOB.RoleAuthority.squads) - if(index_squad.active && index_squad.faction == faction && index_squad.name != "Root") + if(index_squad.active && (role ? index_squad.squad_role == role : TRUE) && index_squad.faction == faction && index_squad.name != "Root") var/list/squad_data = list(list("name" = index_squad.name, "primary_objective" = index_squad.primary_objective, "secondary_objective" = index_squad.secondary_objective, "overwatch_officer" = index_squad.overwatch_officer, "ref" = REF(index_squad))) data["squad_data"] += squad_data @@ -573,6 +585,18 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp var/datum/squad/marine/echo/echo_squad = locate() in GLOB.RoleAuthority.squads data["echo_squad_active"] = echo_squad.active + var/has_supply_pad = FALSE + var/obj/structure/closet/crate/supply_crate + if(current_squad.drop_pad) + supply_crate = locate() in current_squad.drop_pad.loc + has_supply_pad = TRUE + data["can_launch_crates"] = has_supply_pad + data["has_crate_loaded"] = supply_crate + + data["saved_coordinates"] = list() + for(var/i in 1 to length(saved_coordinates)) + data["saved_coordinates"] += list(list("x" = saved_coordinates[i]["x"], "y" = saved_coordinates[i]["y"], "z" = saved_coordinates[i]["z"], "comment" = saved_coordinates[i]["comment"], "index" = i)) + return data /obj/structure/machinery/computer/overwatch/ui_state(mob/user) @@ -595,6 +619,18 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp // if none of the above were true, something is very wrong return UI_CLOSE +/obj/structure/machinery/computer/overwatch/proc/pick_section() + return TRUE + +/obj/structure/machinery/computer/overwatch/groundside_operations/section/pick_section(mob/user) + var/section = tgui_input_list(user, "Choose a section to overwatch:", "Section Selection", list(SQUAD_ROLE_ASSAULT, SQUAD_ROLE_SUPPORT, SQUAD_ROLE_SECURITY)) + + if(!section) + return FALSE + + role = section + return TRUE + /obj/structure/machinery/computer/overwatch/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -605,16 +641,20 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if("pick_squad") if(current_squad) return + + if(!pick_section(user)) + return + var/datum/squad/selected_squad for(var/datum/squad/searching_squad in GLOB.RoleAuthority.squads) - if(searching_squad.active && !searching_squad.overwatch_officer && searching_squad.faction == faction && searching_squad.name == params["squad"]) + if(searching_squad.active && (!searching_squad.overwatch_officer || can_override_overwatch_officer) && searching_squad.faction == faction && searching_squad.name == params["squad"]) selected_squad = searching_squad break if(!selected_squad) return - if(selected_squad.assume_overwatch(user)) + if(selected_squad.assume_overwatch(user) || can_override_overwatch_officer) current_squad = selected_squad operator = user if(current_squad.name == "Root") @@ -1649,26 +1689,6 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp glob_squad.drop_pad = null return ..() -/obj/structure/supply_drop/alpha - icon_state = "alphadrop" - squad = SQUAD_MARINE_1 - -/obj/structure/supply_drop/bravo - icon_state = "bravodrop" - squad = SQUAD_MARINE_2 - -/obj/structure/supply_drop/charlie - icon_state = "charliedrop" - squad = SQUAD_MARINE_3 - -/obj/structure/supply_drop/delta - icon_state = "deltadrop" - squad = SQUAD_MARINE_4 - -/obj/structure/supply_drop/echo //extra supply drop pad - icon_state = "echodrop" - squad = SQUAD_MARINE_5 - //======UPP======= /obj/structure/supply_drop/upp1 diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index fee113575903..3c7330f42461 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -946,7 +946,7 @@ ACCESS_MARINE_CREWMAN, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 0e1bb032bf76..b9b5c91e955b 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -147,7 +147,7 @@ ACCESS_MARINE_CREWMAN, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ) assignment = JOB_TANK_CREW diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 6d8b6b66236f..cf1ae0e0e34d 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -21,7 +21,7 @@ ACCESS_MARINE_MORGUE, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_MAINT, @@ -96,7 +96,7 @@ ACCESS_MARINE_MORGUE, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_MAINT, @@ -159,7 +159,7 @@ ACCESS_MARINE_MORGUE, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_MAINT, diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index b2ff4e5681cc..4998ac484601 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -354,7 +354,7 @@ ACCESS_MARINE_COMMAND, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_PREP, ) @@ -582,7 +582,7 @@ ACCESS_MARINE_PREP, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA, ACCESS_MARINE_PILOT, ACCESS_MARINE_DROPSHIP, diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 78c4e9b08082..fa10512422db 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -115,8 +115,6 @@ . += "Operation Name: [GLOB.round_statistics.round_name]" if(assigned_squad) - if(assigned_squad.overwatch_officer) - . += "Overwatch Officer: [assigned_squad.overwatch_officer.get_paygrade()][assigned_squad.overwatch_officer.name]" if(assigned_squad.primary_objective || assigned_squad.secondary_objective) var/turf/current_turf = get_turf(src) var/is_shipside = is_mainship_level(current_turf?.z) @@ -1314,7 +1312,9 @@ TRACKER_DSL = /datum/squad/marine/delta, TRACKER_ESL = /datum/squad/marine/echo, TRACKER_FSL = /datum/squad/marine/cryo, - TRACKER_ISL = /datum/squad/marine/intel + TRACKER_ISL = /datum/squad/marine/intel, + TRACKER_KSL = /datum/squad/marine/kilo, + TRACKER_OSL = /datum/squad/marine/oscar ) hud_used.locate_leader.overlays.Cut() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3fc32e9e5922..fbc10fec534a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -13,11 +13,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( ":f" = SQUAD_MARINE_CRYO, ".f" = SQUAD_MARINE_CRYO, "#f" = RADIO_CHANNEL_PMC_MED, ":g" = RADIO_CHANNEL_ALMAYER, ".g" = RADIO_CHANNEL_ALMAYER, "#g" = RADIO_CHANNEL_CLF_GEN, ":j" = RADIO_CHANNEL_JTAC, ".j" = RADIO_CHANNEL_JTAC, "#j" = RADIO_CHANNEL_UPP_CCT, - ":k" = SQUAD_SOF, ".k" = RADIO_CHANNEL_YAUTJA_SPECOPS, "#k" = RADIO_CHANNEL_WY_WO, + ":k" = SQUAD_MARINE_6, ".k" = SQUAD_MARINE_6, "#k" = RADIO_CHANNEL_WY_WO, "#l" = RADIO_CHANNEL_PROVOST, //l . and : reserved for Left hand ":m" = RADIO_CHANNEL_MEDSCI, ".m" = RADIO_CHANNEL_MEDSCI, "#m" = RADIO_CHANNEL_UPP_MED, ":n" = RADIO_CHANNEL_ENGI, ".n" = RADIO_CHANNEL_ENGI, "#n" = RADIO_CHANNEL_UPP_ENGI, - ":o" = RADIO_CHANNEL_COLONY, ".o" = RADIO_CHANNEL_COLONY, "#o" = RADIO_CHANNEL_PMC_CCT, + ":o" = SQUAD_MARINE_7, ".o" = SQUAD_MARINE_7, "#o" = RADIO_CHANNEL_PMC_CCT, ":p" = RADIO_CHANNEL_MP , ".p" = RADIO_CHANNEL_MP , "#p" = RADIO_CHANNEL_PMC_GEN, ":q" = RADIO_CHANNEL_ROYAL_MARINE, ".q" = RADIO_CHANNEL_ROYAL_MARINE, "#r" = RADIO_CHANNEL_YAUTJA, //r .r and :r reserved for Right hand @@ -28,10 +28,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( ":x" = RADIO_CHANNEL_HYPERDYNE, ".x" = RADIO_CHANNEL_HYPERDYNE, "#x" = RADIO_CHANNEL_HYPERDYNE, ":y" = RADIO_CHANNEL_WY, ".y" = RADIO_CHANNEL_WY, "#y" = RADIO_CHANNEL_WY_SEC, ":z" = RADIO_CHANNEL_HIGHCOM, ".z" = RADIO_CHANNEL_HIGHCOM, "#z" = RADIO_CHANNEL_PMC_CMD, - - ":1" = RADIO_CHANNEL_WY_PUB, ".1" = RADIO_CHANNEL_WY_PUB, "#1" = RADIO_CHANNEL_WY_PUB, - ":2" = RADIO_CHANNEL_CIA, ".2" = RADIO_CHANNEL_CIA, "#2" = RADIO_CHANNEL_CIA, - //1-9 available + ":1" = SQUAD_SOF, ".1" = SQUAD_SOF, + ":2" = RADIO_CHANNEL_COLONY, ".2" = RADIO_CHANNEL_COLONY, + ":3" = RADIO_CHANNEL_CIA, ".3" = RADIO_CHANNEL_CIA, "#3" = RADIO_CHANNEL_CIA, + ":4" = RADIO_CHANNEL_WY_PUB, ".4" = RADIO_CHANNEL_WY_PUB, "#4" = RADIO_CHANNEL_WY_PUB, + ":5" = RADIO_CHANNEL_YAUTJA_SPECOPS, )) /proc/channel_to_prefix(channel) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f80732124745..b328d43b6d03 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -132,6 +132,22 @@ to_chat(src, SPAN_WARNING("[rank] is not available. Please try another.")) return + var/mob/living/carbon/human/test_human = new + var/datum/equipment_preset/preset = new player_rank.gear_preset + test_human.faction = preset.faction + test_human.job = player_rank.title + if(player_rank.flags_startup_parameters & ROLE_ADD_TO_SQUAD && test_human.job != JOB_INTEL) + GLOB.RoleAuthority.randomize_squad(test_human, force_client=client) + if(istype(test_human.assigned_squad, /datum/squad/marine/cryo)) + test_human.assigned_squad.forget_marine_in_squad(test_human) + GLOB.RoleAuthority.free_role(player_rank, force = TRUE) + job = null + to_chat(src, SPAN_WARNING("[rank] is not available with your current squad preferences.")) + qdel(test_human) + return + test_human.assigned_squad.forget_marine_in_squad(test_human) + qdel(test_human) + spawning = TRUE close_spawn_windows() @@ -150,10 +166,14 @@ SSticker.mode.update_gear_scale() for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) - if(target_squad) + if(!target_squad) + continue + + if(target_squad.dynamic_scaling) target_squad.roles_cap[JOB_SQUAD_ENGI] = engi_slot_formula(length(GLOB.clients)) target_squad.roles_cap[JOB_SQUAD_MEDIC] = medic_slot_formula(length(GLOB.clients)) + var/latejoin_larva_drop = SSticker.mode.latejoin_larva_drop if(ROUND_TIME < XENO_ROUNDSTART_LATEJOIN_LARVA_TIME) diff --git a/code/modules/tgui_input/priority.dm b/code/modules/tgui_input/priority.dm new file mode 100644 index 000000000000..1ecf4c1737cc --- /dev/null +++ b/code/modules/tgui_input/priority.dm @@ -0,0 +1,224 @@ +/** + * ### tgui_priority_input + * Opens a window with a list of items and returns a list of selected choices in order of priority. + * + * * Arguments: + * * user - The mob to display the window to + * * message - The message inside the window + * * title - The title of the window + * * list/items - The list of items to display + * * timeout - The timeout for the input (optional) + * * theme - The ui theme to use for the TGUI window (optional). + * * ui_state - The TGUI UI state that will be returned in ui_state(). Default: always_state + */ +/proc/tgui_priority_input(mob/user, message, title = "Select", list/items, timeout = 0, theme = null, ui_state = GLOB.always_state) + if (!user) + user = usr + if(!length(items)) + return null + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return null + + if(isnull(user.client)) + return null + + var/datum/tgui_priority_input/input = new(user, message, title, items, timeout, theme, ui_state) + if(input.invalid) + qdel(input) + return + input.tgui_interact(user) + input.wait() + if (input) + . = input.choices + qdel(input) + +/** + * ### tgui_priority_input + * Opens a window with a list of items and returns a list of selected choices in order of priority. + * + * * Arguments: + * * user - The mob to display the window to + * * message - The message inside the window + * * title - The title of the window + * * list/items - The list of items to display + * * timeout - The timeout for the input (optional) + * * theme - The ui theme to use for the TGUI window (optional). + * * ui_state - The TGUI UI state that will be returned in ui_state(). Default: always_state + */ +/proc/tgui_priority_input_async(mob/user, message, title = "Select", list/items, datum/callback/callback, timeout = 0, theme = null, ui_state = GLOB.always_state) + if (!user) + user = usr + if(!length(items)) + return null + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return null + + if(isnull(user.client)) + return null + + var/datum/tgui_priority_input/async/input = new(user, message, title, items, callback, timeout, theme, ui_state) + if(input.invalid) + qdel(input) + return + input.tgui_interact(user) + +/// Window for tgui_priority_input +/datum/tgui_priority_input + /// Title of the window + var/title + /// Message to display + var/message + /// List of items to display + var/list/items + /// List of selected items + var/list/choices + /// Time when the input was created + var/start_time + /// Timeout for the input + var/timeout + /// Whether the input was closed + var/closed + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state + /// String field for the theme to use + var/ui_theme + /// Whether the tgui list input is invalid or not (i.e. due to all list entries being null) + var/invalid = FALSE + +/datum/tgui_priority_input/New(mob/user, message, title, list/items, timeout, theme = null, ui_state) + src.title = title + src.message = message + src.items = list() + src.state = ui_state + src.ui_theme = theme + + //var/list/repeat_items = list() + // Gets rid of illegal characters + var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"}) + + for(var/i in items) + if(!i) + continue + var/string_key = whitelistedWords.Replace("[i]", "") + //avoids duplicated keys E.g: when areas have the same name + //string_key = avoid_assoc_duplicate_keys(string_key, repeat_items) + src.items += string_key + + if(!length(src.items)) + invalid = TRUE + + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + +/datum/tgui_priority_input/Destroy(force) + SStgui.close_uis(src) + state = null + items?.Cut() + return ..() + +/** + * Waits for a user's response to the tgui_priority_input's prompt before returning. Returns early if + * the window was closed by the user. + */ +/datum/tgui_priority_input/proc/wait() + while (!closed && !QDELETED(src)) + stoplag(0.2 SECONDS) + +/datum/tgui_priority_input/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "PriorityInput") + ui.open() + +/datum/tgui_priority_input/ui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_priority_input/ui_state(mob/user) + return state + +/datum/tgui_priority_input/ui_data(mob/user) + var/list/data = list() + + if(timeout) + data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + + return data + +/datum/tgui_priority_input/ui_static_data(mob/user) + var/list/data = list() + + data["items"] = items + data["large_buttons"] = TRUE // Pref? + data["message"] = message + data["swapped_buttons"] = FALSE // Pref? + data["title"] = title + data["theme"] = ui_theme + + return data + +/datum/tgui_priority_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if (.) + return + + switch(action) + if("submit") + var/list/selections = params["entry"] + var/list/valid_selections = list() + for(var/raw_entry in selections) + if(raw_entry in items) + valid_selections += raw_entry + set_choices(valid_selections) + closed = TRUE + SStgui.close_uis(src) + return TRUE + + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE + + return FALSE + +/datum/tgui_priority_input/proc/set_choices(list/selections) + src.choices = selections.Copy() + +/** + * # async tgui_priority_input + * + * An asynchronous version of tgui_priority_input to be used with callbacks instead of waiting on user responses. + */ +/datum/tgui_priority_input/async + /// The callback to be invoked by the tgui_modal upon having a choice made. + var/datum/callback/callback + +/datum/tgui_priority_input/async/New(mob/user, message, title, list/items, callback, timeout, theme = null, ui_state) + ..(user, message, title, items, callback, timeout, theme, ui_state) + src.callback = callback + +/datum/tgui_priority_input/async/Destroy(force, ...) + QDEL_NULL(callback) + . = ..() + +/datum/tgui_priority_input/async/ui_close(mob/user) + . = ..() + qdel(src) + +/datum/tgui_priority_input/async/set_choices(list/selections) + . = ..() + if(length(choices)) + callback?.InvokeAsync(choices) + +/datum/tgui_priority_input/async/wait() + return diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 35d1125383e3..ac67dd3dfdf5 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -62,6 +62,8 @@ em {font-style: normal; font-weight: bold;} .bravoradio {color: #C68610;} .charlieradio {color: #AA55AA;} .deltaradio {color: #007FCF;} +.kiloradio {color: #059E96;} +.oscarradio {color: #718066;} .echoradio {color: #3EB489;} .cryoradio {color: #4a4740;} .hcradio {color: #318779;} diff --git a/colonialmarines.dme b/colonialmarines.dme index 691301171f88..f92f181b77a4 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2619,6 +2619,7 @@ #include "code\modules\tgui\tgui-say\typing.dm" #include "code\modules\tgui_input\checkboxes.dm" #include "code\modules\tgui_input\color.dm" +#include "code\modules\tgui_input\priority.dm" #include "code\modules\tgui_input\text.dm" #include "code\modules\tgui_panel\audio.dm" #include "code\modules\tgui_panel\external.dm" diff --git a/icons/effects/warning_stripes.dmi b/icons/effects/warning_stripes.dmi index 55dcbb4be75c..941a71b06ea6 100644 Binary files a/icons/effects/warning_stripes.dmi and b/icons/effects/warning_stripes.dmi differ diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi index ac7d01808e0c..430001228997 100644 Binary files a/icons/landmarks.dmi and b/icons/landmarks.dmi differ diff --git a/icons/mob/hud/human_bronze.dmi b/icons/mob/hud/human_bronze.dmi index 057dd99f5bd3..f95bfe8f57b7 100644 Binary files a/icons/mob/hud/human_bronze.dmi and b/icons/mob/hud/human_bronze.dmi differ diff --git a/icons/mob/hud/human_dark.dmi b/icons/mob/hud/human_dark.dmi index 7d2d635a734b..3c168ad4ffb9 100644 Binary files a/icons/mob/hud/human_dark.dmi and b/icons/mob/hud/human_dark.dmi differ diff --git a/icons/mob/hud/human_glass.dmi b/icons/mob/hud/human_glass.dmi index 60d89f448761..206c615088cc 100644 Binary files a/icons/mob/hud/human_glass.dmi and b/icons/mob/hud/human_glass.dmi differ diff --git a/icons/mob/hud/human_green.dmi b/icons/mob/hud/human_green.dmi index 6ebf2bf1db38..17be7881b1f5 100644 Binary files a/icons/mob/hud/human_green.dmi and b/icons/mob/hud/human_green.dmi differ diff --git a/icons/mob/hud/human_grey.dmi b/icons/mob/hud/human_grey.dmi index fbd044bc7be7..6a8f1fc0dd52 100644 Binary files a/icons/mob/hud/human_grey.dmi and b/icons/mob/hud/human_grey.dmi differ diff --git a/icons/mob/hud/human_holo.dmi b/icons/mob/hud/human_holo.dmi index 9cd3bff960ba..e4867f469fc3 100644 Binary files a/icons/mob/hud/human_holo.dmi and b/icons/mob/hud/human_holo.dmi differ diff --git a/icons/mob/hud/human_midnight.dmi b/icons/mob/hud/human_midnight.dmi index e83ac45420f8..70ffbd592635 100644 Binary files a/icons/mob/hud/human_midnight.dmi and b/icons/mob/hud/human_midnight.dmi differ diff --git a/icons/mob/hud/human_old.dmi b/icons/mob/hud/human_old.dmi index 2185c37bb296..c8bdabb50845 100644 Binary files a/icons/mob/hud/human_old.dmi and b/icons/mob/hud/human_old.dmi differ diff --git a/icons/mob/hud/human_orange.dmi b/icons/mob/hud/human_orange.dmi index 421ccd789dc6..67628bfa1a6a 100644 Binary files a/icons/mob/hud/human_orange.dmi and b/icons/mob/hud/human_orange.dmi differ diff --git a/icons/mob/hud/human_red.dmi b/icons/mob/hud/human_red.dmi index ec55a34d5a01..7b3b171d71b0 100644 Binary files a/icons/mob/hud/human_red.dmi and b/icons/mob/hud/human_red.dmi differ diff --git a/icons/mob/hud/human_white.dmi b/icons/mob/hud/human_white.dmi index c3181aeb2d89..d0c969aa4311 100644 Binary files a/icons/mob/hud/human_white.dmi and b/icons/mob/hud/human_white.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/armbands.dmi b/icons/mob/humans/onmob/clothing/accessory/armbands.dmi index 0681fcd08599..3fc66683f000 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/armbands.dmi and b/icons/mob/humans/onmob/clothing/accessory/armbands.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/patches.dmi b/icons/mob/humans/onmob/clothing/accessory/patches.dmi index 80322cf8107e..144f81c46753 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/patches.dmi and b/icons/mob/humans/onmob/clothing/accessory/patches.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/berets.dmi b/icons/mob/humans/onmob/clothing/head/berets.dmi index 952426dc0017..8689b3cc2279 100644 Binary files a/icons/mob/humans/onmob/clothing/head/berets.dmi and b/icons/mob/humans/onmob/clothing/head/berets.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/headbands.dmi b/icons/mob/humans/onmob/clothing/head/headbands.dmi index db98af1c6599..5c85de5a7b41 100644 Binary files a/icons/mob/humans/onmob/clothing/head/headbands.dmi and b/icons/mob/humans/onmob/clothing/head/headbands.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi index c1857f6e0e96..ff487d24c1f5 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi index ea7f548f8149..6e91cf38044d 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi differ diff --git a/icons/mob/humans/onmob/clothing/masks/scarves.dmi b/icons/mob/humans/onmob/clothing/masks/scarves.dmi index 7e49a18da7f6..b47f4b90fbe2 100644 Binary files a/icons/mob/humans/onmob/clothing/masks/scarves.dmi and b/icons/mob/humans/onmob/clothing/masks/scarves.dmi differ diff --git a/icons/obj/items/clothing/accessory/armbands.dmi b/icons/obj/items/clothing/accessory/armbands.dmi index 0a8f8e2f75a4..7a5a5b84c7e2 100644 Binary files a/icons/obj/items/clothing/accessory/armbands.dmi and b/icons/obj/items/clothing/accessory/armbands.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi index fe03166fa7e6..9f1dbb44c798 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi differ diff --git a/icons/obj/items/clothing/accessory/patches.dmi b/icons/obj/items/clothing/accessory/patches.dmi index 6ddf3c2dc32f..18f27a418a05 100644 Binary files a/icons/obj/items/clothing/accessory/patches.dmi and b/icons/obj/items/clothing/accessory/patches.dmi differ diff --git a/icons/obj/items/clothing/hats/berets.dmi b/icons/obj/items/clothing/hats/berets.dmi index bce3136a1778..c7628d87479c 100644 Binary files a/icons/obj/items/clothing/hats/berets.dmi and b/icons/obj/items/clothing/hats/berets.dmi differ diff --git a/icons/obj/items/clothing/hats/headbands.dmi b/icons/obj/items/clothing/hats/headbands.dmi index 65983751bea8..8e0f8538882e 100644 Binary files a/icons/obj/items/clothing/hats/headbands.dmi and b/icons/obj/items/clothing/hats/headbands.dmi differ diff --git a/icons/obj/items/clothing/masks/scarves.dmi b/icons/obj/items/clothing/masks/scarves.dmi index b1a4ad369934..e53695e25a2d 100644 Binary files a/icons/obj/items/clothing/masks/scarves.dmi and b/icons/obj/items/clothing/masks/scarves.dmi differ diff --git a/icons/obj/items/radio.dmi b/icons/obj/items/radio.dmi index b7ed6f5b57b5..660106403173 100644 Binary files a/icons/obj/items/radio.dmi and b/icons/obj/items/radio.dmi differ diff --git a/icons/obj/structures/mug_rack.dmi b/icons/obj/structures/mug_rack.dmi new file mode 100644 index 000000000000..e183abaa634f Binary files /dev/null and b/icons/obj/structures/mug_rack.dmi differ diff --git a/icons/turf/almayer.dmi b/icons/turf/almayer.dmi index 4f12aa300573..a9981eb182e4 100644 Binary files a/icons/turf/almayer.dmi and b/icons/turf/almayer.dmi differ diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 50ce83caff78..5e92ce423c99 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index f6aec5bdc33f..56a7cfa785f8 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -121,7 +121,7 @@ pixel_x = -16; pixel_y = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "aar" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -220,10 +220,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) -"aaE" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/engineering/lower/workshop/hangar) "aaF" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, @@ -287,13 +283,12 @@ /obj/structure/pipes/vents/scrubber{ dir = 1 }, -/obj/structure/surface/rack{ - density = 0; - pixel_x = 26 - }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/starboard_emb) "aaN" = ( @@ -504,11 +499,11 @@ /area/almayer/hallways/hangar) "abq" = ( /obj/structure/sign/safety/medical{ - pixel_y = 28 + pixel_y = 25 }, /obj/structure/sign/safety/outpatient{ pixel_x = 15; - pixel_y = 28 + pixel_y = 25 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) @@ -523,18 +518,25 @@ /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/north1) "abt" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 15; + pixel_y = 25 + }, +/obj/structure/sign/safety/medical{ + pixel_y = 25 + }, /obj/structure/sign/nosmoking_1{ - pixel_y = 28 + pixel_y = 39 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) "abu" = ( /obj/structure/sign/safety/distribution_pipes{ - pixel_y = 28 + pixel_y = 32 }, /obj/structure/sign/safety/manualopenclose{ pixel_x = 15; - pixel_y = 28 + pixel_y = 32 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) @@ -602,15 +604,12 @@ /turf/closed/wall/almayer, /area/almayer/living/basketball) "abF" = ( +/obj/structure/flora/bush/ausbushes/var3/ppflowers, /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; pixel_y = 28 }, -/obj/structure/flora/bush/ausbushes/var3/ppflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake ppflowers" - }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "abG" = ( @@ -718,13 +717,41 @@ /turf/open/floor/almayer/redfull, /area/almayer/engineering/upper_engineering) "abS" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer/cargo, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/mono, /area/almayer/squads/alpha) "abT" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 7; + pixel_y = -24 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/machinery/power/apc/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/platoon1_shared) "abU" = ( /obj/structure/machinery/computer/aa_console, /obj/structure/bed/chair/ob_chair, @@ -767,6 +794,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) "abX" = ( +/obj/structure/bed/chair/wheelchair{ + dir = 1 + }, /obj/structure/bed/chair/wheelchair{ dir = 1 }, @@ -816,18 +846,20 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lockerroom) "acc" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 1; name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" + req_one_access = list(3,19); + req_access = list() }, /turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) +/area/almayer/living/grunt_rnr) "acd" = ( /obj/structure/machinery/chem_master/industry_mixer, -/obj/structure/machinery/light_construct, +/obj/structure/machinery/light, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "ace" = ( @@ -882,28 +914,22 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cicconference) "ack" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) -"acl" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood{ - pixel_y = 1; - pixel_x = -1 +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 }, -/obj/structure/medical_supply_link/green, -/obj/structure/sign/safety/ref_bio_storage{ +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon2_shared) +"acl" = ( +/obj/structure/machinery/vending/coffee{ pixel_x = 14; - pixel_y = -28 + density = 0 }, -/obj/structure/sign/safety/biohazard{ - pixel_y = -28 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, /turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) -"acm" = ( -/obj/docking_port/stationary/emergency_response/external/hangar_starboard, -/turf/open/space, -/area/space) "acn" = ( /obj/structure/stairs/multiz/down{ dir = 1 @@ -918,9 +944,18 @@ /turf/open/floor/almayer/plate, /area/almayer/living/chapel) "acp" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "acq" = ( /turf/open/floor/almayer/blue/north, /area/almayer/living/offices/flight) @@ -989,8 +1024,8 @@ pixel_y = 3 }, /obj/item/book/manual/surgery{ - pixel_x = 5; - pixel_y = 3 + pixel_x = 6; + pixel_y = 5 }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_four) @@ -1063,12 +1098,13 @@ /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/lockerroom) "acH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, /obj/structure/extinguisher_cabinet{ pixel_y = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer/flooredgesmooth3/south, /area/almayer/medical/lower_medical_lobby) "acI" = ( @@ -1079,19 +1115,15 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/sign/safety/ladder{ - pixel_x = 25; - pixel_y = 28 - }, /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; pixel_y = 28; - pixel_x = -13 + pixel_x = -5 }, /obj/structure/sign/safety/intercom{ - pixel_y = 28; - pixel_x = 10 + pixel_y = 24; + pixel_x = 19 }, /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/medical/lower_medical_lobby) @@ -1337,18 +1369,26 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_medbay) "adn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_17"; - pixel_x = 7; - pixel_y = 14 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_17"; - pixel_x = -5; - pixel_y = 10 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/plate, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/machinery/power/apc/almayer/west, +/turf/open/floor/almayer/plating/northeast, /area/almayer/living/briefing) "ado" = ( /obj/effect/decal/warning_stripes{ @@ -1396,7 +1436,7 @@ id_tag = "or03" }, /obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "or3privacyshutterdoor"; + id = "or3privacyshutter"; name = "\improper Privacy Shutters" }, /turf/open/floor/almayer/test_floor4, @@ -1416,7 +1456,7 @@ id_tag = "or04" }, /obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "or4privacyshutterdoor"; + id = "or4privacyshutter"; name = "\improper Privacy Shutters" }, /turf/open/floor/almayer/test_floor4, @@ -1437,10 +1477,20 @@ /area/almayer/middeck/maintenance/sp) "ady" = ( /obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = 7; + pixel_y = 14 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = -5; + pixel_y = 10 + }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "adz" = ( @@ -1911,15 +1961,6 @@ /obj/structure/machinery/computer/emails{ dir = 4 }, -/obj/structure/sign/safety/rewire{ - pixel_y = 28; - layer = 3 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 15; - pixel_y = 28; - layer = 3 - }, /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) "aeP" = ( @@ -1932,6 +1973,15 @@ /turf/open/floor/almayer/silver/northwest, /area/almayer/living/officer_study) "aeQ" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 15; + pixel_y = 32; + layer = 3 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 32; + layer = 3 + }, /obj/effect/decal/cleanable/dirt, /obj/structure/bookcase{ pixel_y = 16; @@ -1946,10 +1996,10 @@ /area/almayer/living/officer_study) "aeR" = ( /obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = -3 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, +/obj/item/device/flashlight/lamp/green, /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) "aeS" = ( @@ -2071,9 +2121,6 @@ /turf/open/floor/almayer/cargo, /area/almayer/medical/lower_medical_medbay) "afi" = ( -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = 6 - }, /obj/structure/surface/table/reinforced/prison{ climbable = 0 }, @@ -2083,9 +2130,20 @@ pixel_y = 10; ring_cooldown_length = 10 }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = -6; + pixel_y = -3 + }, /obj/structure/machinery/door/window/eastleft{ dir = 8 }, +/obj/item/book/manual/chemistry{ + pixel_x = 4 + }, +/obj/item/book/manual/medical_diagnostics_manual{ + pixel_x = 7; + pixel_y = 6 + }, /turf/open/floor/almayer/sterile_green2, /area/almayer/medical/lower_medical_medbay) "afj" = ( @@ -2378,14 +2436,8 @@ dir = 8 }, /obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 8; - pixel_x = -5 - }, -/obj/item/tool/pen{ - pixel_x = -3; - pixel_y = 1 - }, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, /obj/item/ashtray/plastic{ pixel_x = 7; pixel_y = 14 @@ -2515,9 +2567,6 @@ name = "\improper Hangar Lockdown Blast Door" }, /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_lobby) "afX" = ( @@ -2717,10 +2766,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/living/basketball) -"agr" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/almayer/engineering/lower/workshop/hangar) "ags" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -2729,10 +2774,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) -"agt" = ( -/obj/item/stack/rods, -/turf/open/floor/plating, -/area/almayer/engineering/lower/workshop/hangar) "agu" = ( /turf/open/floor/almayer/silver/southeast, /area/almayer/living/officer_study) @@ -2818,9 +2859,6 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 38 - }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) "agF" = ( @@ -2831,23 +2869,15 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "agH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/storage/fancy/cigar/tarbacks, -/obj/item/reagent_container/food/snacks/mre_pack/xmas3{ - pixel_x = -4; - pixel_y = 12 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/obj/item/trash/USCMtray, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "agI" = ( /obj/structure/surface/table, /obj/structure/machinery/cell_charger{ @@ -2950,8 +2980,9 @@ pixel_y = 2; pixel_x = 1 }, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 +/obj/structure/sign/nosmoking_1{ + pixel_x = 25; + pixel_y = -6 }, /turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/lower_medical_lobby) @@ -2993,13 +3024,14 @@ icon_state = "S"; layer = 3.3 }, +/obj/structure/sign/safety/rewire{ + pixel_x = -13; + pixel_y = 25 + }, /obj/structure/machinery/power/apc/almayer/north, /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 36 - }, /turf/open/floor/almayer/plating/northeast, /area/almayer/medical/cryo_tubes) "agX" = ( @@ -3028,7 +3060,7 @@ id_tag = "or01" }, /obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "or1privacyshutterdoor"; + id = "or1privacyshutter"; name = "\improper Privacy Shutters" }, /turf/open/floor/almayer/test_floor4, @@ -3045,7 +3077,7 @@ id_tag = "or02" }, /obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "or2privacyshutterdoor"; + id = "or2privacyshutter"; name = "\improper Privacy Shutters" }, /turf/open/floor/almayer/test_floor4, @@ -3109,13 +3141,10 @@ pixel_x = 10; pixel_y = 3 }, -/obj/item/book/manual/chemistry{ - pixel_x = -5; - pixel_y = 4 - }, +/obj/item/book/manual/chemistry, /obj/item/book/manual/medical_diagnostics_manual{ - pixel_x = -6; - pixel_y = 8 + pixel_x = -4; + pixel_y = 6 }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_medbay) @@ -3163,7 +3192,6 @@ density = 0 }, /obj/structure/closet/secure_closet/emergency/surgery{ - pixel_x = -4; pixel_y = 29 }, /turf/open/floor/almayer/sterile_green_corner/north, @@ -3192,6 +3220,7 @@ /obj/structure/machinery/chem_dispenser/medbay{ pixel_x = -1 }, +/obj/item/reagent_container/glass/beaker/bluespace, /obj/item/reagent_container/glass/beaker/bluespace{ pixel_y = 20 }, @@ -3237,13 +3266,14 @@ /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_lobby) "ahu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2; + pixel_x = 1 + }, /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, /turf/open/floor/almayer/flooredgesmooth2/north, /area/almayer/medical/lower_medical_lobby) "ahv" = ( @@ -3255,15 +3285,11 @@ freerange = 1; name = "General Listening Channel"; pixel_y = -28; - pixel_x = -13 + pixel_x = -5 }, /obj/structure/sign/safety/intercom{ - pixel_y = -28; - pixel_x = 10 - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 25; - pixel_y = -28 + pixel_y = -25; + pixel_x = 19 }, /turf/open/floor/almayer/flooredgesmooth3/north, /area/almayer/medical/lower_medical_lobby) @@ -3401,24 +3427,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) -"ahL" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ - pixel_x = 7; - pixel_y = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "ahM" = ( /obj/structure/platform/metal/almayer/west, /obj/structure/stairs/multiz/up, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "ahN" = ( -/obj/structure/flora/bush/ausbushes/ywflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake ywflowers" - }, +/obj/structure/flora/bush/ausbushes/ywflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "ahO" = ( @@ -3442,14 +3457,15 @@ pixel_y = 3 }, /obj/item/book/manual/surgery{ - pixel_x = 5; - pixel_y = 3 + pixel_x = 6; + pixel_y = 5 }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_two) "ahR" = ( -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/hallways/upper/midship_hallway) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "ahS" = ( /obj/structure/surface/rack, /obj/item/reagent_container/spray/cleaner{ @@ -3671,6 +3687,24 @@ /obj/item/clothing/accessory/storage/surg_vest/black/equipped, /obj/item/clothing/accessory/storage/surg_vest/blue/equipped, /obj/item/clothing/accessory/storage/surg_vest/equipped, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, /obj/structure/machinery/light/small{ dir = 1 }, @@ -3763,11 +3797,11 @@ /area/almayer/medical/lower_medical_medbay) "aiz" = ( /obj/structure/sign/safety/medical{ - pixel_y = -26 + pixel_y = -28 }, /obj/structure/sign/safety/outpatient{ pixel_x = 15; - pixel_y = -26 + pixel_y = -28 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) @@ -3781,9 +3815,16 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/hanger) "aiC" = ( -/obj/structure/sign/nosmoking_1{ +/obj/structure/sign/safety/ladder{ + pixel_x = 15; + pixel_y = -28 + }, +/obj/structure/sign/safety/medical{ pixel_y = -28 }, +/obj/structure/sign/nosmoking_1{ + pixel_y = -40 + }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) "aiD" = ( @@ -3839,17 +3880,6 @@ "aiK" = ( /turf/open/floor/almayer/flooredge/south, /area/almayer/hallways/upper/fore_hallway) -"aiL" = ( -/obj/structure/reagent_dispensers/tank/fuel{ - anchored = 1 - }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/engineering/lower/workshop/hangar) -"aiM" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating_striped/east, -/area/almayer/engineering/lower/workshop/hangar) "aiN" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -3887,27 +3917,21 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/medical_science) -"aiU" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/lower/workshop/hangar) "aiV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - dir = 2; - name = "\improper Research Workshop" - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/camera/autoname/almayer/containment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/machinery/flasher{ + id = "Containment Cell 5"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 + }, +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) "aiW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3921,41 +3945,26 @@ "aiX" = ( /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) -"aiY" = ( -/obj/item/tool/crowbar, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/lower/workshop/hangar) "aiZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) -"aja" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 1; + name = "ship-grade camera" }, +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) +"aja" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) +/obj/structure/machinery/power/apc/almayer/south, +/obj/structure/reagent_dispensers/tank/fuel/custom, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/containment/cell) "ajb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -3963,22 +3972,35 @@ icon_state = "E"; pixel_x = 1 }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_display/research_cell{ + dir = 1; + has_wall_divider = 1; + id = "Containment Cell 3"; + layer = 3.2; + name = "Cell 3 Control"; + pixel_x = 5; + pixel_y = -1 + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 3"; + name = "Containment Lockdown"; + pixel_x = -9; + pixel_y = 3; + req_one_access_txt = "19;28" + }, /turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/medical_science) -"ajc" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/almayer/engineering/lower/workshop/hangar) +/area/almayer/medical/containment) "ajd" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 8 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) "aje" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -3990,19 +4012,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) "ajg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"ajh" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/orange/southwest, -/area/almayer/engineering/lower/workshop/hangar) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) "aji" = ( -/obj/structure/platform/metal/almayer_smooth, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open_space, +/obj/structure/machinery/light, +/turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/containment) "ajj" = ( /turf/open/floor/almayer, @@ -4021,41 +4039,32 @@ /turf/open/floor/almayer/redfull, /area/almayer/command/cic) "ajn" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/open/floor/almayer/flooredge/west, /area/almayer/medical/morgue) -"ajo" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/stack/sheet/cardboard{ - amount = 50; - pixel_x = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/lower/workshop/hangar) "ajp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "ajq" = ( -/obj/structure/morgue{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" + icon_state = "W" }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/east, /area/almayer/medical/morgue) "ajr" = ( -/obj/structure/morgue{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" + icon_state = "W" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/obj/structure/machinery/optable, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, /area/almayer/medical/morgue) "ajs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4064,11 +4073,18 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north2) "ajt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/flashlight/lamp{ + pixel_y = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/device/flash, +/obj/item/device/megaphone, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/medical/upper_medical) "aju" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -4082,55 +4098,73 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) "ajw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access_txt = "5" }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) -"ajx" = ( -/obj/item/stack/rods, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/almayer/engineering/lower/workshop/hangar) +/obj/item/clothing/accessory/stethoscope, +/turf/open/floor/almayer, +/area/almayer/medical/upper_medical) "ajy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/CMO, /turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) +/area/almayer/medical/upper_medical) "ajz" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/glass{ - pixel_x = 1; - pixel_y = 7 +/obj/structure/machinery/smartfridge/chemistry{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -1; + pixel_y = 35 + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/containment) "ajA" = ( /obj/structure/stairs/multiz/down, /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) "ajB" = ( -/obj/structure/bed/chair/comfy/charlie{ - name = "comfy chair"; - desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in purple."; - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/obj/structure/extinguisher_cabinet{ + pixel_y = 26; + pixel_x = -8 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 16; + pixel_x = 9; + density = 0 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "ajC" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + layer = 2.9; + pixel_x = -8; + pixel_y = 16 }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + layer = 2.9; + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 29 + }, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/containment) "ajD" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -4151,19 +4185,31 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/medical_science) -"ajG" = ( -/obj/structure/sign/safety/ladder{ - pixel_y = 28; - pixel_x = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_display/research_cell{ + has_wall_divider = 1; + id = "Containment Cell 2"; + layer = 3.2; + name = "Cell 2 Control"; + pixel_x = 5; + pixel_y = 2 }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 2"; + name = "Containment Lockdown"; + pixel_x = -9; + pixel_y = 5; + req_one_access_txt = "19;28" + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/containment) +"ajG" = ( +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "ajH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4178,22 +4224,28 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) "ajJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/medical/upper_medical) "ajK" = ( -/obj/structure/machinery/disposal{ - pixel_x = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/disposalpipe/trunk{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/prop/hybrisa/misc/machinery/screens/wood_clock{ - pixel_y = 34 +/obj/structure/machinery/flasher{ + id = "Containment Cell 1"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 30 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/almayer/medical/containment/cell) "ajL" = ( /obj/structure/platform/metal/almayer/east, /obj/structure/stairs/multiz/down, @@ -4213,27 +4265,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/flooredge/east, /area/almayer/medical/morgue) -"ajO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/stack/tile/plasteel, -/obj/item/stack/tile/plasteel, -/obj/item/stack/tile/plasteel, -/obj/item/stack/tile/plasteel, -/obj/item/stack/tile/plasteel, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/lower/workshop/hangar) -"ajP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/almayer/engineering/lower/workshop/hangar) -"ajQ" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer/orange/north, -/area/almayer/engineering/lower/workshop/hangar) "ajR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -4302,26 +4333,25 @@ /area/almayer/lifeboat_pumps/north1) "akd" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "S" }, -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/hallways/upper/fore_hallway) -"ake" = ( -/turf/closed/wall/almayer/outer/internal, -/area/almayer/middeck/engineer) +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Midship Upper Medical Ladders" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "akf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/redcorner/north, /area/almayer/shipboard/weapon_room) "akg" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Midship Upper Medical Ladders" +/obj/structure/sign/safety/refridgeration{ + pixel_y = -28 }, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/green, /area/almayer/hallways/upper/fore_hallway) "akh" = ( /turf/open/floor/almayer/bluecorner/east, @@ -4329,20 +4359,14 @@ "aki" = ( /turf/open_space, /area/almayer/command/airoom) -"akj" = ( -/obj/effect/landmark/start/working_joe, -/obj/effect/landmark/late_join/working_joe, -/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3_4range, -/area/almayer/command/airoom) -"akk" = ( -/obj/effect/landmark/start/working_joe, -/obj/effect/landmark/late_join/working_joe, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"akl" = ( -/obj/structure/machinery/cryopod/joe/seegson/alt, -/turf/open/floor/almayer/aicore/no_build/ai_cargo, -/area/almayer/command/airoom) +"akm" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/turf/closed/wall/almayer/outer, +/area/almayer/underdeck) "akn" = ( /turf/open/floor/almayer/flooredgesmooth2/west, /area/almayer/command/cicconference) @@ -4392,6 +4416,10 @@ "akw" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) +"akx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_p) "aky" = ( /obj/structure/sign/safety/ladder{ pixel_x = 32; @@ -4419,9 +4447,17 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/starboard_missiles) "akD" = ( -/turf/open/floor/almayer/plating_stripedcorner/west, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_midship_hallway) "akE" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet{ name = "Field Doctor's locker" @@ -4434,7 +4470,9 @@ /obj/item/storage/box/mre, /obj/item/device/radio/marine, /obj/item/clothing/accessory/patch/medic_patch, -/obj/effect/decal/cleanable/dirt, +/obj/item/book/manual/surgery, +/obj/item/book/manual/chemistry, +/obj/item/book/manual/medical_diagnostics_manual, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/lower_medical_medbay) "akF" = ( @@ -4474,9 +4512,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/command/cichallway) -"akM" = ( -/turf/open/floor/almayer/plating_stripedcorner/north, -/area/almayer/hallways/lower/port_midship_hallway) "akN" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/hallways/lower/port_midship_hallway) @@ -4485,9 +4520,9 @@ /area/almayer/hallways/lower/port_midship_hallway) "akP" = ( /obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 + pixel_x = 18 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_p) "akQ" = ( /obj/structure/sign/safety/restrictedarea{ @@ -4517,18 +4552,22 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "akT" = ( -/turf/open/floor/plating, +/obj/structure/reagent_dispensers/tank/fuel/custom, +/turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "akU" = ( -/obj/structure/largecrate/random/secure, +/obj/structure/reagent_dispensers/tank/fuel/gas/hydrogen, /turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "akV" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; dir = 4 }, -/turf/open/floor/almayer/flooredgesmooth2/east, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "akW" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/engineering/lower/workshop/hangar) @@ -4552,14 +4591,31 @@ /turf/open/floor/almayer/cargo_arrow/east, /area/almayer/hallways/lower/port_fore_hallway) "ala" = ( -/turf/open/floor/almayer/flooredgesmooth2/east, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/bravo) +"alb" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/effect/landmark/yautja_teleport, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "alc" = ( +/obj/structure/reagent_dispensers/tank/fuel{ + anchored = 1 + }, /obj/structure/window/reinforced/toughened{ dir = 8; health = 500 }, -/obj/structure/machinery/light_construct{ +/obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer/test_floor5, @@ -4567,6 +4623,13 @@ "ald" = ( /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) +"ale" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_p) "alf" = ( /turf/open_space, /area/almayer/stair_clone/upper/port_fore) @@ -4578,32 +4641,53 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_s) "ali" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass{ + req_one_access = list(19,35); + name = "\improper Ordnance Workshop" + }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "OTcenter"; + name = "\improper Secure Storage"; + unacidable = 1 + }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/workshop/hangar) "alj" = ( -/obj/structure/machinery/light_construct, +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/plastic{ + amount = 5 + }, +/obj/item/stack/sheet/glass{ + amount = 50; + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/item/stack/sheet/plasteel{ + amount = 30; + pixel_x = 4; + pixel_y = 4 + }, +/obj/structure/machinery/light, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "alk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/structure/machinery/status_display{ - pixel_y = -30 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 1"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/purple, +/area/almayer/medical/containment/cell) "all" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/orange, @@ -4686,7 +4770,6 @@ /area/almayer/engineering/lower/workshop/hangar) "alA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop/hangar) "alB" = ( @@ -4702,22 +4785,32 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop/hangar) "alD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 7 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/surface/table/almayer, +/obj/item/tool/pen{ + pixel_x = 5 }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) +"alE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "alF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop/hangar) "alG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -4857,9 +4950,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/living/tankerbunks) -"alZ" = ( -/turf/open/floor/almayer/red, -/area/almayer/command/cic) "ama" = ( /obj/structure/stairs/perspective{ dir = 4 @@ -4924,7 +5014,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/tankerbunks) "amf" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, +/obj/structure/sign/safety/distribution_pipes{ + pixel_y = -26; + pixel_x = 7 + }, +/turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) "amg" = ( /turf/open/floor/plating/plating_catwalk, @@ -4933,8 +5027,10 @@ /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) "ami" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/south, +/obj/structure/sign/safety/conference_room{ + pixel_y = -26 + }, +/turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "amj" = ( /obj/structure/machinery/gear{ @@ -4947,26 +5043,25 @@ /area/almayer/hallways/lower/vehiclehangar) "amk" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + icon_state = "W" }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_display/research_cell{ + id = "Containment Cell 1"; + name = "Cell 1 Control"; + pixel_x = 2; + pixel_y = 7; dir = 4 }, -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28; - pixel_x = -8 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 17; - pixel_y = -26 +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 1"; + name = "Containment Lockdown"; + pixel_x = 1; + pixel_y = -4; + req_one_access_txt = "19;28" }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/containment) "aml" = ( /obj/structure/machinery/door/poddoor/railing{ id = "vehicle_elevator_railing_aux" @@ -5036,7 +5131,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) "amv" = ( -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/port_midship_hallway) "amw" = ( /turf/open/floor/almayer/orange/northwest, @@ -5046,7 +5141,7 @@ /area/almayer/engineering/upper_engineering) "amy" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/port_midship_hallway) "amz" = ( /obj/structure/window/framed/almayer, @@ -5166,6 +5261,15 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/shipboard/stern_point_defense) "amT" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/structure/largecrate/random/barrel/blue, /obj/structure/sign/safety/hvac_old{ pixel_x = 8; pixel_y = -25 @@ -5227,8 +5331,15 @@ /turf/open/floor/plating, /area/almayer/living/auxiliary_officer_office) "anb" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/living/briefing) +/obj/structure/closet/secure_closet/fridge/dry/stock, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "anc" = ( /obj/structure/machinery/light{ dir = 4 @@ -5283,8 +5394,15 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/stair_clone/upper/port_aft) "ank" = ( -/turf/open/floor/almayer/flooredgesmooth2/north, -/area/almayer/living/briefing) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/fridge/dry/stock, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "anl" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -5310,19 +5428,38 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "anp" = ( -/obj/structure/flora/bush/ausbushes/ausbush{ - name = "fake ausbush"; - desc = "Just like a real plant, but fake!" - }, -/turf/open/floor/grass, +/obj/structure/flora/bush/ausbushes/var3/ppflowers, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "anq" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/obj/structure/platform_decoration/metal/almayer/east, -/turf/open/floor/almayer/mono, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/almayer/redfull, /area/almayer/medical/upper_medical) +"anr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "ans" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) @@ -5342,15 +5479,19 @@ /turf/open/floor/almayer/mono, /area/almayer/engineering/lower/engine_core) "anv" = ( -/turf/open/floor/almayer/flooredgesmooth2/west, +/turf/open/floor/almayer/greencorner/west, /area/almayer/squads/req) "anw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/hydroponics) +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 1 + }, +/area/almayer/medical/containment/cell) "anx" = ( /turf/open/floor/almayer/plating_striped/south, /area/almayer/engineering/lower/engine_core) @@ -5363,9 +5504,16 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) "anz" = ( -/obj/structure/machinery/computer/med_data, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/photocopier, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "anA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build, @@ -5597,23 +5745,15 @@ }, /turf/open/floor/almayer/mono, /area/almayer/engineering/lower/engine_core) -"aog" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "aoh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/crema_switch{ - pixel_x = -23; - req_access_txt = "25"; - pixel_y = 25 +/obj/structure/morgue/crematorium, +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/machinery/light/small/blue{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "test_square_smooth" }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "aoi" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -5664,14 +5804,28 @@ /area/almayer/living/cryo_cells) "aop" = ( /obj/structure/ladder/multiz, -/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/ladder{ + pixel_x = 23; + pixel_y = -28 + }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer/plating, -/area/almayer/hallways/upper/fore_hallway) -"aor" = ( -/obj/structure/curtain/open/medical{ - pixel_x = -1 +/area/almayer/medical/upper_medical) +"aoq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"aor" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wardrobe/morgue, /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "aos" = ( @@ -5810,29 +5964,35 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/lifeboat_pumps/north1) "aoJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 1"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 1 + }, +/area/almayer/medical/containment/cell) "aoK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/rack{ + pixel_x = -1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/storage/firstaid/regular{ + pixel_y = -1; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/containment) "aoL" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -5845,34 +6005,8 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/hanger) "aoM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/westright, -/obj/structure/machinery/door/window/westright{ - dir = 4; - req_access_txt = "28" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/item/desk_bell{ - anchored = 1; - pixel_y = 11; - pixel_x = -4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 8; - id = "researchlockdownext_windoor"; - name = "\improper Research Windoor Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) -"aoN" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "aoO" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/stern_point_defense) @@ -5880,8 +6014,10 @@ /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) "aoQ" = ( -/turf/open/floor/almayer/blue/west, -/area/almayer/squads/delta) +/obj/effect/landmark/late_join/charlie, +/obj/effect/landmark/start/marine/charlie, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "aoR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -5991,11 +6127,12 @@ /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) "ape" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/hero/voteno{ + pixel_y = 32 }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "apf" = ( /obj/structure/coatrack, /obj/item/clothing/head/helmet/marine/pilot{ @@ -6026,7 +6163,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "apj" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, +/turf/open/floor/almayer/flooredge, /area/almayer/hallways/lower/starboard_midship_hallway) "apk" = ( /obj/item/device/radio/intercom{ @@ -6034,7 +6171,7 @@ name = "General Listening Channel"; pixel_y = 28 }, -/turf/open/floor/almayer/green/north, +/turf/open/floor/almayer/green/northwest, /area/almayer/hallways/upper/fore_hallway) "apl" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -6118,7 +6255,7 @@ /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/lower/starboard_fore_hallway) "apv" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, +/turf/open/floor/almayer/flooredge, /area/almayer/hallways/lower/starboard_aft_hallway) "apw" = ( /obj/structure/stairs/multiz/up, @@ -6143,7 +6280,11 @@ /obj/structure/machinery/door_control{ id = "northcheckpoint"; name = "North Checkpoint Shutters"; - req_access_txt = "19" + req_one_access_txt = "3;12;19" + }, +/obj/structure/machinery/flasher_button{ + pixel_y = 7; + id = "briefing_flash_n" }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -6289,62 +6430,47 @@ "apP" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/starboard_fore_hallway) "apQ" = ( -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/starboard_fore_hallway) "apR" = ( +/obj/structure/pipes/vents/pump/no_boom{ + name = "Secure Reinforced Air Vent" + }, +/turf/open/floor/almayer/sterile_green2, +/area/almayer/medical/containment) +"apS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/safety/stairs{ - pixel_y = -26; - pixel_x = 1 - }, -/obj/structure/machinery/door_control{ - id = "ResearchStairs"; - name = "Stairway Lockdown"; - req_one_access_txt = "19;28"; - pixel_y = -36; - pixel_x = 1 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -26; - pixel_x = 15 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/medical_science) -"apS" = ( -/obj/structure/platform/metal/almayer_smooth/north, -/turf/open_space, +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/containment) "apT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, +/obj/structure/sign/safety/conference_room{ + pixel_y = 26 + }, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/starboard_midship_hallway) "apU" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - dir = 1; - name = "Research Break Room"; - req_one_access = list(28,206,207) +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 2"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 8 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "apV" = ( /turf/open/floor/almayer/flooredgesmooth2/north, /area/almayer/hallways/lower/starboard_aft_hallway) @@ -6628,9 +6754,17 @@ /turf/open/floor/almayer/silver/northwest, /area/almayer/command/cic) "aqG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 33; + pixel_y = 7 + }, /obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -25 + pixel_x = 33; + pixel_y = -8 }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) @@ -6672,6 +6806,20 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/blue, /area/almayer/living/offices/flight) +"aqP" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aqQ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -6696,6 +6844,13 @@ }, /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/panic) +"aqS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aqT" = ( /obj/structure/machinery/door/airlock/almayer/secure{ name = "\improper Saferoom Office"; @@ -7278,11 +7433,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices/flight) "asl" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/disposal{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/floor/almayer/flooredgesmooth2/east, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "asm" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/middeck/req) @@ -7291,6 +7450,7 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/upper_medical) "aso" = ( @@ -7336,11 +7496,8 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/panic) "asr" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) "ass" = ( /obj/structure/largecrate/random/case/double, @@ -7370,6 +7527,10 @@ }, /turf/open/floor/almayer/silver/northwest, /area/almayer/hallways/lower/repair_bay) +"asu" = ( +/obj/structure/stairs, +/turf/open/floor/plating/almayer/no_build, +/area/almayer/stair_clone/lower/port_aft) "asv" = ( /obj/structure/flora/pottedplant/random{ pixel_y = 5; @@ -7378,10 +7539,15 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) "asw" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "asx" = ( /obj/structure/machinery/vending/cola{ @@ -7391,8 +7557,17 @@ /turf/open/floor/almayer/blue/northwest, /area/almayer/living/offices/flight) "asy" = ( -/turf/open/floor/almayer/flooredgesmooth2/east, -/area/almayer/squads/alpha_bravo_shared) +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28; + pixel_x = 10 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -26 + }, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) "asz" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -7519,9 +7694,6 @@ /obj/item/flag/plantable/ua, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"asR" = ( -/turf/open/floor/almayer/orange, -/area/almayer/command/cic) "asS" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -7549,9 +7721,12 @@ /turf/open/floor/almayer, /area/almayer/living/offices/cryo) "asX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/janitorialcart, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/glass/bucket/janibucket, +/obj/item/tool/mop, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "asY" = ( /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/living/offices/cryo) @@ -7630,9 +7805,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/offices/cryo) -"atj" = ( -/turf/open/floor/almayer/plating_stripedcorner/west, -/area/almayer/hallways/lower/starboard_midship_hallway) "atk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7702,25 +7874,15 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) "atz" = ( -/obj/structure/sign/safety/stairs{ - pixel_y = 28; - pixel_x = 18 +/obj/structure/sign/safety/escapepod{ + pixel_y = 32 + }, +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = 32 }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/upper/fore_hallway) -"atA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "atB" = ( /turf/open/floor/almayer/plating_striped/west, /area/almayer/hallways/lower/starboard_midship_hallway) @@ -7730,9 +7892,6 @@ "atD" = ( /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/hallways/lower/starboard_midship_hallway) -"atE" = ( -/turf/open/floor/almayer/plating_stripedcorner/north, -/area/almayer/hallways/lower/starboard_midship_hallway) "atF" = ( /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/lower/starboard_midship_hallway) @@ -7806,8 +7965,8 @@ dir = 4; name = "ship-grade camera" }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/port_midship_hallway) +/turf/closed/wall/almayer, +/area/almayer/living/briefing) "atS" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, @@ -7894,6 +8053,7 @@ "auj" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "auk" = ( @@ -7904,10 +8064,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/port) "aum" = ( @@ -7962,7 +8118,6 @@ light_color = "#BB3F3F"; dir = 4 }, -/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_p) "auu" = ( @@ -7972,6 +8127,10 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"auv" = ( +/obj/structure/stairs, +/turf/open/floor/almayer/plating_striped/east, +/area/almayer/stair_clone/lower/port_aft) "auw" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -8138,9 +8297,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) -"auT" = ( -/turf/open/floor/almayer/orangecorner/north, -/area/almayer/command/cic) "auU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plating_striped/west, @@ -8188,6 +8344,16 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) +"ava" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/conveyor_switch{ + id = "lower_garbage" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "avb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -8334,10 +8500,19 @@ /turf/open/floor/almayer/red/north, /area/almayer/command/lifeboat) "avv" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/red/east, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, /area/almayer/squads/alpha) "avw" = ( /obj/structure/window/framed/almayer, @@ -8384,13 +8559,6 @@ /obj/item/tool/screwdriver, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) -"avC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "avD" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) @@ -8400,12 +8568,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) "avF" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, -/obj/structure/platform/metal/almayer_smooth/north, -/turf/open_space, +/turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/containment) +"avG" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "avH" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -8428,8 +8604,8 @@ /area/almayer/living/bridgebunks) "avL" = ( /obj/structure/sign/poster{ - pixel_x = 25; - pixel_y = 4 + pixel_x = 23; + pixel_y = 7 }, /turf/open/floor/almayer/blue/southeast, /area/almayer/living/bridgebunks) @@ -8479,7 +8655,7 @@ dir = 8; layer = 3.25 }, -/turf/open/floor/almayer/red/southwest, +/turf/open/floor/almayer/silver/southwest, /area/almayer/command/cic) "avT" = ( /obj/structure/machinery/vending/coffee{ @@ -8511,13 +8687,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) "avZ" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/flora/bush/ausbushes/var3/fullgrass{ - desc = "Just like a real plant, but fake!"; - name = "fake fullgrass" - }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "awa" = ( @@ -8567,11 +8740,8 @@ /turf/open/floor/almayer/plate, /area/almayer/living/starboard_garden) "awj" = ( -/obj/structure/platform/metal/almayer/east, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer/mono, +/obj/structure/machinery/light/blue, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "awk" = ( /turf/open/floor/almayer/silver, @@ -8603,7 +8773,7 @@ /turf/open/floor/almayer/blue/west, /area/almayer/living/bridgebunks) "awm" = ( -/turf/open/floor/almayer/red/northwest, +/turf/open/floor/almayer/silver/northwest, /area/almayer/command/cic) "awn" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -8620,15 +8790,8 @@ /turf/open/floor/almayer/plate, /area/almayer/living/bridgebunks) "awp" = ( -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/morgue) -"awq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "awr" = ( /turf/open/floor/almayer/blue/northwest, /area/almayer/living/bridgebunks) @@ -8799,11 +8962,29 @@ /turf/open/floor/almayer/plate, /area/almayer/living/intel) "awQ" = ( -/obj/structure/closet/secure_closet/professor_dummy{ - pixel_y = 32 +/obj/structure/surface/table/almayer, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 11 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/clothing/accessory/storage/black_vest/acid_harness, +/obj/item/clothing/accessory/storage/black_vest/acid_harness, +/obj/item/device/multitool, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "awR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/flora/pottedplant{ @@ -8981,41 +9162,50 @@ /turf/open/floor/almayer/redcorner/west, /area/almayer/shipboard/weapon_room) "axl" = ( -/obj/structure/machinery/disposal/delivery{ - density = 0; - desc = "A pneumatic delivery unit. Sends items to the requisitions."; - icon_state = "delivery_med"; - name = "Requisitions Delivery Unit"; - pixel_y = 1; - pixel_x = 25 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMO Shutters"; + name = "\improper CMO Office Shutters" }, -/obj/structure/disposalpipe/trunk{ +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; + name = "\improper CMO's Office"; + req_one_access = null; + req_one_access_txt = "1;5" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "axm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) +"axn" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + name = "\improper Disposals" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "axo" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, /turf/open/floor/almayer/plate, /area/almayer/command/telecomms) -"axp" = ( -/turf/open/floor/almayer/blue/north, -/area/almayer/command/cic) "axq" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orange, /area/almayer/maint/upper/mess) "axr" = ( -/turf/open/floor/almayer/flooredge/west, +/turf/open/floor/almayer/flooredgesmooth2/west, /area/almayer/hallways/upper/port) "axs" = ( /obj/effect/decal/cleanable/dirt, @@ -9219,12 +9409,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/pb) -"axW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "axX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -9414,13 +9598,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/bridgebunks) -"ayz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/almayer/orange/southwest, -/area/almayer/command/cic) "ayA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{ name = "\improper Officer's Quarters" @@ -9451,6 +9628,13 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, /area/almayer/maint/upper/mess) +"ayF" = ( +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "ayG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -9504,11 +9688,24 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/turf/open/floor/almayer/green/east, +/area/almayer/hallways/upper/fore_hallway) +"ayO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"ayP" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/green/east, -/area/almayer/hallways/upper/fore_hallway) +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "ayQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -9543,17 +9740,36 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering) -"ayY" = ( -/obj/structure/sign/safety/maint{ +"ayW" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"ayX" = ( +/obj/structure/sign/safety/hvac_old{ pixel_x = 8; - pixel_y = 28 + pixel_y = -32 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/upper/midship_hallway) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "ayZ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/sterile_green_side/southeast, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "aza" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -9821,8 +10037,8 @@ /turf/open/floor/almayer/flooredgesmooth/south, /area/almayer/command/cic) "azN" = ( -/obj/structure/platform/metal/almayer/north, -/turf/open/floor/almayer, +/obj/structure/barricade/handrail, +/turf/open/floor/almayer/flooredge, /area/almayer/living/briefing) "azO" = ( /obj/structure/machinery/light{ @@ -10075,10 +10291,16 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cicconference) "aAr" = ( -/obj/structure/closet/secure_closet/CMO, -/obj/item/clothing/accessory/stethoscope, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/surface/rack, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "aAs" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cicconference) @@ -10282,14 +10504,17 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering) "aAT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "aAU" = ( /obj/structure/machinery/light{ - dir = 4 + dir = 8 }, -/turf/open/floor/almayer/orange/east, +/turf/open/floor/almayer/flooredge/east, /area/almayer/hallways/lower/starboard_midship_hallway) "aAV" = ( /obj/structure/bed/chair{ @@ -10336,12 +10561,25 @@ /turf/open_space, /area/almayer/middeck/hanger) "aBd" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/almayer/cargo, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) +"aBe" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aBf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, @@ -10637,11 +10875,11 @@ /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; dir = 1; - name = "\improper Closet"; + name = "\improper Synthetic Storage"; req_one_access = list(36) }, /turf/open/floor/almayer/test_floor4, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "aBQ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm{ @@ -10861,7 +11099,7 @@ /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering) "aCo" = ( -/turf/open/floor/almayer/sterile_green_corner, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "aCp" = ( /turf/open/floor/almayer/flooredgesmooth2/west, @@ -10879,19 +11117,27 @@ /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/upper/fore_hallway) "aCt" = ( -/obj/structure/bed/sofa/south/white/right{ - pixel_y = 1 - }, +/obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "aCu" = ( /obj/structure/machinery/light, -/turf/open/floor/almayer/green/east, +/turf/open/floor/almayer/green/southeast, /area/almayer/hallways/lower/port_midship_hallway) "aCv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/silver/north, /area/almayer/command/computerlab) +"aCw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 26 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aCx" = ( /obj/structure/dartboard{ pixel_y = 27; @@ -10936,23 +11182,14 @@ /turf/open/floor/almayer/tcomms, /area/almayer/command/telecomms) "aCC" = ( -/obj/structure/bed/sofa/south/white/left{ - pixel_y = 1 - }, /turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "aCD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "researchlockdownext_door"; - name = "\improper Research Door Shutter" +/obj/structure/machinery/computer/cameras/almayer{ + dir = 4; + pixel_x = -16 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/medical_science) "aCE" = ( /obj/structure/disposalpipe/junction{ @@ -10963,6 +11200,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) +"aCF" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aCG" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/securestorage) @@ -11041,9 +11287,22 @@ /turf/open/floor/plating, /area/almayer/command/securestorage) "aCR" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/medical/hydroponics) +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_y = 28; + req_one_access_txt = "28" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/containment) "aCS" = ( /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/command/securestorage) @@ -11396,25 +11655,11 @@ /turf/open/floor/almayer/cargo, /area/almayer/command/securestorage) "aDU" = ( -/obj/structure/surface/rack, -/obj/item/tool/minihoe{ - pixel_x = -4 - }, -/obj/item/tool/minihoe{ - pixel_x = 4 - }, -/obj/item/tool/minihoe{ - pixel_y = -4 - }, -/obj/item/tool/wirecutters/clippers{ - pixel_y = -4 - }, -/obj/item/tool/wirecutters/clippers{ - pixel_y = -2 - }, -/obj/item/tool/wirecutters/clippers, -/turf/open/floor/almayer/green/southwest, -/area/almayer/living/grunt_rnr) +/obj/structure/closet/crate/trashcart, +/obj/item/trash/buritto, +/obj/item/clothing/head/helmet/marine/rto/intel, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "aDV" = ( /obj/structure/machinery/telecomms/server/presets/engineering, /obj/structure/machinery/telecomms/processor/preset_four{ @@ -11504,10 +11749,7 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Upper Medical Corridors"; - req_access = list() - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "aEf" = ( @@ -11536,12 +11778,8 @@ /turf/open/floor/almayer/blue/west, /area/almayer/living/auxiliary_officer_office) "aEi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/medical/morgue) "aEj" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/helmet/marine/pilot, @@ -11583,6 +11821,17 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) +"aEp" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aEq" = ( /obj/structure/pipes/vents/pump/on{ dir = 4 @@ -11697,7 +11946,6 @@ icon_state = "pottedplant_22"; pixel_y = 8 }, -/obj/structure/machinery/light, /turf/open/floor/almayer/silver/southeast, /area/almayer/command/cic) "aEE" = ( @@ -11766,7 +12014,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "aEO" = ( -/turf/open/floor/almayer/sterile_green, +/obj/structure/machinery/status_display{ + pixel_y = -32 + }, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "aEP" = ( /obj/effect/decal/cleanable/dirt, @@ -11794,6 +12045,10 @@ "aET" = ( /turf/closed/wall/almayer, /area/almayer/living/captain_mess) +"aEU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aEV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11848,6 +12103,13 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) +"aFa" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/lower/port_midship_hallway) "aFb" = ( /obj/structure/sign/prop2{ pixel_y = 30; @@ -11892,28 +12154,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) "aFf" = ( -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = -8; - pixel_y = 1 - }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/clipboard{ - pixel_x = -8 - }, -/obj/item/folder/white{ - pixel_x = -8 - }, -/obj/item/folder/white{ - pixel_x = 6 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 8 +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 20 }, -/turf/open/floor/almayer/sterile_green_corner/east, +/obj/structure/machinery/chem_dispenser/research, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "aFg" = ( /obj/structure/filingcabinet/security{ @@ -12112,8 +12357,9 @@ layer = 4.1; pixel_y = 18 }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/cargo_arrow, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "aFN" = ( /obj/item/tool/wet_sign, /turf/open/floor/almayer/plate, @@ -12219,7 +12465,7 @@ icon_state = "S" }, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "aGf" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -12233,13 +12479,11 @@ "aGg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ - dir = 8; - pixel_y = 8; - pixel_x = -1 + dir = 8 }, /obj/item/reagent_container/food/drinks/coffeecup/uscm{ - pixel_x = -7; - pixel_y = 23 + pixel_x = 8; + pixel_y = 12 }, /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) @@ -12247,7 +12491,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/flooredge/east, +/turf/open/floor/almayer/flooredgesmooth/east, /area/almayer/hallways/upper/starboard) "aGi" = ( /obj/structure/bed/chair/comfy, @@ -12301,7 +12545,7 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "aGq" = ( -/turf/open/floor/almayer/blue/southwest, +/turf/open/floor/almayer/silver/southwest, /area/almayer/command/cic) "aGr" = ( /turf/open/floor/almayer, @@ -12346,8 +12590,8 @@ pixel_x = -17; pixel_y = -6 }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "aGz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build, @@ -12411,8 +12655,8 @@ pixel_y = 10; can_block_movement = 0 }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "aGK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -12423,7 +12667,7 @@ /obj/structure/largecrate/random/case/double, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "aGM" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -12457,6 +12701,12 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/north1) +"aGQ" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/lower/port_midship_hallway) "aGR" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -12503,11 +12753,16 @@ /turf/open/floor/wood/ship, /area/almayer/living/numbertwobunks) "aHa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/upper_medical) +/obj/structure/surface/rack, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "aHb" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -12894,10 +13149,6 @@ /area/almayer/middeck/maintenance/sp) "aIj" = ( /obj/structure/ladder/multiz, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 28 - }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/briefing) "aIk" = ( @@ -12926,15 +13177,17 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) "aIo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "researchlockdownext_windoor"; + name = "\improper Research Windoor Shutter" }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/turf/open/floor/plating, +/area/almayer/medical/medical_science) "aIp" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -12942,10 +13195,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/briefing) -"aIq" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aIr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -12997,10 +13246,7 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/shipboard/navigation) "aIx" = ( -/obj/structure/flora/bush/ausbushes/var3/ppflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake ppflowers" - }, +/obj/structure/flora/bush/ausbushes/var3/ppflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "aIy" = ( @@ -13019,30 +13265,30 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/medical) "aIB" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass{ - desc = "Just like a real plant, but fake!"; - name = "fake fullgrass" - }, +/obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "aIC" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = 26 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/photocopier/wyphotocopier{ - pixel_y = 1 +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = 10 }, -/turf/open/floor/plating/plating_catwalk, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "aID" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - pixel_y = 19; - density = 0 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "aIE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -13131,11 +13377,26 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) "aIP" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Containment Cell 5"; + name = "Cell 5 Control"; + pixel_x = 2; + pixel_y = 7 + }, +/obj/structure/machinery/door_control{ + id = "W_Containment Cell 5"; + name = "Containment Lockdown"; + pixel_x = 1; + pixel_y = -4; + req_one_access_txt = "19;28" + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/containment) "aIQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13401,6 +13662,9 @@ /obj/structure/surface/rack, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"aJD" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/stairs) "aJE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -13417,7 +13681,7 @@ dir = 8; layer = 3.25 }, -/turf/open/floor/almayer/blue/northwest, +/turf/open/floor/almayer/silver/northwest, /area/almayer/command/cic) "aJH" = ( /obj/effect/decal/heavy_cable/cable_vertical, @@ -13439,11 +13703,8 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/command/cic) "aJJ" = ( +/obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/bed/chair, -/obj/structure/flora/bush/ausbushes/var3/brflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake brflowers" - }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "aJK" = ( @@ -13578,10 +13839,7 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) "aKg" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake brflowers" - }, +/obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "aKh" = ( @@ -13752,9 +14010,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone/upper/port_aft) -"aKB" = ( -/turf/closed/wall/almayer/outer/internal, -/area/almayer/middeck/maintenance/sp) "aKC" = ( /obj/structure/machinery/light, /turf/open_space, @@ -14123,11 +14378,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/lower_astronav) -"aLE" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/map/galaxy, -/turf/open/floor/carpet, -/area/almayer/command/cicconference) "aLF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/almayer, @@ -14174,12 +14424,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/lower_astronav) -"aLJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "aLK" = ( /obj/structure/surface/table/almayer, /obj/item/stack/cable_coil{ @@ -14228,11 +14472,35 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/lower_astronav) "aLS" = ( -/obj/structure/machinery/status_display{ - pixel_x = -32 +/obj/structure/surface/table/almayer, +/obj/item/clipboard{ + pixel_x = -6; + pixel_y = 2 }, -/turf/open/floor/grass, -/area/almayer/medical/upper_medical) +/obj/item/tool/hand_labeler{ + pixel_x = -5 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/tool/pen{ + pixel_x = 5 + }, +/obj/structure/transmitter{ + name = "Morgue Telephone"; + phone_category = "Medical & Research Dept."; + phone_id = "Morgue"; + dir = 8; + pixel_x = 19 + }, +/obj/item/tool/stamp{ + pixel_x = -5; + pixel_y = 12; + name = "Medical Examiner's rubber stamp" + }, +/turf/open/floor/almayer, +/area/almayer/medical/morgue) "aLT" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha) @@ -14260,6 +14528,9 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) +"aLZ" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/stairs) "aMa" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -14283,23 +14554,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) "aMd" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - pixel_x = -1; - pixel_y = 19; +/obj/structure/filingcabinet/seeds{ density = 0; - opacity = 0 + pixel_x = 5; + pixel_y = 16 }, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/book/manual/surgery, -/obj/item/book/manual/research_and_development, -/obj/item/book/manual/ripley_build_and_repair, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32; - pixel_y = -5 +/obj/structure/filingcabinet/disk{ + density = 0; + pixel_x = -11; + pixel_y = 16 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/upper_medical) +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 30; + pixel_x = -7 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "aMe" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -14312,6 +14582,16 @@ "aMf" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_f_s) +"aMg" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer/plating_striped/east, +/area/almayer/maint/hull/lower/l_a_p) "aMh" = ( /turf/open_space, /area/almayer/middeck/maintenance/bow) @@ -14389,12 +14669,6 @@ /obj/structure/platform/metal/almayer_smooth/west, /turf/open_space, /area/almayer/middeck/maintenance/bow) -"aMt" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "aMu" = ( /obj/structure/barricade/handrail/no_vault{ dir = 1 @@ -14414,19 +14688,6 @@ /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"aMx" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) "aMy" = ( /turf/open/floor/almayer/mono, /area/almayer/hallways/upper/starboard) @@ -14442,16 +14703,34 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/bow) "aMB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer/red/west, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/alpha) "aMC" = ( -/obj/structure/machinery/light{ +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/red/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/alpha) "aMD" = ( /obj/structure/surface/table/almayer, @@ -14480,21 +14759,13 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison/kitchen, /area/almayer/engineering/upper_engineering) -"aMH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/landmark/start/marine/smartgunner/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aMI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "aMJ" = ( /obj/structure/platform_decoration/metal/almayer_smooth, /turf/open_space, @@ -14516,21 +14787,15 @@ /obj/structure/window/framed/almayer, /turf/open/floor/almayer/no_build/plating, /area/almayer/shipboard/navigation) -"aMO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/alpha_bravo_shared) -"aMP" = ( -/turf/open/floor/almayer/redcorner, -/area/almayer/squads/alpha) "aMQ" = ( -/obj/structure/machinery/cm_vending/clothing/tl/alpha{ - density = 0; - pixel_x = 32 +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, /area/almayer/squads/alpha) "aMR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -14590,16 +14855,6 @@ /obj/structure/platform/metal/almayer_smooth/west, /turf/open_space, /area/almayer/shipboard/navigation) -"aNc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "aNd" = ( /obj/structure/platform/metal/almayer_smooth, /turf/open_space, @@ -14670,6 +14925,10 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) +"aNr" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aNs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -14706,13 +14965,6 @@ /obj/structure/platform_decoration/metal/almayer_smooth/west, /turf/open_space, /area/almayer/middeck/maintenance/bow) -"aNx" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/alpha_bravo_shared) "aNy" = ( /obj/structure/platform/metal/almayer_smooth/north, /turf/open_space, @@ -14771,8 +15023,11 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) "aNI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl, -/turf/open/floor/almayer/test_floor4, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "aNJ" = ( /obj/effect/decal/warning_stripes{ @@ -14821,16 +15076,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) -"aNQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aNR" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -14846,12 +15091,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) "aNT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aNU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -14882,17 +15124,15 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) "aNY" = ( -/obj/structure/machinery/light, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/computer/research{ - pixel_y = -1; - dir = 8; - pixel_x = 18 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/containment) "aNZ" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -14936,9 +15176,35 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) +"aOd" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 26 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aOe" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner/north, +/area/almayer/medical/containment/cell) "aOf" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -15091,16 +15357,11 @@ /turf/open_space, /area/almayer/middeck/medical) "aOy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/squads/alpha) -"aOz" = ( -/turf/open/floor/almayer/redcorner/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/alpha) "aOA" = ( /obj/structure/platform/metal/almayer_smooth, @@ -15165,32 +15426,28 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) "aOK" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/squads/alpha) +/obj/effect/landmark/late_join/delta, +/obj/effect/landmark/start/marine/leader/delta, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "aOL" = ( -/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/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/cargo_arrow/east, +/area/almayer/squads/delta) "aOM" = ( /obj/structure/machinery/power/power_generator/port_gen/pacman, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) "aON" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/turf/closed/wall/almayer, +/area/almayer/squads/platoon2_shared) "aOO" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /obj/structure/barricade/handrail/no_vault{ @@ -15300,9 +15557,11 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "aPf" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/door/airlock/almayer/marine/alpha/medic{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) "aPg" = ( /obj/structure/surface/table/almayer, /obj/item/frame/table, @@ -15321,16 +15580,14 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) -"aPi" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "aPj" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + vend_y_offset = 0; + req_one_access = list(15,18); + req_access = list() }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) "aPk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -15340,13 +15597,15 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aPl" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon1_shared) "aPm" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /obj/structure/machinery/light/red{ @@ -15356,21 +15615,31 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) "aPn" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) -"aPo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon1_shared) +"aPo" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 2 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) +"aPp" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aPq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -15459,9 +15728,6 @@ /obj/structure/largecrate/supply, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) -"aPB" = ( -/turf/open/floor/almayer/emerald, -/area/almayer/command/cic) "aPC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15474,8 +15740,7 @@ pixel_y = 12 }, /obj/structure/filingcabinet/documentation/uscm_mp{ - pixel_x = 8; - icon_state = "chestdrawer" + pixel_x = 8 }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) @@ -15510,16 +15775,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices/cryo) -"aPI" = ( -/turf/open/floor/almayer/blue, -/area/almayer/command/cic) "aPJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/research/containment/corner2, +/area/almayer/medical/containment/cell) "aPK" = ( /obj/structure/stairs, /obj/structure/platform/metal/almayer_smooth/west, @@ -15712,13 +15977,6 @@ /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/pb) -"aQg" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/almayer/emerald/northwest, -/area/almayer/command/cic) "aQh" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/effect/decal/cleanable/dirt, @@ -15828,8 +16086,8 @@ /area/almayer/middeck/maintenance/pb) "aQx" = ( /obj/structure/window/framed/almayer, -/obj/structure/curtain/open/colorable_transparent{ - color = "#9aabb7" +/obj/structure/curtain/open/shower{ + name = "hypersleep curtain" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -15848,13 +16106,9 @@ /area/almayer/squads/req) "aQz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + icon_state = "S" }, -/turf/open/floor/almayer/flooredgesmooth2/south, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "aQA" = ( /obj/effect/decal/warning_stripes{ @@ -15946,21 +16200,6 @@ "aQL" = ( /turf/closed/wall/almayer, /area/almayer/squads/bravo) -"aQM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/engineering_guide{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -8 - }, -/obj/structure/sign/nosmoking_1{ - pixel_x = 25; - pixel_y = -7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aQN" = ( /obj/structure/stairs, /obj/structure/platform/metal/almayer_smooth/east, @@ -15997,13 +16236,14 @@ /turf/open/floor/almayer/no_build, /area/almayer/middeck/maintenance/sp) "aQT" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha) +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/squads/platoon1_shared) "aQU" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -16035,12 +16275,8 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) "aQW" = ( -/obj/structure/machinery/vending/cola{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/redcorner, +/area/almayer/hallways/lower/port_fore_hallway) "aQX" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16058,18 +16294,17 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/maintenance/sp) "aQZ" = ( -/obj/structure/machinery/shower{ +/obj/structure/machinery/botany/editor{ + density = 0; + pixel_x = 5; pixel_y = 16 }, -/obj/item/tool/soap{ - pixel_x = 3; - pixel_y = 1 - }, -/obj/structure/machinery/door/window/westright{ - dir = 2 +/obj/item/clothing/glasses/science{ + pixel_x = 5; + pixel_y = 24 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "aRa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16104,6 +16339,10 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"aRd" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aRe" = ( /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/sp) @@ -16185,14 +16424,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) -"aRo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aRp" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16229,9 +16460,6 @@ /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/pb) -"aRt" = ( -/turf/open/floor/almayer/emeraldcorner/west, -/area/almayer/command/cic) "aRu" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, @@ -16302,11 +16530,10 @@ /turf/open/floor/almayer, /area/almayer/living/captain_mess) "aRF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) +/obj/structure/bed, +/obj/item/bedsheet/green, +/turf/open/floor/almayer, +/area/almayer/medical/upper_medical) "aRG" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -16343,6 +16570,11 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aRJ" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aRK" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, @@ -16359,6 +16591,7 @@ id = "southcheckpoint"; name = "\improper Checkpoint Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/redfull, /area/almayer/hallways/lower/port_midship_hallway) "aRM" = ( @@ -16382,35 +16615,37 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) "aRP" = ( -/turf/open/floor/almayer/orangecorner/north, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/alpha) "aRQ" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/middeck/briefing) "aRR" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 1"; - name = "\improper Containment Cell 1" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 8; - icon_state = "containment_window_h" +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19"; + dir = 2 }, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) "aRS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "aRT" = ( -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"aRU" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) "aRV" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -16432,11 +16667,12 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/paft) "aRX" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon1_shared) "aRY" = ( /obj/structure/largecrate/random/barrel/medical, /obj/structure/prop/invuln/lattice_prop{ @@ -16446,22 +16682,32 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) "aRZ" = ( -/turf/open/floor/almayer/orangecorner/east, -/area/almayer/squads/bravo) -"aSa" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; + icon_state = "door_warning2"; + layer = 3.33; pixel_x = 1; - pixel_y = 1 + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"aSa" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28; + pixel_x = 10 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "aSb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/sterile_green_side/southwest, +/turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/upper_medical) "aSc" = ( /obj/structure/largecrate/random/barrel/true_random, @@ -16547,50 +16793,29 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) "aSn" = ( -/obj/structure/coatrack{ - pixel_x = -8; - pixel_y = 15 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/item/stack/sheet/mineral/plastic{ + amount = 15 }, -/obj/structure/sign/catclock{ - pixel_y = 28; - pixel_x = 7 +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = 3; + pixel_y = 3 }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) "aSo" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/white{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"aSp" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -7; - pixel_y = 6 + icon_state = "SW-out"; + pixel_x = -1 }, -/obj/item/tool/pen{ - pixel_x = -10; - pixel_y = 6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/tool/pen{ - pixel_x = -10; - pixel_y = -2 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "aSq" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/vents/scrubber{ @@ -16609,6 +16834,10 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aSs" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aSt" = ( /turf/open/floor/almayer/bluefull, /area/almayer/living/captain_mess) @@ -16662,17 +16891,6 @@ /obj/structure/platform/metal/almayer_smooth/east, /turf/open_space, /area/almayer/middeck/engineer) -"aSE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "aSF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail/no_vault{ @@ -16688,27 +16906,47 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) "aSH" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/turf/open/floor/almayer/orangecorner/west, -/area/almayer/squads/bravo) +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = -8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) "aSI" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) "aSJ" = ( /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/north1) "aSK" = ( -/turf/open/floor/almayer/research/containment/corner_var1, -/area/almayer/medical/containment/cell) +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) "aSL" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -16753,23 +16991,6 @@ /obj/structure/platform/metal/almayer_smooth/west, /turf/open_space, /area/almayer/middeck/engineer) -"aSQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - pixel_x = 8; - pixel_y = -1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/containment) "aSR" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -16786,8 +17007,8 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/engineer) "aSU" = ( -/turf/closed/wall/almayer/research/containment/wall/connect_e2, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "aSV" = ( /obj/structure/platform/metal/almayer_smooth/north, /turf/open_space, @@ -16964,34 +17185,30 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) -"aTt" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Containment Analysis"; - dir = 1 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) "aTu" = ( /obj/structure/platform/metal/almayer_smooth, /turf/open_space, /area/almayer/middeck/req) "aTv" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/bravo) -"aTw" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/tl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) -"aTx" = ( -/obj/structure/machinery/power/apc/almayer/south, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer/orange/east, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) "aTy" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -17217,11 +17434,14 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aTW" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/structure/machinery/door/airlock/almayer/marine/alpha/smart{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) "aTX" = ( /obj/structure/machinery/power/apc/almayer/north, /obj/effect/decal/cleanable/dirt, @@ -17318,19 +17538,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) -"aUi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) -"aUj" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aUk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -17364,18 +17571,9 @@ /turf/open/floor/carpet, /area/almayer/living/numbertwobunks) "aUp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment_Cell_Umbilical"; - name = "\improper Umbilical Containment Connection"; - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - icon_state = "containment_window_center" - }, -/area/almayer/medical/containment/cell) +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) "aUq" = ( /obj/structure/surface/rack, /obj/structure/surface/rack{ @@ -17507,14 +17705,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) "aUB" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Midship Upper Medical Ladders" +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/upper/fore_hallway) "aUC" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/almayer/orange/west, @@ -17531,9 +17726,6 @@ /obj/structure/airlock_assembly, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/sp) -"aUE" = ( -/turf/closed/wall/almayer/outer/internal, -/area/almayer/middeck/maintenance/paft) "aUF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/no_build/test_floor4, @@ -17543,9 +17735,23 @@ light_color = "#BB3F3F"; dir = 1 }, -/obj/effect/decal/heavy_cable/cable_vertical, -/turf/open/floor/plating/plating_catwalk/no_build, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/briefing) +"aUH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aUI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -17606,37 +17812,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) -"aUR" = ( -/obj/structure/reagent_dispensers/tank/fuel/custom, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/containment) -"aUS" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = -8 +"aUP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/containment) -"aUT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +/obj/structure/pipes/vents/scrubber{ + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/port_midship_hallway) +"aUQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/port_midship_hallway) "aUU" = ( /obj/structure/machinery/light/red{ dir = 8; @@ -17667,22 +17860,31 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/req) "aUY" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/platoon1{ + req_access = list(); + req_one_access = list(15,18) }, -/turf/open/floor/almayer/orange/east, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) "aUZ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/orange/west, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon1_shared) "aVa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/saft) +"aVb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/port_midship_hallway) "aVc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lattice_prop{ @@ -17692,9 +17894,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/pb) -"aVd" = ( -/turf/open/floor/almayer/orange/northwest, -/area/almayer/squads/bravo) "aVe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -17708,8 +17907,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aVf" = ( -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "aVg" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -17722,27 +17926,28 @@ /obj/effect/decal/heavy_cable/node_n_w, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/paft) -"aVi" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - dir = 8; - name = "\improper Decontamination Lounge" +"aVj" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/containment) +/turf/open/floor/almayer/plating_striped/east, +/area/almayer/hallways/lower/port_midship_hallway) +"aVk" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/l_a_p) "aVl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - pixel_x = -8; - pixel_y = -1 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/containment) +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "aVm" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/almayer/cargo, @@ -17777,41 +17982,21 @@ /obj/structure/machinery/portable_atmospherics/canister/empty, /turf/open/floor/engine, /area/almayer/engineering/airmix) -"aVq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/paper_bin/wy{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/tool/pen{ - pixel_y = 5; - pixel_x = -5 - }, -/obj/item/clipboard{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/paper{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 22 +"aVp" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "aVr" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer/orange/northwest, /area/almayer/maint/upper/mess) "aVs" = ( -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, -/area/almayer/medical/containment) +/obj/structure/platform/metal/almayer_smooth, +/turf/open_space, +/area/almayer/middeck/briefing) "aVt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -17832,6 +18017,17 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aVv" = ( +/obj/effect/landmark/start/marine/leader/charlie, +/obj/effect/landmark/late_join/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"aVw" = ( +/obj/structure/largecrate/random/case/double, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "aVx" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -17845,17 +18041,13 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) -"aVz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +"aVy" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = 8; + pixel_y = 26 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/lower/port_midship_hallway) "aVA" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "n_umbilical"; @@ -17892,6 +18084,16 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) +"aVE" = ( +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer/plating_stripedcorner/north, +/area/almayer/hallways/lower/port_midship_hallway) "aVF" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orange, @@ -17899,6 +18101,9 @@ "aVG" = ( /turf/open/floor/almayer/silver/southwest, /area/almayer/command/cichallway) +"aVH" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/squads/bravo) "aVI" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/no_build, @@ -17935,20 +18140,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) "aVN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - pixel_x = -8; - pixel_y = 21 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "aVO" = ( /obj/structure/ladder/multiz, /obj/effect/decal/cleanable/dirt, @@ -18000,7 +18199,7 @@ pixel_x = -3; pixel_y = 6 }, -/turf/open/floor/almayer/blue/southeast, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "aVR" = ( /obj/structure/machinery/light/red{ @@ -18025,11 +18224,31 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/saft) "aVT" = ( +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" + }, /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, -/obj/item/tool/weldingtool/simple, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 + }, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"aVU" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) "aVV" = ( /obj/structure/bed/chair/office/dark, /obj/effect/decal/cleanable/dirt, @@ -18055,6 +18274,9 @@ /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, /area/almayer/middeck/maintenance/pb) +"aVZ" = ( +/turf/closed/wall/almayer, +/area/almayer/squads/support) "aWa" = ( /obj/structure/machinery/light/red{ dir = 4; @@ -18385,34 +18607,16 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/aft) "aWO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/structure/sign/safety/one{ - pixel_y = -26; - pixel_x = 14 - }, -/obj/structure/sign/safety/biohazard{ - pixel_y = -26 - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "aWP" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = 8 + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/containment) +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) "aWQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -18428,28 +18632,27 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aWR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/sign/safety/biohazard{ - pixel_y = 28; - pixel_x = 8 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"aWT" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/heavy_cable/cable_horizontal, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"aWS" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) +/obj/structure/machinery/light, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "aWU" = ( -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "aWV" = ( /obj/structure/window/reinforced, /obj/structure/surface/table/reinforced/almayer_B, @@ -18493,46 +18696,22 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aWY" = ( -/obj/item/storage/firstaid/regular{ - pixel_y = 5; - pixel_x = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/barricade/handrail/no_vault{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) +/obj/structure/barricade/handrail/no_vault, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "aWZ" = ( /obj/structure/pipes/standard/simple/visible, /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/airmix) "aXa" = ( -/obj/item/device/reagent_scanner{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/briefcase/inflatable{ - pixel_y = -8; - pixel_x = -3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) +/obj/structure/platform/metal/almayer_smooth, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open_space, +/area/almayer/middeck/briefing) "aXb" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -19239,12 +19418,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/shipboard/navigation) -"aYH" = ( -/obj/structure/sign/third_fleet_info{ - pixel_y = 29 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "aYI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -19438,17 +19611,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"aZf" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "aZg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -19622,32 +19784,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"aZA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) "aZB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -19783,22 +19919,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/upper/port_fore) -"aZO" = ( -/obj/structure/machinery/landinglight/delaytwo, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"aZP" = ( -/obj/structure/machinery/landinglight/delayone, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"aZQ" = ( -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"aZR" = ( -/obj/structure/machinery/landinglight/delaythree, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "aZS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, @@ -19817,31 +19937,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) -"aZU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delayone{ - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/shipboard/port_point_defense) -"aZV" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_y = -30 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"aZW" = ( -/obj/structure/machinery/cm_vending/gear/synth, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"aZX" = ( -/obj/structure/machinery/cm_vending/clothing/synth, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"aZY" = ( -/obj/structure/machinery/cm_vending/own_points/experimental_tools, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "aZZ" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -19877,18 +19972,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) -"baf" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/shipboard/port_point_defense) -"bag" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/shipboard/port_point_defense) "bah" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -20138,12 +20221,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/briefing) -"baH" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "baI" = ( /turf/open/floor/plating, /area/almayer/hallways/hangar) @@ -20167,15 +20244,6 @@ /obj/effect/decal/heavy_cable/node_s_w, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) -"baM" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "baN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, @@ -20204,16 +20272,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"baS" = ( -/obj/structure/sign/safety/ladder{ - pixel_y = 28 - }, -/obj/structure/sign/safety/medical{ - pixel_y = 28; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_fore_hallway) "baT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -20231,20 +20289,6 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) -"baW" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_midship_hallway) -"baX" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "baY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/node_s_w_e, @@ -20294,6 +20338,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bbg" = ( @@ -20393,6 +20438,12 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/briefing) +"bbo" = ( +/obj/effect/landmark/start/marine/leader/kilo, +/obj/effect/landmark/late_join/kilo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bbp" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -20452,13 +20503,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) -"bbu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) "bbv" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -20510,8 +20554,8 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie_delta_shared) +/turf/closed/wall/almayer, +/area/almayer/squads/bravo) "bbA" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/effect/decal/cleanable/dirt, @@ -20739,27 +20783,12 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/maintenance/aft) -"bbY" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/alpha, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "bbZ" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) -"bca" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "bcb" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -20778,15 +20807,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"bcd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/landinglight{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bce" = ( /obj/structure/barricade/handrail/no_vault{ dir = 8 @@ -20798,21 +20818,16 @@ /area/almayer/middeck/hanger) "bcg" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/bed/sofa/south/white/right{ - pixel_y = 16; - layer = 4.11 +/obj/structure/bed/sofa/south/white/left{ + pixel_y = 16 }, -/turf/open/floor/almayer/silverfull2, +/turf/open/floor/almayer/silver/northwest, /area/almayer/maint/upper/u_m_p) "bch" = ( /obj/structure/surface/table/almayer, -/obj/item/stack/cable_coil{ - pixel_y = 3; - pixel_x = -8 - }, /obj/item/stack/cable_coil{ pixel_y = 3; pixel_x = -8 @@ -20850,6 +20865,12 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bcl" = ( +/obj/effect/landmark/start/marine/tl/kilo, +/obj/effect/landmark/late_join/kilo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bcm" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) @@ -20863,8 +20884,10 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) "bco" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer/plate, +/obj/effect/landmark/start/marine/spec/alpha, +/obj/effect/landmark/late_join/alpha, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bcp" = ( /obj/effect/decal/warning_stripes{ @@ -20876,6 +20899,38 @@ /obj/structure/prop/almayer/hangar_stencil, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"bcq" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"bcr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/south, +/obj/item/storage/box/guncase/m2c, +/obj/item/storage/box/guncase/m2c{ + pixel_y = 7 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/support) "bcs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -20892,13 +20947,10 @@ /turf/open/floor/almayer/red/west, /area/almayer/maint/upper/u_a_p) "bcu" = ( -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow4_red"; - pixel_y = -1 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/trading_card/blue, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bcv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -20909,9 +20961,6 @@ icon_state = "S" }, /obj/structure/prop/almayer/hangar_stencil, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "bcx" = ( @@ -20968,7 +21017,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/reagent_dispensers/tank/fuel/custom, +/obj/structure/closet/wardrobe/chemistry_white, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/chemistry) "bcB" = ( @@ -20983,6 +21032,7 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "bcC" = ( +/obj/structure/reagent_dispensers/tank/fuel/custom, /obj/structure/machinery/power/apc/almayer{ dir = 1 }, @@ -20998,10 +21048,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/chemistry) -"bcE" = ( -/obj/structure/machinery/cm_vending/gear/engi, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "bcF" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -21013,17 +21059,6 @@ /obj/effect/decal/heavy_cable/node_n_e_s, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/aft) -"bcH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "bcI" = ( /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk/no_build, @@ -21082,15 +21117,9 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) "bcQ" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) +/obj/effect/decal/heavy_cable/node_n_e_s, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) "bcR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/transmitter/rotary{ @@ -21128,15 +21157,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) "bcU" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7" - }, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_x = 1 + icon_state = "E" }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "bcV" = ( /obj/structure/largecrate/machine/bodyscanner, /obj/item/folded_tent/med{ @@ -21155,24 +21181,9 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/req) "bcY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner2, -/area/almayer/medical/containment/cell) -"bcZ" = ( -/obj/structure/machinery/chem_dispenser/corpsman{ - pixel_y = 3 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bda" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood{ pixel_x = -1 @@ -21323,10 +21334,6 @@ "bdr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"bds" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/alpha, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "bdt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -21335,11 +21342,7 @@ pixel_y = 16 }, /obj/item/clothing/glasses/sunglasses{ - pixel_y = 16; - pixel_x = -2 - }, -/obj/item/storage/fancy/trading_card/blue{ - pixel_y = 4 + pixel_y = 5 }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) @@ -21372,12 +21375,25 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/starboard_point_defense) "bdz" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/smart, -/turf/open/floor/almayer/test_floor4, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/squads/alpha) "bdA" = ( -/obj/structure/machinery/cm_vending/clothing/medic/alpha, -/turf/open/floor/almayer/plate, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/alpha) "bdB" = ( /obj/effect/decal/warning_stripes{ @@ -21388,19 +21404,31 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) "bdC" = ( -/turf/open/floor/almayer/plate, +/obj/effect/landmark/start/marine/leader/alpha, +/obj/effect/landmark/late_join/alpha, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bdD" = ( -/obj/structure/machinery/cm_vending/clothing/engi/alpha, -/turf/open/floor/almayer/plate, +/obj/effect/landmark/start/marine/medic/alpha, +/obj/effect/landmark/late_join/alpha, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bdE" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8 + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) "bdF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -21425,22 +21453,8 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 38 - }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bdJ" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_y = 25 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "bdK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -21470,23 +21484,17 @@ /obj/structure/surface/rack, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) -"bdO" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bdP" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth_red"; - dir = 1 + icon_state = "NE-out"; + pixel_y = 1 }, -/obj/structure/pipes/vents/scrubber/no_boom{ - welded = 1; - name = "Secure Reinforced Air Scrubber" +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "bdQ" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/no_build/plate, @@ -21510,12 +21518,13 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/req) -"bdU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" +"bdT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/lower_medical_lobby) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "bdV" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -21523,8 +21532,12 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "bdW" = ( -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) +/obj/structure/surface/rack, +/obj/item/storage/fancy/trading_card/red{ + pixel_y = 15 + }, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bdX" = ( /obj/structure/surface/rack, /obj/structure/surface/rack{ @@ -21548,13 +21561,6 @@ /obj/effect/decal/heavy_cable/node_n_w, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) -"bea" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/lower_medical_lobby) "beb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/red{ @@ -21570,6 +21576,13 @@ "bec" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 + }, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, @@ -21601,12 +21614,6 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/shipboard/navigation) -"beg" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "beh" = ( /obj/structure/largecrate/supply, /turf/open/floor/almayer/no_build/plate, @@ -21618,9 +21625,13 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/chemistry) "bek" = ( -/obj/structure/reagent_dispensers/tank/fuel/custom, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bel" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -21678,12 +21689,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "north_central_checkpoint"; - name = "North Checkpoint Shutters"; - req_access_txt = "19" - }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bes" = ( @@ -21727,17 +21732,19 @@ pixel_y = 3 }, /obj/item/book/manual/surgery{ - pixel_x = 5; - pixel_y = 3 + pixel_x = 6; + pixel_y = 5 }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/operating_room_one) "bew" = ( -/obj/structure/machinery/chem_dispenser/corpsman{ - pixel_y = 3 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon1_shared) "bex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail/no_vault, @@ -21773,6 +21780,18 @@ /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) +"beC" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "southcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "beD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -21831,15 +21850,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) -"beK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ - dir = 1 +"beJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"beK" = ( +/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow4" + icon_state = "E" }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) "beL" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -21888,41 +21918,25 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "beP" = ( -/obj/item/stack/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/plating, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) "beQ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/living/briefing) -"beR" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/medic, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) -"beS" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/engineer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) -"beT" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "beU" = ( /obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) -"beV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "beW" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -22075,16 +22089,32 @@ /turf/open/floor/almayer/silver/northwest, /area/almayer/living/cryo_cells) "bfn" = ( -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/cm_vending/gear/smartgun{ + density = 0; + pixel_x = -26; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red2/southwest, +/area/almayer/squads/alpha) "bfo" = ( /turf/open/floor/almayer/redcorner/north, /area/almayer/living/cryo_cells) "bfp" = ( -/turf/closed/wall/almayer/research/containment/wall/divide{ - remote_id = "W_Containment_Cell_Umbilical_1" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/area/almayer/medical/containment/cell) +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) "bfq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -22106,54 +22136,57 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/maint/hull/lower/l_f_s) "bft" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/marine/dress_cover{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/facepaint/lipstick/maroon{ + pixel_y = 8; + pixel_x = 5 }, +/obj/item/facepaint/sunscreen_stick, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bfu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/redcorner/east, -/area/almayer/squads/alpha) +/obj/effect/landmark/start/marine/smartgunner/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "bfv" = ( /obj/structure/platform_decoration/metal/almayer, /turf/open/floor/almayer/no_build, /area/almayer/middeck/engineer) -"bfw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"bfx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) -"bfx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "bfy" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 2; + icon_state = "pipe-c" }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/mono, /area/almayer/squads/alpha) "bfz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sign/safety/hvac_old{ pixel_x = 8; pixel_y = 25 }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/turf/closed/wall/almayer, +/area/almayer/squads/platoon1_shared) "bfA" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -22178,24 +22211,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/medical/containment/cell/cl) -"bfD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) -"bfE" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/squads/alpha) "bfF" = ( /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) @@ -22226,12 +22241,6 @@ /obj/item/prop/almayer/comp_closed, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bfL" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bfM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -22241,12 +22250,23 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) "bfN" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - dir = 8; - name = "\improper Decontamination Lounge" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) +/turf/closed/wall/almayer/reinforced, +/area/almayer/middeck/briefing) +"bfO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -27 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) "bfP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -22279,44 +22299,24 @@ /obj/structure/barricade/handrail/no_vault, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) -"bfV" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger{ - pixel_y = 4 - }, -/obj/item/device/defibrillator{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/device/defibrillator{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/device/defibrillator{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/device/defibrillator{ - pixel_x = -1; - pixel_y = 5 +"bfW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/obj/item/device/defibrillator{ - pixel_x = -1; - pixel_y = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/lower_medical_lobby) -"bfW" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 + icon_state = "NE-out"; + pixel_y = 1 }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) "bfX" = ( /obj/effect/decal/heavy_cable/node_n_e_s, /turf/open/floor/plating/plating_catwalk/no_build, @@ -22326,49 +22326,29 @@ /obj/item/prop/almayer/comp_open, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bfZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 32; - pixel_y = -7 - }, -/obj/structure/sign/safety/outpatient{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) "bga" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/containment/contshutter{ - name = "\improper Containment Stairs"; - id = null; - dir = 2; - req_one_access = list(28,206,207); - id_tag = "ResearchStairs_A"; - locked = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"bgc" = ( -/obj/structure/pipes/vents/scrubber/no_boom{ - welded = 1; - name = "Secure Reinforced Air Scrubber" +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bgb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/turf/open/floor/almayer/research/containment/floor1, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) "bgd" = ( -/obj/structure/machinery/iv_drip, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 - }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/node_n_e_s, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bge" = ( /obj/effect/decal/cleanable/dirt, /obj/vehicle/train/cargo/trolley, @@ -22406,14 +22386,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) -"bgj" = ( -/obj/structure/machinery/landinglight{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bgk" = ( /obj/structure/surface/table/almayer, +/obj/item/book/manual/chemistry, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/chemistry) "bgl" = ( @@ -22466,63 +22441,49 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/shipboard/navigation) "bgs" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build, +/area/almayer/middeck/briefing) +"bgt" = ( +/turf/open/floor/almayer/no_build, +/area/almayer/middeck/briefing) +"bgu" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/biohazard_lockdown{ - pixel_y = 2; - pixel_x = -6 + icon_state = "NE-out"; + pixel_y = 1 }, -/obj/structure/machinery/door_control{ - id = "W_Containment_Cell_Umbilical_1"; - name = "Umbilical Containment Connection Port"; - pixel_y = -7; - req_one_access_txt = "19;28"; - normaldoorcontrol = 4; - pixel_x = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/obj/structure/machinery/door_control{ - id = "W_Containment_Cell_Umbilical"; - name = "Umbilical Containment Connection Windows"; - pixel_y = 2; - req_one_access_txt = "19;28"; - pixel_x = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_control{ - id = "W_Containment_Cell_Umbilical_2"; - name = "Umbilical Containment Connection Starboard"; - pixel_y = 11; - req_one_access_txt = "19;28"; - normaldoorcontrol = 4; - pixel_x = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/containment) -"bgt" = ( +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bgv" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "SW-out"; + layer = 2.5 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) -"bgu" = ( -/obj/structure/machinery/shower{ - dir = 4; - pixel_x = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 }, -/obj/item/tool/soap/deluxe{ - pixel_y = -5; - pixel_x = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bgv" = ( -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) +/obj/structure/ladder/multiz, +/turf/open/floor/almayer/plating, +/area/almayer/middeck/briefing) "bgw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22530,13 +22491,31 @@ /turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/lower_medical_medbay) "bgx" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -14; - pixel_y = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"bgy" = ( +/obj/effect/landmark/start/marine/tl/bravo, +/obj/effect/landmark/late_join/bravo, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) "bgz" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -22692,9 +22671,19 @@ }, /turf/open/floor/almayer/orange/northeast, /area/almayer/hallways/upper/midship_hallway) +"bgN" = ( +/obj/effect/landmark/start/marine/bravo, +/obj/effect/landmark/late_join/bravo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "bgO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, /turf/open/floor/almayer, /area/almayer/living/briefing) @@ -22735,8 +22724,24 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) "bgU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/red, +/obj/structure/surface/table/reinforced/prison, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/prop/magazine/boots/n058{ + pixel_y = 3; + pixel_x = 13 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bgV" = ( /obj/structure/machinery/power/monitor{ @@ -22745,39 +22750,41 @@ /turf/open/floor/almayer/no_build, /area/almayer/middeck/engineer) "bgW" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"bgY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) -"bgZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/computer/cameras/almayer/containment{ - dir = 4; - pixel_y = 9; - pixel_x = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon2_shared) +"bgX" = ( +/obj/effect/landmark/start/marine/charlie, +/obj/effect/landmark/late_join/charlie, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"bgY" = ( +/obj/structure/machinery/disposal{ + pixel_x = -1; + pixel_y = 1 }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_display/research_cell{ - id = "Containment Cell 2"; - name = "Cell 2 Control"; - pixel_y = -5; - layer = 3.125; - dir = 4; - pixel_x = 1 +/obj/structure/disposalpipe/trunk{ + dir = 2 }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/containment) +/obj/structure/sign/prop1{ + pixel_y = 32 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/platoon1_shared) +"bgZ" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "bha" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22797,16 +22804,29 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) "bhb" = ( -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bhc" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 }, -/obj/structure/platform/metal/almayer_smooth/north, -/turf/open/floor/almayer, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"bhc" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho, +/obj/item/reagent_container/food/condiment/hotsauce/franks, +/obj/item/reagent_container/food/condiment/coldsauce, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/effect/decal/heavy_cable/cable_vertical, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bhd" = ( +/obj/effect/landmark/start/marine/kilo, +/obj/effect/landmark/late_join/kilo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bhe" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -22850,9 +22870,6 @@ /area/almayer/middeck/req) "bhj" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight{ - dir = 1 - }, /turf/open/floor/almayer/plating_striped/south, /area/almayer/shipboard/port_point_defense) "bhk" = ( @@ -22904,6 +22921,12 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) +"bho" = ( +/obj/effect/landmark/start/marine/tl/charlie, +/obj/effect/landmark/late_join/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bhp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -22923,6 +22946,7 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/living/briefing) "bhr" = ( @@ -22982,8 +23006,40 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sb) "bhA" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19"; + dir = 2 + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"bhB" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "bhC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail/no_vault{ @@ -23006,27 +23062,30 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) "bhF" = ( -/turf/closed/wall/almayer/research/containment/wall/divide{ - remote_id = "W_Containment_Cell_Umbilical_2" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/area/almayer/medical/containment/cell) -"bhG" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"bhH" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "SW-out"; + layer = 2.5 }, -/obj/structure/sign/safety/biohazard{ - pixel_y = -26; - pixel_x = 8 +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"bhH" = ( +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bhI" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -23039,14 +23098,8 @@ /turf/open/floor/almayer/blue/west, /area/almayer/living/bridgebunks) "bhK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/containment) +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bhL" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -23080,23 +23133,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) +"bhO" = ( +/obj/effect/landmark/start/marine/tl/oscar, +/obj/effect/landmark/late_join/oscar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bhP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - pixel_x = 8; - pixel_y = 21 +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ - dir = 8 +/obj/structure/largecrate/random/mini{ + pixel_y = 2 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bhQ" = ( /obj/effect/decal/heavy_cable/node_n_w, /obj/effect/decal/cleanable/dirt, @@ -23167,6 +23221,15 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) +"bhZ" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "bia" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -23196,6 +23259,22 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/shipboard/navigation) +"bid" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = -26 + }, +/obj/structure/sign/safety/maint{ + pixel_x = 15; + pixel_y = -26 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "bie" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/iv_drip{ @@ -23248,12 +23327,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bij" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "bik" = ( /obj/structure/ladder/multiz, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -26 - }, /turf/open/floor/almayer/plating, /area/almayer/middeck/briefing) "bil" = ( @@ -23323,14 +23405,10 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) "bit" = ( -/obj/structure/machinery/camera/autoname/almayer/containment, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/effect/decal/heavy_cable/node_s_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) "biu" = ( /obj/structure/machinery/smartfridge/chemistry, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -23416,9 +23494,11 @@ "biB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, -/obj/structure/largecrate/random/mini{ - pixel_y = 2 +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, +/obj/item/tool/weldingtool/simple, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) "biC" = ( @@ -23436,6 +23516,14 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) +"biE" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "biF" = ( /obj/structure/machinery/door_control{ id = "or02"; @@ -23449,7 +23537,7 @@ pixel_y = 3 }, /obj/structure/machinery/door_control{ - id = "or2privacyshutterdoor"; + id = "or2privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = -22; throw_range = 15; @@ -23759,6 +23847,10 @@ pixel_x = 16; pixel_y = 16 }, +/obj/structure/prop/server_equipment/yutani_server{ + pixel_y = 16; + density = 0 + }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/briefing) "bji" = ( @@ -23870,10 +23962,15 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sf) "bjs" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) "bjt" = ( /obj/structure/bed/chair{ dir = 8 @@ -23941,17 +24038,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) -"bjA" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/squads/alpha) "bjB" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -24115,12 +24201,6 @@ /obj/structure/cargo_container/armat/right, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bjS" = ( -/obj/structure/machinery/landinglight{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bjT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail/no_vault{ @@ -24196,13 +24276,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/test_floor4, /area/almayer/middeck/maintenance/sb) -"bkd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/lower_medical_lobby) "bke" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -24221,16 +24294,6 @@ /obj/structure/machinery/door/airlock/almayer/marine/alpha/spec, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/alpha) -"bkh" = ( -/obj/structure/sign/safety/ladder{ - pixel_y = -26 - }, -/obj/structure/sign/safety/medical{ - pixel_y = -26; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_fore_hallway) "bki" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -24295,11 +24358,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) "bko" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/north, /area/almayer/living/briefing) "bkp" = ( /obj/effect/decal/warning_stripes{ @@ -24340,12 +24403,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) -"bks" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bkt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -24515,6 +24572,12 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/sp) +"bkM" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 33 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "bkN" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -24558,24 +24621,14 @@ /turf/open/floor/almayer/plating_striped/north, /area/almayer/hallways/lower/repair_bay) "bkT" = ( -/obj/structure/sink{ - pixel_y = 1; - dir = 4; - pixel_x = 14 - }, -/obj/structure/mirror{ - pixel_x = 30 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - layer = 3.33; - pixel_y = 2 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "bkU" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -24666,12 +24719,6 @@ /obj/structure/machinery/door/poddoor/almayer/blended/liaison, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/containment/cell/cl) -"blb" = ( -/obj/structure/machinery/landinglight{ - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/shipboard/port_point_defense) "blc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/red{ @@ -24684,8 +24731,7 @@ /obj/structure/machinery/door_control/cl/quarter/backdoor{ id = "cl_quarter_maintenance_2"; name = "Emergency Exit Shutter"; - pixel_y = 26; - pixel_x = -2 + pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -24704,8 +24750,8 @@ pixel_x = 8 }, /obj/structure/machinery/door_control/cl/office/evac{ - pixel_x = 3; - pixel_y = 33 + pixel_x = 8; + pixel_y = 32 }, /obj/item/device/motion_sensor/wy{ anchored = 1; @@ -24750,10 +24796,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/sign/safety/rewire{ - pixel_x = 33; - pixel_y = 11 - }, /turf/open/floor/almayer/plating/no_build, /area/almayer/medical/containment/cell/cl) "blh" = ( @@ -24921,12 +24963,26 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/hanger) "blA" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) "blB" = ( -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) "blC" = ( /obj/structure/largecrate/random/barrel/medical, /turf/open/floor/almayer/no_build/plate, @@ -25221,28 +25277,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) "bmh" = ( -/obj/structure/machinery/vending/cigarette/koorlander{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 + icon_state = "S" }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "bmi" = ( /obj/structure/machinery/body_scanconsole{ pixel_y = 3 @@ -25287,6 +25327,16 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) +"bmn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "bmo" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -25318,8 +25368,9 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) "bmr" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer, /area/almayer/living/briefing) @@ -25747,19 +25798,6 @@ /obj/effect/decal/heavy_cable/node_s_e, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) -"bno" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/orangecorner, -/area/almayer/squads/bravo) "bnq" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -25780,16 +25818,6 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) -"bnr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "bns" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -25798,23 +25826,14 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) "bnt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) "bnv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -25857,27 +25876,10 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) -"bnA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) -"bnB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/bravo) +"bnC" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/port_midship_hallway) "bnD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -25889,6 +25891,12 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bnE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "bnF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet{ @@ -26059,18 +26067,15 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/maintenance/sp) "bnX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/machinery/disposal{ + pixel_x = -1; + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "bnY" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/no_build/test_floor4, @@ -26204,13 +26209,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sb) -"bom" = ( -/obj/structure/sign/safety/south{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer/blue/west, -/area/almayer/hallways/lower/port_midship_hallway) "bon" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -26226,8 +26224,8 @@ /turf/open/floor/almayer/cargo/southwest, /area/almayer/engineering/upper_engineering/port) "boq" = ( -/obj/structure/bed/chair/comfy/alpha, -/turf/open/floor/almayer/redfull, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/mono, /area/almayer/living/briefing) "bor" = ( /obj/effect/decal/heavy_cable/cable_vertical, @@ -26242,6 +26240,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/pilotbunks) +"bot" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) "bou" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -26310,6 +26314,16 @@ }, /turf/open/floor/almayer/mono, /area/almayer/squads/req) +"boC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/cargo_arrow/west, +/area/almayer/squads/bravo) "boD" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -26576,18 +26590,6 @@ /obj/structure/barricade/handrail/hybrisa/road/plastic, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/paft) -"bpv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "south_central_checkpoint"; - name = "South Checkpoint Shutters"; - req_access_txt = "19" - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "bpw" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -26651,16 +26653,6 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/chemistry) -"bpA" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/paper, -/obj/item/tool/pen{ - pixel_x = -5; - pixel_y = 2 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "bpB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -26742,18 +26734,10 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) -"bpG" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/medic, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) -"bpH" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/engineer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) "bpI" = ( -/obj/structure/closet/secure_closet/fridge/dry/stock, +/obj/structure/largecrate/supply, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "bpJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -26773,12 +26757,6 @@ /obj/structure/machinery/door/airlock/almayer/marine/alpha/sl, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/alpha) -"bpL" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/squads/alpha) "bpM" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -26921,6 +26899,20 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"bqa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) "bqb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -27187,6 +27179,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) "bqw" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + dir = 2; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/briefing) "bqx" = ( @@ -27284,9 +27283,6 @@ req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_lobby) "bqI" = ( @@ -27393,22 +27389,6 @@ /obj/structure/largecrate/empty/case, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) -"bqW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/head/cmcap{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ - pixel_x = 5; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "bqX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/empty/case/double, @@ -27507,6 +27487,40 @@ }, /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) +"brk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/cargo_arrow/east, +/area/almayer/squads/support) +"brl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "brm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/photocopier{ @@ -27515,9 +27529,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/req) "brn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) "bro" = ( /obj/structure/surface/rack, /obj/structure/surface/rack{ @@ -27573,26 +27590,31 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/req) "bry" = ( -/obj/structure/sign/poster{ - pixel_y = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/red/east, -/area/almayer/squads/alpha) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "brz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/ladder/multiz, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "brA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/machinery/door/airlock/almayer/marine/delta/sl{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) "brB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate, @@ -27634,56 +27656,34 @@ /obj/structure/largecrate/random/barrel/medical, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) -"brH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "brI" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = 1; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 8; - pixel_x = -1 + icon_state = "W"; + layer = 3.3 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/containment) +/obj/structure/reagent_dispensers/tank/fuel, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "brJ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3_red"; - pixel_y = 17 + icon_state = "E" }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; dir = 4; - pixel_x = -1; - pixel_y = 8 + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; +/obj/structure/bed/chair{ + can_buckle = 0; dir = 4; - pixel_x = -19; - pixel_y = 8 + pixel_y = 6 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "brK" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -27794,21 +27794,16 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "brZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -26; - pixel_x = 14 +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, -/obj/structure/sign/safety/three{ - pixel_y = -26 +/obj/structure/largecrate/random/mini{ + pixel_y = 2 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bsa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -28092,8 +28087,8 @@ pixel_y = 3 }, /obj/item/book/manual/surgery{ - pixel_x = 5; - pixel_y = 3 + pixel_x = 6; + pixel_y = 5 }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/operating_room_three) @@ -28164,9 +28159,8 @@ /area/almayer/shipboard/brig/mp_bunks) "bsG" = ( /obj/structure/machinery/disposal{ - density = 0; layer = 3.2; - pixel_y = 16 + pixel_x = -1 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -28263,9 +28257,13 @@ /turf/open/floor/almayer/green/east, /area/almayer/living/offices) "bsS" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/bravo, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) "bsT" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/assembly/mousetrap/armed, @@ -28273,11 +28271,15 @@ /area/almayer/middeck/req) "bsU" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; + icon_state = "W" + }, +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_y = 16; pixel_x = -1 }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) "bsV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -28343,13 +28345,14 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "btc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + vend_x_offset = 1; + pixel_y = 16; + pixel_x = -1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/redfull, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) "btd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -28395,6 +28398,32 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/silver/southwest, /area/almayer/command/computerlab) +"btj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"btk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "btl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/red{ @@ -28414,25 +28443,9 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) "btn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/computer/cameras/almayer/containment{ - dir = 4; - pixel_y = 8; - pixel_x = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_display/research_cell{ - id = "Containment Cell 3"; - layer = 3.125; - name = "Cell 3 Control"; - pixel_y = -6; - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/containment) +/obj/structure/reagent_dispensers/tank/water, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) "bto" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -28549,13 +28562,9 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/upper_medical) +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) "btD" = ( /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) @@ -28740,7 +28749,7 @@ /obj/structure/machinery/door_control{ id = "hangarentrancesouth"; name = "South Hangar Shutters"; - pixel_x = -30; + pixel_x = -26; req_one_access_txt = "2;3;12;19"; throw_range = 15 }, @@ -28859,6 +28868,23 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/operating_room_one) +"buk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"bul" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "bum" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/structure/prop/invuln/lattice_prop{ @@ -28873,6 +28899,13 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) +"bun" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) "buo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29149,21 +29182,6 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/middeck/maintenance/sf) -"buM" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/bravo, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) -"buN" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "buO" = ( /obj/structure/machinery/cm_vending/gear/medic, /turf/open/floor/almayer/plate, @@ -29260,6 +29278,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/stairs, /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/port_aft) "buZ" = ( @@ -29325,13 +29344,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/maintenance/sp) -"bvh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/shipboard/port_point_defense) "bvi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29353,6 +29365,12 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) +"bvk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/cargo_arrow/east, +/area/almayer/squads/support) "bvl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29387,24 +29405,25 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) -"bvq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 +"bvp" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 18; + pixel_y = 15 }, -/turf/open/floor/almayer/research/containment/corner_var2/east, -/area/almayer/medical/containment/cell) +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_m_p) +"bvq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/case, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bvr" = ( /obj/structure/bed/chair/office/dark, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bvs" = ( @@ -29455,33 +29474,56 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) +"bvy" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 + }, +/turf/closed/wall/almayer, +/area/almayer/living/port_emb) "bvz" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 }, /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/operating_room_one) -"bvB" = ( -/obj/structure/machinery/shower{ - dir = 8; - pixel_x = -2 - }, -/obj/structure/barricade/handrail/strata{ - dir = 4; - pixel_x = 1 +"bvA" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bvC" = ( +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/port_midship_hallway) +"bvB" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "N"; + pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/containment) +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bvC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/surface/rack, +/obj/item/tool/shovel/spade, +/obj/item/tool/shovel/spade, +/obj/item/tool/hatchet, +/obj/item/tool/hatchet, +/obj/item/tool/hatchet, +/obj/item/reagent_container/glass/bucket, +/obj/item/reagent_container/glass/bucket, +/obj/item/reagent_container/glass/watertank, +/obj/item/tool/minihoe, +/obj/item/tool/minihoe, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bvD" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/light{ @@ -29496,12 +29538,9 @@ /turf/open/floor/almayer/red/west, /area/almayer/hallways/lower/port_fore_hallway) "bvE" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer/research/containment/wall/west, -/area/almayer/medical/containment/cell) +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) "bvF" = ( /turf/open/floor/almayer/silver/west, /area/almayer/living/cryo_cells) @@ -29582,12 +29621,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sb) -"bvS" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bvT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -29664,44 +29697,31 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/paft) "bwe" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"bwf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"bwg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"bwg" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 + icon_state = "W" }, -/turf/open/floor/almayer/red/east, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/bluefull2, +/area/almayer/squads/delta) "bwh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/bluefull2, +/area/almayer/squads/delta) "bwi" = ( /obj/structure/prop/server_equipment/yutani_server{ pixel_y = 16 @@ -29748,12 +29768,17 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) "bwp" = ( -/obj/structure/filingcabinet{ - pixel_x = -8 - }, -/obj/structure/filingcabinet{ - pixel_x = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) "bwq" = ( @@ -29786,14 +29811,19 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "bwt" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/invuln/lifeboat_hatch_placeholder{ + layer = 2 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/middeck/briefing) "bwu" = ( -/obj/structure/window/reinforced/toughened{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ + layer = 2 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/containment) +/turf/open/floor/almayer/no_build, +/area/almayer/middeck/briefing) "bwv" = ( /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -29830,6 +29860,11 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) +"bwy" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) "bwz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lifeboat_hatch_placeholder{ @@ -30223,18 +30258,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"bxB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "bxC" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -30474,6 +30497,9 @@ pixel_x = -21; pixel_y = -7 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "byc" = ( @@ -30580,26 +30606,48 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"byn" = ( -/obj/effect/landmark/start/marine/leader/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "byo" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, /area/almayer/middeck/engineer) "byp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) +"byq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/containment) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "byr" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"bys" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "byt" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -30668,8 +30716,11 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sf) "byE" = ( -/obj/structure/platform/metal/almayer, -/turf/open/floor/almayer, +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer/flooredge/north, /area/almayer/living/briefing) "byF" = ( /obj/effect/decal/warning_stripes{ @@ -31353,18 +31404,15 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sf) "bAd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + dir = 4 }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "bAe" = ( /turf/open/floor/almayer/uscm/directional/north, /area/almayer/command/lifeboat) @@ -31595,6 +31643,7 @@ /obj/structure/sign/safety/terminal{ pixel_x = -17 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redcorner/north, /area/almayer/living/briefing) "bAK" = ( @@ -31655,6 +31704,7 @@ /obj/structure/machinery/computer/secure_data{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bAV" = ( @@ -31729,9 +31779,13 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "bBg" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/obj/structure/largecrate/random/secure, +/obj/effect/spawner/random/toolbox{ + pixel_y = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) "bBh" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/effect/decal/cleanable/dirt, @@ -32086,16 +32140,14 @@ /obj/structure/machinery/door_control{ id = "southcheckpoint"; name = "South Checkpoint Shutters"; - req_access_txt = "19" + req_one_access_txt = "3;12;19" + }, +/obj/structure/machinery/flasher_button{ + pixel_y = 7; + id = "briefing_flash_s" }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"bBR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_midship_hallway) "bBS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -32230,13 +32282,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"bCh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/living/briefing) "bCi" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /obj/effect/decal/cleanable/dirt, @@ -32339,12 +32384,6 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) -"bCu" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 4 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "bCv" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -32370,7 +32409,7 @@ dir = 2 }, /obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Briefing Room" + name = "\improper Enlisted Men's Mess" }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) @@ -32379,6 +32418,7 @@ dir = 2 }, /obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) "bCz" = ( @@ -32522,14 +32562,17 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) "bCP" = ( -/obj/structure/bed/chair, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; + icon_state = "W" + }, +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + vend_x_offset = 1; pixel_x = -1; - pixel_y = 2 + pixel_y = -29 }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "bCQ" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /obj/effect/decal/cleanable/dirt, @@ -32545,16 +32588,10 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "bCS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "bCT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -33069,16 +33106,18 @@ "bDO" = ( /turf/open/floor/almayer/tcomms, /area/almayer/shipboard/weapon_room) -"bDP" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 8 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "bDQ" = ( /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/vending/coffee{ + pixel_x = -1 + }, +/obj/structure/sign/safety/coffee{ + pixel_y = 26; + pixel_x = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bDR" = ( @@ -33102,14 +33141,16 @@ dir = 1; icon_state = "pipe-c" }, -/turf/open/floor/almayer/plate, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/green/east, /area/almayer/living/briefing) "bDT" = ( /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -33121,6 +33162,9 @@ /obj/structure/machinery/alarm/almayer{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" + }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bDV" = ( @@ -33128,6 +33172,7 @@ dir = 4 }, /obj/effect/landmark/map_item, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo, /area/almayer/squads/req) "bDW" = ( @@ -33339,16 +33384,6 @@ /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/paft) -"bEA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bEB" = ( /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/paft) @@ -33375,10 +33410,6 @@ }, /turf/open/floor/almayer/redcorner, /area/almayer/shipboard/weapon_room) -"bEG" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/red/southeast, -/area/almayer/squads/alpha) "bEH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -33426,16 +33457,6 @@ "bEM" = ( /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) -"bEN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/landinglight{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bEO" = ( /obj/structure/machinery/light{ dir = 4 @@ -33472,10 +33493,6 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/lockerroom) -"bES" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "bET" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/no_build/test_floor4, @@ -33758,12 +33775,12 @@ /turf/open/floor/almayer/silver/north, /area/almayer/command/cichallway) "bFB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, /turf/open/floor/almayer/flooredgesmooth2/west, /area/almayer/hallways/lower/starboard_midship_hallway) "bFC" = ( @@ -33801,6 +33818,9 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "bFH" = ( +/obj/structure/reagent_dispensers/tank/fuel/oxygentank{ + anchored = 1 + }, /obj/structure/window/reinforced/toughened{ dir = 4; health = 500 @@ -33819,7 +33839,6 @@ /turf/open/floor/almayer/plating_striped/northeast, /area/almayer/engineering/lower/workshop/hangar) "bFL" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/southeast, /area/almayer/engineering/lower/workshop/hangar) "bFM" = ( @@ -33851,11 +33870,6 @@ /area/almayer/hallways/hangar) "bFQ" = ( /obj/structure/surface/table/reinforced/black, -/obj/item/stack/catwalk{ - amount = 60; - pixel_x = 5; - pixel_y = 4 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop/hangar) "bFR" = ( @@ -33872,10 +33886,10 @@ /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/paft) "bFV" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/pb) "bFW" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/aft) "bFX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -33884,10 +33898,10 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) "bFY" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/shipboard/navigation) "bFZ" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/req) "bGa" = ( /obj/effect/decal/warning_stripes{ @@ -33896,12 +33910,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/port) -"bGb" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bGc" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -33909,24 +33917,17 @@ /turf/open/floor/almayer/red/west, /area/almayer/command/lifeboat) "bGd" = ( -/obj/structure/sign/safety/reduction{ - pixel_x = 8; - pixel_y = -26 - }, -/turf/open/floor/almayer/no_build/plate, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/briefing) "bGe" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/saft) "bGf" = ( -/turf/closed/wall/almayer/outer/internal, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/sb) "bGg" = ( /turf/closed/wall/almayer/outer/internal, /area/almayer/stair_clone/upper/starboard_fore) -"bGh" = ( -/turf/closed/wall/almayer/outer/internal, -/area/almayer/middeck/maintenance/sf) "bGi" = ( /turf/solid_open_space, /area/almayer/middeck/maintenance/sf) @@ -33939,6 +33940,12 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) +"bGk" = ( +/obj/effect/landmark/start/marine/charlie, +/obj/effect/landmark/late_join/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bGl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -34010,6 +34017,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"bGv" = ( +/obj/effect/landmark/start/marine/kilo, +/obj/effect/landmark/late_join/kilo, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bGw" = ( /obj/structure/bed/chair{ dir = 4 @@ -34081,30 +34093,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/req) -"bGF" = ( -/obj/structure/machinery/landinglight{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bGG" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bGH" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bGI" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bGJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34133,39 +34121,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"bGM" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/briefing) -"bGN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"bGO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/middeck/briefing) -"bGP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) "bGQ" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -34210,6 +34165,21 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) +"bGW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "bGX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -34307,7 +34277,6 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) "bHk" = ( -/turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) "bHl" = ( /obj/structure/closet/firecloset, @@ -34329,20 +34298,9 @@ /turf/open/floor/plating, /area/almayer/shipboard/port_point_defense) "bHp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/machinery/disposal, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "bHq" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -34717,13 +34675,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/port_point_defense) -"bIr" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/port_point_defense) "bIs" = ( /obj/structure/largecrate/supply/supplies/mre, /obj/structure/machinery/light/small{ @@ -34856,20 +34807,13 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/stern_point_defense) "bIJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/book/manual/chef_recipes, -/obj/item/reagent_container/food/condiment/sugar{ - pixel_x = 10 - }, -/obj/item/clothing/head/chefhat, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/surface/table/reinforced/black, +/obj/effect/landmark/map_item{ + pixel_y = 2; + pixel_x = -1 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/red/southwest, +/area/almayer/hallways/lower/port_fore_hallway) "bIK" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/autoname{ dir = 1; @@ -34882,11 +34826,11 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/stern_point_defense) "bIM" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/upper_medical) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "bIN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating/northeast, @@ -34902,6 +34846,7 @@ /area/almayer/hallways/lower/port_fore_hallway) "bIP" = ( /obj/docking_port/stationary/emergency_response/port3, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/stern_point_defense) "bIQ" = ( @@ -34920,18 +34865,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/stern_point_defense) "bIU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 + icon_state = "SW-out" }, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "bIV" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "ert3_umbilical"; @@ -35084,16 +35023,6 @@ "bJr" = ( /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) -"bJs" = ( -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/airlock{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "bJt" = ( /turf/closed/wall/almayer, /area/almayer/living/grunt_rnr) @@ -35120,7 +35049,7 @@ dir = 1 }, /obj/structure/machinery/door_control{ - id = "or1privacyshutterdoor"; + id = "or1privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = 23; throw_range = 15; @@ -35156,21 +35085,38 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) "bJC" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie) -"bJD" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"bJE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; + icon_state = "N"; + layer = 3.33; pixel_y = 1 }, -/turf/open/floor/almayer/orangecorner/north, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/sign/safety/rewire{ + pixel_y = -26; + pixel_x = 8 + }, +/obj/item/storage/box/guncase/m56d, +/obj/item/storage/box/guncase/m56d{ + pixel_y = 6 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/bravo) +"bJD" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) "bJF" = ( /obj/structure/machinery/light/red{ @@ -35188,21 +35134,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_stripedcorner/east, /area/almayer/shipboard/starboard_point_defense) -"bJH" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black{ - pixel_x = -4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = 10; - pixel_y = 22 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bJI" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, @@ -35513,18 +35444,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) -"bKC" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bKD" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/structure/largecrate/random/barrel/yellow, @@ -35579,11 +35498,6 @@ /obj/structure/largecrate/random, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) -"bKM" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "bKN" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk, @@ -35627,7 +35541,6 @@ /area/almayer/shipboard/starboard_point_defense) "bKV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight, /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/starboard_point_defense) "bKW" = ( @@ -35639,11 +35552,14 @@ /turf/open/floor/almayer/plating_stripedcorner/south, /area/almayer/shipboard/starboard_point_defense) "bKX" = ( -/obj/structure/machinery/chem_dispenser/corpsman{ - pixel_y = 3 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/platoon2_shared) "bKY" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "s_umbilical"; @@ -35707,14 +35623,20 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) "bLd" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/machinery/cm_vending/clothing/marine/support{ + density = 0; + pixel_x = -26 }, -/turf/open/floor/almayer/emerald/west, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "bLe" = ( -/obj/structure/sign/prop3{ - pixel_y = -31 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) @@ -35889,9 +35811,8 @@ /turf/open/floor/engine, /area/almayer/engineering/airmix) "bLB" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/vending/cola{ + pixel_x = -1 }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -35925,6 +35846,17 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/starboard_hallway) +"bLG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "bLH" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/weapon_room) @@ -35959,14 +35891,21 @@ /turf/open/floor/plating, /area/almayer/medical/operating_room_four) "bLL" = ( -/obj/structure/sign/safety/security{ - pixel_y = -25 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -39 +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"bLM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) "bLN" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -36028,23 +35967,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/operating_room_two) -"bLU" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 39; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) -"bLV" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "bLW" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -36097,21 +36019,12 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "bMe" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/prop/holidays/string_lights{ - dir = 4; - pixel_x = -28 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta{ + dir = 1 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) -"bMf" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "bMg" = ( /obj/structure/pipes/vents/pump/no_boom/gas/ares{ dir = 8; @@ -36123,24 +36036,11 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/alpha_bravo_shared) +/turf/closed/wall/almayer, +/area/almayer/squads/alpha) "bMi" = ( /turf/open/floor/almayer/orange/west, /area/almayer/squads/bravo) -"bMj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "bMk" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -36148,13 +36048,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) -"bMl" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_midship_hallway) "bMm" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -36163,35 +36056,38 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) "bMn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ dir = 1; pixel_y = -28 }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) -"bMo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "bMp" = ( /obj/structure/machinery/light{ - dir = 4 + dir = 8 }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "bMq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = 27; + pixel_y = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/sign/safety/intercom{ + pixel_y = -13; + pixel_x = 34 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "bMr" = ( /obj/structure/sign/safety/storage{ pixel_x = 7; @@ -36213,19 +36109,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) -"bMu" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) "bMv" = ( /obj/structure/sign/safety/stairs{ pixel_x = -17 @@ -36239,30 +36122,22 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"bMx" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/emerald/west, -/area/almayer/squads/charlie) "bMy" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/squads/charlie) -"bMz" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;16;21" }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) "bMA" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/cm_vending/clothing/marine/support{ + pixel_y = 26; + density = 0 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "bMB" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -36271,19 +36146,28 @@ /turf/open/floor/almayer/red/west, /area/almayer/shipboard/port_missiles) "bMC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/mirror{ - pixel_x = -32 +/obj/structure/machinery/cm_vending/clothing/marine/support{ + density = 0; + pixel_x = -26 + }, +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/emerald/northwest, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "bMD" = ( -/obj/structure/machinery/vending/cigarette/koorlander{ - density = 0; - pixel_y = 16 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/structure/machinery/alarm/almayer{ + dir = 1; + pixel_x = 31; + pixel_y = -6 + }, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/support) "bME" = ( /obj/structure/surface/rack, /obj/structure/ob_ammo/ob_fuel, @@ -36297,8 +36181,9 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/sign/safety/maint{ - pixel_x = 32 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/port) @@ -36364,6 +36249,16 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/shipboard/navigation) +"bMQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/cargo_arrow/east, +/area/almayer/squads/support) "bMR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -36404,7 +36299,14 @@ /turf/open/floor/almayer/silver, /area/almayer/command/cichallway) "bMW" = ( -/turf/open/floor/almayer/flooredge/south, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/blue, /area/almayer/hallways/upper/midship_hallway) "bMX" = ( /obj/structure/machinery/camera/autoname/almayer{ @@ -36468,12 +36370,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/shipboard/navigation) -"bNh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/northwest, -/area/almayer/living/starboard_emb) "bNi" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -36575,17 +36471,8 @@ /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) "bNw" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/rollingpin, -/obj/item/tool/kitchen/knife, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/red/southeast, +/area/almayer/hallways/lower/port_fore_hallway) "bNx" = ( /obj/structure/machinery/light{ dir = 1 @@ -36629,12 +36516,16 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/req) "bNC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "bND" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -36642,22 +36533,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/starboard_missiles) -"bNE" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/charlie_delta_shared) -"bNF" = ( -/turf/open/floor/almayer/emeraldcorner, -/area/almayer/squads/charlie) -"bNG" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "bNH" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -36673,12 +36548,10 @@ /area/almayer/lifeboat_pumps/north2) "bNJ" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) "bNK" = ( /obj/structure/machinery/light/containment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) "bNL" = ( /obj/structure/disposalpipe/segment, @@ -36858,7 +36731,6 @@ pixel_y = 30 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/research/containment/corner, /area/almayer/medical/containment/cell/cl) "bOm" = ( /obj/effect/decal/cleanable/dirt, @@ -36866,7 +36738,7 @@ /area/almayer/medical/containment/cell/cl) "bOn" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/research/containment/corner/west, +/turf/open/floor/almayer/research/containment/corner_var1/east, /area/almayer/medical/containment/cell/cl) "bOo" = ( /turf/closed/wall/almayer/reinforced, @@ -36921,10 +36793,6 @@ "bOw" = ( /turf/open/floor/almayer/silver/southeast/no_build, /area/almayer/medical/containment/cell/cl) -"bOx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/tl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) "bOy" = ( /obj/structure/surface/table/reinforced/black, /obj/structure/machinery/faxmachine/corporate/liaison/almayer{ @@ -36977,17 +36845,6 @@ /obj/effect/spawner/random/powercell, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/paft) -"bOG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) "bOH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -37002,8 +36859,8 @@ "bOJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Briefing Room"; - dir = 1 + name = "\improper Enlisted Men's Mess"; + dir = 2 }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) @@ -37062,20 +36919,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/containment/cell/cl) -"bOQ" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 17 - }, -/obj/item/facepaint/green{ - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "bOR" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -37083,15 +36926,15 @@ /turf/open/floor/almayer/green/west, /area/almayer/squads/req) "bOS" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + dir = 2; + name = "\improper Corporate Conference Room"; + req_access = list(200) + }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "WY_conference"; name = "\improper Conference Room Shutters" }, -/obj/structure/machinery/door/airlock/almayer/glass{ - name = "\improper Corporate Conference Room"; - dir = 2; - req_access = list(200) - }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/medical/containment/cell/cl) "bOT" = ( @@ -37138,20 +36981,27 @@ /turf/open/floor/almayer/silver/west/no_build, /area/almayer/medical/containment/cell/cl) "bOZ" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = -8 }, -/turf/open/floor/almayer/emeraldcorner/north, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "bPa" = ( -/turf/open/floor/almayer/emeraldcorner/west, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/bravo) "bPb" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Antechamber"; +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2/glass{ dir = 2; req_access = list(200) }, @@ -37192,6 +37042,19 @@ /obj/structure/ob_ammo/ob_fuel, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/weapon_room) +"bPi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) "bPj" = ( /obj/structure/sign/safety/conference_room{ pixel_x = 7; @@ -37200,10 +37063,9 @@ /turf/open/floor/almayer/silver/southeast/no_build, /area/almayer/medical/containment/cell/cl) "bPk" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer{ - access_modified = 1; +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + dir = 1; name = "\improper Corporate Power Storage"; - dir = 2; req_access = list(200) }, /turf/open/floor/almayer/no_build/test_floor4, @@ -37286,9 +37148,6 @@ pixel_y = -28; pixel_x = -1 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32 - }, /turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/operating_room_four) "bPv" = ( @@ -37334,10 +37193,10 @@ /turf/open/floor/almayer/silver/northeast/no_build, /area/almayer/medical/containment/cell/cl) "bPz" = ( -/obj/structure/bed/roller/hospital_empty/bigrollerempty3, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/structure/machinery/status_display{ + pixel_y = 32 }, +/obj/structure/bed/roller/hospital_empty/bigrollerempty3, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_medbay) "bPA" = ( @@ -37434,12 +37293,18 @@ /turf/open/floor/almayer/mono/no_build, /area/almayer/medical/containment/cell/cl) "bPO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/mug_rack{ + pixel_y = 9 }, -/obj/effect/landmark/observer_start, -/obj/effect/landmark/spycam_start, -/turf/open/floor/almayer/uscm/directional/logo_c/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/reagent_container/food/drinks/milk{ + pixel_y = 8; + pixel_x = 16 + }, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bPP" = ( /obj/effect/decal/cleanable/dirt, @@ -37565,10 +37430,6 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = 26 - }, /turf/open/floor/almayer/silver/north/no_build, /area/almayer/medical/containment/cell/cl) "bQe" = ( @@ -37611,7 +37472,7 @@ /area/almayer/command/corporateliaison) "bQg" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/wall/almayer/reinforced, +/turf/closed/wall/almayer/reinforced/temphull, /area/almayer/middeck/maintenance/sp) "bQh" = ( /obj/structure/surface/rack, @@ -37729,11 +37590,15 @@ /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) "bQA" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon2_shared) "bQB" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -37747,18 +37612,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "bQD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ - dir = 1 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/support) "bQE" = ( /obj/structure/surface/rack, /obj/structure/ob_ammo/ob_fuel, @@ -37857,13 +37715,12 @@ /area/almayer/command/corporateliaison) "bQN" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer{ - access_modified = 1; +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + dir = 1; name = "\improper Downstairs Entrance"; - dir = 2; req_access = list(200) }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) "bQO" = ( @@ -37981,34 +37838,12 @@ "bRe" = ( /turf/open/floor/almayer/plating_stripedcorner/north, /area/almayer/shipboard/sea_office) -"bRf" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4; - pixel_y = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "bRg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/light/small{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/blue/east, +/area/almayer/squads/delta) "bRh" = ( /obj/structure/machinery/camera/wey_yu{ dir = 1; @@ -38031,9 +37866,6 @@ icon_state = "NE-out"; pixel_y = 1 }, -/obj/structure/machinery/light/small{ - dir = 1 - }, /turf/open/floor/almayer/dark_sterile, /area/almayer/command/corporateliaison) "bRk" = ( @@ -38048,6 +37880,9 @@ pixel_x = 25; pixel_y = 6 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer/dark_sterile, /area/almayer/command/corporateliaison) "bRl" = ( @@ -38131,6 +37966,9 @@ /turf/open/floor/almayer/orangecorner, /area/almayer/hallways/lower/starboard_umbilical) "bRu" = ( +/obj/structure/machinery/door/airlock/almayer/generic/corporate{ + name = "\improper Corporate Liaison's Bedroom" + }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -38143,10 +37981,6 @@ pixel_x = 8; pixel_y = 8 }, -/obj/structure/machinery/door/airlock/almayer{ - name = "\improper Corporate Liaison's Bedroom"; - req_access = list(200) - }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) "bRv" = ( @@ -38321,7 +38155,7 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/command/corporateliaison) "bRK" = ( -/obj/structure/machinery/door/airlock/almayer{ +/obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" }, /turf/open/floor/almayer/test_floor4, @@ -38336,28 +38170,18 @@ "bRN" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/on{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/structure/machinery/recharger{ - pixel_y = 2; - pixel_x = -2; - layer = 3.04 + pixel_x = 5; + pixel_y = 10 }, +/obj/structure/machinery/recharger, /turf/open/floor/almayer/flooredge/west, /area/almayer/command/corporateliaison) -"bRO" = ( -/obj/structure/machinery/landinglight{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bRP" = ( /obj/structure/machinery/light{ dir = 1 }, /obj/structure/machinery/door_control{ - id = "or2privacyshutterdoor"; + id = "or2privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = 23; throw_range = 15; @@ -38412,26 +38236,20 @@ /obj/structure/sign/calendar/wy{ pixel_y = 28 }, -/obj/structure/machinery/door_control/cl{ - pixel_y = -12; - name = "Safe Shutters"; - id = "CL_Safe" - }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "bRV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S" }, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_x = -1; + pixel_y = 16 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "bRW" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -38451,6 +38269,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"bRZ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bSa" = ( /obj/structure/target, /turf/open/floor/almayer/plating_striped/east, @@ -38462,10 +38287,9 @@ /turf/open/floor/almayer/silver/east, /area/almayer/living/cryo_cells) "bSc" = ( -/obj/structure/machinery/door/poddoor/almayer/blended/liaison{ - dir = 4; - id = "CL_Safe"; - emp_proof = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "CL_Safe" }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) @@ -38477,8 +38301,8 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "bSe" = ( -/turf/open/floor/almayer/orange/southeast, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/bluefull2, +/area/almayer/squads/delta) "bSf" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_point_defense) @@ -38516,11 +38340,10 @@ /turf/open/floor/almayer/flooredge/south, /area/almayer/command/corporateliaison) "bSk" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer{ - name = "\improper Corporate Guard's Bedroom"; - req_access = list(200) +/obj/structure/machinery/door/airlock/almayer/generic/corporate{ + name = "\improper Corporate Guard's Bedroom" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) "bSl" = ( @@ -38532,13 +38355,15 @@ /turf/open/floor/almayer/flooredge/west, /area/almayer/command/corporateliaison) "bSn" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/orange/southwest, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) "bSo" = ( /obj/structure/bookcase{ opacity = 0 @@ -38742,18 +38567,13 @@ /turf/closed/wall/almayer, /area/almayer/squads/delta) "bSK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/tool/wrench, +/obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_1{ pixel_x = 25; pixel_y = -7 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) "bSL" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/wy_intranet{ @@ -38820,6 +38640,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) +"bST" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "bSU" = ( /obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ dir = 4; @@ -38877,31 +38702,11 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "bSZ" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"bTa" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"bTb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" +/obj/structure/machinery/door/airlock/almayer/marine/support/medic{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) "bTc" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -39121,8 +38926,15 @@ /turf/open/floor/almayer/plating_stripedcorner/east, /area/almayer/shipboard/sea_office) "bTy" = ( -/turf/open/floor/almayer/bluecorner/north, -/area/almayer/squads/delta) +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) "bTz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39130,8 +38942,21 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_umbilical) "bTA" = ( -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/cargo_arrow, +/area/almayer/squads/support) "bTB" = ( /obj/item/stool{ pixel_y = 9 @@ -39142,12 +38967,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/command/corporateliaison) -"bTC" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) "bTD" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -39157,9 +38976,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) -"bTE" = ( -/turf/open/floor/almayer/bluecorner/east, -/area/almayer/squads/delta) "bTF" = ( /obj/structure/coatrack{ pixel_x = 3; @@ -39188,16 +39004,16 @@ /turf/open/floor/almayer, /area/almayer/command/corporateliaison) "bTJ" = ( -/obj/structure/machinery/vending/cigarette/koorlander{ - density = 0; - pixel_y = 16 +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/propaganda{ + pixel_x = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +/obj/structure/sign/poster/propaganda{ + pixel_x = 34; + pixel_y = 7 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/support) "bTK" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ dir = 1; @@ -39215,21 +39031,10 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"bTM" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) "bTN" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bTO" = ( /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) @@ -39333,15 +39138,6 @@ }, /turf/open/floor/almayer/plating_stripedcorner/east, /area/almayer/command/computerlab) -"bUb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "bUc" = ( /obj/structure/machinery/computer/arcade{ layer = 3.3 @@ -39355,9 +39151,9 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/lobby_door, -/obj/structure/machinery/door/airlock/almayer/glass{ - name = "\improper Weyland-Yutani Office Reception"; - dir = 2 +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + dir = 1; + name = "\improper Weyland-Yutani Office Lobby" }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) @@ -39367,13 +39163,6 @@ }, /turf/open/floor/almayer/flooredge/south, /area/almayer/command/corporateliaison) -"bUf" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/bluecorner/west, -/area/almayer/squads/delta) "bUg" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -39392,11 +39181,18 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "bUi" = ( -/obj/structure/machinery/light{ +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; dir = 4 }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "bUj" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -39423,6 +39219,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) +"bUm" = ( +/obj/structure/reagent_dispensers/tank/fuel/oxygentank{ + anchored = 1 + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/engineering/lower/workshop/hangar) "bUn" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -39433,46 +39235,46 @@ "bUo" = ( /obj/structure/sign/safety/ammunition{ pixel_x = 15; - pixel_y = -32 + pixel_y = -26 }, /obj/structure/sign/safety/hazard{ - pixel_y = -32 + pixel_y = -26 }, /obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer/redfull, /area/almayer/squads/req) "bUp" = ( -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"bUq" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/largecrate/random/barrel/red, +/obj/structure/sign/safety/ladder{ + pixel_x = 33 }, -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"bUq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 16; pixel_x = -1 }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "bUr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/engi/support{ + density = 0; + pixel_y = 1; + pixel_x = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools{ + pixel_y = 16; + pixel_x = -5; + density = 0 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/support) "bUs" = ( /obj/structure/largecrate/random/case/double, /obj/effect/decal/cleanable/dirt, @@ -39545,14 +39347,19 @@ }, /turf/open/floor/almayer/blue, /area/almayer/hallways/upper/midship_hallway) +"bUB" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "bUC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) "bUD" = ( /obj/structure/closet/emcloset, @@ -39562,6 +39369,19 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/hallways/upper/midship_hallway) +"bUF" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/port_midship_hallway) "bUG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -39579,34 +39399,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) -"bUI" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUJ" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUK" = ( -/obj/structure/machinery/landinglight{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUL" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUM" = ( -/obj/structure/machinery/landinglight/delaytwo, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bUN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -39615,269 +39407,93 @@ /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) -"bUP" = ( -/obj/structure/machinery/landinglight/delayone, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bUQ" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"bUR" = ( -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUS" = ( -/obj/structure/machinery/landinglight/delaythree, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) "bUT" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) -"bUU" = ( -/obj/structure/machinery/cm_vending/clothing/tl/delta{ - density = 0; +/obj/structure/sign/safety/cryo{ pixel_x = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"bUV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/port_point_defense) -"bUW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bUX" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delayone{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bUY" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bUZ" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVa" = ( -/obj/structure/machinery/landinglight{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVb" = ( +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/bravo) +"bUU" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) -"bVc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/bravo) "bVd" = ( /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) -"bVf" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVg" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVh" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVi" = ( -/obj/structure/machinery/landinglight{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVj" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bVk" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVl" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 +"bVe" = ( +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 4; + pixel_x = -1 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVm" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"bVn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bVn" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/blue/west, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "bVo" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/turf/open/floor/almayer/blue/east, -/area/almayer/squads/delta) -"bVp" = ( -/obj/structure/machinery/landinglight{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVq" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) -"bVr" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) +"bVq" = ( +/obj/effect/landmark/start/marine/leader/oscar, +/obj/effect/landmark/late_join/oscar, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "bVs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"bVt" = ( -/obj/structure/machinery/landinglight/delaytwo, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVu" = ( -/obj/structure/machinery/landinglight/delayone, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) "bVv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) -"bVw" = ( -/turf/open/floor/almayer/bluecorner/east, -/area/almayer/living/briefing) "bVx" = ( /obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/south1) -"bVy" = ( -/obj/structure/machinery/chem_dispenser/corpsman{ - pixel_y = 3 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) -"bVz" = ( -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVA" = ( -/obj/structure/machinery/landinglight/delaythree, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/stern_point_defense) -"bVC" = ( -/obj/structure/machinery/landinglight{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVD" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVF" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVG" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVH" = ( +"bVE" = ( +/obj/structure/machinery/cm_vending/gear/medic, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVI" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVJ" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVK" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVL" = ( -/obj/structure/machinery/landinglight{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "bVM" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -39886,86 +39502,13 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/engine_core) -"bVO" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVP" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVQ" = ( -/obj/structure/machinery/landinglight{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) "bVR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) -"bVS" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) "bVU" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/port_point_defense) -"bVV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/starboard_point_defense) -"bVW" = ( -/obj/structure/machinery/landinglight/delaytwo, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/shipboard/starboard_point_defense) -"bVX" = ( -/obj/structure/machinery/landinglight/delayone, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/shipboard/starboard_point_defense) -"bVY" = ( -/obj/structure/machinery/landinglight, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/shipboard/starboard_point_defense) -"bVZ" = ( -/obj/structure/machinery/landinglight/delaythree, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/shipboard/starboard_point_defense) -"bWa" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/sign/safety/reduction{ - pixel_x = 8; - pixel_y = 28 - }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"bWb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"bWc" = ( -/turf/open/floor/almayer, -/area/almayer/middeck/briefing) "bWd" = ( /obj/structure/machinery/light{ dir = 4 @@ -39996,43 +39539,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) -"bWi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"bWj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/middeck/medical) -"bWk" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 14; - pixel_y = 28 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 28 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/middeck/briefing) -"bWl" = ( -/obj/structure/sign/safety/reduction{ - pixel_x = 8; - pixel_y = 28 - }, -/obj/structure/barricade/handrail/hybrisa/road/plastic{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"bWm" = ( -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) "bWn" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -40061,197 +39567,25 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/living/chapel) -"bWs" = ( -/obj/structure/machinery/light/red{ - dir = 8; - light_color = "#BB3F3F" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/clothing/suit/storage/hazardvest/blue, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bWt" = ( -/obj/structure/surface/rack, -/obj/item/clothing/head/hardhat/dblue{ - pixel_y = 2; - pixel_x = 3 - }, -/obj/item/clothing/head/hardhat/orange{ - pixel_y = -7; - pixel_x = -1 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) "bWu" = ( -/turf/closed/wall/almayer/white/reinforced, -/area/almayer/medical/containment) -"bWv" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Security Checkpoint Access"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/middeck/briefing) -"bWw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner/east, -/area/almayer/medical/containment/cell) -"bWx" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bWy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bWz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner/north, -/area/almayer/medical/containment/cell) -"bWA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/containment/contshutter{ - name = "\improper Containment Cell 3"; - id = "Containment Cell 3"; - dir = 2; - req_one_access = list(28,206,207); - queen_pryable = 0; - locked = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment/cell) -"bWB" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 8; - pixel_x = -1; + icon_state = "NE-out"; pixel_y = 1 }, -/obj/structure/sign/nosmoking_2{ - pixel_y = -30 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red" - }, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/containment) -"bWC" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 4; - pixel_x = 1; + icon_state = "NW-out"; pixel_y = 1 }, -/obj/structure/machinery/camera/autoname/almayer/containment{ - name = "ship-grade camera"; +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"bWz" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red" - }, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/containment) -"bWD" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bWE" = ( -/obj/structure/surface/rack{ - pixel_x = -1 - }, -/obj/item/ammo_box/magazine/misc/mre/emergency{ - pixel_y = 12; - pixel_x = -2 - }, -/obj/item/storage/toolbox/emergency{ - pixel_y = -2 - }, -/obj/structure/pipes/vents/pump/no_boom, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bWF" = ( -/turf/open/floor/almayer/research/containment/corner4, -/area/almayer/medical/containment/cell) -"bWG" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 5 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bWH" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/research/containment/corner/north, -/area/almayer/medical/containment/cell) -"bWI" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 1; - pixel_x = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; - dir = 4 - }, -/turf/open/floor/almayer/research/containment/entrance/west, -/area/almayer/medical/containment/cell) +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bWJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -40266,202 +39600,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/pilotbunks) -"bWK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment/cell) "bWL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/squads/req) -"bWM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 1; - pixel_x = -8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 1; - pixel_x = -8; - pixel_y = -18 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3_red"; - dir = 8; - pixel_x = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/containment) -"bWN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/containment) -"bWO" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata{ - pixel_y = -8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bWP" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 4 - }, -/obj/structure/machinery/flasher{ - id = "Containment Cell 1"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30; - pixel_x = -26 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 - }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) "bWQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/brig/warden_office) -"bWR" = ( -/obj/structure/pipes/vents/pump/no_boom{ - name = "Secure Reinforced Air Vent"; - welded = 1 - }, -/turf/open/floor/almayer/research/containment/floor1, -/area/almayer/medical/containment/cell) "bWS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = -1 - }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"bWT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/co2_knife{ - pixel_x = 8; - pixel_y = 9 + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) -"bWU" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/containment) -"bWV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/rack, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bWW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, /obj/structure/machinery/light/red{ - dir = 4; - light_color = "#BB3F3F" + light_color = "#BB3F3F"; + dir = 4 }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) -"bWX" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8 - }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"bWY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2 - }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"bWZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment/cell) -"bXa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = 1; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/containment) -"bXb" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata{ - pixel_y = -8 - }, -/obj/item/tool/soap/deluxe{ - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) "bXc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40471,19 +39633,6 @@ }, /turf/open/floor/almayer/green/east, /area/almayer/hallways/upper/fore_hallway) -"bXd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner, -/area/almayer/medical/containment/cell) "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) @@ -40493,171 +39642,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) -"bXg" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 4; - pixel_y = 7 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 8; - pixel_y = 7 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; - dir = 1 - }, -/turf/open/floor/almayer/research/containment/entrance, -/area/almayer/medical/containment/cell) -"bXh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "bXi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner/west, -/area/almayer/medical/containment/cell) -"bXj" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/containment) -"bXk" = ( -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bXl" = ( -/turf/open/floor/almayer/research/containment/corner/west, -/area/almayer/medical/containment/cell) -"bXm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/containment/contshutter{ - name = "\improper Umbilical Containment"; - req_one_access = list(28,206,207); - id = null; - id_tag = "Containment_Cell_Umbilical_B"; - locked = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 2 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"bXn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 2 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"bXo" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - dir = 1; - id = "Containment Cell 1"; - locked = 1; - name = "\improper Containment Cell 1" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "Containment Cell 1"; - name = "\improper Containment Cell 1" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/containment/cell) -"bXp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 1"; - name = "\improper Containment Cell 1" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 4; - icon_state = "containment_window_h" - }, -/area/almayer/medical/containment/cell) -"bXq" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/door/airlock/almayer/white{ - name = "\improper Tank Storage"; - dir = 2; - req_one_access = list(28,206,207); - req_access = list() - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/containment) -"bXr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/heavy_cable/cable_horizontal, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"bXs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner, -/area/almayer/medical/containment/cell) -"bXt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bXu" = ( -/obj/structure/machinery/flasher{ - alpha = 1; - id = "Containment Cell 3"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bXv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) +/obj/structure/largecrate/random/barrel/true_random, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) "bXw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/gloves{ @@ -40692,16 +39680,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/lower_medical_medbay) -"bXx" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Containment Analysis"; - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) "bXy" = ( /obj/structure/machinery/cm_vending/clothing/maintenance_technician, /obj/structure/machinery/light{ @@ -40714,124 +39692,181 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) "bXA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bXC" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/machinery/vending/hydronutrients, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bXH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bXB" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/plate, +/area/almayer/squads/req) +"bXV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bXX" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/machinery/light/red{ + dir = 4; + light_color = "#BB3F3F" + }, +/obj/structure/machinery/vending/hydroseeds, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bYa" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, +/turf/open/floor/almayer/green/southwest, +/area/almayer/squads/req) +"bYb" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E" }, -/obj/structure/machinery/light, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYk" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bXC" = ( +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"bYm" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E" }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYn" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/engineering/upper_engineering/port) +"bYq" = ( +/obj/structure/cargo_container/wy/left, +/obj/structure/machinery/light{ dir = 8 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 7; - pixel_y = -26 - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bXD" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"bYr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/vehicle/powerloader, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"bYu" = ( +/obj/structure/machinery/light{ dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/cm_vending/sorted/uniform_supply, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"bYv" = ( +/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ + name = "\improper Requisitions Storage" }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bXE" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/req) +"bYw" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/junction, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/req) +"bYz" = ( +/obj/structure/sign/safety/south{ + pixel_x = 32; + pixel_y = -8 }, -/obj/structure/sign/poster/safety{ - pixel_y = -25 - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bXF" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 10 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/obj/structure/sign/safety/bridge{ + pixel_x = 32; + pixel_y = 7 }, +/turf/open/floor/almayer/silver/northeast, +/area/almayer/command/cichallway) +"bYA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/reagent_dispensers/tank/water, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bYB" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) -"bXG" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E" }, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYC" = ( +/obj/effect/decal/heavy_cable/node_n_e_s, /obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/iv_drip, -/obj/structure/sign/safety/storage{ - pixel_y = -26; - pixel_x = 7 - }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/containment) -"bXH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 + pixel_x = 16 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/plate, -/area/almayer/squads/req) -"bXI" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bYE" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; + icon_state = "W"; layer = 3.3 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -25 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/lower) +"bYH" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 2 }, -/obj/structure/barricade/handrail/no_vault{ +/turf/open/floor/almayer/plate, +/area/almayer/underdeck/hangar) +"bYL" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 }, -/obj/structure/largecrate/random/barrel/medical, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXK" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/upper/u_a_s) +"bYN" = ( +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19" + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"bYO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 @@ -40840,13 +39875,9 @@ icon_state = "S"; layer = 3.3 }, -/obj/structure/largecrate/random/barrel/medical, -/obj/structure/barricade/handrail/no_vault{ - dir = 1 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXL" = ( +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYP" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 @@ -40855,2408 +39886,2931 @@ icon_state = "S"; layer = 3.3 }, -/obj/structure/barricade/handrail/no_vault{ - dir = 1 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXM" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "N"; + icon_state = "NW-out"; pixel_y = 1 }, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYQ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/barricade/handrail/no_vault{ - dir = 1 + icon_state = "NW-out"; + pixel_y = 1 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXN" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SW-out"; + layer = 2.5 }, -/obj/structure/barricade/handrail/no_vault{ - dir = 1 +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bYR" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19" }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bXO" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 3"; - name = "\improper Containment Cell 3" +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"bYW" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/panic) +"bYY" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 8; - icon_state = "containment_window_h" +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 2; + id = "CIC Lockdown"; + name = "\improper Combat Information Center Blast Door" }, -/area/almayer/medical/containment/cell) -"bXP" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 3"; - name = "\improper Containment Cell 3" +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + dir = 1; + name = "\improper Combat Information Center" }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 4; - icon_state = "containment_window_h" +/turf/open/floor/almayer/test_floor4, +/area/almayer/command/cic) +"bZa" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = 7; + pixel_y = 10 }, -/area/almayer/medical/containment/cell) -"bXQ" = ( +/turf/open/floor/almayer/mono, +/area/almayer/hallways/upper/fore_hallway) +"bZb" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "W"; + layer = 3.3 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/camera/autoname/almayer/containment{ - name = "ship-grade camera"; - dir = 4 +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bZc" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = -16 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/containment) -"bXR" = ( -/obj/structure/pipes/vents/scrubber/no_boom, -/turf/open/floor/almayer/dark_sterile2, -/area/almayer/medical/containment) -"bXS" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/notunnel) +"bZd" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 + icon_state = "E" }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/containment) -"bXT" = ( +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bZe" = ( +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north1) +"bZr" = ( +/turf/open/floor/almayer/plating_striped/north, +/area/almayer/squads/req) +"bZz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SW-out" }, -/obj/structure/extinguisher_cabinet{ +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/containment) +"bZD" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/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, +/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, +/obj/item/reagent_container/food/snacks/meat/fish, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bZJ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/effect/landmark/map_item, +/obj/item/device/binoculars, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/cic) +"bZM" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/item/tool/wet_sign{ + pixel_y = 18 + }, +/obj/item/reagent_container/glass/bucket/mopbucket{ pixel_x = 7; - pixel_y = 26 + pixel_y = -3 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bXU" = ( +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bZO" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/structure/sign/safety/stairs{ - pixel_y = 28 +/obj/structure/reagent_dispensers/tank/fuel, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 8; + pixel_y = -32 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 28; - pixel_x = 14 +/turf/open/floor/almayer/mono, +/area/almayer/lifeboat_pumps/south2) +"bZP" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/janitorialcart, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bZR" = ( +/obj/structure/machinery/status_display{ + pixel_x = 16; + pixel_y = -30 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bXV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 +/obj/structure/sign/safety/airlock{ + pixel_y = -25 }, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/containment) -"bXW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) +"bZS" = ( +/obj/structure/machinery/vending/ingredients, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"bZV" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/containment) -"bXX" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "E" }, -/obj/item/tool/mop{ - pixel_y = 22; - pixel_x = 7 +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"bZW" = ( +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = 2; - pixel_y = 5 +/obj/item/clothing/suit/storage/apron/overalls, +/obj/item/clothing/suit/apron, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bXY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/obj/structure/machinery/camera/autoname/almayer/containment{ - name = "ship-grade camera" +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bXZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/obj/structure/machinery/door_display/research_cell{ - id = "Containment Cell 1"; - name = "Cell 1 Control"; - pixel_y = 24 +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/obj/structure/machinery/door_control{ - id = "W_Containment Cell 1"; - name = "Containment Cell 1 Windows"; - pixel_y = 24; - req_one_access_txt = "19;28"; - pixel_x = -14 +/obj/item/folded_tent/mess{ + pixel_x = 1; + pixel_y = 20; + layer = 5.21 + }, +/obj/item/stack/sheet/cardboard/full_stack, +/obj/item/stack/sheet/cardboard/full_stack, +/obj/item/frame/table/almayer, +/obj/item/frame/table/almayer, +/obj/item/frame/table/almayer, +/obj/item/frame/table/almayer, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cab" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cac" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, -/turf/open/floor/almayer/green/southwest, -/area/almayer/squads/req) -"bYb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/green/east, +/area/almayer/living/briefing) +"cad" = ( +/obj/structure/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cae" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it."; + name = "dip cup"; + pixel_x = -4; + pixel_y = 8 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bYc" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "cargo" }, -/obj/structure/machinery/status_display{ - pixel_y = 30 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"caf" = ( +/obj/structure/machinery/computer/cryopod{ + dir = 8 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bYd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"cag" = ( +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"cah" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"cai" = ( +/obj/structure/filingcabinet, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"caj" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"cak" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/evidence_storage) +"cal" = ( +/turf/open/floor/almayer/green/southeast, +/area/almayer/squads/req) +"cas" = ( +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bYe" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/iv_drip, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/containment) -"bYf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = 1; - layer = 2.50 +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cau" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + access_modified = 1; + dir = 2; + name = "Firing Range"; + req_access = null; + req_one_access_txt = "2;4;7;9;21" }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_x = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/turf/open/floor/almayer/research/containment/corner/east, -/area/almayer/medical/containment/cell) -"bYg" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 4 +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/cryo_cells) +"caC" = ( +/obj/structure/prop/dam/crane/cargo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating_striped/north, +/area/almayer/underdeck/req) +"caF" = ( +/obj/structure/closet/crate/freezer, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"caG" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = 1; - layer = 2.50 + icon_state = "W"; + layer = 3.3 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_x = 1 + icon_state = "E" }, -/turf/open/floor/almayer/research/containment/corner/north, -/area/almayer/medical/containment/cell) -"bYh" = ( +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"caM" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"caN" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" }, /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "N"; + pixel_y = 1 }, /obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/sign/safety/rad_shield{ - pixel_x = -23; - pixel_y = 7 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = -23; - pixel_y = -7 - }, -/obj/item/device/camera{ - pixel_x = 17; - pixel_y = 7 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 2 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bYi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" + dir = 1 }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"caO" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/green/east, +/area/almayer/living/briefing) +"caT" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_control{ - id = "W_Containment Cell 3"; - name = "Containment Cell 3 Windows"; - req_one_access_txt = "19;28"; - pixel_x = 6 +/obj/structure/transmitter/rotary{ + name = "Operation Theatre 3 Telephone"; + phone_category = "Medical & Research Dept."; + phone_id = "Operation Theatre 3"; + pixel_x = -4; + pixel_y = 16 }, -/obj/structure/machinery/door_control{ - id = "Containment_Cell_Umbilical_B"; - name = "Umbilical Containment Airlock Port Lock"; - pixel_y = 8; - req_one_access_txt = "19;28"; - pixel_x = 6; - specialfunctions = 4; - normaldoorcontrol = 1 +/obj/structure/closet/secure_closet/surgical{ + pixel_y = -28; + pixel_x = -1 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/containment) -"bYj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/operating_room_three) +"caY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/middeck/briefing) +"cbg" = ( +/obj/structure/stairs, +/turf/open/floor/almayer/plating_striped/west, +/area/almayer/stair_clone/lower/port_aft) +"cbx" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/middeck/maintenance/sf) +"cbA" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) +"cbF" = ( +/obj/structure/coatrack{ + pixel_x = -5; + pixel_y = 9 }, -/obj/structure/window/reinforced/toughened{ - dir = 4 +/obj/structure/transmitter/tent{ + name = "Executive Officer's Office"; + phone_category = "Offices"; + phone_id = "Executive Officer's Office"; + pixel_x = 7; + pixel_y = 24 }, -/obj/structure/machinery/smartfridge/chemistry{ - pixel_y = 2; - pixel_x = -2 +/obj/item/clothing/head/cmcap/bridge{ + pixel_x = -7; + pixel_y = 18 }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -2; - pixel_y = 20 +/obj/item/clothing/suit/storage/windbreaker/windbreaker_brown{ + layer = 3.03; + pixel_x = -6; + pixel_y = 11 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bYk" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/item/clothing/suit/storage/windbreaker/windbreaker_green{ + pixel_x = -6; + pixel_y = 7 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/containment) -"bYl" = ( -/obj/structure/surface/rack{ - pixel_x = -1 +/turf/open/floor/wood/ship, +/area/almayer/living/numbertwobunks) +"cbL" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/obj/item/storage/xeno_tag_case/full{ - pixel_y = 8 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"cbM" = ( +/obj/structure/closet/crate, +/obj/item/clothing/glasses/welding, +/obj/item/circuitboard, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/lifeboat_pumps/north1) +"cbN" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredgesmooth2/north, +/area/almayer/hallways/upper/fore_hallway) +"cbT" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/item/storage/box/bloodbag{ - pixel_x = -2; - pixel_y = -1 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) +"ccb" = ( +/obj/structure/surface/table/reinforced/black, +/turf/open/floor/almayer/red/north, +/area/almayer/living/cryo_cells) +"ccd" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer/red/northeast, +/area/almayer/living/cryo_cells) +"ccg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer/silver/north, +/area/almayer/command/cichallway) +"cck" = ( +/obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_y = -1; - pixel_x = 8 + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/containment) -"bYm" = ( -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/containment) -"bYn" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/engineering/upper_engineering/port) -"bYo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) +"cco" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 }, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out" + icon_state = "S" }, -/obj/structure/curtain/open/medical{ - pixel_x = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/containment) -"bYp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment_Cell_Umbilical"; - name = "\improper Umbilical Containment Connection"; +/turf/open/floor/almayer/research/containment/corner/east, +/area/almayer/medical/containment/cell) +"ccx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) +"ccD" = ( +/obj/structure/cargo_container/uscm/right{ + layer = 3.1 + }, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/underdeck/req) +"ccG" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/turf/closed/wall/almayer/research/containment/wall/purple, -/area/almayer/medical/containment/cell) -"bYq" = ( -/obj/structure/cargo_container/wy/left, /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"bYr" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 +"ccJ" = ( +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_y = 29; + req_access_txt = "28" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bYs" = ( -/obj/structure/machinery/door/window/westright{ - dir = 4; - req_one_access = list(28,206,207) +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/medical_science) +"ccL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/containment) -"bYt" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_umbilical) +"ccN" = ( +/turf/open/floor/almayer/redcorner/east, +/area/almayer/living/cryo_cells) +"ccQ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) -"bYu" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/req) -"bYv" = ( -/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ - name = "\improper Requisitions Storage" +/turf/open/floor/almayer/plate, +/area/almayer/living/cryo_cells) +"cdi" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/turf/open/floor/almayer/no_build/plate, +/area/almayer/underdeck/req) +"cdo" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/req) -"bYw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/junction, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/req) -"bYx" = ( -/obj/structure/closet/l3closet/scientist, -/obj/structure/machinery/door/window/westright{ +/turf/open/floor/almayer/silver/west, +/area/almayer/living/cryo_cells) +"cdp" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; - req_one_access = list(28,206,207) + id = "Firing_Range_2"; + name = "range shutters" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"bYy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/turf/open/floor/plating, +/area/almayer/living/cryo_cells) +"cdA" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/hangar) +"cdB" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"cdC" = ( +/obj/structure/largecrate/random/secure{ + pixel_y = 11 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16; + layer = 5.4 }, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/containment) -"bYz" = ( -/obj/structure/sign/safety/south{ - pixel_x = 32; - pixel_y = -8 +/turf/open/floor/almayer/no_build/plating, +/area/almayer/underdeck/req) +"cdI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 }, -/obj/structure/sign/safety/bridge{ - pixel_x = 32; - pixel_y = 7 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cdJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/silver/northeast, -/area/almayer/command/cichallway) -"bYA" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "W"; + pixel_x = -1 }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/medical_science) +"cdM" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/containment) -"bYB" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/medical_science) +"cdN" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S" }, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out" + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/containment) -"bYC" = ( +/turf/open/floor/almayer/research/containment/corner/north, +/area/almayer/medical/containment/cell) +"cdP" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/containment) -"bYD" = ( -/obj/structure/platform_decoration/metal/almayer_smooth, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = -9 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 1; - pixel_x = -9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"cdV" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; - dir = 8 + icon_state = "N"; + layer = 3.33; + pixel_y = 2 }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bYE" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" + icon_state = "W"; + layer = 3.3 }, -/obj/structure/platform/metal/almayer_smooth, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bYF" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S"; + layer = 3.3 }, -/obj/structure/sign/safety/hvac_old{ +/obj/structure/sign/safety/rewire{ pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/lower) -"bYG" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" + pixel_y = 24 }, -/obj/structure/platform/metal/almayer_smooth, -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bYH" = ( +/obj/structure/machinery/power/apc/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/platoon2_shared) +"cdX" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; - pixel_y = 2 + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/plate, -/area/almayer/underdeck/hangar) -"bYI" = ( -/obj/structure/stairs/multiz/up{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon2_shared) +"cdZ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, -/obj/structure/platform/metal/almayer_smooth, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/upper/u_m_s) +"cea" = ( +/obj/structure/machinery/fuelpump, /turf/open/floor/almayer, -/area/almayer/medical/containment) -"bYJ" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 4; - name = "ship-grade camera" +/area/almayer/lifeboat_pumps/south2) +"cek" = ( +/obj/structure/flora/bush/ausbushes/var3/ppflowers, +/obj/structure/machinery/light/blue{ + dir = 8 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bYK" = ( -/obj/structure/machinery/camera/autoname/almayer/containment{ +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) +"cel" = ( +/obj/structure/barricade/handrail{ dir = 4 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 + icon_state = "cargo" }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"bYL" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ceC" = ( +/obj/structure/prop/almayer/ship_memorial, +/turf/open/floor/almayer/plating, +/area/almayer/living/starboard_garden) +"ceD" = ( +/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ + name = "\improper Evacuation Airlock PU-3"; dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer/test_floor4, -/area/almayer/maint/upper/u_a_s) -"bYM" = ( -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/containment) -"bYN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, +/area/almayer/powered) +"ceE" = ( +/turf/closed/wall/almayer, +/area/almayer/command/cichallway) +"ceK" = ( +/turf/open/floor/almayer/plate, +/area/almayer/living/bridgebunks) +"ceM" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/containment) -"bYO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/flooredge/west, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/containment) -"bYP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = -9 +"ceQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) +"ceV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 1; - pixel_x = -9 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; +/turf/open/floor/almayer/orange/west, +/area/almayer/hallways/upper/midship_hallway) +"ceY" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/mono, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"ceZ" = ( +/obj/structure/bed/sofa/south/grey/left, +/turf/open/floor/almayer/silver/northwest, +/area/almayer/shipboard/brig/cic_hallway) +"cfc" = ( +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/containment) -"bYQ" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" +"cfi" = ( +/obj/structure/largecrate/random{ + pixel_y = 8 }, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bYR" = ( -/obj/structure/stairs/multiz/up{ - dir = 4 +/obj/structure/largecrate/random/case/small{ + pixel_y = 23; + pixel_x = 5; + layer = 3.1 }, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bYS" = ( -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/almayer/no_build, +/area/almayer/underdeck/req) +"cfk" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/obj/structure/machinery/optable, -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/containment) -"bYT" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment_Cell_Umbilical"; - name = "\improper Umbilical Containment Connection"; - dir = 4 +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/port_missiles) +"cfm" = ( +/obj/structure/flora/pottedplant{ + desc = "Life is underwhelming, especially when you're a potted plant."; + icon_state = "pottedplant_22"; + name = "Jerry"; + pixel_y = 8 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 +/obj/item/clothing/glasses/sunglasses/prescription{ + pixel_x = -3; + pixel_y = -3 }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 1 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 }, -/area/almayer/medical/containment/cell) -"bYU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) +"cfo" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_x = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"cft" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) +"cfy" = ( +/obj/structure/machinery/light/blue{ + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) +"cfE" = ( +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/starboard_missiles) +"cfT" = ( +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/medical_science) +"cgo" = ( +/obj/structure/machinery/light{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/containment) -"bYV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/area/almayer/squads/bravo) +"cgr" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_one_access = list(16,17); + vend_x_offset = 0; + vend_y_offset = 0; + req_access = list() }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cgt" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/containment) -"bYW" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/panic) -"bYX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"cgu" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/machinery/cm_vending/clothing/marine/support{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"cgv" = ( +/obj/structure/machinery/cm_vending/clothing/marine/support{ + pixel_x = 26; + density = 0 }, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/door_control{ - id = "ResearchStairs_A"; - name = "Stairway Entrance Lock"; - pixel_y = 24; - req_one_access_txt = "19;28"; - specialfunctions = 4; - normaldoorcontrol = 1 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"cgA" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/gear/tl{ + pixel_x = 26; + density = 0; + pixel_y = 1 }, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/containment) -"bYY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"cgE" = ( +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) +"cgO" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_y = 6 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 2; - id = "CIC Lockdown"; - name = "\improper Combat Information Center Blast Door" +/turf/open/floor/almayer/silver/southeast, +/area/almayer/shipboard/brig/cic_hallway) +"cgT" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - dir = 1; - name = "\improper Combat Information Center" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) +"cgU" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"chb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 }, /turf/open/floor/almayer/test_floor4, -/area/almayer/command/cic) -"bYZ" = ( -/obj/structure/platform_decoration/metal/almayer_smooth/west, -/obj/structure/machinery/door_control{ - id = "ResearchStairs_A"; - name = "Stairway Entrance Lock"; - pixel_y = 24; - req_one_access_txt = "19;28"; - pixel_x = -7; - specialfunctions = 4; - normaldoorcontrol = 1 +/area/almayer/hallways/upper/starboard) +"chc" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ + dir = 2 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 26; - pixel_x = 14 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/bravo) +"chp" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 1; - pixel_x = -9 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/sign/poster/pinup{ + pixel_x = 26 }, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/delta) +"chv" = ( +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"chQ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = -9 + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"chR" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) +"chS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; - dir = 8 + icon_state = "W"; + layer = 3.3 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 25 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"cic" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bZa" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_17"; - pixel_x = 7; - pixel_y = 10 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 }, -/turf/open/floor/almayer/mono, -/area/almayer/hallways/upper/fore_hallway) -"bZb" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) +"cif" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/platform/metal/almayer_smooth/north, -/obj/structure/machinery/camera/autoname/almayer/containment{ - name = "ship-grade camera" +/obj/item/tank/emergency_oxygen/double, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_umbilical) +"cil" = ( +/obj/structure/machinery/light, +/obj/structure/sign/safety/waterhazard{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bZc" = ( -/obj/structure/sign/safety/nonpress_0g{ - pixel_x = -16 +/turf/open/floor/almayer/mono, +/area/almayer/lifeboat_pumps/south2) +"cir" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/green, +/area/almayer/squads/req) +"civ" = ( +/turf/open/floor/almayer/flooredgesmooth2/south, +/area/almayer/engineering/upper_engineering) +"cix" = ( +/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ + name = "\improper Evacuation Airlock PU-4"; + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/notunnel) -"bZd" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" +/turf/open/floor/almayer/test_floor4, +/area/almayer/powered) +"ciB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/platform/metal/almayer_smooth/north, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/almayer, -/area/almayer/medical/containment) -"bZe" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north1) -"bZf" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = 17 + pixel_x = 16; + pixel_y = -15 }, -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"bZg" = ( -/obj/structure/stairs/multiz/up{ - dir = 4 +"ciC" = ( +/obj/structure/largecrate/random, +/turf/open/floor/almayer/plating_striped/north, +/area/almayer/underdeck/req) +"ciN" = ( +/turf/open/floor/almayer/silver/southeast, +/area/almayer/shipboard/brig/cic_hallway) +"ciQ" = ( +/obj/structure/sign/safety/fire_haz{ + pixel_x = 8; + pixel_y = -32 }, -/obj/structure/platform/metal/stair_cut/almayer_smooth_right, /turf/open/floor/almayer, -/area/almayer/medical/containment) -"bZh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/closet/secure_closet/surgical{ - pixel_x = 30 - }, -/obj/item/reagent_container/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/containment) -"bZi" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/sign/safety/reduction{ - pixel_x = 7; - pixel_y = 28 - }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/req) -"bZj" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; +/area/almayer/lifeboat_pumps/south1) +"ciU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 1; - pixel_x = 1 + icon_state = "SW-out" }, -/turf/open/floor/almayer/research/containment/corner/west, -/area/almayer/medical/containment/cell) -"bZk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/cargo_arrow/west, +/area/almayer/squads/bravo) +"ciV" = ( +/obj/effect/landmark/start/marine/leader/bravo, +/obj/effect/landmark/late_join/bravo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"ciW" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 }, /obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/transmitter/rotary{ - name = "Research Containment Telephone"; - phone_category = "Medical & Research Dept."; - phone_id = "Research Containment"; - pixel_y = -2; - pixel_x = -1 + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"ciX" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 }, -/obj/item/device/flashlight/lamp{ - pixel_y = 12; - pixel_x = 3; - layer = 3.2 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic{ - pixel_x = 15 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"ciY" = ( +/obj/effect/landmark/start/marine/engineer/kilo, +/obj/effect/landmark/late_join/kilo, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"ciZ" = ( +/obj/structure/machinery/door/airlock/almayer/marine/support/engineer{ + dir = 4 }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) +"cja" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bZl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/area/almayer/squads/support) +"cjb" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_control{ - id = "W_Containment Cell 2"; - name = "Containment Cell 2 Windows"; - pixel_y = 8; - req_one_access_txt = "19;28"; - pixel_x = 6 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cjc" = ( +/obj/effect/landmark/start/marine/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"cje" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 }, -/obj/structure/machinery/door_control{ - id = "Containment_Cell_Umbilical_A"; - name = "Umbilical Containment Airlock Starboard Lock"; - req_one_access_txt = "19;28"; - pixel_x = 6; - specialfunctions = 4; - normaldoorcontrol = 1 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/containment) -"bZm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cjf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; + icon_state = "NE-out"; + pixel_x = 1; pixel_y = 1 }, -/obj/structure/window/reinforced/toughened{ - dir = 4 +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon2_shared) +"cjg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/obj/structure/filingcabinet/filingcabinet{ - layer = 2.9; - pixel_x = 5; - pixel_y = 2 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"cjh" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 }, -/obj/structure/filingcabinet/filingcabinet{ - layer = 2.9; - pixel_x = -10; - pixel_y = 2 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 }, -/obj/structure/sign/safety/terminal{ - pixel_y = 28; - pixel_x = -1 +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cji" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 13; - pixel_y = 28 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/containment) -"bZn" = ( -/obj/structure/surface/rack{ - pixel_x = -1 +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cjj" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/obj/item/storage/box/bodybags{ - pixel_y = 7 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjk" = ( +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 6"; + pixel_x = -24 }, -/obj/item/storage/box/gloves{ - pixel_x = -2; - pixel_y = -1 +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) +"cjl" = ( +/obj/item/stool{ + pixel_x = -15; + pixel_y = 6 }, -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cjm" = ( +/obj/structure/surface/rack, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/turf/open/floor/almayer/plate, +/area/almayer/maint/upper/u_a_p) +"cjn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/water{ + pixel_x = -17; + pixel_y = -8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjo" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/containment) -"bZo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjp" = ( +/obj/effect/landmark/start/marine/medic/oscar, +/obj/effect/landmark/late_join/oscar, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_midship_hallway) -"bZp" = ( -/obj/structure/curtain/open/medical{ - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 +/area/almayer/squads/support) +"cjq" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cjr" = ( +/obj/item/tool/crowbar, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjs" = ( +/obj/structure/largecrate/random/barrel/brown, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjt" = ( +/turf/open/floor/almayer/orange, +/area/almayer/engineering/lower) +"cju" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjv" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/sign/safety/hazard{ + pixel_y = -25 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -25 }, -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/containment) -"bZq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cjw" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cjx" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + vend_y_offset = 0; + req_one_access = list(16,17); + req_access = list() }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cjy" = ( +/obj/structure/machinery/disposal{ + pixel_x = -1; pixel_y = 1 }, -/obj/structure/barricade/handrail/no_vault, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bZr" = ( -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/squads/req) -"bZs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/obj/structure/sign/prop1{ + pixel_y = -32 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/barricade/handrail/no_vault, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"bZt" = ( -/turf/closed/wall/almayer/research/containment/wall/connect3, -/area/almayer/medical/containment/cell) -"bZu" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 2"; - name = "\improper Containment Cell 2"; - dir = 2 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/platoon2_shared) +"cjz" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/sign/safety/hazard{ + pixel_y = -25 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 1; - icon_state = "containment_window_h" +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -25 }, -/area/almayer/medical/containment/cell) -"bZv" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Containment Cell 2"; - name = "\improper Containment Cell 2"; +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cjA" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ dir = 2 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/closed/wall/almayer/research/containment/wall/purple{ - icon_state = "containment_window_h" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/medical/containment/cell) -"bZw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/bravo) +"cjB" = ( +/obj/effect/landmark/start/marine/medic/kilo, +/obj/effect/landmark/late_join/kilo, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"cjD" = ( +/obj/effect/landmark/start/marine/engineer/oscar, +/obj/effect/landmark/late_join/oscar, +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/containment) -"bZx" = ( -/obj/structure/pipes/vents/pump/no_boom, -/turf/open/floor/almayer/dark_sterile2, -/area/almayer/medical/containment) -"bZy" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"cjE" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/sign/safety/stairs{ - pixel_y = -26 +/obj/structure/machinery/cm_vending/clothing/leader/support{ + pixel_y = 16; + density = 0; + pixel_x = -1 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = -26; - pixel_x = 14 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"cjF" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bZz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cjG" = ( +/obj/structure/reagent_dispensers/tank/pacid{ + anchored = 1 }, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/containment) -"bZA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/turf/open/floor/almayer/test_floor5, +/area/almayer/engineering/lower/workshop/hangar) +"cjH" = ( +/obj/structure/reagent_dispensers/tank/sacid, +/turf/open/floor/almayer/test_floor5, +/area/almayer/engineering/lower/workshop/hangar) +"cjI" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/containment) -"bZB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/largecrate/supply, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjJ" = ( +/obj/structure/largecrate/random/secure, +/obj/item/trash/crushed_cup{ + pixel_y = 12 }, -/obj/structure/machinery/camera/autoname/almayer/containment{ - dir = 1; - name = "ship-grade camera" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjK" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/largecrate/random/secure, +/obj/structure/largecrate/random/mini{ + pixel_y = 13 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bZC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjL" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bZD" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30; - pixel_x = 1 +/obj/item/trash/popcorn, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cjM" = ( +/obj/item/tool/wet_sign{ + pixel_y = 18 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cjN" = ( +/obj/structure/machinery/door/airlock/almayer/marine/bravo/engineer{ + dir = 8 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/bravo) +"cjO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"cjP" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/almayer/cargo_arrow, +/area/almayer/squads/platoon2_shared) +"cjQ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"cjR" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/containment) -"bZE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; layer = 3.33; pixel_x = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon2_shared) +"cjS" = ( +/obj/structure/machinery/disposal{ + pixel_x = -1; + pixel_y = 1 }, -/obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/containment) -"bZF" = ( -/obj/effect/decal/heavy_cable/cable_horizontal, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"bZG" = ( +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"cjT" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; + icon_state = "E"; + layer = 3.33; pixel_x = 1 }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"bZH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"cjU" = ( +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 1; + pixel_x = 26 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"cjV" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cjW" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/lower_medical_medbay) +"cjX" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cjY" = ( +/obj/structure/bed/chair/comfy/bravo{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow4_red"; - pixel_y = 1; +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/living/briefing) +"cjZ" = ( +/obj/structure/bed/chair/comfy/bravo{ dir = 1 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) -"bZI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/south, +/area/almayer/living/briefing) +"cka" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/living/briefing) +"ckb" = ( +/obj/structure/sign/arcturianstopsign{ + pixel_y = -26; + desc = "This is the Arcturian stop sign that some Bravos from Second Platoon stole on the last shore leave." }, -/obj/structure/sign/safety/airlock{ - pixel_y = 28; - pixel_x = 14 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ckc" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -8 }, -/obj/structure/sign/safety/two{ - pixel_y = 28 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"ckd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/effect/landmark/map_item, -/obj/item/device/binoculars, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) -"bZK" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/turf/open/floor/almayer/plate, +/area/almayer/living/intel) +"cke" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 18 }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"bZL" = ( +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) +"ckf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 + icon_state = "W"; + layer = 2.5 }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) +"ckg" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_y = 6; + pixel_x = -6 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZM" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/structure/sign/nosmoking_1{ + pixel_y = -28 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 7; - pixel_y = 28 +/obj/structure/sign/prop3{ + pixel_x = -30 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/item/stack/sheet/cardboard/medium_stack{ + layer = 3.01; + pixel_x = 6; + pixel_y = 3 }, -/obj/structure/machinery/light{ +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"ckh" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"cki" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon2_shared) +"ckj" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/nanopaste{ + pixel_x = -3; + pixel_y = 14 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZO" = ( +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/p_stern) +"ckk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon2_shared) +"ckl" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "W"; + layer = 3.3 }, -/obj/structure/reagent_dispensers/tank/fuel, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 8; - pixel_y = -32 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"ckm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/south2) -"bZP" = ( +/area/almayer/squads/platoon2_shared) +"ckn" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon2_shared) +"cko" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_y = 6; + pixel_x = 6 }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "W"; + layer = 3.3 }, -/obj/structure/sign/poster/safety{ - pixel_y = 32 +/obj/structure/sign/nosmoking_1{ + pixel_y = -28 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZR" = ( -/obj/structure/machinery/status_display{ - pixel_x = 16; - pixel_y = -30 +/obj/item/ashtray/bronze{ + pixel_x = -9; + pixel_y = 1 }, -/obj/structure/sign/safety/airlock{ - pixel_y = -25 +/obj/item/trash/cigbutt{ + pixel_x = -7; + pixel_y = 13 }, /turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) -"bZS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/area/almayer/squads/platoon2_shared) +"ckp" = ( +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = -27; + serial_number = 11; + pixel_y = 2 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +/obj/structure/bed/chair{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/structure/dartboard{ + pixel_y = -30 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/containment) -"bZT" = ( -/obj/structure/sign/safety/biohazard{ - pixel_y = 28 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckq" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 +/obj/structure/bed/chair{ + dir = 1 }, -/obj/structure/sign/safety/storage{ - pixel_y = 28; - pixel_x = 14 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"cks" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckt" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 }, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "SE-out"; + pixel_x = 1 }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"cku" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_y = 1; - pixel_x = 8; - dir = 1 + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/containment) -"bZU" = ( +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckv" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SW-out" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/support) +"ckw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"bZV" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 9 +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"ckx" = ( +/obj/structure/machinery/cm_vending/clothing/medic/support{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow4"; - dir = 1 + icon_state = "S" }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/containment) -"bZW" = ( -/obj/structure/machinery/door_display/research_cell{ - id = "Biohazard Storage"; - name = "Biohazard Storage Control"; - pixel_y = 24; - layer = 3.125; - pixel_x = -4 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"cky" = ( +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "S" }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_y = 1; - pixel_x = -8; - dir = 1 + icon_state = "S" }, -/obj/structure/machinery/door_control{ - id = "W_Biohazard Storage"; - name = "Biohazard Storage Windows"; - pixel_y = 26; - req_one_access_txt = "19;28"; - pixel_x = 11 +/obj/structure/machinery/cm_vending/clothing/medic/support{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/containment) -"bZX" = ( +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckA" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S" }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/containment) -"bZY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - layer = 3.33; - pixel_x = 1 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) +"ckB" = ( +/obj/structure/machinery/cm_vending/clothing/medic/support{ + density = 0; + pixel_y = 1; + pixel_x = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - layer = 3.33; - pixel_y = 2 +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 16; + pixel_x = -4; + density = 0 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/support) +"ckC" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 33 }, -/obj/structure/machinery/power/apc/almayer/east, -/obj/structure/sign/safety/rewire{ - layer = 2.4; - pixel_x = 7; - pixel_y = 28 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"ckD" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/deck/uno, +/obj/item/clothing/mask/cigarette{ + pixel_x = 5; + pixel_y = -4 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/containment/cell) -"bZZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"ckE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/emergency, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"ckF" = ( +/obj/structure/largecrate/random/barrel/black, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"ckG" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"caa" = ( -/turf/open/floor/almayer/research/containment/corner3, -/area/almayer/medical/containment/cell) -"cab" = ( -/obj/structure/machinery/light, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, /turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"ckH" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/turf/open/floor/almayer/flooredge/north, /area/almayer/living/briefing) -"cac" = ( +"ckI" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/living/briefing) +"ckJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"cad" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"ckK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"cae" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"caf" = ( -/obj/structure/machinery/computer/cryopod{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/req) -"cag" = ( -/turf/open/floor/almayer/cargo, -/area/almayer/squads/req) -"cah" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/req) -"cai" = ( -/obj/structure/filingcabinet, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/req) -"cak" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/evidence_storage) -"cal" = ( -/turf/open/floor/almayer/green/southeast, -/area/almayer/squads/req) -"cam" = ( +/area/almayer/squads/bravo) +"ckL" = ( /obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" + icon_state = "S" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/containment/contshutter{ - name = "\improper Umbilical Containment"; - req_one_access = list(28,206,207); - id = null; - id_tag = "Containment_Cell_Umbilical_A"; - locked = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"can" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon2_shared) +"ckM" = ( /obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" + icon_state = "S" }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment) -"cao" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - id = "Biohazard Storage"; - locked = 1; - name = "\improper Biohazard Storage Chamber"; - dir = 2 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "Biohazard Storage"; - name = "\improper Biohazard Storage Chamber"; - dir = 2 +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon2_shared) +"ckN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/containment/cell) -"cap" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Biohazard Storage"; - name = "\improper Biohazard Storage Chamber"; - dir = 2 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 1; - icon_state = "containment_window_h" +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/area/almayer/medical/containment/cell) -"caq" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"car" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon2_shared) +"ckO" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/obj/structure/bed/chair/comfy/delta{ +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"ckP" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/silver/east, +/area/almayer/shipboard/brig/cic_hallway) +"ckR" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"cas" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ - id = "W_Biohazard Storage"; - name = "\improper Biohazard Storage Chamber"; - dir = 2 - }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - icon_state = "containment_window_h" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/area/almayer/medical/containment/cell) -"cat" = ( /obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"ckS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/platoon2_shared) +"ckT" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "S" }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-y" }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"cau" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - access_modified = 1; - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21" +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon2_shared) +"ckU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/cryo_cells) -"cav" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon2_shared) +"ckV" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 }, /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "SW-out" }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"caw" = ( -/obj/structure/machinery/light/red{ - dir = 8; - light_color = "#BB3F3F" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"ckW" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/engineering/lower) +"ckX" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"ckY" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/wardrobe/medic_white, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"cax" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/tool/warning_cone{ - pixel_y = 18 +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/support{ + dir = 2 }, -/obj/item/tool/warning_cone{ - pixel_y = 9; - pixel_x = -9 +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) +"ckZ" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/item/clothing/head/headset{ - pixel_x = 14; - pixel_y = 1 +/obj/structure/machinery/power/power_generator/reactor{ + pixel_x = -1; + pixel_y = -3 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"cay" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/engineering/lower/engine_core) +"cla" = ( /obj/effect/decal/warning_stripes{ - icon_state = "test_warning_red" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/containment/contshutter{ - name = "\improper Containment Cell 2"; - id = "Containment Cell 2"; - dir = 2; - req_one_access = list(28,206,207); - queen_pryable = 0; - locked = 1 + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/medical/containment/cell) -"caz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = -1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 8; - pixel_x = -1 +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"clb" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/containment) -"caA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 4; - pixel_x = -19; - pixel_y = -8 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"clc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 4; - pixel_x = -1; - pixel_y = -8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3_red"; - pixel_y = -17; - dir = 1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"cld" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen/red/clicky{ + pixel_x = 1; + pixel_y = 2 }, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/medical/containment) -"caB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = -1 +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 4; - pixel_x = 1 +/obj/item/device/megaphone{ + pixel_x = -1 }, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/containment) -"caC" = ( -/obj/structure/prop/dam/crane/cargo, +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) +"cle" = ( +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/lower_medical_lobby) +"clf" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/underdeck/req) -"caD" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/structure/largecrate/supply/supplies/mre{ + desc = "A supply crate containing everything you need to stop a CLF uprising."; + name = "\improper USCM crate 'FOB supplies'" }, -/obj/item/tool/soap/deluxe{ - pixel_y = 2; - pixel_x = -7 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"clg" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) +"cll" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"caE" = ( -/obj/structure/machinery/disposal/delivery{ - density = 0; - desc = "A pneumatic delivery unit. Sends items to the requisitions."; - icon_state = "delivery_med"; - name = "Requisitions Delivery Unit"; - pixel_y = 2; +/area/almayer/squads/delta) +"clp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sign/poster{ + desc = "It says DRUG."; + icon_state = "poster2"; pixel_x = -26 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/item/weapon/gun/shotgun/pump{ + pixel_y = 5 }, +/obj/item/weapon/gun/shotgun/pump, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"clq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; + icon_state = "N"; pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/corner/east, -/area/almayer/medical/containment/cell) -"caF" = ( -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ - dir = 8 + icon_state = "W"; + layer = 2.5 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/squads/bravo) +"clr" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 8; - pixel_y = -9 + icon_state = "W"; + layer = 3.3 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"cls" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/port_point_defense) +"clt" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 4; - pixel_y = -9 + icon_state = "N"; + pixel_y = 1 }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/bravo) +"clu" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3" - }, -/turf/open/floor/almayer/research/containment/entrance/north, -/area/almayer/medical/containment/cell) -"caG" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"caH" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 9 +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/bravo) +"clv" = ( /obj/effect/decal/warning_stripes{ icon_state = "door_warning2"; - pixel_x = 1 + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"caI" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; + icon_state = "NE-out"; + pixel_x = 1; pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - pixel_x = 1 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/research/containment/corner1, -/area/almayer/medical/containment/cell) -"caJ" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"clw" = ( +/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, +/area/almayer/command/airoom) +"clx" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E" + icon_state = "N"; + pixel_y = 1 }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon2_shared) +"cly" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"caK" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/barricade/handrail/no_vault, -/obj/structure/largecrate/random/case/double{ - layer = 2.95 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"caL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon2_shared) +"clz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/item/tool/wet_sign{ - pixel_y = -7; - pixel_x = 5 +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon2_shared) +"clA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/item/tool/wet_sign{ - pixel_y = 1; - pixel_x = -9 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon2_shared) +"clB" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/middeck/medical) -"caM" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"caN" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; + icon_state = "NE-out"; + pixel_x = 1; pixel_y = 1 }, /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"caO" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/turf/open/floor/almayer/silver/west, -/area/almayer/living/briefing) -"caP" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 6 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"caQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/research/containment/corner/west, -/area/almayer/medical/containment/cell) -"caR" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 8 - }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) +"clC" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - dir = 1; - pixel_x = 9 + icon_state = "N"; + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon2_shared) +"clD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3"; - dir = 4 + icon_state = "N"; + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon2_shared) +"clE" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/medic, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) +"clG" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3"; - pixel_x = 9 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/research/containment/entrance/west, -/area/almayer/medical/containment/cell) -"caS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 1; - pixel_x = -8 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning3_red"; - dir = 1; - pixel_x = -8; - pixel_y = -18 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"clH" = ( /obj/effect/decal/warning_stripes{ - icon_state = "cargo_arrow3_red"; - dir = 8; - pixel_x = 1 + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/containment) -"caT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter/rotary{ - name = "Operation Theatre 3 Telephone"; - phone_category = "Medical & Research Dept."; - phone_id = "Operation Theatre 3"; - pixel_x = -4; - pixel_y = 16 - }, -/obj/structure/closet/secure_closet/surgical{ - pixel_y = -28; - pixel_x = -1 +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"clI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/operating_room_three) -"caU" = ( -/obj/structure/disposalpipe/up/almayer{ - dir = 2; - id = "almayerlink_med_req" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/closed/wall/almayer/research/containment/wall/west, -/area/almayer/medical/containment/cell) -"caV" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 8 +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) +"clJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/marine/bravo, +/obj/effect/landmark/late_join/bravo, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"clK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"caW" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; +/obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"clL" = ( +/obj/effect/landmark/start/marine/oscar, +/obj/effect/landmark/late_join/oscar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"clM" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = -1 + icon_state = "S" }, -/turf/open/floor/almayer/research/containment/floor2/west, -/area/almayer/medical/containment/cell) -"caX" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; + icon_state = "NW-out"; + layer = 2.5; pixel_y = 1 }, -/obj/item/tool/wet_sign{ - pixel_y = 15; - pixel_x = 5 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, -/obj/item/tool/wet_sign{ - pixel_y = 8; - pixel_x = -1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"clN" = ( +/obj/structure/machinery/cm_vending/clothing/leader/delta, +/turf/open/floor/almayer/plate, +/area/almayer/squads/delta) +"clO" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) +"clP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/middeck/medical) -"caY" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"clQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/support) +"clR" = ( +/obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/support) +"clS" = ( +/obj/effect/landmark/start/marine/medic/charlie, +/obj/effect/landmark/late_join/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"clT" = ( +/obj/structure/machinery/cm_vending/gear/leader, +/turf/open/floor/almayer/plate, +/area/almayer/squads/delta) +"clU" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"clV" = ( +/obj/structure/machinery/computer/arcade, +/turf/open/floor/almayer/green/northwest, +/area/almayer/squads/req) +"clX" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"caZ" = ( -/obj/structure/machinery/flasher{ - alpha = 1; - id = "Containment Cell 2"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 + icon_state = "W"; + layer = 2.5 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; + icon_state = "E"; + layer = 3.33; pixel_x = 1 }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"cba" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = 1; +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) +"clY" = ( +/obj/effect/landmark/start/marine/bravo, +/obj/effect/landmark/late_join/bravo, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) +"clZ" = ( +/obj/effect/landmark/start/marine/oscar, +/obj/effect/landmark/late_join/oscar, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"cma" = ( +/obj/structure/closet/radiation, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) +"cmb" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 8; - pixel_x = -1 +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cmc" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/sign/poster/blacklight{ + pixel_y = 35 }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cmd" = ( +/obj/structure/sign/nosmoking_1{ + pixel_y = -28 }, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/containment) -"cbb" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"cme" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"cmf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = 1; - dir = 1 + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/containment) -"cbc" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - pixel_y = 1; - dir = 1 + icon_state = "W" }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2_red"; - dir = 4; + icon_state = "SE-out"; pixel_x = 1 }, -/obj/structure/machinery/camera/autoname/almayer/containment{ - name = "ship-grade camera" +/obj/structure/machinery{ + density = 1; + dir = 4; + icon = 'icons/obj/vehicles/tank.dmi'; + icon_state = "tank_base"; + explo_proof = 1; + name = "M34A2 Longstreet Light Tank"; + pixel_y = -45; + unacidable = 1; + unslashable = 1; + use_power = 0; + needs_power = 0; + pixel_x = -11; + desc = "A giant piece of armor with a big gun, you know what to do. Entrance in the back."; + layer = 2.9 }, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/containment) -"cbd" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/item/ammo_magazine/hardpoint/ltb_cannon{ + pixel_x = -7 }, -/obj/structure/barricade/handrail/strata{ - pixel_y = -8 +/turf/open/floor/almayer/no_build, +/area/almayer/underdeck/vehicle) +"cmg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/obj/item/tool/soap/deluxe{ - pixel_y = 2; - pixel_x = 3 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = -16; + pixel_y = 16 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/containment) -"cbe" = ( -/obj/structure/machinery/xenoanalyzer, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 8; - pixel_y = -1 + icon_state = "N"; + layer = 3.33; + pixel_y = -15; + pixel_x = 11 }, /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 + icon_state = "N"; + layer = 3.33; + pixel_y = -15; + pixel_x = 19 }, -/turf/open/floor/almayer/research/containment/corner, -/area/almayer/medical/containment/cell) -"cbf" = ( -/obj/structure/machinery/flasher{ - id = "BiohazStore"; - layer = 2.1; - name = "Mounted Flash"; - pixel_y = 30 +/obj/structure/machinery/prop/almayer/CICmap/dumb{ + pixel_x = 15; + pixel_y = 16; + density = 0 }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/circular_saw{ - pixel_x = -1; - pixel_y = 4 +/turf/open/floor/almayer/flooredge/south, +/area/almayer/living/briefing) +"cmh" = ( +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 }, -/obj/item/tool/surgery/retractor{ - pixel_y = 3; - pixel_x = -2 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"cmi" = ( +/obj/structure/machinery/cm_vending/gear/tl, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) +"cmj" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/obj/item/tool/surgery/scalpel, -/obj/item/tool/surgery/hemostat{ - pixel_x = -2; - pixel_y = 2 +/turf/open/floor/almayer/orange/north, +/area/almayer/squads/bravo) +"cmk" = ( +/obj/structure/machinery/door/airlock/almayer/marine/bravo/tl{ + dir = 4; + req_access = list(32,16); + req_one_access = list() }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/bravo) +"cml" = ( +/turf/open/floor/almayer/plating_striped/north, +/area/almayer/shipboard/port_point_defense) +"cmm" = ( +/obj/structure/machinery/camera/autoname/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) +"cmn" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; + icon_state = "E"; + layer = 3.33; pixel_x = 1 }, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"cbg" = ( -/turf/open/floor/almayer/plating_striped/west, -/area/almayer/stair_clone/lower/port_aft) -"cbh" = ( -/obj/structure/machinery/camera/autoname/almayer/containment, -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 - }, -/obj/structure/bed/roller/heavy, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"cbi" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon2_shared) +"cmo" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/tool, +/obj/item/packageWrap, +/turf/open/floor/almayer/green/west, +/area/almayer/squads/req) +"cmp" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/structure/bed/roller/heavy, -/turf/open/floor/almayer/research/containment/floor2, -/area/almayer/medical/containment/cell) -"cbj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 4; - pixel_x = 2; - pixel_y = -1 +/obj/structure/machinery/light{ + dir = 8 }, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/support) +"cmq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "door_warning2"; - dir = 1; - pixel_x = 1 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/research/containment/corner_var2/west, -/area/almayer/medical/containment/cell) -"cbk" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"cbl" = ( -/obj/structure/machinery/light/red{ - dir = 8; - light_color = "#BB3F3F" +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = 8 }, -/obj/structure/largecrate/random/barrel/true_random, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/medical) -"cbm" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 14; - pixel_y = -26 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"cmr" = ( +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"cms" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -26 +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"cmt" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/middeck/briefing) -"cbn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/sign/safety/reduction{ - pixel_x = 8; - pixel_y = -26 +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/support) +"cmu" = ( +/obj/structure/machinery/cm_vending/clothing/leader/support{ + pixel_y = 1; + density = 0; + pixel_x = 26 }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/medical) -"cbo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -16 +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/support) +"cmv" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16 +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/briefing) -"cbp" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redcorner/north, +/area/almayer/shipboard/brig/processing) +"cmw" = ( +/turf/open/floor/almayer/orangecorner/west, +/area/almayer/engineering/lower/workshop/hangar) +"cmx" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"cmy" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/plating2, +/area/almayer/maint/hull/lower/l_m_p) +"cmz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F" - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"cbq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/no_build/test_floor4, -/area/almayer/middeck/briefing) -"cbr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/random/case, -/turf/open/floor/almayer, -/area/almayer/middeck/briefing) -"cbs" = ( -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_y = 3 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_y = 6 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"cbt" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 16 - }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16 + icon_state = "S"; + layer = 3.3; + pixel_y = 16; + pixel_x = 11 }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/briefing) -"cbu" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 + icon_state = "S"; + layer = 3.3; + pixel_y = 16; + pixel_x = 20 }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cmA" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E" + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/prop/server_equipment/yutani_server{ - pixel_y = 16; - density = 0 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"cbv" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 1 +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/living/briefing) +"cmB" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/briefing) -"cbw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/random/case, -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/briefing) -"cbx" = ( -/turf/closed/wall/almayer/reinforced/temphull, -/area/almayer/middeck/maintenance/sf) -"cby" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"cmC" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock PU-5"; + name = "\improper Evacuation Airlock SL-1"; dir = 1 }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) -"cbz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) -"cbA" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/vehiclehangar) -"cbB" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +"cmD" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_x = -26 }, -/obj/structure/machinery/light, /turf/open/floor/almayer/cargo, -/area/almayer/maint/upper/u_m_p) -"cbC" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = -17 +/area/almayer/squads/bravo) +"cmE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/upper/port) -"cbD" = ( -/obj/structure/sign/safety/high_voltage{ - pixel_y = -8; - pixel_x = -17 +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) +"cmF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = 7 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) +"cmG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4 }, -/turf/open/floor/almayer/green/southwest, -/area/almayer/hallways/upper/fore_hallway) -"cbE" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 7; - pixel_y = -26 +/obj/item/device/binoculars/civ, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cmH" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = list(); + req_one_access = list(16,17) }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) -"cbF" = ( -/obj/structure/coatrack{ - pixel_x = -5; - pixel_y = 9 +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cmI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/obj/structure/transmitter/tent{ - name = "Executive Officer's Office"; - phone_category = "Offices"; - phone_id = "Executive Officer's Office"; - pixel_x = 7; - pixel_y = 24 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon2_shared) +"cmJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/item/clothing/head/cmcap/bridge{ - pixel_x = -7; - pixel_y = 18 +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon2_shared) +"cmK" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/obj/item/clothing/suit/storage/windbreaker/windbreaker_brown{ - layer = 3.03; - pixel_x = -6; - pixel_y = 11 +/turf/open/floor/almayer/silver/west, +/area/almayer/command/securestorage) +"cmL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/item/clothing/suit/storage/windbreaker/windbreaker_green{ - pixel_x = -6; - pixel_y = 7 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/open/floor/wood/ship, -/area/almayer/living/numbertwobunks) -"cbG" = ( -/obj/structure/sign/poster/safety{ - pixel_y = -25 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cmM" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/medical) +"cmN" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cmO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8 }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) -"cbH" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = -26 +/obj/item/facepaint/black{ + pixel_x = 6 }, -/obj/structure/sign/safety/south{ - pixel_y = -26; - pixel_x = 14 +/obj/item/facepaint/brown{ + pixel_x = -7 }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) -"cbI" = ( +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cmP" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"cmQ" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) +"cmR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/hybrisa/trash, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cmS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/silver/west, -/area/almayer/maint/upper/u_m_p) -"cbJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/silver/west, /area/almayer/hallways/upper/fore_hallway) -"cbK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/bed/sofa/south/white/left{ - pixel_y = 16; - layer = 4.11 +"cmT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/helmet/marine/veteran/UPP/firefighter, +/obj/item/trash/burger, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) +"cmU" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/lower/port_fore_hallway) +"cmV" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) +"cmW" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/lower/port_fore_hallway) +"cmX" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cmY" = ( +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/obj/structure/sign/safety/cryo{ - pixel_x = -17 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/living/briefing) +"cmZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 }, -/turf/open/floor/almayer/silverfull2, -/area/almayer/maint/upper/u_m_p) -"cbL" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cna" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_fore_hallway) -"cbM" = ( -/obj/structure/closet/crate, -/obj/item/clothing/glasses/welding, -/obj/item/circuitboard, /turf/open/floor/plating/plating_catwalk, -/area/almayer/lifeboat_pumps/north1) -"cbN" = ( -/turf/open/floor/almayer/flooredge/north, -/area/almayer/hallways/upper/fore_hallway) -"cbO" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 14; - pixel_y = 28 +/area/almayer/hallways/lower/port_midship_hallway) +"cnb" = ( +/obj/item/reagent_container/glass/bucket{ + pixel_x = -15; + pixel_y = 5 }, -/obj/structure/sign/safety/medical{ - pixel_y = 28 +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = -9; + pixel_y = -2 }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/upper/fore_hallway) -"cbP" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/magazine/dirty{ + pixel_y = 13; + pixel_x = 6 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"cnc" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"cnd" = ( +/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ + name = "\improper Evacuation Airlock PL-1"; + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/powered) +"cne" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"cnf" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cng" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) -"cbQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cnh" = ( +/obj/structure/machinery/cm_vending/clothing/marine/support{ + pixel_x = 26; + density = 0 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"cni" = ( +/obj/structure/machinery/door/airlock/almayer/marine/support/tl{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) -"cbR" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) +"cnj" = ( +/obj/item/trash/buritto, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cnk" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/captain_mess) -"cbS" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/turf/open/floor/almayer/red, +/area/almayer/hallways/lower/port_fore_hallway) +"cnl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redcorner/west, +/area/almayer/hallways/lower/port_fore_hallway) +"cnm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/green/west, -/area/almayer/hallways/upper/fore_hallway) -"cbT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) +"cnn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/east, +/area/almayer/hallways/lower/port_fore_hallway) +"cno" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/window/eastright{ + access_modified = 1; + dir = 8; + req_access_txt = "19" + }, +/obj/structure/machinery/door/window/eastleft{ + req_access_txt = "19" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"cbU" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/area/almayer/hallways/lower/port_fore_hallway) +"cnp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"cnq" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 }, -/turf/open/floor/almayer/green/northwest, -/area/almayer/hallways/upper/fore_hallway) -"cbV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/hallways/upper/fore_hallway) -"cbW" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 28 +/obj/structure/machinery/door_control{ + pixel_y = -21; + name = "\improper Shutter Controls"; + id = "IO Lab Shutters"; + req_access_txt = "19"; + pixel_x = 11 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/upper/midship_hallway) -"cbX" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 1; - pixel_y = 28 +/turf/open/floor/almayer/silver/southwest, +/area/almayer/command/computerlab) +"cnr" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/lower_medical_medbay) +"cns" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) +"cnt" = ( +/obj/structure/bed/chair/comfy/charlie, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/living/briefing) +"cnv" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/bed/chair/comfy/charlie, +/turf/open/floor/almayer/flooredge/south, +/area/almayer/living/briefing) +"cnw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/sign/safety/intercom{ - pixel_y = 28; - pixel_x = 15 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cnx" = ( +/obj/structure/sign/safety/south{ + pixel_x = -19; + pixel_y = 8 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/upper/midship_hallway) -"cbY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"cny" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"cnz" = ( +/obj/structure/sign/safety/water{ + pixel_x = 33 }, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -26 +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/tank/water{ + anchored = 1 }, -/turf/open/floor/almayer/blue, -/area/almayer/hallways/upper/midship_hallway) -"cbZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"cnA" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/blue, -/area/almayer/hallways/upper/midship_hallway) -"cca" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"cnB" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; layer = 3.33; @@ -43265,4378 +42819,7898 @@ /obj/effect/decal/warning_stripes{ icon_state = "N"; layer = 3.33; - pixel_y = 2 + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) +"cnC" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"cnD" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon2_shared) +"cnE" = ( +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 13; + density = 0 + }, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 13; + density = 0 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_y = 30; + pixel_x = 9 }, +/turf/open/floor/almayer/silver/north, +/area/almayer/command/computerlab) +"cnF" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; + icon_state = "W"; layer = 3.3 }, -/obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) -"ccb" = ( -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer/red/north, -/area/almayer/living/cryo_cells) -"ccc" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/upper_medical) -"ccd" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer/red/northeast, -/area/almayer/living/cryo_cells) -"cce" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; + layer = 3.33; pixel_y = 1 }, -/turf/open/floor/almayer/flooredgesmooth2/north, -/area/almayer/medical/upper_medical) -"ccf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"cnG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; + layer = 3.33; pixel_y = 1 }, -/turf/open/floor/almayer/flooredgesmooth3/north, -/area/almayer/medical/upper_medical) -"ccg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) +"cnH" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/turf/open/floor/almayer/plate, +/area/almayer/command/computerlab) +"cnI" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 }, -/turf/open/floor/almayer/silver/north, -/area/almayer/command/cichallway) -"cch" = ( +/turf/open/floor/almayer/orange/east, +/area/almayer/hallways/lower/port_umbilical) +"cnJ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) -"cci" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/roller/hospital_empty/bigrollerempty{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) -"ccj" = ( -/obj/structure/machinery/disposal{ - pixel_x = -1 +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/support) +"cnK" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cnL" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cnM" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/starboard_emb) +"cnN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) -"cck" = ( -/obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ icon_state = "E"; + layer = 3.33; pixel_x = 1 }, /obj/effect/decal/warning_stripes{ icon_state = "S"; layer = 3.3 }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) -"ccl" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 12 +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/sign/safety/rewire{ + pixel_y = -26; + pixel_x = 8 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/maint/hull/lower/l_a_p) +"cnO" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) -"ccm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/medical_supply_link/green, -/obj/structure/machinery/cm_vending/sorted/medical/marinemed{ - pixel_y = 1 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"cnP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item{ + pixel_x = 11; + pixel_y = 12 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) -"ccn" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cnQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item{ + pixel_x = -3; + pixel_y = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cnR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/firealarm{ + pixel_y = -25; + dir = 1 + }, +/turf/open/floor/almayer/silver, +/area/almayer/command/computerlab) +"cnS" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"cco" = ( -/turf/closed/wall/almayer/white, -/area/almayer/medical/medical_science) -"ccp" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - closeOtherId = "ciclobby_s"; - id_tag = "cic_exterior"; - name = "\improper Midship Security Checkpoint Access"; +/turf/open/floor/almayer/test_floor4, +/area/almayer/command/computerlab) +"cnT" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/upper/midship_hallway) -"ccq" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/living/briefing) +"cnU" = ( +/obj/structure/bed/chair/comfy/charlie, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cnV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cnW" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = -19; + pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/sign/safety/escapepod{ + pixel_x = -19; + pixel_y = -9 }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) -"ccr" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/medical/upper_medical) -"ccs" = ( -/obj/structure/bed/chair{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"cnX" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/rewire{ - layer = 2.4; - pixel_x = 6; - pixel_y = -26 +/turf/open/floor/almayer/test_floor4, +/area/almayer/hallways/lower/port_midship_hallway) +"cnY" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_y = 26 }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) -"cct" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"cnZ" = ( +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/upper_medical) -"ccu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 7; + pixel_y = 16 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/folder/white, +/obj/item/folder/black, +/obj/item/folder/black, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/folder/blue{ + pixel_y = 5; + pixel_x = 6 }, -/turf/open/floor/almayer/sterile_green_side, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) -"ccv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"coa" = ( /obj/structure/machinery/light, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) -"ccw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/cabinet/hybrisa/metal/alt{ + pixel_x = 1; + name = "morgue cabinet"; + storage_capacity = 100 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) -"ccx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) +"cob" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) -"ccy" = ( -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/hallways/upper/midship_hallway) -"ccz" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/blue/northeast, -/area/almayer/hallways/upper/midship_hallway) -"ccA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/hallways/upper/midship_hallway) -"ccB" = ( -/obj/structure/bed/chair{ - dir = 4 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) +"coc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) -"ccC" = ( +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon2_shared) +"cod" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/command/cic) +"coe" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; + layer = 3.33; pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"ccD" = ( -/obj/structure/cargo_container/uscm/right{ - layer = 3.1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/platoon2_shared) +"cof" = ( +/obj/structure/machinery/cm_vending/clothing/marine/support{ + pixel_y = 26; + density = 0 }, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/underdeck/req) -"ccE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) +"coh" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/upper_medical) -"ccF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 26 }, -/obj/structure/machinery/light{ - dir = 1 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"coi" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) -"ccG" = ( -/obj/structure/largecrate/random/secure, -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/turf/open/floor/plating, +/area/almayer/hallways/lower/port_fore_hallway) +"cok" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/light{ - dir = 8 +/turf/open/floor/almayer/test_floor4, +/area/almayer/hallways/lower/port_fore_hallway) +"col" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"ccH" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/firealarm{ - pixel_y = 26; - pixel_x = -1 +/turf/open/floor/almayer/test_floor4, +/area/almayer/hallways/lower/port_fore_hallway) +"com" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/bravo_support/yellow{ + name = "\improper 2nd Platoon's Briefing Room" }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) -"ccI" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"ccJ" = ( -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) -"ccK" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) -"ccL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_umbilical) -"ccM" = ( -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/medical_science) -"ccN" = ( -/turf/open/floor/almayer/redcorner/east, -/area/almayer/living/cryo_cells) -"ccO" = ( -/obj/structure/machinery/light, -/obj/structure/surface/table/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = 32 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = 14; - pixel_x = 32 +/area/almayer/living/briefing) +"con" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/computer/cameras/almayer{ - pixel_x = -2; - pixel_y = 18; +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/bravo_support{ dir = 8; - layer = 3.04 + name = "\improper 2nd Platoon's Briefing Room" }, -/obj/structure/machinery/computer/crew/alt{ - pixel_x = -2; +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/briefing) +"coo" = ( +/obj/structure/disposalpipe/segment{ dir = 8; - pixel_y = 2; - layer = 3.06 - }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/medical_science) -"ccP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" + icon_state = "pipe-c" }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/hallways/upper/midship_hallway) -"ccQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = -32 }, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, /turf/open/floor/almayer/plate, -/area/almayer/living/cryo_cells) -"ccR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 +/area/almayer/maint/hull/lower/l_f_s) +"cop" = ( +/obj/structure/platform{ + dir = 1; + layer = 2.9 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/hallways/upper/midship_hallway) -"ccS" = ( -/turf/open/floor/almayer/silverfull, -/area/almayer/hallways/upper/midship_hallway) -"ccT" = ( -/turf/open/floor/almayer/flooredge/east, -/area/almayer/hallways/upper/fore_hallway) -"ccU" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Midship Upper Medical Ladders"; +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/landmark/start/tank_crew, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) +"coq" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/port_midship_hallway) +"cor" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/bravo_support/yellow{ + req_one_access = list(2,21,17,16); + req_access = list(9) + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"ccV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/upper_medical) -"ccW" = ( -/obj/structure/sign/safety/reduction{ - pixel_y = 28; - pixel_x = 8 +/area/almayer/squads/platoon2_shared) +"cos" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) -"ccX" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"ccY" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10"; - pixel_y = 11 - }, -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/upper_medical) -"ccZ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Research Wing"; - id = null; - id_tag = "rsr01" +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon2_shared) +"cot" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/platoon2_shared) +"cou" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 + dir = 2 }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "researchlockdownext_door"; - name = "\improper Research Door Shutter" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/support{ + req_one_access = list(2,21,17,16) }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cda" = ( -/turf/closed/wall/almayer/white/reinforced, -/area/almayer/hallways/upper/midship_hallway) -"cdb" = ( -/obj/structure/machinery/autolathe, /turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cdc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdd" = ( -/obj/item/ashtray/plastic{ - pixel_x = -7; - pixel_y = 14 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = -26 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/research{ - pixel_y = 3; - dir = 8; - pixel_x = -3; - layer = 3.02 +/area/almayer/squads/platoon2_shared) +"cov" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/obj/structure/sign/safety/security{ + pixel_x = 32; + pixel_y = -8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cde" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 8; - pixel_x = 1 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 32; + pixel_y = 7 }, -/obj/item/storage/toolbox/electrical{ - pixel_y = 1; - pixel_x = -4 +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/general_equipment) +"cow" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon2_shared) +"cox" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/cell/high{ - pixel_x = -16; - pixel_y = 14 +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/support) +"coy" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28; + pixel_x = 8 }, -/obj/item/cell/high{ - pixel_x = -16; - pixel_y = 14 +/obj/structure/sign/safety/intercom{ + pixel_y = -26; + pixel_x = -1 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdf" = ( -/obj/structure/machinery/light{ - pixel_x = 16 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_aft_hallway) +"coz" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdg" = ( -/obj/structure/barricade/handrail/no_vault{ - dir = 4; - pixel_x = 1 - }, -/obj/structure/surface/rack{ - pixel_x = -1 - }, -/obj/item/clothing/accessory/storage/black_vest/acid_harness, -/obj/item/clothing/accessory/storage/black_vest/acid_harness, -/obj/item/stack/sheet/mineral/plastic{ - amount = 15; +/area/almayer/hallways/lower/port_aft_hallway) +"coA" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28; pixel_x = -1 }, -/obj/item/stack/sheet/metal{ - amount = 20 +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/port_aft_hallway) +"coC" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_aft_hallway) +"coD" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18"; + pixel_y = 12 }, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = 2; - pixel_y = 3 +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"coE" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) +"coF" = ( +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/port_aft_hallway) +"coG" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/door_control{ + id = "laddersouthwest"; + name = "South West Ladders Shutters"; + pixel_x = 5; + req_one_access_txt = "2;3;12;19"; + throw_range = 15; + pixel_y = -28 }, -/obj/item/reagent_container/spray/cleaner{ - pixel_y = 9; - pixel_x = -7 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"coH" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/port_fore_hallway) +"coI" = ( +/obj/structure/sign/safety/security{ + pixel_y = -26 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdh" = ( -/obj/structure/bed/roller/hospital_empty/bigrollerempty3{ - dir = 1 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = -26 }, -/obj/structure/sign/safety/rewire{ - layer = 2.4; +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"coJ" = ( +/obj/structure/sign/safety/maint{ pixel_x = 8; pixel_y = -26 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdi" = ( -/obj/structure/largecrate/random/barrel/true_random, -/obj/structure/machinery/light/red{ - dir = 8; - light_color = "#BB3F3F" - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/underdeck/req) -"cdj" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdk" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"coK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/port_midship_hallway) +"coL" = ( +/obj/structure/sign/safety/conference_room{ + pixel_x = 14; + pixel_y = -26 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"coM" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) -"cdl" = ( -/obj/structure/machinery/medical_pod/sleeper, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cdm" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 + icon_state = "S" }, -/turf/open/floor/almayer/cargo, -/area/almayer/medical/medical_science) -"cdn" = ( -/obj/structure/flora/pottedplant/random, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"coN" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; + icon_state = "SW-out"; pixel_x = -1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/cryo_cells) -"cdo" = ( -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"coO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -30 }, -/turf/open/floor/almayer/silver/west, -/area/almayer/living/cryo_cells) -"cdp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"coP" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -26 }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) -"cdq" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/structure/sign/safety/hazard{ + pixel_y = -26 }, -/obj/structure/sign/safety/cryo{ +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"coQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/port_midship_hallway) +"coR" = ( +/obj/structure/sign/safety/distribution_pipes{ pixel_y = -26; - pixel_x = -8 + pixel_x = 8 }, -/turf/open/floor/almayer/cargo, -/area/almayer/medical/medical_science) -"cdr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"coS" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/hallways/upper/fore_hallway) -"cds" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"coT" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"cdt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/tool, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/starboard_point_defense) +"coU" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/upper_medical) -"cdu" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"coV" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/upper_medical) -"cdv" = ( -/obj/structure/bed/roller/hospital_empty/bigrollerempty, -/obj/structure/sign/poster/safety{ - pixel_y = 32 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"coW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/upper_medical) -"cdw" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"cdx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"coX" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/upper_medical) -"cdy" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"coY" = ( +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"cdz" = ( -/obj/structure/machinery/disposal{ - pixel_x = -1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_aft_hallway) +"coZ" = ( +/turf/open/floor/almayer/research/containment/corner/east, +/area/almayer/medical/containment/cell) +"cpa" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdA" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/hallways/hangar) -"cdB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"cpb" = ( +/obj/structure/sign/safety/galley{ + pixel_x = 7; + pixel_y = 26 }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"cdC" = ( -/obj/structure/largecrate/random/secure{ - pixel_y = 11 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cpc" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16; - layer = 5.4 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) +"cpd" = ( +/obj/structure/sign/poster{ + desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; + icon_state = "poster7"; + name = "EAT - poster"; + pixel_y = 32 }, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/underdeck/req) -"cdD" = ( -/obj/structure/machinery/light, -/obj/structure/medical_supply_link/green, -/obj/structure/machinery/cm_vending/sorted/medical/bolted{ - pixel_x = -1; - pixel_y = 1 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"cpe" = ( +/turf/open/floor/almayer/flooredge/north, +/area/almayer/hallways/lower/port_aft_hallway) +"cpf" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 26 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdE" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/beakers{ - pixel_x = -6; - pixel_y = 8 +/obj/structure/sign/safety/firingrange{ + pixel_y = 26 }, -/obj/item/storage/box/sprays{ - pixel_x = -6 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"cpg" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/item/storage/box/pillbottles{ - pixel_x = 6; - pixel_y = 8 +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/turf/open/floor/plating, +/area/almayer/living/briefing) +"cph" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/briefing) +"cpi" = ( +/obj/structure/machinery/atm{ + pixel_y = 32 }, -/obj/item/storage/box/pillbottles{ - pixel_x = 6 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cpj" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 6; + pixel_y = 13 }, -/obj/structure/sign/safety/storage{ - pixel_x = 32; - pixel_y = 6 +/obj/structure/machinery/light, +/turf/open/floor/almayer/blue, +/area/almayer/living/bridgebunks) +"cpk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdG" = ( -/obj/structure/machinery/centrifuge{ - pixel_y = 8; +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/port_point_defense) +"cpl" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 26; pixel_x = -1 }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = -5; - layer = 3.01 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cpm" = ( +/obj/structure/sign/safety/galley{ + pixel_x = 8; + pixel_y = 26 }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = -10; - layer = 3.01 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cpn" = ( +/obj/structure/sign/safety/intercom{ + pixel_y = 26; + pixel_x = 7 }, -/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_aft_hallway) +"cpo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdH" = ( -/obj/structure/machinery/computer/working_joe{ - pixel_x = 2; - pixel_y = 4; +/area/almayer/living/briefing) +"cpp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/biohazard_lockdown{ - pixel_y = -11; - pixel_x = 4 +/turf/open/floor/almayer, +/area/almayer/living/offices) +"cpq" = ( +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/living/briefing) +"cpr" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cps" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 5 }, -/obj/item/cell/high{ - pixel_x = -12; - pixel_y = -9 +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 8 }, -/obj/item/cell/high{ - pixel_x = -12; - pixel_y = -9; - layer = 3.01 +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 11 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdI" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 14 }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) -"cdJ" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdK" = ( -/obj/structure/barricade/handrail/no_vault{ - dir = 4; - pixel_x = 1 +/obj/item/trash/USCMtray{ + pixel_x = -15; + pixel_y = 5 }, -/obj/structure/machinery/disposal{ - pixel_x = -1 +/obj/item/trash/USCMtray{ + pixel_x = -15; + pixel_y = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/item/trash/USCMtray{ + pixel_x = -15; + pixel_y = 11 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdL" = ( -/obj/structure/bed/roller/hospital_empty/bigrollerempty3{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpt" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -10; + pixel_y = 3 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdM" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cdN" = ( -/obj/effect/landmark/start/researcher, -/obj/effect/landmark/late_join/researcher, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cdO" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -6; + pixel_y = 3 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -3; + pixel_y = 3 }, -/turf/open/floor/almayer/cargo, -/area/almayer/medical/medical_science) -"cdP" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 5; + pixel_y = 3 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie) -"cdQ" = ( -/obj/structure/sign/safety/medical{ - pixel_y = 6; - pixel_x = 32 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 8; + pixel_y = 3 }, -/obj/structure/sign/safety/ladder{ - pixel_x = 32; - pixel_y = -8 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 11; + pixel_y = 3 }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpu" = ( +/turf/open/floor/almayer/green/west, +/area/almayer/living/briefing) +"cpv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/green/east, -/area/almayer/hallways/upper/fore_hallway) -"cdR" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 8; - pixel_x = 2 - }, +/area/almayer/living/briefing) +"cpw" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 8 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12; + pixel_x = -9 }, -/obj/item/tool/pen{ - pixel_x = -1; - pixel_y = 3 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) -"cdS" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12; + pixel_x = 9 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"cdT" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cdU" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 25 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5; + pixel_x = 9 }, -/obj/structure/sign/safety/hazard{ - pixel_y = 25 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5; + pixel_x = -9 }, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cdV" = ( -/obj/structure/machinery/cm_vending/gear/medic, +/area/almayer/living/briefing) +"cpx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/fridge, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cdW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"cdX" = ( -/obj/structure/machinery/cm_vending/gear/engi, +/area/almayer/living/briefing) +"cpy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/fridge, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cdY" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 +/area/almayer/living/briefing) +"cpz" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_s) +"cpA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green/east, +/area/almayer/squads/req) +"cpB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/platform_decoration/metal/almayer/west, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/lower_medical_lobby) +"cpC" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"cpD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Security Checkpoint"; + access_modified = 1; + req_access = null; + req_one_access_txt = "3;19" }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) -"cdZ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/briefing) +"cpE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpF" = ( +/turf/open/floor/almayer/green/southwest, +/area/almayer/living/briefing) +"cpG" = ( +/turf/open/floor/almayer/green, +/area/almayer/living/briefing) +"cpH" = ( +/turf/open/floor/almayer/greencorner/west, +/area/almayer/living/briefing) +"cpI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/greencorner, +/area/almayer/living/briefing) +"cpJ" = ( +/obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/upper/u_m_s) -"cea" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) -"ceb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Research Armory"; - req_one_access_txt = "4;28"; - pixel_x = -22 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) -"cec" = ( -/obj/structure/machinery/vending/cola/research{ - pixel_x = -2; - pixel_y = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "or4privacyshutter"; + name = "\improper Privacy Shutters" }, -/obj/structure/sign/safety/fire_haz{ - pixel_y = 28 +/turf/open/floor/plating, +/area/almayer/medical/operating_room_four) +"cpK" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "ROlobby2"; + name = "\improper RO Line 2" }, -/obj/structure/sign/safety/chem_lab{ - pixel_x = 14; - pixel_y = 28 +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/turf/open/floor/plating, +/area/almayer/squads/req) +"cpL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green2, +/area/almayer/living/briefing) +"cpM" = ( +/turf/open/floor/almayer/green2/southeast, +/area/almayer/living/briefing) +"cpN" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/vending/coffee{ + pixel_x = -1 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/sign/safety/coffee{ + pixel_y = -26; + pixel_x = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - layer = 3.33; - pixel_x = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpO" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/barricade/handrail{ + dir = 4 }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpP" = ( +/obj/structure/blocker/fuelpump, /turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"ced" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/area/almayer/lifeboat_pumps/north1) +"cpQ" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/barricade/handrail{ dir = 8 }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/medical_science) -"cee" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ + pixel_x = 1; + pixel_y = 4; + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpS" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/vending/cigarette/koorlander{ + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) -"cef" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpT" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/item/toy/beach_ball/holoball{ + pixel_x = -11; + pixel_y = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green/west, +/area/almayer/living/briefing) +"cpV" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redcorner, +/area/almayer/living/briefing) +"cpW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/misc/mre/empty{ + pixel_y = 12; + pixel_x = -6 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) -"ceg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/ammo_box/magazine/misc/mre/empty{ + pixel_y = 3; + pixel_x = 2 }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/alpha) -"ceh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cei" = ( +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cpX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"cpY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/greencorner, +/area/almayer/living/briefing) +"cpZ" = ( +/turf/open/floor/almayer/green2, +/area/almayer/living/briefing) +"cqa" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/medical/medical_science) -"cej" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler{ - pixel_x = -6; - pixel_y = -15 +/turf/open/floor/almayer/green2, +/area/almayer/living/briefing) +"cqb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo_arrow, +/area/almayer/living/briefing) +"cqc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, -/obj/item/storage/box/bodybags{ - pixel_y = 7; - pixel_x = -6 +/turf/open/floor/almayer/greencorner, +/area/almayer/living/briefing) +"cqd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/item/storage/box/bodybags{ - pixel_y = 1; - pixel_x = 3 +/turf/open/floor/almayer/orangecorner/north, +/area/almayer/hallways/lower/starboard_umbilical) +"cqe" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/brown{ + pixel_y = 21; + pixel_x = 7 }, -/obj/structure/sign/safety/refridgeration{ - pixel_y = 28 +/obj/item/facepaint/green{ + pixel_x = -7; + pixel_y = 4 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 28; - pixel_x = 14 +/obj/item/facepaint/black{ + pixel_y = 4; + pixel_x = 7 }, -/turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) -"cek" = ( -/obj/structure/flora/bush/ausbushes/var3/ppflowers{ - name = "fake ppflowers"; - desc = "Just like a real plant, but fake!" +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/squads/req) +"cqg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/grass, -/area/almayer/medical/upper_medical) -"cel" = ( -/obj/structure/platform_decoration/metal/almayer/west, +/turf/closed/wall/almayer, +/area/almayer/living/briefing) +"cqh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/briefing) -"cem" = ( -/obj/structure/platform/metal/almayer/west, +"cqi" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) -"cen" = ( +/area/almayer/living/briefing) +"cqj" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) -"ceo" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_y = 2; - pixel_x = 5 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqk" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_y = -5; - pixel_x = 5 +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) +"cql" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_x = -4; - pixel_y = -5 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) -"cep" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Research Armory"; - name = "\improper Armory Shutters"; - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) -"ceq" = ( -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) -"cer" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/medical/medical_science) -"ces" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/medical_science) -"cet" = ( -/obj/structure/sign/safety/biolab{ - pixel_x = 14; - pixel_y = 28 +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) +"cqm" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/folder/white{ + pixel_y = 6 }, -/obj/structure/sign/safety/water{ - pixel_y = 28 +/obj/item/folder/white{ + pixel_x = 5; + pixel_y = 6 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) -"ceu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/medical_science) -"cev" = ( -/obj/structure/sign/safety/distribution_pipes{ +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) +"cqn" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/deck{ pixel_x = 7; - pixel_y = 28 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) -"cew" = ( -/obj/structure/sign/poster/art2{ - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) -"cex" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 + pixel_y = 11 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Cryosleep Storage Room"; - req_one_access = list(28,206,207); - req_access = list() +/obj/item/toy/deck{ + pixel_x = -5; + pixel_y = 11 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cey" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - dir = 8; - name = "Morgue"; - req_one_access = list(25) +/obj/item/toy/deck/uno{ + pixel_x = -5; + pixel_y = 2 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"cez" = ( -/obj/item/toy/plush/therapy/random_color{ - pixel_y = 2; - pixel_x = 2 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/req) +"cqp" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cqq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/platform/metal/almayer/north, -/obj/structure/platform/metal/almayer/west, -/obj/structure/platform_decoration/metal/almayer/northeast{ - layer = 4.1 +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = 31 }, -/obj/structure/bed/chair/comfy{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) +"cqr" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = -26 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/upper_medical) -"ceA" = ( -/obj/structure/platform_decoration/metal/almayer/east, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) -"ceB" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_x = -4; - pixel_y = 2 +/obj/structure/sign/safety/security{ + pixel_y = -26 }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_x = -4; - pixel_y = -5 +/obj/structure/machinery/gibber, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_y = 2; - pixel_x = 5 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"cqs" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 }, -/obj/item/clothing/suit/storage/marine/light/vest{ - pixel_y = -5; - pixel_x = 5 +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"cqt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) -"ceC" = ( -/obj/structure/prop/almayer/ship_memorial, -/turf/open/floor/almayer/plating, -/area/almayer/living/starboard_garden) -"ceD" = ( -/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock PU-3"; - dir = 1 +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/living/grunt_rnr) +"cqu" = ( +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19" }, /turf/open/floor/almayer/test_floor4, -/area/almayer/powered) -"ceE" = ( -/turf/closed/wall/almayer, -/area/almayer/command/cichallway) -"ceF" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Emergency Research Armory Release"; - pixel_x = -31; - pixel_y = 26 - }, -/turf/open/floor/almayer/plating_stripedcorner/north, -/area/almayer/medical/upper_medical) -"ceG" = ( +/area/almayer/living/briefing) +"cqv" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 + icon_state = "door_warning2"; + layer = 3.33; + dir = 8; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/medical_science) -"ceH" = ( -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"cqw" = ( +/obj/item/ashtray/plastic{ + pixel_x = -4; + pixel_y = -12 }, -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/medical_science) -"ceI" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/trash/ceramic_plate{ + pixel_y = 10; + pixel_x = -3 }, -/turf/open/floor/plating, -/area/almayer/medical/hydroponics) -"ceJ" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Research Hydroponics"; - req_one_access = list(28,206,207); - dir = 2 +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 14; + pixel_x = -7 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 12; + pixel_x = -1 }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/hydroponics) -"ceK" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/plate, -/area/almayer/living/bridgebunks) -"ceL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/area/almayer/living/briefing) +"cqx" = ( +/obj/item/ashtray/plastic{ + pixel_x = 1; + pixel_y = -7 }, -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/medical_science) -"ceM" = ( -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/medical_science) -"ceN" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ResearchStairs"; - name = "\improper Stairway Lockdown" +/obj/item/trash/ceramic_plate{ + pixel_y = 15 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - dir = 8; - name = "\improper Research Workshop" +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 17; + pixel_x = -3 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 19; + pixel_x = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"ceO" = ( -/obj/structure/sign/safety/cryo{ - pixel_y = -28 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green/east, +/area/almayer/living/briefing) +"cqA" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/reagent_container/food/drinks/cans/souto, +/obj/item/reagent_container/food/snacks/margheritaslice{ + desc = "A slice of classic pizza ruined by the corps."; + name = "dirty margherita slice"; + pixel_x = -3; + pixel_y = 3 }, -/obj/structure/machinery/cm_vending/clothing/medical_crew/researcher, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"ceP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/item/clothing/gloves/latex, +/obj/item/trash/uscm_mre, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 11; + pixel_y = 7 }, -/obj/structure/sign/poster/corporate{ - pixel_y = 5; - pixel_x = 26 +/obj/item/stack/medical/ointment{ + layer = 3.5; + pixel_x = -7; + pixel_y = 13 }, -/turf/open/floor/almayer/silver/east, -/area/almayer/hallways/upper/midship_hallway) -"ceQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) -"ceR" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - name = "fake grassybush"; - desc = "Just like a real plant, but fake!" +/obj/item/trash/cigbutt/ucigbutt{ + desc = "A handful of rounds to reload on the go."; + icon = 'icons/obj/items/weapons/guns/handful.dmi'; + icon_state = "bullet_2"; + name = "handful of pistol bullets (9mm)"; + pixel_x = -8 }, -/turf/open/floor/grass, -/area/almayer/medical/upper_medical) -"ceS" = ( -/obj/structure/platform_decoration/metal/almayer/west, -/obj/structure/platform_decoration/metal/almayer/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) -"ceT" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/obj/structure/machinery/light/small{ +/obj/item/clothing/glasses/disco_fever{ + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqB" = ( +/obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) -"ceU" = ( -/obj/structure/sign/safety/ammunition{ - pixel_y = -7; - pixel_x = -17 +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/lower_medical_lobby) +"cqC" = ( +/obj/structure/sink{ + pixel_y = 24; + pixel_x = -4 }, -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = 7 +/obj/item/tool/soap{ + pixel_y = 24 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) -"ceV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"cqD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"cqE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_x = 1; + wrenchable = 0; + pixel_y = 7 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"cqF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/orange/west, -/area/almayer/hallways/upper/midship_hallway) -"ceW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"ceX" = ( -/obj/structure/transmitter/rotary{ - name = "Main Research Laboratory Telephone"; - phone_category = "Medical & Research Dept."; - phone_id = "Main Research Laboratory"; - pixel_y = 8; - pixel_x = -11 - }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"ceY" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; +/obj/structure/machinery/reagentgrinder{ + pixel_y = 7 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"cqG" = ( +/obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"ceZ" = ( -/obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/almayer/silver/northwest, -/area/almayer/shipboard/brig/cic_hallway) -"cfa" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/barricade/handrail{ dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cfb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" + pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cqH" = ( +/obj/structure/pipes/vents/scrubber{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/maint/hull/lower/l_m_s) +"cqI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cqJ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/medical_science) -"cfc" = ( -/obj/structure/platform/metal/almayer_smooth, -/turf/open_space, -/area/almayer/medical/containment) -"cfd" = ( -/obj/structure/pipes/vents/scrubber, -/obj/structure/bed/chair{ - dir = 8; - buckling_x = 7; - buckling_y = 7 +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/general_equipment) +"cqK" = ( +/obj/item/ashtray/plastic{ + pixel_x = -4; + pixel_y = 12 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cfe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqL" = ( +/obj/item/ashtray/plastic{ + pixel_x = -4; + pixel_y = 12 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"cff" = ( -/obj/structure/surface/table/reinforced/black, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqM" = ( /obj/structure/machinery/light{ - dir = 4 + unacidable = 1; + unslashable = 1 }, +/turf/open/floor/almayer/red, +/area/almayer/shipboard/brig/processing) +"cqN" = ( /obj/item/ashtray/plastic{ - pixel_x = -6; + pixel_x = 4; pixel_y = 5 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cfg" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32 - }, -/turf/open/floor/almayer/green/east, -/area/almayer/hallways/upper/fore_hallway) -"cfh" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 8 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqO" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/grass, -/area/almayer/medical/upper_medical) -"cfi" = ( -/obj/structure/largecrate/random{ - pixel_y = 8 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cqP" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/obj/structure/largecrate/random/case/small{ - pixel_y = 23; - pixel_x = 5; - layer = 3.1 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/req) +"cqQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/no_build, -/area/almayer/underdeck/req) -"cfj" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/structure/noticeboard{ - pixel_y = 31 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) -"cfk" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/port_missiles) -"cfl" = ( -/obj/structure/machinery/chem_simulator{ - pixel_y = 16; - density = 0; - explo_proof = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cfm" = ( -/obj/structure/flora/pottedplant{ - desc = "Life is underwhelming, especially when you're a potted plant."; - icon_state = "pottedplant_22"; - name = "Jerry"; - pixel_y = 8 - }, -/obj/item/clothing/glasses/sunglasses/prescription{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) -"cfn" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/starboard_missiles) +"cqR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; - layer = 3.33; pixel_x = 1 }, -/obj/structure/pipes/vents/scrubber, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26; - pixel_x = 1 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"cqS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/poster{ + pixel_x = 25; + pixel_y = 3 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) -"cfo" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"cfp" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 25 +/area/almayer/living/briefing) +"cqT" = ( +/obj/structure/machinery/microwave{ + density = 0; + pixel_y = 7; + pixel_x = 3 }, -/obj/structure/sign/safety/hazard{ - pixel_y = 25 +/obj/structure/machinery/light{ + dir = 8 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cfq" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cfr" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) -"cfs" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) -"cft" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"cfu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/medical_science) -"cfv" = ( -/obj/structure/machinery/washing_machine{ - pixel_y = 16; - density = 0 +/area/almayer/living/grunt_rnr) +"cqU" = ( +/obj/structure/machinery/microwave{ + density = 0; + pixel_y = 7; + pixel_x = -2 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cfw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"cfx" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"cqV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -6; + pixel_y = 6 }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/upper/fore_hallway) -"cfy" = ( -/obj/structure/morgue{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"cqW" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "kitchen"; + name = "\improper Kitchen Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/grunt_rnr) +"cqX" = ( /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" + icon_state = "cargo" }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfz" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) -"cfA" = ( -/obj/structure/machinery/chem_master/vial{ - pixel_x = -2; - pixel_y = 2; - explo_proof = 1 - }, -/obj/item/reagent_container/glass/beaker/bluespace{ - pixel_y = 14; - pixel_x = -3 - }, +/area/almayer/living/briefing) +"cqY" = ( +/turf/open/floor/almayer/cargo_arrow/west, +/area/almayer/living/briefing) +"cqZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cfB" = ( -/turf/closed/wall/almayer/research/containment/wall/south, -/area/almayer/medical/medical_science) -"cfC" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Test_Chamber"; - name = "\improper Test Chamber Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Test Chamber"; - req_one_access = null; - dir = 2 +/area/almayer/living/briefing) +"cra" = ( +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 4; + pixel_y = 7 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cfD" = ( -/obj/structure/bedsheetbin{ - pixel_y = 2; - layer = 3.05 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crb" = ( +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crd" = ( +/obj/structure/machinery/computer/supply, +/obj/structure/sign/safety/galley{ + pixel_x = -17 }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/medical_science) -"cfE" = ( -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/starboard_missiles) -"cfF" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/medical/medical_science) -"cfG" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/morgue) -"cfH" = ( -/obj/structure/morgue{ - dir = 8 +/turf/open/floor/almayer/plate, +/area/almayer/squads/req) +"cre" = ( +/obj/structure/machinery/light{ + dir = 4 }, /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" - }, -/obj/structure/machinery/light/small/blue, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfI" = ( -/obj/structure/bed/chair/comfy{ - buckling_y = 2; - pixel_y = 2; - dir = 8 + icon_state = "SE-out"; + pixel_x = 1 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"crf" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cfJ" = ( -/obj/structure/machinery/chem_dispenser/research{ - pixel_y = 2; - explo_proof = 1 - }, -/obj/structure/sign/safety/ref_chem_storage{ - pixel_x = 32 - }, +/area/almayer/squads/platoon1_shared) +"crg" = ( +/obj/structure/closet/crate/freezer, +/obj/effect/decal/cleanable/dirt, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/mystery, +/obj/item/pizzabox/mystery, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"crh" = ( /obj/structure/machinery/light{ dir = 1 }, -/obj/item/reagent_container/glass/beaker/bluespace, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cfK" = ( -/turf/closed/wall/almayer/research/containment/wall/west, -/area/almayer/medical/medical_science) -"cfL" = ( -/turf/closed/wall/almayer/research/containment/wall/east, -/area/almayer/medical/medical_science) -"cfM" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) -"cfN" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/south1) +"cri" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_f_s) +"crj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/barman_recipes{ + pixel_x = 5; + pixel_y = 9 }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) -"cfO" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - name = "\improper Research's Meeting Room"; - req_one_access = list(28,206,207) +/obj/item/book/manual/chef_recipes{ + pixel_x = 6; + pixel_y = 5 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/tool/hand_labeler{ + pixel_x = -6; + pixel_y = -5 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ResearchStairs"; - name = "\improper Stairway Lockdown" +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = -7 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cfP" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/tool/pen{ + pixel_x = -9; + pixel_y = 2 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - name = "Researchers' Quarters"; - req_one_access = list(28,206,207) +/obj/item/tool/pen{ + pixel_x = -9; + pixel_y = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"cfQ" = ( -/obj/structure/sign/poster/corporate{ - pixel_y = 5; - pixel_x = 26 +/obj/item/tool/pen{ + pixel_x = -9; + pixel_y = 2 }, -/turf/open/floor/almayer/green/east, -/area/almayer/hallways/upper/fore_hallway) -"cfR" = ( -/obj/structure/morgue, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"crk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/rag{ + pixel_x = -5; + pixel_y = 10 }, +/obj/item/clothing/mask/cigarette, +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"crl" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge, +/area/almayer/living/briefing) +"crm" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfS" = ( -/obj/structure/morgue{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"crn" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/living/briefing) +"cro" = ( /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/obj/structure/machinery/light/small/blue, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfT" = ( -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/medical_science) -"cfU" = ( -/obj/structure/morgue{ - dir = 1 +/turf/open/floor/almayer/silver/north, +/area/almayer/living/briefing) +"crp" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, /obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" + icon_state = "S" }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfV" = ( -/obj/structure/pipes/vents/scrubber, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfW" = ( -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cfX" = ( +/area/almayer/living/grunt_rnr) +"crq" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 6; - pixel_x = -17 - }, -/obj/structure/sign/safety/refridgeration{ - pixel_y = -8; - pixel_x = -17 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) -"cfY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"cfZ" = ( -/obj/structure/sign/calendar/wy{ - pixel_y = 29 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/beaker/catalyst/silver{ - pixel_x = -5; - pixel_y = 11 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/item/reagent_container/glass/beaker/large{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/item/reagent_container/glass/beaker/large{ +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"crr" = ( +/obj/structure/surface/table/reinforced/almayer_blend, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/item/desk_bell{ + anchored = 1; pixel_x = 4; - pixel_y = 5 + pixel_y = 15; + ring_cooldown_length = 10 }, -/obj/item/reagent_container/glass/beaker/large{ - pixel_x = 4; - pixel_y = 5 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "kitchen"; + name = "\improper Kitchen Shutters" }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = -7; - pixel_y = 1 +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/grunt_rnr) +"crs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = -7; - pixel_y = 1 +/turf/open/floor/almayer/uscm/directional, +/area/almayer/living/briefing) +"crt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = -7; - pixel_y = 1 +/turf/open/floor/almayer/silver/northeast, +/area/almayer/living/briefing) +"cru" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) -"cga" = ( -/obj/structure/medical_supply_link, -/obj/structure/machinery/cm_vending/sorted/medical/chemistry{ - pixel_x = -1; - pixel_y = 2; - explo_proof = 1 +/obj/effect/decal/cleanable/dirt, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28; + pixel_x = -5 }, -/obj/structure/machinery/status_display{ - pixel_y = 32 +/obj/structure/sign/safety/intercom{ + pixel_y = 28; + pixel_x = 17 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cgb" = ( -/turf/closed/wall/almayer/research/containment/wall/north, -/area/almayer/medical/medical_science) -"cgc" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ +/turf/open/floor/almayer/silverfull2, +/area/almayer/living/briefing) +"crv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/area/almayer/medical/medical_science) -"cgd" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) -"cge" = ( -/obj/item/trash/plate{ - pixel_x = 7; - pixel_y = 11 +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 3; + pixel_y = 12 }, -/obj/item/reagent_container/food/snacks/cheesewedge{ - pixel_x = 6; - pixel_y = 14; - layer = 3.03 +/turf/open/floor/almayer/silver/north, +/area/almayer/living/briefing) +"crw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/mob/living/simple_animal/small/mouse/white/Doc, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) -"cgf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/silver/north, +/area/almayer/living/briefing) +"crx" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/hydroponics) -"cgg" = ( +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"cry" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 4 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"crz" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"crA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 8; icon_state = "pipe-c" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) -"cgh" = ( -/obj/structure/machinery/reagentgrinder{ - pixel_y = 9 +/turf/open/floor/almayer/greencorner/east, +/area/almayer/living/briefing) +"crB" = ( +/turf/open/floor/almayer/green/north, +/area/almayer/living/briefing) +"crC" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crD" = ( +/turf/open/floor/almayer/greencorner/north, +/area/almayer/squads/req) +"crE" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) -"cgi" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) -"cgj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cgk" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) -"cgl" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie_delta_shared) -"cgm" = ( +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crG" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/obj/structure/sign/safety/conference_room{ - pixel_x = 7; - pixel_y = -26 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/medical_science) -"cgn" = ( -/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"crH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/ladder/multiz, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/medical_science) -"cgo" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) -"cgp" = ( -/obj/structure/disposalpipe/segment{ +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"crI" = ( +/obj/structure/machinery/light{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "kitchen"; + name = "Kitchen Shutters"; + pixel_x = 28; + pixel_y = -7 }, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/medical_science) -"cgq" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/smart, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"cgr" = ( -/obj/structure/machinery/cm_vending/clothing/medic/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgs" = ( -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgt" = ( -/obj/structure/machinery/cm_vending/clothing/engi/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgu" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgv" = ( -/obj/structure/machinery/cm_vending/clothing/leader/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "kitchen-top"; + name = "Kitchen Shutters"; + pixel_x = 28; + pixel_y = 10 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/obj/structure/machinery/disposal{ + pixel_x = -1 }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/medical_science) -"cgx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/medical_science) -"cgy" = ( -/obj/structure/bed/chair{ +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"crJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/uscm/directional/west, +/area/almayer/living/briefing) +"crK" = ( +/turf/open/floor/almayer/silverfull2, +/area/almayer/living/briefing) +"crL" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/trash/ceramic_plate, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 5; + pixel_x = 3 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +/obj/item/reagent_container/food/condiment/sugar{ + pixel_y = 21; + pixel_x = 5 }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crM" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "cargo" }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"cgz" = ( -/obj/structure/machinery/disposal{ - pixel_x = -1 +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/disposalpipe/trunk{ +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"crN" = ( +/obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cgA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/area/almayer/living/briefing) +"crO" = ( +/obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "N"; + layer = 3.33; + pixel_y = 2 }, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cgB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/area/almayer/living/grunt_rnr) +"crP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/morgue) -"cgC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) -"cgD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"crQ" = ( +/obj/structure/surface/table/reinforced/almayer_blend/north, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/item/desk_bell{ + anchored = 1; + pixel_x = -3; + pixel_y = 8; + ring_cooldown_length = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "kitchen-top"; + name = "\improper Kitchen Shutters" }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) -"cgE" = ( -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) -"cgF" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/grunt_rnr) +"crR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) -"cgG" = ( +/turf/open/floor/almayer/uscm/directional/north, +/area/almayer/living/briefing) +"crS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/southeast, +/area/almayer/living/briefing) +"crT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) -"cgH" = ( -/obj/structure/disposalpipe/segment{ +/turf/open/floor/almayer/silverfull2, +/area/almayer/living/briefing) +"crU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) -"cgI" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - dir = 2; - name = "Morgue"; - req_one_access = list(25) - }, +/area/almayer/living/briefing) +"crV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"cgJ" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/turf/open/floor/almayer/silver, +/area/almayer/living/briefing) +"crW" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"crX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"cgK" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = 14; - pixel_y = 28 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26; - pixel_x = -7 - }, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/medical_science) -"cgL" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/sign/calendar/wy{ - pixel_y = 29 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) -"cgM" = ( -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) -"cgN" = ( -/obj/structure/surface/table/reinforced/black, -/obj/structure/machinery/light{ +/turf/open/floor/almayer/flooredge, +/area/almayer/living/briefing) +"crY" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/obj/structure/machinery/hybrisa/coffee_machine{ - pixel_y = 13; +/turf/open/floor/almayer/flooredge, +/area/almayer/living/briefing) +"crZ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/greencorner, +/area/almayer/living/briefing) +"csa" = ( +/obj/structure/barricade/handrail{ + dir = 4; + layer = 3.1; pixel_x = 1 }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/structure/sign/safety/coffee{ - pixel_x = 32; - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"cgO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 8; - pixel_y = 6 - }, -/turf/open/floor/almayer/silver/southeast, -/area/almayer/shipboard/brig/cic_hallway) -"cgP" = ( -/obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cgQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/medical/morgue) -"cgR" = ( -/obj/structure/surface/rack{ - pixel_y = 16; - pixel_x = 5; - density = 0 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = 5 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = 5 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = 5 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) -"cgS" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) -"cgT" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cic_hallway) -"cgU" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_p) -"cgV" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"cgW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/underdeck/hangar) +"csb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green, +/area/almayer/living/briefing) +"csc" = ( /obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"cgX" = ( -/obj/structure/machinery/botany/extractor{ - density = 0; - pixel_x = -5; - pixel_y = 16 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"csd" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) +"cse" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/knife{ + pixel_y = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/hydroponics) -"cgY" = ( -/obj/structure/machinery/botany/editor{ - density = 0; - pixel_x = -15; - pixel_y = 16 +/obj/item/tool/kitchen/knife{ + pixel_y = 5; + pixel_x = -5 }, /turf/open/floor/almayer/plate, -/area/almayer/medical/hydroponics) -"cgZ" = ( -/obj/structure/machinery/seed_extractor{ - density = 0; - pixel_y = 17; - pixel_x = -21 - }, -/obj/structure/machinery/vending/hydroseeds{ - density = 0; - pixel_x = 4; - pixel_y = 16; - req_access_txt = "28" +/area/almayer/living/grunt_rnr) +"csf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/rag{ + pixel_x = 4 }, -/obj/item/storage/box/botanydisk{ - pixel_y = 34; - pixel_x = 2 +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 5; + pixel_y = 15 }, -/obj/structure/machinery/firealarm{ +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) +"csg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/hydroponics) -"cha" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -1; - pixel_y = 5 + id = "kitchen-top"; + name = "\improper Kitchen Shutters" }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"chb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/grunt_rnr) +"csh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"csi" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 2 + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"csj" = ( +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"csk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"csl" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/upper/starboard) -"chd" = ( -/obj/structure/machinery/vending/cigarette/koorlander{ +/turf/open/floor/almayer/silver, +/area/almayer/living/briefing) +"csm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green/north, +/area/almayer/living/briefing) +"csn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; pixel_x = 1 }, -/obj/structure/sign/safety/galley{ - pixel_x = 32; - pixel_y = 9 +/obj/structure/sign/nosmoking_1{ + pixel_x = 25; + pixel_y = -6 }, -/obj/structure/sign/safety/bathunisex{ +/obj/structure/sign/safety/medical{ pixel_x = 32; - pixel_y = -5 - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"che" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 + pixel_y = 9 }, -/obj/structure/machinery/door/airlock/almayer/white{ - dir = 2; - name = "\improper Bathroom" +/obj/structure/sign/safety/outpatient{ + pixel_x = 46; + pixel_y = 9 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) -"chf" = ( -/obj/structure/window/reinforced{ +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) +"cso" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/firealarm{ dir = 4; - health = 80 + pixel_x = 21 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/charlie_delta_shared) -"chg" = ( -/obj/structure/surface/table/reinforced/black, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/briefing) +"csp" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/machinery/microwave{ - pixel_y = 7 + density = 0; + pixel_y = 7; + pixel_x = 3 }, -/obj/item/storage/box/donkpockets{ - pixel_x = -4; - pixel_y = 19 +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"chh" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/sign/safety/rewire{ - layer = 2.4; - pixel_x = -17 +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"csq" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -18; + pixel_x = -4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"chi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/area/almayer/living/grunt_rnr) +"csr" = ( +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_x = 1; + wrenchable = 0; + pixel_y = 7 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"chj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/area/almayer/living/grunt_rnr) +"css" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ - name = "Morgue"; - req_one_access = list(25) +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 7 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"chk" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/medic, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"chl" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/engineer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"chm" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/spec, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"chn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/sl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"cho" = ( -/obj/structure/closet/cabinet/hybrisa/metal/alt{ - pixel_x = 1; - name = "morgue cabinet"; - storage_capacity = 100 +/obj/structure/sign/calendar{ + pixel_y = 29 }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"chp" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/area/almayer/living/grunt_rnr) +"cst" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 }, +/obj/structure/barricade/handrail, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; - pixel_x = -1; + layer = 2.5; pixel_y = 1 }, +/turf/open/floor/almayer/flooredge, +/area/almayer/living/briefing) +"csu" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, /turf/open/floor/almayer, -/area/almayer/squads/bravo) -"chq" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"chr" = ( +/area/almayer/hallways/lower/starboard_aft_hallway) +"csv" = ( +/obj/structure/closet/secure_closet/fridge/organic, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"chs" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/sign/safety/fridge{ + pixel_y = 26; + pixel_x = 7 }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/morgue) -"cht" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/junction{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"csw" = ( +/obj/structure/closet/secure_closet/fridge/groceries, +/obj/structure/sign/nosmoking_1{ + pixel_y = 28 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"chu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"chv" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) -"chw" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/upper_medical) -"chx" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/upper_medical) -"chy" = ( -/obj/structure/toilet{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"csx" = ( +/obj/structure/machinery/processor{ + pixel_x = -2 }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 26 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/upper_medical) -"chz" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 26 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"chA" = ( -/obj/structure/sign/safety/intercom{ - pixel_y = 28; - pixel_x = 18 +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/obj/structure/bed/chair/comfy/charlie{ - name = "comfy chair"; - desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in purple."; - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) +"csy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"chB" = ( -/obj/item/device/radio/intercom{ - name = "General Listening Channel"; - pixel_y = 27; - freerange = 1; - canhear_range = 3 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) +"csz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/foodcart, +/turf/open/floor/almayer/cargo, +/area/almayer/living/briefing) +"csA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/glass{ - pixel_x = 2; - pixel_y = -2 +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"csB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"chC" = ( -/obj/structure/machinery/light{ - dir = 1 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"csC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -10; + pixel_y = 3 }, -/obj/structure/coatrack{ - pixel_y = 2; - pixel_x = 9 +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -6; + pixel_y = 3 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) -"chD" = ( -/obj/structure/toilet{ - dir = 4; - pixel_y = 8 +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -3; + pixel_y = 3 }, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 5; + pixel_y = 3 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"chE" = ( -/obj/structure/sink{ - pixel_y = 20; - layer = 3.02 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 8; + pixel_y = 3 }, -/obj/structure/mirror{ - pixel_x = -1; - pixel_y = 32 +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 11; + pixel_y = 3 }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; + icon_state = "SE-out"; pixel_x = 1 }, +/turf/open/floor/almayer/green/west, +/area/almayer/living/briefing) +"csD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/medical_science) -"chF" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/item/tool/soap/deluxe{ - pixel_x = -5; - pixel_y = 5 + icon_state = "SW-out" }, -/obj/structure/machinery/door/window/westright, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"chG" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/sign/safety/fridge{ +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"csE" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"csF" = ( +/obj/item/reagent_container/food/drinks/coffeecup/wy, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"csG" = ( +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ pixel_x = 7; - pixel_y = 28 + pixel_y = 17 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) -"chH" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"csH" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/sign/safety/refridgeration{ - pixel_y = -8; - pixel_x = -17 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 6; - pixel_x = -17 + pixel_y = 2 }, /turf/open/floor/almayer/flooredgesmooth2/north, -/area/almayer/hallways/upper/fore_hallway) -"chI" = ( +/area/almayer/medical/lower_medical_lobby) +"csI" = ( +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/south1) +"csJ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 32 + icon_state = "E"; + pixel_x = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredgesmooth3/north, -/area/almayer/hallways/upper/fore_hallway) -"chJ" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/morgue) -"chK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) -"chL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"csK" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12; + pixel_x = -9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12 }, -/turf/open/floor/almayer/orangecorner, -/area/almayer/squads/bravo) -"chM" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 12; + pixel_x = 9 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5; + pixel_x = -9 }, -/turf/open/floor/almayer/emeraldcorner/east, -/area/almayer/squads/charlie) -"chO" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_y = 5; + pixel_x = 9 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) -"chP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"csL" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 6; + pixel_y = 1 }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) -"chQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/almayer/green/west, +/area/almayer/living/briefing) +"csM" = ( +/turf/open/floor/almayer/greencorner/east, +/area/almayer/living/briefing) +"csN" = ( +/turf/open/floor/almayer/green2/north, +/area/almayer/living/briefing) +"csO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/turf/open/floor/almayer/emeraldcorner/north, -/area/almayer/squads/charlie) -"chR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/green2/north, +/area/almayer/living/briefing) +"csP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/living/briefing) +"csQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green2/northwest, +/area/almayer/living/briefing) +"csR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/green2/north, +/area/almayer/living/briefing) +"csS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/greencorner/east, +/area/almayer/living/briefing) +"csT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/east, +/area/almayer/living/briefing) +"csU" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Security Checkpoint"; + access_modified = 1; + req_access = null; + req_one_access_txt = "3;19" }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 25 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/briefing) +"csV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) -"chT" = ( +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"csW" = ( +/turf/open/floor/almayer/green/northwest, +/area/almayer/living/briefing) +"csX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/greencorner/east, +/area/almayer/living/briefing) +"csY" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge/northwest, -/area/almayer/medical/morgue) -"chU" = ( -/obj/structure/disposalpipe/up/almayer{ - dir = 2; - id = "almayerlink_med_req" +/turf/open/floor/almayer/green2/northeast, +/area/almayer/living/briefing) +"csZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/morgue) -"chV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) -"chW" = ( -/obj/structure/pipes/vents/scrubber{ +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) +"cta" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/barricade/handrail{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ + pixel_x = -1; + pixel_y = 4 }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ctb" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/barricade/handrail{ + dir = 8 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) -"chX" = ( -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/upper_medical) -"chY" = ( -/obj/structure/ladder/multiz, -/obj/structure/machinery/light, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/hallways/upper/midship_hallway) -"chZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/fire_haz{ - pixel_y = 28; - pixel_x = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ctc" = ( +/obj/structure/machinery/vending/cigarette/koorlander{ + pixel_x = -1 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cia" = ( -/obj/structure/ladder/multiz, -/obj/structure/machinery/light{ - dir = 8 +/area/almayer/living/briefing) +"ctd" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating, -/area/almayer/hallways/upper/fore_hallway) -"cib" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cte" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 36 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) -"cic" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/light{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredgesmooth2/south, +/area/almayer/medical/lower_medical_lobby) +"ctf" = ( +/obj/structure/closet/secure_closet/fridge, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ctg" = ( +/obj/structure/closet/secure_closet/fridge, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/obj/item/reagent_container/food/drinks/milk, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cth" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/s_bow) +"cti" = ( +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + pixel_x = -14; + layer = 2.9 + }, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + layer = 2.9; + pixel_x = -2 + }, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + pixel_x = 10; + layer = 2.9 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"ctj" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/alpha) -"cid" = ( -/obj/structure/machinery/optable, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/morgue) -"cie" = ( -/obj/structure/morgue{ - dir = 2 +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -6; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -10; + pixel_y = 3 }, -/obj/structure/machinery/light/small/blue{ - dir = 1 +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/tool/kitchen/utensil/pspoon{ + pixel_x = 11; + pixel_y = 3 }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cif" = ( +/area/almayer/living/briefing) +"ctk" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 4 +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/item/trash/USCMtray{ + pixel_x = 5; + pixel_y = 14 }, -/obj/item/tank/emergency_oxygen/double, /turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_umbilical) -"cig" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/area/almayer/living/briefing) +"ctl" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/hallways/upper/midship_hallway) -"cih" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/squads/req) +"ctm" = ( /obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 + name = "ship-grade camera" }, -/turf/open/floor/almayer/blue, -/area/almayer/hallways/upper/midship_hallway) -"cii" = ( -/obj/structure/machinery/status_display{ +/turf/open/floor/almayer/redcorner/east, +/area/almayer/living/cryo_cells) +"ctn" = ( +/obj/structure/machinery/atm{ pixel_y = -32 }, -/turf/open/floor/almayer/blue, -/area/almayer/hallways/upper/midship_hallway) -"cij" = ( -/obj/structure/sign/safety/autoopenclose{ +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cto" = ( +/obj/structure/sign/safety/galley{ pixel_x = 7; pixel_y = -26 }, -/turf/open/floor/almayer/silver, -/area/almayer/hallways/upper/midship_hallway) -"cik" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctp" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) -"cil" = ( -/obj/structure/machinery/light, -/obj/structure/sign/safety/waterhazard{ +/area/almayer/maint/hull/lower/l_a_s) +"ctq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctr" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/starboard_fore_hallway) +"cts" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"ctt" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctu" = ( +/obj/structure/sign/safety/cryo{ pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/south2) -"cim" = ( -/obj/structure/morgue/crematorium, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" + pixel_y = -26 }, /turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"cin" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredgesmooth3/south, -/area/almayer/hallways/upper/fore_hallway) -"cio" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/autopsy_scanner{ - pixel_y = 13; - pixel_x = 4 - }, -/obj/item/tool/surgery/circular_saw, -/obj/item/tool/surgery/cautery, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/blue{ - dir = 8 +/area/almayer/hallways/lower/starboard_aft_hallway) +"ctv" = ( +/obj/structure/sign/safety/firingrange{ + pixel_y = -26 }, -/obj/item/tool/surgery/hemostat{ - pixel_x = -8; - pixel_y = 3 +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -26 }, -/obj/item/tool/surgery/retractor, -/obj/item/tool/surgery/scalpel, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/morgue) -"cip" = ( -/obj/structure/sink{ - pixel_y = 20; - layer = 3.02 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_aft_hallway) +"ctw" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/test_floor4, +/area/almayer/hallways/lower/port_umbilical) +"ctx" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) -"ciq" = ( -/obj/structure/transmitter{ - name = "Morgue Telephone"; - phone_category = "Medical & Research Dept."; - phone_id = "Morgue"; - pixel_x = -1; - pixel_y = 27 +/obj/structure/window/reinforced{ + dir = 4; + pixel_y = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) -"cir" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/green, -/area/almayer/squads/req) -"cis" = ( -/obj/structure/filingcabinet{ - pixel_y = 16; - pixel_x = 8; - density = 0 +/obj/structure/bed{ + icon_state = "abed"; + layer = 3.5; + pixel_y = 12 }, -/obj/structure/filingcabinet/medical{ - pixel_x = -8; - layer = 2.96; - pixel_y = 16; - density = 0 +/obj/item/bedsheet/orange{ + pixel_y = 12 }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) -"cit" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 8; - pixel_x = 7; - layer = 2.97 +/obj/item/bedsheet/orange{ + layer = 3.2 }, -/obj/item/tool/pen{ - pixel_x = 5; - pixel_y = 2 +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 }, -/obj/item/clipboard{ - pixel_x = -6; - pixel_y = 1 +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) +"cty" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/tool/hand_labeler{ - pixel_x = -6 +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctz" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/obj/item/tool/stamp{ - pixel_x = -5; - pixel_y = 12; - name = "Medical Examiner's rubber stamp" +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctA" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctB" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/flooredge/southwest, -/area/almayer/medical/morgue) -"ciu" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/machinery/door_control{ + id = "laddernorthwest"; + name = "North West Ladders Shutters"; + pixel_x = 9; + req_one_access_txt = "2;3;12;19"; + throw_range = 15; + pixel_y = 33 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"ctC" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 26 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) -"civ" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/engineering/upper_engineering) -"ciw" = ( +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctD" = ( +/turf/open/floor/almayer/flooredge/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctE" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredge/south, -/area/almayer/hallways/upper/fore_hallway) -"cix" = ( -/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock PU-4"; - dir = 1 +/turf/open/floor/almayer/flooredge/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctF" = ( +/obj/structure/sign/safety/conference_room{ + pixel_x = 14; + pixel_y = 26 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/powered) -"ciy" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) -"ciz" = ( -/obj/structure/sign/safety/refridgeration{ - pixel_y = -26; +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; pixel_x = 1 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -26; - pixel_x = 15 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) -"ciA" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) -"ciB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctK" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 26 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctL" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 26 }, -/obj/structure/prop/invuln/lattice_prop{ +/obj/structure/sign/safety/hazard{ + pixel_y = 26 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctM" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctN" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"ctO" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/offices/flight) +"ctP" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/hangar) +"ctQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/item/tool/weldingtool{ + pixel_x = -7; + pixel_y = 3 + }, +/turf/open/floor/almayer/silver, +/area/almayer/hallways/lower/repair_bay) +"ctR" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/gym) +"ctS" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/offices) +"ctT" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -15 + name = "\improper Cryogenics Bay" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) -"ciC" = ( -/obj/structure/largecrate/random, -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/underdeck/req) -"ciD" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cryo) +"ctU" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/l_m_s) +"ctV" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ + name = "\improper 1rst Platoon's Briefing Room (Alpha)"; + req_one_access = list(2,21,15,18,15) }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) -"ciE" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/briefing) +"ctW" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) -"ciF" = ( -/obj/structure/sign/safety/intercom{ - pixel_y = 28; - pixel_x = 18 +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + name = "\improper 1rst Platoon's Briefing Room (Delta)" }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/upper/midship_hallway) -"ciG" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/hallways/upper/midship_hallway) -"ciH" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/briefing) +"ctX" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ctY" = ( +/turf/closed/wall/almayer, +/area/almayer/squads/platoon1_shared) +"ctZ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ + req_one_access = list(2,21,15,18) }, -/turf/open/floor/almayer/green/northwest, -/area/almayer/hallways/upper/fore_hallway) -"ciI" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 28 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/upper/fore_hallway) -"ciJ" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) +"cua" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) +"cub" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/platoon1_shared) +"cuc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + req_one_access = list(2,21,15,18) + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) +"cud" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/delta) +"cue" = ( /obj/structure/sign/safety/intercom{ + pixel_y = 26; + pixel_x = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cuf" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; pixel_y = 28; - pixel_x = 18 + pixel_x = 1 }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/upper/fore_hallway) -"ciK" = ( -/obj/structure/sign/safety/north{ - pixel_x = 14; - pixel_y = 28 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cug" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 }, -/obj/structure/sign/safety/escapepod{ - pixel_y = 28 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cuh" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 26; + pixel_x = -1 }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/upper/fore_hallway) -"ciL" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/sign/safety/maint{ - pixel_x = 7; - pixel_y = -26 +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cui" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 26 }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/lifeboat_pumps/north1) -"ciM" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -26 +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cuj" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/north1) -"ciN" = ( -/turf/open/floor/almayer/silver/southeast, -/area/almayer/shipboard/brig/cic_hallway) -"ciO" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"cuk" = ( /obj/structure/sign/safety/maint{ - pixel_x = 7; - pixel_y = -26 + pixel_y = 26; + pixel_x = 7 }, /turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/north1) -"ciP" = ( -/obj/structure/largecrate/random/case/small, -/obj/structure/machinery/light, -/turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/north1) -"ciQ" = ( -/obj/structure/sign/safety/fire_haz{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/hallways/lower/starboard_aft_hallway) +"cul" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item{ + pixel_y = 10; + pixel_x = -11 }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) -"ciR" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 +/obj/item/prop/helmetgarb/gunoil{ + layer = 4.2; + pixel_x = 7; + pixel_y = 9 }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) -"ciS" = ( -/obj/structure/sign/safety/synth_storage{ - pixel_x = 8; - pixel_y = 25 +/obj/item/prop/helmetgarb/gunoil{ + layer = 4.2; + pixel_x = 2; + pixel_y = 3 }, -/turf/open/floor/almayer_hull, -/area/space) -"ciT" = ( -/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock SU-5"; +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cum" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/alpha{ dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/powered) -"cjc" = ( -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/flooredge/south, +/area/almayer/living/briefing) +"cun" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -19; + pixel_y = 9 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -19; + pixel_y = -6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cuo" = ( +/obj/structure/machinery/cm_vending/clothing/marine/alpha, +/turf/open/floor/almayer/plate, /area/almayer/squads/alpha) -"cjd" = ( +"cup" = ( +/obj/structure/sign/prop3{ + pixel_x = -30 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon1_shared) +"cuq" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) -"cjf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"cur" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) -"cjg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon1_shared) +"cus" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = list(); + req_one_access = list(15,18); + vend_x_offset = 0; + vend_y_offset = 0 }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cut" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W"; + layer = 3.3 }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/platoon1_shared) +"cuu" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) -"cjk" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 6"; - pixel_x = -24 + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/cells) -"cjm" = ( -/obj/structure/surface/rack, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon1_shared) +"cuv" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta, /turf/open/floor/almayer/plate, -/area/almayer/maint/upper/u_a_p) -"cjt" = ( -/turf/open/floor/almayer/orange, -/area/almayer/engineering/lower) -"cjA" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/area/almayer/squads/delta) +"cuw" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) +"cux" = ( +/obj/structure/bed/chair/comfy/alpha{ dir = 1 }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cuy" = ( +/obj/item/tool/warning_cone{ + pixel_y = 13 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cjC" = ( -/obj/structure/machinery/vending/cola{ +/area/almayer/hallways/hangar) +"cuz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta{ + dir = 1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cuA" = ( +/obj/structure/sign/safety/north{ + pixel_x = -19; + pixel_y = -8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cuB" = ( +/obj/structure/machinery/cm_vending/gear/tl{ density = 0; - pixel_y = 16 + vend_x_offset = 1; + pixel_x = -26; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) +"cuC" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/engineering/upper_engineering/starboard) +"cuD" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redfull2, +/area/almayer/squads/alpha) +"cuE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/tl/alpha{ + density = 0; + pixel_x = 26; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cuF" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) +"cuG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, /obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cuH" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"cjE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/area/almayer/squads/platoon1_shared) +"cuI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon1_shared) +"cuJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; + layer = 3.33; pixel_x = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon1_shared) +"cuK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; - pixel_x = -1 + layer = 3.3 }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/squads/charlie) -"cjW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/lower_medical_medbay) -"ckd" = ( +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon1_shared) +"cuL" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; + layer = 3.33; pixel_x = 1 }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon1_shared) +"cuM" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /turf/open/floor/almayer/plate, -/area/almayer/living/intel) -"cke" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 18 +/area/almayer/squads/platoon1_shared) +"cuN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) -"ckh" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/sign/safety/escapepod{ + pixel_x = -17 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/turf/open/floor/almayer/red/west, +/area/almayer/hallways/upper/starboard) +"cuO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_fore_hallway) -"ckj" = ( -/obj/structure/surface/table/almayer, -/obj/item/stack/nanopaste{ - pixel_x = -3; - pixel_y = 14 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/p_stern) -"ckr" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/delta) -"ckP" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/silver/east, -/area/almayer/shipboard/brig/cic_hallway) -"ckQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/blue/north, +"cuP" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/underdeck/hangar) +"cuQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, /area/almayer/squads/delta) -"ckR" = ( +"cuR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) +"cuS" = ( +/obj/structure/machinery/light, /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; - pixel_y = 16 + pixel_x = 26 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/cargo, /area/almayer/squads/delta) -"ckW" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, -/area/almayer/engineering/lower) -"ckX" = ( -/turf/open/floor/almayer/blue/north, +"cuT" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"ckZ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/power/power_generator/reactor{ - pixel_x = -1; - pixel_y = -3 +"cuU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/bluefull2, +/area/almayer/squads/delta) +"cuV" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/engineering/lower/engine_core) -"cle" = ( -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/lower_medical_lobby) -"clg" = ( +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cuW" = ( +/obj/structure/closet, +/obj/item/clothing/mask/cigarette/weed, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cuX" = ( +/obj/item/bedsheet/yellow, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cuY" = ( +/obj/effect/landmark/start/marine/smartgunner/delta, +/obj/effect/landmark/late_join/delta, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"clh" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +"cuZ" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_y = -16 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cva" = ( +/obj/structure/largecrate/random/case/double, +/obj/item/tool/wet_sign{ + pixel_y = 18 + }, +/obj/item/trash/cigbutt/ucigbutt{ + desc = "A handful of rounds to reload on the go."; + icon = 'icons/obj/items/weapons/guns/handful.dmi'; + icon_state = "bullet_2"; + name = "handful of pistol bullets (9mm)"; + pixel_x = -8; + pixel_y = 10 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"cli" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/area/almayer/maint/hull/lower/l_f_s) +"cvb" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/bluecorner, -/area/almayer/squads/delta) -"clj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/squads/req) +"cvc" = ( +/obj/structure/coatrack, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvd" = ( +/obj/item/trash/uscm_mre, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_y = -16 }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) -"clk" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 3 }, -/obj/structure/disposalpipe/segment{ +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cve" = ( +/obj/structure/bed/chair/comfy/alpha{ dir = 4 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/living/briefing) +"cvf" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 }, -/turf/open/floor/almayer/bluecorner/west, -/area/almayer/squads/delta) -"cll" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cvg" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"cvh" = ( +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"clm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/hallways/lower/starboard_midship_hallway) +"cvi" = ( +/obj/structure/machinery/cm_vending/clothing/tl/alpha{ + density = 0; + pixel_x = -26; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/bluecorner, -/area/almayer/squads/delta) -"cln" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) +"cvj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + vend_x_offset = 1; + pixel_x = 26; + pixel_y = 1 }, -/obj/structure/machinery/alarm/almayer{ - dir = 1; - pixel_y = -29 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cvk" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/alpha{ + density = 0; + pixel_x = 26; + pixel_y = 1 }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) -"clo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red2/northeast, +/area/almayer/squads/alpha) +"cvl" = ( +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_x = -26 }, -/turf/open/floor/almayer/bluecorner/west, -/area/almayer/squads/delta) -"clp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) +"cvm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cvn" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cvo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon1_shared) +"cvp" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" - }, -/turf/open/floor/almayer/blue/southwest, -/area/almayer/squads/delta) -"cls" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/port_point_defense) -"clw" = ( -/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, -/area/almayer/command/airoom) -"clE" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/medic, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clF" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/engineer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clG" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/spec, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clH" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/sl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/smart, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) -"clJ" = ( -/obj/structure/machinery/cm_vending/clothing/medic/delta, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clK" = ( -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clL" = ( -/obj/structure/machinery/cm_vending/clothing/engi/delta, /turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cvq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, /area/almayer/squads/delta) -"clM" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/delta, -/turf/open/floor/almayer/plate, +"cvr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/cargo, /area/almayer/squads/delta) -"clN" = ( -/obj/structure/machinery/cm_vending/clothing/leader/delta, -/turf/open/floor/almayer/plate, +"cvs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/delta) -"clS" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 +"cvt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clT" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clV" = ( -/obj/structure/machinery/computer/arcade, -/turf/open/floor/almayer/green/northwest, -/area/almayer/squads/req) -"clW" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/delta, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/north, /area/almayer/squads/delta) -"clX" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 +"cvu" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 3 }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = -27; + serial_number = 11 }, /turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clY" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"clZ" = ( -/obj/structure/machinery/cm_vending/gear/engi, +/area/almayer/maint/hull/lower/l_f_s) +"cvv" = ( +/obj/item/trash/cigbutt, /turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"cme" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/area/almayer/maint/hull/lower/l_f_s) +"cvw" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/tray{ + pixel_y = 5 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_y = 18; + pixel_x = -6 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"cmf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_y = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvx" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/lower/cryo_cells) +"cvy" = ( +/obj/structure/bed/stool, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/underdeck/hangar) +"cvA" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_y = -16 }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvB" = ( +/obj/item/trash/crushed_cup, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvC" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/living/gym) +"cvD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) +"cvE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cvF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4 + }, +/obj/item/ammo_magazine/smartgun, +/obj/item/ammo_magazine/smartgun, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cvG" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad/platoon1{ + req_access = list(); + req_one_access = list(15,18) + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cvH" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +"cvI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/hallways/upper/port) +"cvJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/platoon1_shared) +"cvK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8 + }, +/obj/item/ammo_magazine/smartgun, +/obj/item/ammo_magazine/smartgun, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cvL" = ( +/obj/structure/sign/poster/pinup{ + pixel_x = -30 + }, +/obj/structure/sign/poster/hunk{ + pixel_x = -25; + pixel_y = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvN" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/crushed_cup, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/ashtray/plastic{ + pixel_x = 5; + pixel_y = -10 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_y = -16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_y = 16 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvO" = ( +/obj/item/trash/buritto, +/obj/structure/bed/stool, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvQ" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_y = -16 + }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 30 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_y = 16 + }, +/obj/item/frame/rack, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvR" = ( +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1 }, -/obj/structure/machinery{ - density = 1; - dir = 4; - icon = 'icons/obj/vehicles/tank.dmi'; - icon_state = "tank_base"; - explo_proof = 1; - name = "M34A2 Longstreet Light Tank"; - pixel_y = -45; - unacidable = 1; - unslashable = 1; - use_power = 0; - needs_power = 0; - pixel_x = -11; - desc = "A giant piece of armor with a big gun, you know what to do. Entrance in the back."; - layer = 2.9 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) +"cvT" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, -/obj/item/ammo_magazine/hardpoint/ltb_cannon{ - pixel_x = -7 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cvU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cvV" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/engineer{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) +"cvW" = ( +/obj/structure/prop/invuln/joey, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cvX" = ( +/obj/structure/sign/poster/blacklight{ + pixel_y = 35 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/reagent_dispensers/beerkeg/alt_dark{ + anchored = 1; + chemical = null; + density = 0; + pixel_x = -7; + pixel_y = 10 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvY" = ( +/obj/structure/sign/poster/clf{ + pixel_x = -28 + }, +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 + }, +/obj/structure/largecrate/random/barrel/red, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_x = -2; + pixel_y = 16 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cvZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silver/east, +/area/almayer/command/cic) +"cwa" = ( +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cwb" = ( +/obj/item/tool/warning_cone{ + pixel_x = -28; + pixel_y = 18 }, -/turf/open/floor/almayer/no_build, -/area/almayer/underdeck/vehicle) -"cml" = ( -/turf/open/floor/almayer/plating_striped/north, -/area/almayer/shipboard/port_point_defense) -"cmo" = ( /obj/structure/surface/table/almayer, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/tool, -/obj/item/packageWrap, -/turf/open/floor/almayer/green/west, -/area/almayer/squads/req) -"cmr" = ( +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 + }, +/obj/item/toy/deck{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_y = 1; + pixel_x = 3 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tuxedo{ + pixel_x = 7; + pixel_y = 19 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"cwc" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cwd" = ( +/obj/structure/machinery/cm_vending/clothing/smartgun/alpha{ + density = 0; + pixel_x = 26; + pixel_y = 1 + }, +/turf/open/floor/almayer/red2/southeast, +/area/almayer/squads/alpha) +"cwe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cwf" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/alpha) +"cwg" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cwh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"cwi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/platoon1_shared) +"cwj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon1_shared) +"cwk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/platoon1_shared) +"cwl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon1_shared) +"cwm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cwn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/platoon1_shared) +"cwo" = ( +/obj/structure/largecrate/random/mini/chest{ + pixel_x = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) -"cmv" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 +/area/almayer/squads/req) +"cwp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 2 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/platoon1_shared) +"cwq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/processing) -"cmC" = ( -/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock SL-1"; +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cwr" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ dir = 1 }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/powered) -"cmK" = ( -/obj/structure/pipes/vents/pump{ +/area/almayer/squads/platoon1_shared) +"cws" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cwt" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) +"cwu" = ( +/obj/structure/cargo_container/uscm/mid{ + layer = 3.1 + }, +/turf/open/floor/almayer/plating_striped/south, +/area/almayer/underdeck/req) +"cwv" = ( +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/delta) +"cww" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) +"cwx" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) +"cwy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) +"cwz" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/offices/cryo) +"cwA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/silver/west, -/area/almayer/command/securestorage) -"cmL" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/alpha) +"cwB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon1_shared) +"cwC" = ( +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/starboard_hallway) +"cwD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon1_shared) +"cwE" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cwF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/platoon1_shared) +"cwG" = ( /obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon1_shared) +"cwH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon1_shared) +"cwI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/platoon1_shared) +"cwJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cwK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/platoon1_shared) +"cwL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cwM" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) +"cwN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) +"cwO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cwP" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"cwQ" = ( +/obj/structure/bed/chair{ + dir = 1; + pixel_y = 3 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cwR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cwS" = ( +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) +"cwT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/living/briefing) +"cwU" = ( +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cwV" = ( +/obj/structure/bed/chair/comfy/alpha, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cwW" = ( +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cwX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cwY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/living/briefing) +"cwZ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/living/briefing) +"cxa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/safety{ + pixel_x = 27 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) +"cxb" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_midship_hallway) -"cmM" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/medical) -"cmN" = ( -/obj/structure/largecrate/random/secure, +"cxc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) +"cxd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) +"cxe" = ( +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) +"cxf" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cxg" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24; + pixel_y = 3 + }, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/alpha) +"cxh" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 28 + }, +/obj/item/stack/sheet/cardboard/medium_stack{ + layer = 3.01; + pixel_x = 6; + pixel_y = 3 + }, /turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) -"cmS" = ( +/area/almayer/squads/platoon1_shared) +"cxi" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cxj" = ( +/obj/structure/sign/nosmoking_1{ + pixel_y = 28 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_y = 6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cxk" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"cxl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxm" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 26; + pixel_x = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxn" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1; + pixel_y = 22 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxo" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxp" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxq" = ( +/obj/structure/sign/banners/maximumeffort{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxr" = ( +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxs" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 26; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxt" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/delta) +"cxu" = ( +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/delta) +"cxv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cxw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/delta) +"cxx" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/spec{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) +"cxy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_y = -29; + pixel_x = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/blue2/southwest, +/area/almayer/squads/delta) +"cxz" = ( +/obj/structure/surface/rack, +/obj/item/storage/belt/utility/full{ + pixel_y = 8 + }, +/obj/item/storage/belt/utility/full, +/obj/item/clothing/suit/storage/hazardvest/black, +/obj/item/tool/crowbar, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cxA" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/deck{ + pixel_y = 5; + pixel_x = 8 + }, +/obj/item/trash/cigbutt/ucigbutt{ + layer = 3.7; + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/ashtray/plastic{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cxB" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/south2) +"cxC" = ( +/obj/effect/landmark/start/researcher, +/obj/effect/landmark/late_join/researcher, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices/cryo) +"cxD" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_s) +"cxE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon1_shared) +"cxF" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/structure/barricade/handrail, +/turf/open/floor/almayer/test_floor5, +/area/almayer/hallways/lower/port_midship_hallway) +"cxG" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/platoon1_shared) +"cxH" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/squads/platoon1_shared) +"cxI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/delta) +"cxJ" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = -8 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = -18; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) +"cxK" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 + }, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/delta) +"cxL" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cxM" = ( +/obj/structure/bed/chair, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"cxN" = ( +/obj/item/trash/boonie, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_s) +"cxO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cxP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redfull2, +/area/almayer/squads/alpha) +"cxQ" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"cxR" = ( +/turf/open/floor/almayer/redfull2, +/area/almayer/squads/alpha) +"cxS" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/sign/safety/hazard{ + pixel_y = 26 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 26 + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cxT" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cxU" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 26 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 26 + }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) +"cxV" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) +"cxW" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) +"cxX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"cxY" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/storage/firstaid{ + pixel_x = 5; + pixel_y = 13 + }, +/obj/item/clipboard, +/obj/item/paper, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cxZ" = ( +/obj/item/tool/warning_cone{ + pixel_y = 18 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_s) +"cya" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 1; + pixel_x = -26 + }, +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 16; + pixel_x = 2; + density = 0 + }, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) +"cyb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cyc" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/starboard_hallway) +"cyd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cye" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/tl{ + dir = 4; + req_access = list(32,18); + req_one_access = list() + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) +"cyf" = ( +/obj/structure/platform/metal/almayer/north, +/obj/item/tool/mop, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) +"cyg" = ( +/obj/item/tool/screwdriver{ + layer = 2.9; + pixel_x = -21; + pixel_y = -14 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/foodcart, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"cyh" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Passenger Cryogenics Bay" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/upper/u_m_p) +"cyi" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/obj/item/device/radio/marine{ + pixel_y = 6 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cyj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cyk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) +"cyl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) +"cym" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/alpha) +"cyn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) +"cyo" = ( +/obj/structure/machinery/vending/cigarette/koorlander, +/turf/open/floor/almayer/green/southwest, +/area/almayer/squads/req) +"cyp" = ( +/obj/structure/machinery/conveyor{ + id = "lower_garbage" + }, +/obj/structure/plasticflaps, +/turf/open/floor/almayer/plating_striped/east, +/area/almayer/maint/hull/lower/l_a_p) +"cyq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer/cargo_arrow/west, +/area/almayer/squads/alpha) +"cyr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cys" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"cyt" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/offices/cryo) +"cyu" = ( +/obj/item/prop/magazine/boots/n131{ + pixel_x = -1; + pixel_y = 5 + }, +/turf/closed/wall/almayer, +/area/almayer/living/offices/cryo) +"cyv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/upper/u_f_p) +"cyw" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cyx" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"cyy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = 26 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) +"cyB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyC" = ( +/obj/effect/landmark/start/marine/tl/alpha, +/obj/effect/landmark/late_join/alpha, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"cyD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) +"cyG" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_s) +"cyH" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "northcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer/redfull, +/area/almayer/maint/hull/lower/l_m_s) +"cyI" = ( +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cyJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 1; + pixel_x = -26 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools{ + pixel_y = 16; + pixel_x = 3; + density = 0 + }, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) +"cyK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cyL" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/trash/USCMtray, +/turf/open/floor/almayer/bluefull, +/area/almayer/living/captain_mess) +"cyM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/engi/alpha{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cyN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/clothing/engi/alpha{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) +"cyO" = ( +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_y = 26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) +"cyP" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer/silver/west, +/area/almayer/command/securestorage) +"cyQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyR" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"cyS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cyT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) +"cyU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) +"cyW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) +"cyX" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) +"cyY" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "northcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_s) +"cyZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +"cza" = ( +/obj/structure/sign/safety/airlock{ + pixel_x = 15; + pixel_y = 26 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 26 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/starboard_point_defense) +"czb" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 26; + pixel_x = 7 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_s) +"czc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/maint/hull/lower/l_m_s) +"czd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer/test_floor4, +/area/almayer/living/starboard_emb) +"cze" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -27 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czg" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/squads/alpha) +"czh" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) +"czi" = ( +/obj/effect/landmark/start/marine/smartgunner/alpha, +/obj/effect/landmark/late_join/alpha, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"czj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) +"czk" = ( +/obj/structure/largecrate/random/case/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"czm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czn" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czp" = ( +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer/plating_stripedcorner/west, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czq" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/squads/alpha) +"czr" = ( +/obj/effect/landmark/start/marine/smartgunner/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"czs" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czu" = ( +/obj/structure/pipes/vents/scrubber, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czv" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czx" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/mono, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czy" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6; + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) +"czz" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czB" = ( +/obj/docking_port/stationary/emergency_response/external/hangar_starboard{ + dwidth = 8 + }, +/turf/open/space, +/area/space) +"czC" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = 26 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czD" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czE" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 7; + pixel_y = 26 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czF" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/l_a_s) +"czG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czI" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"czJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/living/starboard_emb) +"czK" = ( +/obj/effect/landmark/yautja_teleport, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czL" = ( +/obj/structure/curtain/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"czM" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"czO" = ( +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/plating/almayer/no_build, +/area/almayer/stair_clone/lower/starboard_aft) +"czP" = ( +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/plating_striped/east, +/area/almayer/stair_clone/lower/starboard_aft) +"czQ" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czS" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Secretroom"; + explo_proof = 1; + unacidable = 1; + dir = 8 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_s) +"czT" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/effect/spawner/random/toolbox{ + pixel_x = -4; + pixel_y = -9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"czU" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 33 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"czV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_s) +"czW" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) +"czX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"czY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/prop/server_equipment/yutani_server{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"czZ" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAa" = ( +/obj/structure/machinery/power/apc/almayer/south, +/turf/open/floor/almayer/no_build, +/area/almayer/stair_clone/lower/starboard_fore) +"cAb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 + }, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAc" = ( +/obj/structure/machinery/light/red{ + dir = 4; + light_color = "#BB3F3F" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 + }, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/clothing/suit/storage/hazardvest/blue, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAf" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAg" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAh" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open_space, +/area/almayer/middeck/briefing) +"cAi" = ( +/turf/open_space, +/area/almayer/middeck/briefing) +"cAj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/largecrate/random/case/double, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cAk" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/medical) +"cAl" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + dir = 8; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"cAm" = ( +/obj/effect/decal/heavy_cable/node_s_w_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAn" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + dir = 4; + light_color = "#BB3F3F" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAq" = ( +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAs" = ( +/obj/effect/decal/heavy_cable/node_s_w_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cAt" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) +"cAu" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/largecrate/random/barrel/medical, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/medical) +"cAv" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/largecrate/random/barrel/medical, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cAw" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cAx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19"; + dir = 2 + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"cAy" = ( +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cAz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/middeck/briefing) +"cAA" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/briefing) +"cAC" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open_space, +/area/almayer/middeck/briefing) +"cAD" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open_space, +/area/almayer/middeck/briefing) +"cAE" = ( +/obj/item/reagent_container/glass/watertank, +/turf/closed/wall/almayer/reinforced, +/area/almayer/middeck/req) +"cAF" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal2"; + dir = 4 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/lower_medical_lobby) +"cAG" = ( +/obj/structure/machinery/seed_extractor, +/obj/effect/decal/heavy_cable/cable_vertical, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/node_s_w_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/barricade/handrail/no_vault, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/barricade/handrail/no_vault, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAK" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/prop/server_equipment/yutani_server, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cAL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"cAM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAO" = ( +/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 = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cAP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/machinery/light{ + dir = 1; + pixel_x = -16 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/middeck/briefing) +"cAQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cAR" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/mp_bunks) +"cAS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAT" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/barricade/handrail/no_vault{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAU" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAV" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAW" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/platform/metal/almayer_smooth, +/turf/open_space, +/area/almayer/middeck/briefing) +"cAX" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/briefing) +"cAY" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/machinery/light/red{ + dir = 8; + light_color = "#BB3F3F" + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cAZ" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/structure/machinery/light/red{ + dir = 4; + light_color = "#BB3F3F" + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cBa" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cBb" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) +"cBc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/middeck/medical) +"cBd" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/wrapped/chunk, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/engineering/upper_engineering/starboard) +"cBe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/node_s_w_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/medical) +"cBf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cBg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/barricade/handrail/no_vault{ + dir = 4 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cBh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/tool/warning_cone{ + pixel_y = 18 + }, +/obj/item/tool/warning_cone{ + pixel_y = 9; + pixel_x = -9 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/headset, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBj" = ( +/obj/structure/machinery/cryopod{ + layer = 3.1; + pixel_y = 13 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/cargo, +/area/almayer/engineering/upper_engineering/port) +"cBk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBl" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plating, +/area/almayer/middeck/medical) +"cBm" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/command/airoom) +"cBn" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/middeck/medical) +"cBo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/structure/surface/rack{ + pixel_y = 19; + layer = 5.2 + }, +/obj/structure/largecrate/random/mini{ + pixel_y = 2 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wardrobe/medic_white, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBq" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/machinery/light/red{ + dir = 4; + light_color = "#BB3F3F" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/medical) +"cBr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cBt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cBu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 16; + pixel_y = -16 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cBv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/effect/decal/heavy_cable/node_s_e, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/briefing) +"cBw" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +"cBx" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/briefing) +"cBy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"cBz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/lifeboat_pumps/south1) +"cBA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"cBB" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, +/area/almayer/powered) +"cBC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_y = 25 + }, +/turf/open/floor/almayer/green/northeast, +/area/almayer/hallways/lower/port_aft_hallway) +"cBD" = ( +/obj/structure/machinery/door_control/cl{ + pixel_y = 24; + name = "Safe Shutters"; + id = "CL_Safe" + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"cBE" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/upper/u_m_p) +"cBF" = ( +/obj/structure/bed/sofa/vert/grey/top{ + pixel_y = 11 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) +"cBG" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/silver/southwest, +/area/almayer/maint/upper/u_m_p) +"cBH" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/hallways/upper/port) +"cBI" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/lifeboat_pumps/south1) +"cBJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_m_p) +"cBK" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = -17 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/upper/u_m_p) +"cBL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/silver/west, +/area/almayer/maint/upper/u_m_p) +"cBM" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -26 + }, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/hallways/upper/midship_hallway) +"cBN" = ( +/obj/structure/sign/safety/high_voltage{ + pixel_y = -8; + pixel_x = -17 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer/green/west, +/area/almayer/hallways/upper/fore_hallway) +"cBO" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) +"cBP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) +"cBQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"cBR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"cBS" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_m_p) +"cBT" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 25 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/upper/fore_hallway) +"cBU" = ( +/turf/open/floor/almayer/flooredgesmooth2/north, +/area/almayer/hallways/upper/fore_hallway) +"cBV" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/hallways/lower/port_fore_hallway) +"cBW" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 7; + pixel_y = 25 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/upper/fore_hallway) +"cBX" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/upper/fore_hallway) +"cBY" = ( +/turf/open/floor/almayer/flooredgesmooth3/north, +/area/almayer/hallways/upper/midship_hallway) +"cBZ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 2; + name = "Morgue Waiting Room"; + req_one_access = null + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) +"cCa" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/chapel) +"cCb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Medical Bay"; + req_one_access = null + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) +"cCc" = ( +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext_se_2"; + name = "\improper Research Window Shutter" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/turf/open/floor/plating, +/area/almayer/medical/medical_science) +"cCd" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 15; + pixel_y = 25 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = 25 + }, +/turf/open/floor/almayer/blue/north, +/area/almayer/hallways/upper/midship_hallway) +"cCe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) +"cCf" = ( +/obj/structure/ladder/multiz, +/obj/structure/sign/safety/refridgeration{ + pixel_x = -17; + pixel_y = 6 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer/plating, +/area/almayer/medical/upper_medical) +"cCg" = ( +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/upper_medical) +"cCh" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 17 + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/medical_science) +"cCi" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/blue/northwest, +/area/almayer/hallways/upper/midship_hallway) +"cCj" = ( +/turf/open/floor/almayer/flooredgesmooth2/north, +/area/almayer/hallways/upper/midship_hallway) +"cCk" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Medical Bay"; + req_one_access = null; + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) +"cCl" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/door/window/westright{ + dir = 4; + req_access_txt = "28" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "researchlockdownext_windoor"; + name = "\improper Research Windoor Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) +"cCm" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cCn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/upper_medical) +"cCo" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/extinguisher, +/obj/structure/sign/catclock{ + pixel_y = 32 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/medical_science) +"cCp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext_door"; + name = "\improper Research Doorway Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) +"cCq" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "researchlockdownext_door"; + name = "\improper Research Doorway Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) +"cCr" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = 8 + }, +/obj/item/clipboard{ + pixel_x = -8 + }, +/obj/item/folder/white{ + pixel_x = -8 }, -/turf/open/floor/almayer/silver/west, -/area/almayer/hallways/upper/fore_hallway) -"cmV" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) -"cnd" = ( -/obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ - name = "\improper Evacuation Airlock PL-1"; - dir = 1 +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/medical_science) +"cCs" = ( +/obj/structure/machinery/vending/cola/research, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cCt" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Research Armory"; + name = "\improper Armory Shutters" }, /turf/open/floor/almayer/test_floor4, -/area/almayer/powered) -"cnm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/medical/upper_medical) +"cCu" = ( +/obj/structure/bed/sofa/south/white, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) +"cCv" = ( +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/upper_medical) +"cCw" = ( +/obj/structure/closet/firecloset, +/obj/structure/sign/safety/ladder{ + pixel_x = -17 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_p) -"cnq" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/turf/open/floor/almayer/cargo, +/area/almayer/medical/upper_medical) +"cCx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) +"cCy" = ( /obj/structure/machinery/door_control{ - pixel_y = -21; - name = "\improper Shutter Controls"; - id = "IO Lab Shutters"; - req_access_txt = "19"; - pixel_x = 11 + dir = 1; + id = "researchlockdownext"; + name = "Window Shutters"; + pixel_x = -26; + pixel_y = 6; + req_access_txt = "28" }, -/turf/open/floor/almayer/silver/southwest, -/area/almayer/command/computerlab) -"cnr" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/lower_medical_medbay) -"cnu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_x = -26; + pixel_y = 1; + req_access_txt = "28" }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) -"cnE" = ( -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 13; - density = 0 +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" }, -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 13; - density = 0 +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/medical_science) +"cCz" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + name = "\improper Research Reception Laboratory" }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_y = 30; - pixel_x = 9 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/turf/open/floor/almayer/silver/north, -/area/almayer/command/computerlab) -"cnH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/command/computerlab) -"cnI" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) +"cCA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/orange/east, -/area/almayer/hallways/lower/port_umbilical) -"cnM" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/medical_science) +"cCB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/bed{ - can_buckle = 0 +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/medical_science) +"cCC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/item/bedsheet/yellow{ - layer = 3.2 +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/medical_science) +"cCD" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit. Sends items to the requisitions."; + icon_state = "delivery_med"; + name = "Requisitions Delivery Unit"; + pixel_y = 1; + pixel_x = 25 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/starboard_emb) -"cnR" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) +"cCE" = ( /obj/structure/machinery/firealarm{ - pixel_y = -25; - dir = 1 + pixel_y = 28 }, -/turf/open/floor/almayer/silver, -/area/almayer/command/computerlab) -"cnS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/command/computerlab) -"cnZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt{ +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"cCF" = ( +/obj/structure/disposalpipe/segment{ dir = 8; - pixel_y = 1; - pixel_x = -2; - layer = 2.99 + icon_state = "pipe-c" }, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 8; - pixel_y = 15; - pixel_x = -2 +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/morgue) +"cCG" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/machinery/light/small/blue{ +/turf/open/floor/almayer/redfull, +/area/almayer/medical/upper_medical) +"cCH" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/obj/structure/machinery/light{ dir = 4 }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 32; - pixel_y = 18 +/turf/open/floor/almayer/redfull, +/area/almayer/medical/upper_medical) +"cCI" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, +/area/almayer/medical/upper_medical) +"cCJ" = ( +/obj/structure/sign/safety/ref_bio_storage{ + pixel_x = -17; + pixel_y = 7 }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/morgue) -"coa" = ( +/obj/structure/sign/safety/biohazard{ + pixel_x = -17; + pixel_y = -7 + }, +/obj/structure/medical_supply_link, +/obj/structure/machinery/cm_vending/sorted/medical/chemistry, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cCK" = ( +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 20 + }, +/obj/structure/machinery/chem_dispenser/research, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cCL" = ( +/obj/effect/landmark/crap_item, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"cCM" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 9; + pixel_x = 2 + }, +/obj/item/stack/sheet/mineral/phoron{ + amount = 25; + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/device/reagent_scanner{ + pixel_x = -14; + pixel_y = 5 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) +"cCN" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/medical_science) +"cCO" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) -"cod" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - density = 0; - pixel_y = 16 +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) +"cCP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/cargo, -/area/almayer/command/cic) -"cog" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/emerald/east, -/area/almayer/squads/charlie) -"coj" = ( /obj/structure/machinery/power/apc/almayer/south, +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/containment) +"cCQ" = ( +/area/almayer/medical/containment/cell) +"cCR" = ( +/obj/structure/disposalpipe/up/almayer{ + dir = 2; + id = "almayerlink_med_req" + }, +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/morgue) +"cCS" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer/blue/east, -/area/almayer/squads/delta) -"coo" = ( -/obj/structure/disposalpipe/segment{ +/obj/item/reagent_container/glass/beaker/large, +/obj/item/reagent_container/glass/beaker/large, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_container/dropper, +/obj/structure/machinery/firealarm{ dir = 8; + pixel_x = -24 + }, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 12; + pixel_x = 6 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cCT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; icon_state = "pipe-c" }, -/obj/structure/bed/chair{ - dir = 1 +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/medical_science) +"cCU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = -32 +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/medical_science) +"cCV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/research/containment/entrance, +/area/almayer/medical/containment/cell) +"cCW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/medical/morgue) +"cCX" = ( +/obj/structure/bed/sofa/south/white/right, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) +"cCY" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/medical_science) +"cCZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_f_s) -"cop" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/machinery/light/small{ +/obj/structure/machinery/body_scanconsole{ dir = 8 }, -/obj/effect/landmark/start/tank_crew, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/tankerbunks) -"cov" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/obj/structure/sign/safety/security{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = 7 +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/medical_science) +"cDa" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) +"cDb" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, +/obj/item/clothing/mask/rebreather/scarf/tacticalmask/red, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) -"coB" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/almayer/maint/hull/lower/p_bow) +"cDc" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) -"coD" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 12 +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) -"coT" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) +"cDd" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) +"cDe" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) +"cDf" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + id = "Containment Cell 3"; + locked = 1; + name = "\improper Containment Cell 3"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ + dir = 4; + id = "Containment Cell 3"; + name = "\improper Containment Cell 3" }, -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/tool, -/obj/item/storage/firstaid/regular, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/starboard_point_defense) -"coZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/iv_drip, -/obj/structure/sign/safety/ref_chem_storage{ - pixel_y = 28; - pixel_x = 7 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/medical_science) -"cpj" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/glass, -/obj/item/trash/cigbutt/cigarbutt{ - pixel_x = 6; - pixel_y = 13 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/blue, -/area/almayer/living/bridgebunks) -"cpk" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/containment/cell) +"cDg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/port_point_defense) -"cpp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/living/offices) -"cpz" = ( -/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/research/containment/entrance/west, +/area/almayer/medical/containment/cell) +"cDh" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/area/almayer/medical/containment/cell) +"cDi" = ( +/obj/structure/morgue, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "test_square_smooth" + }, /turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) -"cpJ" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/area/almayer/medical/morgue) +"cDj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "or4privacyshutter"; - name = "\improper Privacy Shutters" +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/medical/operating_room_four) -"cpK" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ +/turf/open/floor/almayer/flooredge/east, +/area/almayer/medical/morgue) +"cDk" = ( +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/upper_medical) +"cDl" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/camera/autoname/almayer{ dir = 4; - id = "ROlobby2"; - name = "\improper RO Line 2" + name = "ship-grade camera" + }, +/obj/item/folder/white{ + pixel_x = 6 + }, +/obj/item/storage/fancy/vials/empty{ + pixel_y = 10; + start_vials = 2 + }, +/obj/item/tool/pen{ + pixel_y = 8 }, -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/turf/open/floor/plating, -/area/almayer/squads/req) -"cpP" = ( -/obj/structure/blocker/fuelpump, /turf/open/floor/almayer/mono, -/area/almayer/lifeboat_pumps/north1) -"cqd" = ( +/area/almayer/medical/medical_science) +"cDm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/orangecorner/north, -/area/almayer/hallways/lower/starboard_umbilical) -"cqm" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/folder/white{ - pixel_y = 6 +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/containment) +"cDn" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/glass{ + pixel_x = -4; + pixel_y = -1 }, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 6 +/obj/item/clothing/mask/cigarette{ + pixel_y = 8 }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"cqp" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_f_s) -"cqz" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/item/clothing/mask/cigarette{ + pixel_x = 4; + pixel_y = 11 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"cqH" = ( -/obj/structure/pipes/vents/scrubber{ +/turf/open/floor/almayer/silver/north, +/area/almayer/shipboard/brig/cic_hallway) +"cDo" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 3"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/lower/l_m_s) -"cqJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 8 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/general_equipment) -"cqM" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/area/almayer/medical/containment/cell) +"cDp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) -"cqQ" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/turf/open/floor/almayer/flooredge/east, +/area/almayer/medical/morgue) +"cDq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/turf/open/floor/almayer/flooredge/east, +/area/almayer/medical/morgue) +"cDr" = ( +/obj/structure/filingcabinet/medical{ + pixel_x = 7; + layer = 2.96; + pixel_y = 2 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) +"cDs" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/bomb_supply, +/obj/effect/spawner/random/bomb_supply, +/obj/item/clothing/suit/storage/hazardvest/yellow, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) +"cDt" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) +"cDu" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Psychiatric Care Unit" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/starboard_missiles) -"crc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/port_midship_hallway) -"crh" = ( -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/medical/upper_medical) +"cDv" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/lifeboat_pumps/south1) -"cri" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_f_s) -"crD" = ( -/turf/open/floor/almayer/greencorner/north, -/area/almayer/squads/req) -"csa" = ( -/obj/structure/barricade/handrail{ - dir = 4; - layer = 3.1; - pixel_x = 1 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) +"cDw" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagent_analyzer{ + pixel_x = 2; + pixel_y = 3 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/underdeck/hangar) -"csd" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"csy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cDx" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) -"csI" = ( -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/south1) -"csZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_p) +"cDy" = ( +/obj/structure/bed/chair/comfy{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) +"cDz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; + icon_state = "E"; pixel_x = 1 }, +/turf/open/floor/almayer/flooredgesmooth2/east, +/area/almayer/hallways/upper/midship_hallway) +"cDA" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 25 + }, +/turf/open/floor/almayer/blue/north, +/area/almayer/hallways/upper/fore_hallway) +"cDB" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = 8; + pixel_y = 25 + }, +/turf/open/floor/almayer/blue/north, +/area/almayer/hallways/upper/fore_hallway) +"cDD" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) +"cDE" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) +"cDF" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) +"cDG" = ( +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) +"cDH" = ( +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/living/briefing) +"cDI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/computer/research{ + dir = 4; + pixel_y = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -6; + pixel_y = -5 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cDJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; + pixel_x = 1; pixel_y = 1 }, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; - pixel_x = -1; pixel_y = 1 }, -/obj/structure/mirror{ - pixel_y = 32 +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/containment) +"cDK" = ( +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/containment) +"cDL" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 2"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/bravo) -"cth" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/s_bow) -"ctp" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 4 + }, +/area/almayer/medical/containment/cell) +"cDM" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) +"cDN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"cts" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/area/almayer/shipboard/brig/lobby) +"cDO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/autopsy_scanner{ + pixel_y = 13; + pixel_x = 4 + }, +/obj/item/tool/surgery/scalpel, +/obj/item/tool/surgery/hemostat{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/tool/surgery/circular_saw, +/obj/item/tool/surgery/cautery, +/obj/item/tool/surgery/retractor, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) -"ctw" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/port_umbilical) -"ctx" = ( -/obj/structure/bed{ - icon_state = "abed" +/area/almayer/medical/morgue) +"cDP" = ( +/turf/open/floor/almayer/silvercorner/north, +/area/almayer/hallways/upper/midship_hallway) +"cDQ" = ( +/obj/structure/machinery/status_display{ + pixel_y = 32 + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) +"cDR" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 6; + pixel_x = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) +"cDS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/bed/sofa/south/white/left, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) +"cDT" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/photocopier, +/obj/structure/sign/safety/terminal{ + layer = 2.5; + pixel_x = -17 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cDU" = ( +/obj/structure/bed/chair/comfy{ + dir = 5 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cDV" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 }, /obj/structure/window/reinforced{ dir = 4; - pixel_y = 4 - }, -/obj/structure/bed{ - icon_state = "abed"; - layer = 3.5; - pixel_y = 12 + health = 80; + pixel_y = 6 }, -/obj/item/bedsheet/orange{ - pixel_y = 12 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) +"cDW" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 }, -/obj/item/bedsheet/orange{ - layer = 3.2 +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_x = 26; + pixel_y = -3; + req_one_access_txt = "28" }, /obj/structure/window/reinforced{ dir = 8; - layer = 3.3; - pixel_y = 4 + health = 80; + pixel_y = 6 }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) -"ctQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) +"cDX" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + dir = 1; + id = "Containment Cell 1"; + locked = 1; + name = "\improper Containment Cell 1" }, -/obj/item/tool/weldingtool{ - pixel_x = -7; - pixel_y = 3 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Containment Cell 1"; + name = "\improper Containment Cell 1"; + unacidable = 1 }, -/turf/open/floor/almayer/silver, -/area/almayer/hallways/lower/repair_bay) -"ctT" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Cryogenics Bay" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cryo) -"cuq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +/area/almayer/medical/containment/cell) +"cDY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/bed/roller/heavy, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/containment) +"cDZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_y = 8; + pixel_x = 6 + }, +/obj/item/device/flashlight/lamp/on{ + pixel_x = -10; + layer = 3.03 + }, +/obj/item/reagent_container/food/drinks/coffeecup/uscm{ + pixel_y = 11; + pixel_x = -6 + }, +/obj/item/tool/pen{ + pixel_y = 5; + pixel_x = 4 + }, /turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) -"cuy" = ( -/obj/item/tool/warning_cone{ - pixel_y = 13 +/area/almayer/living/tankerbunks) +"cEa" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + id = "Containment Cell 2"; + locked = 1; + name = "\improper Containment Cell 2" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/containment{ + dir = 4; + id = "Containment Cell 2"; + name = "\improper Containment Cell 2" }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"cuC" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/engineering/upper_engineering/starboard) -"cuN" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/upper/starboard) -"cuP" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/underdeck/hangar) -"cuY" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, /turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) -"cvb" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ +/area/almayer/medical/containment/cell) +"cEb" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/research/containment/corner/east, +/area/almayer/medical/containment/cell) +"cEc" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/area/almayer/medical/containment/cell) +"cEd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/almayer/white, +/area/almayer/medical/upper_medical) +"cEe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = -29 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) +"cEf" = ( +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/req) -"cvg" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit. Sends items to the requisitions."; + icon_state = "delivery_med"; + name = "Requisitions Delivery Unit"; + pixel_y = 28; + pixel_x = -1 + }, +/obj/structure/machinery/xenoanalyzer, +/turf/open/floor/almayer/mono, +/area/almayer/medical/medical_science) +"cEg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/research/containment/entrance, +/area/almayer/medical/containment/cell) +"cEh" = ( +/obj/structure/machinery/autolathe/medilathe/partial, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEi" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_fore_hallway) -"cvx" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/lower/cryo_cells) -"cvz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/underdeck/hangar) -"cvH" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"cEj" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEk" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/sign/safety/storage{ + pixel_x = 33; + pixel_y = -1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/machinery/light{ - dir = 1 +/turf/open/floor/almayer/sterile_green2, +/area/almayer/medical/hydroponics) +"cEl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) -"cvI" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/obj/structure/machinery/light{ - dir = 4 +/turf/open/floor/almayer/plating/northeast, +/area/almayer/command/cic) +"cEm" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/turf/open/floor/almayer/red/east, -/area/almayer/hallways/upper/port) -"cvZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ + name = "\improper Research Hydroponics Workshop" }, -/turf/open/floor/almayer/silver/east, -/area/almayer/command/cic) -"cwo" = ( -/obj/structure/largecrate/random/mini/chest{ - pixel_x = 4 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEn" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/req) -"cwu" = ( -/obj/structure/cargo_container/uscm/mid{ - layer = 3.1 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/plating_striped/south, -/area/almayer/underdeck/req) -"cwC" = ( -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/starboard_hallway) -"cwS" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"cwX" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/hydroponics) +"cEp" = ( +/obj/structure/disposalpipe/up/almayer{ + dir = 8; + id = "almayerlink_med_req" + }, +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/hydroponics) +"cEq" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/hydroponics) +"cEr" = ( +/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"cxc" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) -"cxk" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) -"cxB" = ( -/obj/structure/platform/metal/almayer/west, -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/south2) -"cxF" = ( -/obj/structure/barricade/handrail{ - dir = 8 + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/barricade/handrail, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEs" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer/test_floor5, -/area/almayer/hallways/lower/port_midship_hallway) -"cyc" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) -"cyf" = ( -/obj/structure/platform/metal/almayer/north, -/obj/item/tool/mop, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"cyh" = ( -/obj/structure/machinery/door/airlock/almayer/glass{ - name = "\improper Passenger Cryogenics Bay" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/upper/u_m_p) -"cyo" = ( -/obj/structure/machinery/vending/cigarette/koorlander, -/turf/open/floor/almayer/green/southwest, -/area/almayer/squads/req) -"cyp" = ( -/obj/structure/machinery/conveyor{ - id = "lower_garbage" - }, -/obj/structure/plasticflaps, -/turf/open/floor/almayer/plating_striped/east, -/area/almayer/maint/hull/lower/l_a_p) -"cyv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/medical/hydroponics) +"cEt" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 3; + pixel_x = 5 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/upper/u_f_p) -"cyL" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/trash/USCMtray, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/captain_mess) -"cyP" = ( +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/upper_medical) +"cEu" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/turf/open/floor/almayer/silver/west, -/area/almayer/command/securestorage) -"cyR" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/structure/closet/secure_closet/professor_dummy{ + pixel_y = -30 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"cyZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) +"cEv" = ( +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/item/storage/fancy/vials/empty, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) -"czN" = ( /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; - pixel_y = -28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/starboard_midship_hallway) -"czR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_midship_hallway) -"cAa" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/no_build, -/area/almayer/stair_clone/lower/starboard_fore) -"cAy" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) -"cAF" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docdecal2"; - dir = 4 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/lower_medical_lobby) -"cAR" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/mp_bunks) -"cBb" = ( -/obj/structure/machinery/light{ - dir = 1 + pixel_x = -29 }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) -"cBd" = ( +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) +"cEw" = ( /obj/structure/surface/rack, -/obj/item/reagent_container/food/snacks/wrapped/chunk, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 +/obj/item/storage/box/autoinjectors{ + pixel_x = 7; + pixel_y = 5 }, -/turf/open/floor/almayer/cargo, -/area/almayer/engineering/upper_engineering/starboard) -"cBj" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 +/obj/item/storage/box/beakers{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/storage/box/sprays{ + pixel_y = -3 }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEx" = ( +/obj/structure/closet/secure_closet/hydroresearch, +/obj/item/reagent_container/glass/watertank, +/obj/item/reagent_container/glass/watertank, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEy" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/cargo, -/area/almayer/engineering/upper_engineering/port) -"cBs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha) -"cBw" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) -"cBC" = ( +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; - pixel_x = 2 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_y = 25 - }, -/turf/open/floor/almayer/green/northeast, -/area/almayer/hallways/lower/port_aft_hallway) -"cBV" = ( -/obj/structure/closet/firecloset, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" + pixel_x = 1 }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/hallways/lower/port_fore_hallway) -"cCa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) -"cCE" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 + pixel_x = -1 }, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; + pixel_x = -1; pixel_y = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"cCL" = ( -/obj/effect/landmark/crap_item, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) -"cDb" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/clothing/mask/rebreather/scarf/tacticalmask/red, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/p_bow) -"cDn" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/glass{ - pixel_x = -4; - pixel_y = -1 +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/obj/item/clothing/mask/cigarette{ - pixel_y = 8 +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -25 }, -/obj/item/clothing/mask/cigarette{ - pixel_x = 4; - pixel_y = 11 +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) +"cEB" = ( +/obj/structure/machinery/flasher{ + alpha = 1; + id = "Containment Cell 2"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = 31 }, -/turf/open/floor/almayer/silver/north, -/area/almayer/shipboard/brig/cic_hallway) -"cDs" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) -"cDx" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +/area/almayer/medical/containment/cell) +"cED" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_m_p) -"cDC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + pixel_y = 19; + density = 0 }, +/turf/open/floor/almayer/flooredge/south, +/area/almayer/medical/upper_medical) +"cEE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) -"cDH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ - pixel_y = 29 +/obj/structure/bookcase{ + icon_state = "book-5"; + pixel_x = -1; + pixel_y = 19; + density = 0; + opacity = 0 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"cDN" = ( +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/surgery, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/ripley_build_and_repair, +/turf/open/floor/almayer/flooredge/south, +/area/almayer/medical/upper_medical) +"cEF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/lobby) -"cDP" = ( -/turf/open/floor/almayer/silvercorner/north, -/area/almayer/hallways/upper/midship_hallway) -"cDZ" = ( /obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 8; - pixel_x = 6 +/obj/structure/machinery/computer/cameras/containment{ + dir = 8; + name = "Research Cameras"; + pixel_y = -2; + pixel_x = -1 }, -/obj/item/device/flashlight/lamp/on{ - pixel_x = -10; - layer = 3.03 +/obj/structure/machinery/computer/research/main_terminal{ + dir = 8; + pixel_y = -16; + pixel_x = -1 }, -/obj/item/reagent_container/food/drinks/coffeecup/uscm{ - pixel_y = 11; - pixel_x = -6 +/obj/item/device/flashlight/lamp{ + pixel_y = 14; + pixel_x = 1; + layer = 2.96 }, -/obj/item/tool/pen{ - pixel_y = 5; - pixel_x = 4 +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) +"cEG" = ( +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/hydroponics) +"cEH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/living/tankerbunks) -"cEi" = ( -/obj/structure/sign/poster, -/turf/closed/wall/almayer, -/area/almayer/living/grunt_rnr) -"cEl" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "W"; + pixel_x = -1 }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEI" = ( +/obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/command/cic) -"cEA" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/crema_switch{ + pixel_x = -23; + req_access_txt = "25"; + pixel_y = 25 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) +"cEK" = ( +/obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/turf/open/floor/almayer/dark_sterile2, +/area/almayer/medical/upper_medical) +"cEL" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -25 +/obj/structure/machinery/autolathe, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEM" = ( +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/hydroponics) +"cEN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_f_s) -"cEC" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/hydroponics) +"cEO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) +"cEQ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" + icon_state = "SE-out"; + pixel_x = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) +"cER" = ( +/turf/open/floor/almayer/flooredgesmooth2/west, +/area/almayer/hallways/upper/fore_hallway) +"cES" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -14; pixel_y = 2 }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) +/obj/structure/mirror{ + pixel_x = -31 + }, +/obj/structure/toilet{ + pixel_y = 15 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "cET" = ( /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) +"cEU" = ( +/obj/structure/machinery/computer/med_data, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) +"cEV" = ( +/obj/structure/machinery/chem_storage/medbay{ + dir = 1 + }, +/obj/structure/machinery/chem_storage/research{ + dir = 1; + layer = 3; + pixel_y = 18 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEW" = ( +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/hydroponics) +"cEX" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/cm_vending/clothing/medical_crew{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/medical/hydroponics) +"cEY" = ( +/obj/structure/sign/safety/rewire{ + layer = 2.4; + pixel_x = 8; + pixel_y = 25 + }, +/obj/structure/reagent_dispensers/tank/water, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cEZ" = ( +/obj/structure/sign/safety/intercom{ + layer = 2.9; + pixel_x = -6; + pixel_y = 29 + }, +/obj/structure/machinery/botany/extractor{ + density = 0; + pixel_x = 15; + pixel_y = 16 + }, +/obj/item/device/flashlight/pen{ + pixel_x = 14; + pixel_y = 15 + }, +/obj/structure/machinery/vending/hydroseeds{ + density = 0; + pixel_x = -7; + pixel_y = 16; + req_access_txt = "28" + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cFa" = ( +/obj/structure/machinery/seed_extractor{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) +"cFb" = ( +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) +"cFc" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; + dir = 2; + name = "Morgue"; + req_access_txt = "25"; + req_one_access = null + }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) +"cFd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) +"cFe" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -25 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) +"cFf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "cFg" = ( /obj/structure/machinery/power/apc/almayer/south, /obj/structure/platform/metal/almayer_smooth, @@ -47652,18 +50726,159 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/weapon_room) +"cFi" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"cFj" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 15; + pixel_y = -28 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -28 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) +"cFk" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/flooredgesmooth2/south, +/area/almayer/hallways/upper/fore_hallway) +"cFl" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 7; + pixel_y = -28 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) +"cFm" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -28 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "cFn" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) +"cFo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredgesmooth2/south, +/area/almayer/hallways/upper/fore_hallway) +"cFp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"cFq" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredgesmooth2/north, +/area/almayer/hallways/upper/midship_hallway) +"cFr" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/synthcloset) +"cFs" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) +"cFt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"cFu" = ( +/turf/open/floor/almayer/green/northwest, +/area/almayer/hallways/upper/fore_hallway) +"cFv" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer/green/north, +/area/almayer/hallways/upper/fore_hallway) +"cFw" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/almayer, +/area/almayer/living/chapel) +"cFx" = ( +/obj/effect/landmark/start/synthetic, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/synthcloset) +"cFy" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/lifeboat_pumps/north1) +"cFz" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 + }, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north1) +"cFA" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer/plate, +/area/almayer/maint/upper/u_f_s) +"cFB" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/synthcloset) "cFC" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer/red/northwest, /area/almayer/shipboard/brig/processing) +"cFD" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 + }, +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer/mono, +/area/almayer/lifeboat_pumps/north1) +"cFE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) +"cFF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/north1) +"cFG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "cGd" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/u_m_s) @@ -47684,8 +50899,18 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) "cGV" = ( -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_y = 1; + pixel_x = -26 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red2/northwest, +/area/almayer/squads/alpha) "cGY" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/plating_catwalk, @@ -47693,22 +50918,9 @@ "cHk" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/warden_office) -"cHl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) -"cHB" = ( -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "cHC" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -47743,16 +50955,17 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/lower/port_fore_hallway) "cIr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"cIx" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "cIG" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -47809,16 +51022,18 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) "cJM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door_control{ - id = "ResearchStairs"; - name = "Stairway Lockdown"; - req_one_access_txt = "19;28"; - pixel_x = 24 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/medical_science) +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "cKm" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket{ @@ -47846,18 +51061,6 @@ "cKL" = ( /turf/open/floor/almayer/orangecorner/west, /area/almayer/engineering/upper_engineering/port) -"cLc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "cLd" = ( /obj/structure/closet, /obj/item/clothing/glasses/mgoggles/prescription, @@ -47897,10 +51100,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/operating_room_four) -"cLC" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "cLN" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -47956,13 +51155,12 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/starboard) "cMV" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_midship_hallway) "cMW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -47979,10 +51177,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "cNf" = ( -/turf/open/floor/almayer/orange, +/turf/open/floor/almayer/greencorner/north, /area/almayer/living/briefing) "cNm" = ( -/turf/open/floor/almayer/orange/east, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer/cargo, /area/almayer/hallways/lower/port_aft_hallway) "cNC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -48023,14 +51222,19 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) "cNX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/tool/shovel/etool{ + pixel_x = 6 }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "cOd" = ( /obj/structure/blocker/fuelpump, /turf/open/floor/almayer/mono, @@ -48045,13 +51249,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"cOo" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_a_p) "cOt" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, @@ -48086,28 +51283,10 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/maint/hull/upper/p_bow) -"cPP" = ( -/obj/structure/sign/poster/pinup{ - pixel_x = -30 - }, -/obj/structure/sign/poster/hunk{ - pixel_x = -25; - pixel_y = 10 - }, -/obj/item/trash/buritto, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "cQa" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"cQc" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/living/briefing) "cQg" = ( /obj/structure/surface/rack, /obj/effect/decal/warning_stripes{ @@ -48127,12 +51306,12 @@ /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; - pixel_x = -10; + pixel_x = -8; pixel_y = 28 }, /obj/structure/sign/safety/intercom{ pixel_x = 14; - pixel_y = 28 + pixel_y = 32 }, /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) @@ -48242,13 +51421,9 @@ /turf/open/floor/almayer/green/northwest, /area/almayer/hallways/lower/port_midship_hallway) "cSQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/machinery/light, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/platoon1_shared) "cTf" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -48289,10 +51464,6 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 7; - pixel_y = -26 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) "cVw" = ( @@ -48310,10 +51481,6 @@ /obj/effect/spawner/random/facepaint, /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"cVZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "cWb" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -48330,7 +51497,7 @@ pixel_y = -22 }, /obj/structure/machinery/door_control{ - id = "or1privacyshutterdoor"; + id = "or1privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = -22; throw_range = 15; @@ -48679,20 +51846,7 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering/port) "dbn" = ( -/obj/structure/surface/table/almayer, -/obj/item/spacecash/c200{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_x = 9 - }, -/obj/item/reagent_container/pill/happy, -/obj/item/clothing/glasses/disco_fever{ - pixel_x = -3; - pixel_y = -2 - }, -/turf/open/floor/plating, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "dbq" = ( /turf/open/floor/almayer/plating_striped/north, @@ -48737,10 +51891,6 @@ "dbM" = ( /obj/item/bedsheet/orange, /obj/structure/bed, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -18; - pixel_y = -6 - }, /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) "dbX" = ( @@ -48750,12 +51900,9 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/living/briefing) -"dck" = ( -/obj/structure/bed/stool, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) "dcp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -48796,11 +51943,13 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/shipboard/brig/interrogation) "ddk" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/redfull, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/food/drinks/coffeecup/uscm, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "ddw" = ( -/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "ddz" = ( @@ -48822,7 +51971,7 @@ /area/almayer/hallways/lower/repair_bay) "ddL" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/port_aft_hallway) "ddM" = ( /obj/structure/disposalpipe/segment, @@ -48862,11 +52011,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/emerald/north, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "dfa" = ( -/turf/closed/wall/almayer/white, -/area/almayer/hallways/upper/fore_hallway) +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "dfg" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -48893,9 +52044,10 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) "dfC" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "dgg" = ( /obj/structure/bed/chair{ dir = 4 @@ -48919,13 +52071,18 @@ /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/chief_mp_office) "dgE" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/obj/structure/machinery/cm_vending/gear/smartgun{ + density = 0; + pixel_x = -26; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/blue2/southwest, +/area/almayer/squads/delta) "dgI" = ( /obj/structure/machinery/disposal{ pixel_x = -6; @@ -48986,13 +52143,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_umbilical) "dhR" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "north_central_checkpoint"; - name = "\improper Checkpoint Shutters" +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/microwave{ + density = 0; + pixel_y = 7; + pixel_x = -2 }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "div" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49013,16 +52173,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "diJ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redfull2, +/area/almayer/squads/alpha) "dji" = ( /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/plating_striped/north, @@ -49068,10 +52225,11 @@ /obj/structure/machinery/door_control{ id = "hangarentrancenorth"; name = "North Hangar Shutters"; - pixel_x = -30; + pixel_x = -26; req_one_access_txt = "2;3;12;19"; throw_range = 15 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/west, /area/almayer/living/briefing) "dkz" = ( @@ -49081,13 +52239,11 @@ /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) "dkX" = ( -/obj/structure/bed/chair/comfy/delta, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) -"dll" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/orangefull, +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" + }, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "dlo" = ( /obj/effect/decal/warning_stripes{ @@ -49138,7 +52294,7 @@ name = "ship-grade camera" }, /turf/open/floor/plating, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "dmF" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -49205,17 +52361,6 @@ "dnS" = ( /turf/open/floor/almayer/plating_stripedcorner/south, /area/almayer/command/securestorage) -"dnZ" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 1 - }, -/turf/open/floor/almayer/plating_striped/east, -/area/almayer/maint/hull/lower/l_a_p) "dof" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ name = "\improper Upper Engineering" @@ -49225,13 +52370,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering) -"doJ" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/bed/stool, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) "doP" = ( /obj/structure/disposaloutlet{ density = 0; @@ -49268,12 +52406,15 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_aft_hallway) "dpO" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/delta) +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo_arrow, +/area/almayer/squads/platoon2_shared) "dqb" = ( /obj/structure/sign/safety/security{ pixel_x = -16 @@ -49293,13 +52434,6 @@ "dqw" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room/notunnel) -"dqD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "dqE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -49312,15 +52446,8 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/offices) "drj" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/charlie_delta_shared) +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "drk" = ( /obj/effect/landmark/start/intel, /obj/effect/landmark/late_join/intel, @@ -49358,26 +52485,23 @@ /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) "drT" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ +/obj/structure/machinery/camera/autoname/almayer{ dir = 4; - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - access_modified = 1; - name = "\improper CMO's Office"; - req_one_access = null; - req_one_access_txt = "1;5" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + name = "ship-grade camera" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "drU" = ( /obj/structure/machinery/door_control{ id = "ARES JoeCryo"; @@ -49410,7 +52534,12 @@ /turf/open/floor/almayer/plate, /area/almayer/underdeck/hangar) "dsY" = ( -/turf/open/floor/almayer/flooredgesmooth2/east, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge/east, /area/almayer/hallways/lower/starboard_midship_hallway) "dtu" = ( /obj/structure/machinery/portable_atmospherics/canister/air, @@ -49435,9 +52564,14 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "duo" = ( -/obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/structure/surface/table/almayer, +/obj/item/device/lightreplacer{ + pixel_x = -6; + pixel_y = 15 + }, +/obj/item/tool/weldpack, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "dut" = ( /obj/effect/landmark/start/nurse, /obj/effect/landmark/late_join/nurse, @@ -49449,13 +52583,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"duw" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "duz" = ( /obj/structure/mirror{ pixel_y = 32 @@ -49478,15 +52605,13 @@ /turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/brig/cells) "duV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/landmark/start/marine/tl/delta, +/obj/effect/landmark/late_join/delta, +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "dvg" = ( /obj/structure/machinery/chem_master{ pixel_x = -1 @@ -49520,16 +52645,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"dwl" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "dwr" = ( -/obj/structure/machinery/disposal{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/centrifuge{ + layer = 3.1; + pixel_y = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) @@ -49593,17 +52713,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/perma) "dyb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 32; - pixel_x = -2 +/obj/structure/machinery/smartfridge/chemistry, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "dyd" = ( /obj/structure/bed/chair/office/dark{ @@ -49612,6 +52728,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "dyj" = ( @@ -49689,12 +52806,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"dzX" = ( -/obj/structure/sign/safety/water{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "dAg" = ( /obj/structure/cryofeed, /turf/open/floor/almayer/plating/northeast, @@ -49705,16 +52816,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_midship_hallway) -"dAq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) "dAA" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -49728,12 +52829,10 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck) "dAQ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 1 +/obj/structure/bed/chair/comfy/alpha{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "dAX" = ( /obj/structure/machinery/camera/autoname/almayer{ @@ -49759,17 +52858,12 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/north2) "dBj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28; +/obj/effect/decal/warning_stripes{ + icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/hydroponics) "dBs" = ( /obj/structure/machinery/cm_vending/clothing/dress, /turf/open/floor/almayer/cargo, @@ -49777,26 +52871,6 @@ "dBH" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/lower_medical_medbay) -"dBI" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 4 - }, -/obj/item/trash/USCMtray{ - pixel_y = 6 - }, -/obj/item/trash/USCMtray{ - pixel_y = 8 - }, -/obj/item/trash/USCMtray{ - pixel_y = 10 - }, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "dBO" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -49939,24 +53013,13 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) -"dEk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "dEm" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/containment) "dEn" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -49996,28 +53059,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/lifeboat_pumps/north2) -"dEK" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/port_midship_hallway) -"dEL" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/port_aft_hallway) -"dEQ" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "dEX" = ( /obj/structure/machinery/light{ dir = 1 @@ -50044,13 +53085,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"dFL" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "dFM" = ( /obj/structure/machinery/light{ dir = 8 @@ -50105,13 +53139,11 @@ /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/mp_bunks) "dGU" = ( -/obj/structure/sign/poster/propaganda{ - pixel_x = -27 - }, -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "dHd" = ( /obj/structure/disposalpipe/segment{ @@ -50127,25 +53159,10 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - layer = 3.33; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "Test_Chamber"; - name = "\improper Test Chamber Shutters"; - pixel_y = 23; - req_one_access_txt = "28" +/obj/structure/pipes/unary/freezer{ + dir = 8 }, -/turf/open/floor/almayer/research/containment/floor2, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "dIi" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, @@ -50167,15 +53184,17 @@ /turf/open/floor/almayer/red/north, /area/almayer/command/lifeboat) "dII" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/specialist/delta{ + density = 0; + pixel_x = -1; + pixel_y = 16 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/blue2/northwest, +/area/almayer/squads/delta) "dJe" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -50212,18 +53231,13 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) "dJI" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/arcturianstopsign{ pixel_y = 32 }, -/obj/structure/prop/holidays/string_lights{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) "dJJ" = ( /turf/open/floor/plating/plating_catwalk, @@ -50259,7 +53273,7 @@ /turf/open/floor/almayer/plating, /area/almayer/living/basketball) "dKp" = ( -/turf/open/floor/almayer/research/containment/corner_var1/east, +/turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell/cl) "dKK" = ( /obj/effect/decal/cleanable/dirt, @@ -50286,13 +53300,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) "dKX" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/structure/sign/safety/ladder{ + pixel_x = 7; + pixel_y = 26 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "dLc" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -50349,16 +53362,12 @@ /turf/open/floor/almayer, /area/almayer/hallways/upper/fore_hallway) "dNq" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 8 + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/containment) "dNt" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -50378,18 +53387,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/fore_hallway) -"dNM" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = -5; - pixel_y = 10 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "dNW" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28 +/obj/structure/sign/safety/distribution_pipes{ + pixel_y = -26; + pixel_x = 8 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) @@ -50532,12 +53533,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/port) -"dRv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/squads/alpha) "dRA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50565,16 +53560,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/offices/flight) "dRT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, +/turf/open/floor/almayer/silverfull, /area/almayer/living/briefing) "dSp" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 1; - pixel_x = -16 +/obj/structure/sign/safety/bathunisex{ + pixel_x = 13; + pixel_y = 25 }, /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/south1) @@ -50637,7 +53629,7 @@ /obj/structure/machinery/door/airlock/almayer/medical{ name = "\improper Field Medical Equipment Storage"; req_one_access = null; - req_one_access_txt = "5;19;39" + req_one_access_txt = "1;5;39" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -50649,7 +53641,8 @@ /turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/port_missiles) "dVe" = ( -/turf/open/floor/almayer/blue/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/greencorner/west, /area/almayer/living/briefing) "dVn" = ( /obj/structure/machinery/power/apc/almayer/west, @@ -50663,19 +53656,15 @@ dir = 2; icon_state = "pipe-c" }, +/obj/item/prop/magazine/boots/n054{ + pixel_x = 29 + }, /turf/open/floor/almayer, /area/almayer/living/port_emb) "dVu" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 28 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 28; - pixel_x = 14 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/medical_science) "dVO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -50684,6 +53673,9 @@ /turf/open/floor/almayer/green/east, /area/almayer/living/offices) "dVR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer/cargo_arrow, /area/almayer/lifeboat_pumps/south1) "dWc" = ( @@ -50771,20 +53763,11 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/living/pilotbunks) -"dYc" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "dYl" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/fore_hallway) "dYu" = ( @@ -50798,13 +53781,6 @@ /obj/item/frame/fire_alarm, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) -"dYR" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "dYU" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -50812,22 +53788,12 @@ }, /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/operating_room_one) -"dYX" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) "dZu" = ( +/obj/structure/reagent_dispensers/tank/ammonia, /obj/structure/window/reinforced/toughened{ dir = 4; health = 500 }, -/obj/structure/largecrate/random/secure, /turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "dZZ" = ( @@ -50851,15 +53817,19 @@ /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/general_equipment) "ean" = ( -/obj/structure/machinery/chem_storage/medbay{ - pixel_x = -2 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "W_Containment Cell 3"; + name = "\improper Containment Cell 5"; + unacidable = 1 }, -/obj/structure/machinery/chem_storage/research{ - pixel_x = -2; - pixel_y = 19 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 4 + }, +/area/almayer/medical/containment/cell) "eas" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -50915,17 +53885,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) -"ebp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, -/obj/structure/prop/holidays/string_lights{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "ebI" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -50950,14 +53909,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) -"ecj" = ( -/obj/structure/largecrate/supply/supplies/mre, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_p) "eco" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17; @@ -50995,11 +53946,9 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "edv" = ( -/obj/structure/bed/sofa/south/white{ - pixel_y = 1 - }, +/obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer/sterile_green, -/area/almayer/medical/upper_medical) +/area/almayer/medical/medical_science) "edG" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -51011,12 +53960,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/computerlab) "eeh" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave{ - pixel_y = 9 +/obj/structure/machinery/firealarm{ + pixel_y = -28; + pixel_x = -1 }, -/obj/item/reagent_container/food/snacks/packaged_burger, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "eei" = ( /obj/structure/surface/table/reinforced/almayer_B, @@ -51045,18 +53994,10 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/starboard) "eeu" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/machinery/door_control{ - id = "kitchen"; - name = "Kitchen Shutters"; - pixel_x = -25 - }, -/obj/structure/machinery/vending/dinnerware, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/structure/machinery/vending/security, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_fore_hallway) "eeA" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/plate, @@ -51101,30 +54042,12 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "efK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"efP" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_y = 14 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 5; - pixel_y = 8 +/obj/structure/machinery/door/airlock/almayer/marine/delta/smart{ + req_access = list(14,18); + req_one_access = list() }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) "efT" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -51137,7 +54060,7 @@ icon_state = "pipe-j2" }, /obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) "egt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -51186,11 +54109,6 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south2) -"ehx" = ( -/obj/effect/landmark/start/marine/tl/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "ehL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/effect/decal/warning_stripes{ @@ -51211,33 +54129,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"ehR" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/red{ - layer = 3.2 - }, -/obj/item/bedsheet/red{ - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/starboard_emb) "ehX" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -51256,9 +54147,16 @@ /area/almayer/engineering/upper_engineering/port) "eiq" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/prop/magazine/dirty, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/item/book/manual/engineering_guide{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/prop/magazine/boots/n125{ + pixel_x = 4; + pixel_y = 11 + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "eiw" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -51280,12 +54178,15 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/medical/lower_medical_medbay) "eiE" = ( -/obj/structure/machinery/autolathe/medilathe/full, /obj/structure/machinery/light{ - dir = 8 + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/machinery/optable, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/area/almayer/medical/containment/cell) "eiN" = ( /obj/structure/machinery/light{ dir = 1 @@ -51313,17 +54214,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"ejo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "ejt" = ( /turf/open/floor/almayer/uscm/directional/east, /area/almayer/command/lifeboat) @@ -51505,6 +54395,7 @@ /area/almayer/maint/hull/lower/l_m_p) "enY" = ( /obj/structure/ladder/multiz, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating, /area/almayer/maint/hull/lower/l_a_p) "eob" = ( @@ -51520,10 +54411,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) -"eoy" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/port_midship_hallway) "eoz" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -51650,27 +54537,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) -"erh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) "ern" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -51692,30 +54558,21 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) "erG" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/structure/bed/chair, +/obj/structure/sign/safety/cryo{ + pixel_x = -18; + pixel_y = 1 }, -/obj/effect/landmark/start/marine/smartgunner/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "erL" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/crushed_cup, -/obj/item/reagent_container/food/drinks/cup{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/ashtray/plastic{ - pixel_x = 5; - pixel_y = -10 +/obj/item/stack/tile/plasteel{ + pixel_x = 4; + pixel_y = -6 }, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_s) "erN" = ( /turf/open/floor/almayer/aicore/no_build/ai_plates, @@ -51751,21 +54608,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) "esn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/multitool{ - desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; - icon_state = "multitool_big"; - name = "\improper Oversized Security Access Tuner"; - pixel_x = 4; - pixel_y = 11 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/item/stack/sheet/cardboard/medium_stack{ - layer = 3.01; - pixel_x = -7; - pixel_y = -6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/alpha) "esC" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -51881,11 +54733,12 @@ /turf/open/floor/almayer/uscm/directional/logo_c/west, /area/almayer/command/cic) "euW" = ( +/obj/structure/reagent_dispensers/tank/sacid, /obj/structure/window/reinforced/toughened{ dir = 8; health = 500 }, -/turf/open/floor/plating, +/turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "eva" = ( /obj/structure/sign/safety/distribution_pipes{ @@ -51967,15 +54820,14 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/execution) "ewO" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) +/obj/item/tool/wrench, +/turf/open/floor/almayer, +/area/almayer/squads/support) "ewS" = ( /turf/open/floor/almayer/silvercorner/west, /area/almayer/command/cichallway) @@ -51986,17 +54838,19 @@ /turf/closed/wall/almayer/outer/internal, /area/almayer/underdeck/req) "exb" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -16 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/surface/table/almayer, +/obj/item/prop/colony/game, +/turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "exc" = ( /obj/structure/machinery/light{ - dir = 4 + dir = 8 }, -/turf/open/floor/almayer/blue/east, +/turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "exi" = ( /obj/structure/pipes/standard/manifold/hidden/supply, @@ -52018,14 +54872,6 @@ "exQ" = ( /turf/open/floor/almayer/greencorner, /area/almayer/hallways/lower/starboard_midship_hallway) -"eyl" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/squads/bravo) "eyC" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -52041,7 +54887,8 @@ /area/almayer/maint/hull/lower/l_f_p) "eyQ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "SE-out"; + pixel_x = 1 }, /turf/open/floor/almayer/flooredgesmooth3/south, /area/almayer/medical/lower_medical_lobby) @@ -52115,13 +54962,15 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) "eAg" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/red/southeast, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer/flooredge/west, /area/almayer/squads/alpha) "eAm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -52235,17 +55084,6 @@ /obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/floor/almayer/red/southwest, /area/almayer/lifeboat_pumps/south1) -"eBV" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) "eCt" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel{ @@ -52280,21 +55118,21 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_m_s) "eDo" = ( -/obj/structure/surface/rack{ - pixel_y = 16; - pixel_x = 5; - density = 0 +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/obj/item/storage/fancy/candle_box{ - pixel_y = 15; - pixel_x = 5 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -25; + pixel_y = 4 }, -/obj/item/storage/fancy/candle_box{ - pixel_y = 15; - pixel_x = 5 +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = -13 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/upper_medical) "eDq" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, @@ -52356,21 +55194,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) -"eFj" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "eFG" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26; @@ -52421,12 +55244,17 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south1) "eFP" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/sign/poster/music{ + pixel_y = 33 }, -/obj/structure/closet/secure_closet/fridge/organic, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/obj/structure/sign/poster/pinup{ + pixel_x = 9; + pixel_y = 36 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "eFT" = ( /obj/structure/bed/sofa/vert/grey, /turf/open/floor/almayer, @@ -52503,15 +55331,8 @@ pixel_x = -12; pixel_y = 13 }, -/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) -"eIG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) "eIN" = ( /obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/almayer/plate, @@ -52626,17 +55447,6 @@ /obj/structure/machinery/computer/supply/asrs/vehicle, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) -"eLu" = ( -/obj/structure/sign/safety/three{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/hallways/lower/port_midship_hallway) "eLC" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray, @@ -52651,18 +55461,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"eLH" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/beer_pack, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = -27; - serial_number = 11 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "eLW" = ( /obj/structure/largecrate/supply/weapons/pistols, /turf/open/floor/almayer/no_build/plating, @@ -52693,8 +55491,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) "eMI" = ( -/turf/open/floor/almayer/blue/west, -/area/almayer/hallways/lower/port_midship_hallway) +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "eMJ" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -52717,26 +55519,17 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) -"eMZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "eNi" = ( /turf/closed/wall/almayer, /area/almayer/engineering/ce_room) "eNI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "containmentlockdown_S"; + name = "\improper Containment Lockdown" }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/hydroponics) +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/containment) "eNL" = ( /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/starboard_midship_hallway) @@ -52747,14 +55540,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) -"eOx" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "eOM" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock PU-6"; @@ -52777,7 +55562,7 @@ /area/almayer/hallways/lower/starboard_umbilical) "ePz" = ( /obj/structure/noticeboard{ - desc = "The note is haphazardly attached to the corkboard by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be disassembled and packed into a crate and sent to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; + desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; pixel_y = 29 }, /obj/structure/flora/pottedplant/random{ @@ -52796,11 +55581,20 @@ pixel_x = 1; pixel_y = 1 }, -/turf/open/floor/almayer/flooredge/east, +/turf/open/floor/almayer/flooredgesmooth/east, /area/almayer/hallways/upper/port) "ePX" = ( -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/morgue) +/obj/structure/platform/metal/almayer/north, +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/plush/therapy/random_color{ + pixel_y = -3 + }, +/obj/structure/sign/nosmoking_2{ + pixel_y = 29 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "eQj" = ( /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; @@ -53035,23 +55829,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "eUf" = ( -/turf/open/floor/almayer/orange/west, -/area/almayer/hallways/lower/starboard_midship_hallway) -"eUh" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 25 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/photocopier, +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) "eUn" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -53061,27 +55841,25 @@ pixel_x = 1; pixel_y = -2 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 7; - pixel_y = 26 - }, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/chemistry) "eUA" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; + icon_state = "N"; pixel_y = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"eUZ" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "eVj" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -53137,36 +55915,19 @@ /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/evidence_storage) "eVT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_windoor"; - name = "Windoor Shutters"; - pixel_x = -9; - pixel_y = 9; - req_access_txt = "28" +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 1; - pixel_x = 5; +/obj/structure/machinery/disposal, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_x = 16; pixel_y = -1 }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_se_2"; - name = "Window Shutters"; - pixel_x = -9; - pixel_y = 2; - req_access_txt = "28" - }, -/turf/open/floor/almayer/sterile_green_corner/west, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "eWp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 - }, -/turf/open/floor/almayer/emeraldfull, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, /area/almayer/living/briefing) "eWs" = ( /turf/closed/wall/almayer, @@ -53205,15 +55966,6 @@ }, /turf/open/floor/almayer/plating, /area/almayer/living/basketball) -"eXD" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "eXN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -53260,16 +56012,6 @@ /obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/squads/req) -"eYu" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/squad_changer{ - pixel_x = -9 - }, -/obj/structure/machinery/computer/card{ - pixel_x = 9 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "eYv" = ( /obj/item/tool/screwdriver, /obj/structure/platform_decoration/metal/almayer/west, @@ -53305,24 +56047,26 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) "eYF" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/emeraldfull, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "eYL" = ( /turf/open/floor/almayer/plating_striped/southeast, /area/almayer/underdeck/req) "eYM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/centrifuge{ + pixel_y = 7 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/processor{ + pixel_x = -3; + pixel_y = 16; + layer = 3.1 }, -/turf/open/floor/almayer/sterile_green_side, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "eYQ" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -53334,9 +56078,8 @@ icon_state = "E"; pixel_x = 1 }, -/obj/item/trash/hotdog, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "eYR" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 5 @@ -53453,6 +56196,14 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "fbb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/cm_vending/gear/smartgun{ + density = 0; + pixel_x = 26; + pixel_y = 1 + }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -53463,18 +56214,8 @@ pixel_x = -1; pixel_y = 1 }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 11 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/blue2/northeast, +/area/almayer/squads/delta) "fbe" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -53483,14 +56224,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"fbo" = ( -/obj/structure/machinery/door_control{ - id = "kitchen2"; - name = "Main Kitchen Shutters"; - pixel_x = -28 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) "fbr" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ closeOtherId = "briglobby"; @@ -53537,6 +56270,7 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/living/briefing) "fco" = ( @@ -53549,9 +56283,13 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) "fcB" = ( +/obj/structure/machinery/cm_vending/clothing/marine/support{ + density = 0; + pixel_x = -26 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emerald/west, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "fcE" = ( /turf/open/floor/almayer/bluecorner/north, /area/almayer/living/basketball) @@ -53603,20 +56341,11 @@ "feo" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 3 + pixel_y = 1; + pixel_x = 1 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) -"feq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) "feD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -53660,8 +56389,10 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "ffx" = ( -/obj/item/clothing/head/helmet/marine/tech/tanker, -/obj/structure/largecrate/random/secure, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) "ffE" = ( @@ -53771,12 +56502,6 @@ }, /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) -"fic" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "fie" = ( /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/workshop) @@ -53879,11 +56604,17 @@ /area/almayer/command/airoom) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, +/obj/item/reagent_container/glass/rag{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/reagent_container/glass/rag{ + pixel_x = 4 + }, /obj/structure/machinery/light{ - dir = 4; - invisibility = 101 + dir = 8 }, -/turf/open/floor/almayer/silver/east, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "fml" = ( /obj/effect/decal/warning_stripes{ @@ -53944,12 +56675,6 @@ "fmZ" = ( /turf/open/floor/almayer/orange/west, /area/almayer/hallways/lower/starboard_umbilical) -"fnc" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/port_midship_hallway) "fnk" = ( /obj/structure/blocker/fuelpump, /turf/open/floor/almayer, @@ -53961,25 +56686,29 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "fnx" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door/window/eastright{ - access_modified = 1; - dir = 8; - req_access_txt = "19" +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/landmark/map_item, -/obj/structure/machinery/door/window/eastleft{ - req_access_txt = "19" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "fnA" = ( -/obj/structure/curtain/open/medical{ - pixel_x = -1 +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + access_modified = 1; + name = "\improper CMO's Bedroom"; + req_one_access_txt = "1;5" }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "fnI" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) @@ -53993,31 +56722,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) -"foL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/emeraldcorner/east, -/area/almayer/squads/charlie) "foN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/ship, /area/almayer/living/tankerbunks) -"foS" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "fpi" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer/plate, @@ -54031,13 +56739,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/port) -"fpM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_aft_hallway) "fpR" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -54047,10 +56748,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) "fpT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "fpW" = ( /obj/structure/sign/safety/bulkhead_door{ @@ -54076,14 +56775,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/bluefull, /area/almayer/command/cicconference) -"fqw" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_aft_hallway) "fqA" = ( /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/lower/port_midship_hallway) @@ -54115,21 +56806,6 @@ /obj/structure/platform/metal/almayer, /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) -"frb" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/tool/kitchen/tray{ - pixel_y = 9 - }, -/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza{ - pixel_y = 8 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "frl" = ( /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/lower_medical_medbay) @@ -54225,14 +56901,14 @@ /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) "fuS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "fuT" = ( /obj/structure/sink{ dir = 4; @@ -54251,30 +56927,24 @@ /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/interrogation) "fva" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/deployable{ - dir = 4 - }, -/turf/open/floor/almayer/plate, +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) "fvd" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/bed/chair{ - dir = 8 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "fvf" = ( -/turf/open/floor/almayer/silver/north, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/northwest, /area/almayer/living/briefing) "fvo" = ( /obj/structure/surface/table/reinforced/almayer_B, @@ -54334,20 +57004,30 @@ /turf/closed/wall/almayer/outer, /area/almayer/hallways/lower/starboard_umbilical) "fwM" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/obj/item/tool/pen{ - pixel_x = -5; - pixel_y = 2 +/obj/structure/bed/chair/comfy/alpha{ + dir = 4 }, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/flooredge/east, /area/almayer/living/briefing) "fwY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28; + pixel_y = 4 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -13; + pixel_x = -21 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "fxJ" = ( /obj/structure/closet/secure_closet/guncabinet/riot_control, /obj/item/weapon/shield/riot, @@ -54379,8 +57059,9 @@ /area/almayer/shipboard/brig/cryo) "fyD" = ( /obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, /obj/structure/ladder/multiz, -/turf/open/floor/almayer/plating, +/turf/open/floor/plating/almayer, /area/almayer/living/briefing) "fyI" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -54397,16 +57078,6 @@ "fzc" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_fore_hallway) -"fzq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) "fzt" = ( /obj/structure/surface/table/almayer, /obj/item/circuitboard{ @@ -54466,26 +57137,13 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"fBo" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) "fBO" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -18; - pixel_y = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/item/clothing/glasses/science{ + pixel_x = 1; + pixel_y = 8 }, -/turf/open/floor/almayer/plate, +/obj/structure/machinery/chem_master/vial, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "fCg" = ( /obj/effect/decal/warning_stripes{ @@ -54550,20 +57208,20 @@ /turf/open/floor/almayer, /area/almayer/hallways/upper/fore_hallway) "fDg" = ( -/obj/structure/platform/metal/almayer/east, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" +/obj/structure/machinery/line_nexter{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) -"fDh" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 + icon_state = "cargo" }, /turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/area/almayer/living/briefing) +"fDh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "fDA" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -54597,11 +57255,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/telecomms) -"fDJ" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "fDU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54623,8 +57276,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "fEC" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer/cargo, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "fEF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -54642,16 +57300,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"fFD" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) "fFL" = ( /obj/structure/bed/roller/hospital_empty/bigrollerempty3, /obj/structure/machinery/camera/autoname/almayer{ @@ -54703,10 +57351,6 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"fGi" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) "fGn" = ( /obj/structure/platform/metal/almayer/north, /turf/open/floor/plating/plating_catwalk, @@ -54764,14 +57408,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/req) -"fIZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/boots/n117{ - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "fJm" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -54885,22 +57521,6 @@ }, /turf/open/floor/almayer/green/northwest, /area/almayer/squads/req) -"fKV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/paper{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/tool/pen/red/clicky{ - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "fKW" = ( /obj/structure/platform/metal/almayer, /obj/structure/platform/metal/almayer/east, @@ -54923,14 +57543,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) -"fLg" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/reagent_container/food/snacks/wrapped/barcardine{ - pixel_x = 3; - pixel_y = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "fLi" = ( /obj/structure/stairs{ dir = 8; @@ -54969,18 +57581,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"fMe" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - pixel_x = 15 - }, -/obj/item/paper, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = -10; - pixel_y = 4 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "fMt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -55059,12 +57659,6 @@ "fNH" = ( /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/hallways/lower/starboard_midship_hallway) -"fOk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "fOv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55092,13 +57686,10 @@ /area/almayer/maint/hull/upper/u_f_s) "fOL" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + icon_state = "SW-out" }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer/sterile_green_corner/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/upper_medical) "fPn" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -55129,13 +57720,13 @@ layer = 3.5; pixel_y = 13 }, -/obj/item/bedsheet/yellow{ +/obj/item/bedsheet/brown{ layer = 3.2 }, -/obj/item/bedsheet/yellow{ +/obj/item/bedsheet/brown{ pixel_y = 13 }, -/turf/open/floor/almayer/orange/northwest, +/turf/open/floor/almayer, /area/almayer/living/starboard_emb) "fPu" = ( /obj/structure/bed/chair{ @@ -55177,6 +57768,10 @@ /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) "fQS" = ( +/obj/structure/machinery/door/airlock/almayer/generic/corporate{ + name = "\improper Weyland-Yutani Office"; + id_tag = "cl_office_door" + }, /obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/door, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55190,11 +57785,6 @@ pixel_x = 8; pixel_y = 8 }, -/obj/structure/machinery/door/airlock/almayer{ - name = "\improper Weyland-Yutani Office"; - req_access = list(200); - id = "cl_quarter_door" - }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) "fRg" = ( @@ -55298,15 +57888,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "fUB" = ( -/obj/structure/closet/secure_closet/fridge/organic/stock, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" + }, +/obj/item/storage/toolbox/mechanical/green, +/obj/item/storage/toolbox/electrical{ + pixel_y = 9 + }, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "fUC" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, +/obj/structure/bed/chair/comfy/charlie, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) "fUE" = ( /turf/open/floor/almayer/plating_striped/northeast, @@ -55342,12 +57938,10 @@ "fVF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2/glass/autoname, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Antechamber" - }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) "fVG" = ( @@ -55418,11 +58012,15 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/stern_point_defense) "fYb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/morgue, +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "test_square_smooth" + }, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "fYf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -55489,10 +58087,10 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "fZG" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "fZR" = ( /obj/structure/machinery/light/red{ @@ -55507,20 +58105,21 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) -"fZZ" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "gac" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer{ + name = "Kitchen"; + id = "Alpha_2"; + req_one_access_txt = "30;19" }, /turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) +/area/almayer/living/grunt_rnr) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -55618,12 +58217,6 @@ }, /turf/open/floor/almayer/silver/east, /area/almayer/shipboard/brig/cic_hallway) -"gdp" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/hallways/hangar) "gdG" = ( /obj/structure/bed/chair{ dir = 8; @@ -55672,10 +58265,6 @@ /obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/starboard_hallway) -"gfq" = ( -/obj/structure/closet/secure_closet/fridge/groceries, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "gfG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -55696,17 +58285,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "ggl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/southeast, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "ggo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -55794,12 +58377,10 @@ /area/almayer/command/cichallway) "gip" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "giD" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -55820,17 +58401,6 @@ "giW" = ( /turf/open/floor/almayer/orange/northeast, /area/almayer/hallways/upper/midship_hallway) -"gjg" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer/blue/west, -/area/almayer/hallways/lower/port_midship_hallway) "gji" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55856,26 +58426,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) "gjv" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) -"gjy" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) "gjK" = ( /obj/structure/machinery/bioprinter{ stored_metal = 125 @@ -55885,17 +58442,16 @@ pixel_y = -28; pixel_x = -1 }, -/obj/structure/sign/safety/rewire{ - pixel_x = -17 - }, /turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/operating_room_three) "gkd" = ( -/obj/effect/landmark/start/marine/charlie, -/obj/effect/landmark/late_join/charlie, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Tool Closet" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "gkg" = ( /obj/structure/platform_decoration/metal/almayer, /turf/open/floor/almayer/red, @@ -55912,9 +58468,11 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "gll" = ( -/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = 33 + }, /turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/hallways/lower/port_midship_hallway) "glG" = ( /obj/structure/surface/rack, /obj/item/storage/box/gloves{ @@ -55980,17 +58538,6 @@ /obj/structure/cargo_container/uscm/right, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"gnu" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "gnv" = ( /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south1) @@ -56027,26 +58574,15 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/weapon_room) -"goo" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/port_midship_hallway) "goy" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/generic{ +/obj/structure/machinery/door/airlock/almayer{ name = "\improper Dorms" }, /turf/open/floor/almayer/test_floor4, @@ -56084,12 +58620,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/upper/port_fore) -"gpI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "gpO" = ( /obj/structure/machinery/door_control{ id = "flightcryo"; @@ -56101,7 +58631,8 @@ /turf/open/floor/almayer/cargo_arrow, /area/almayer/living/pilotbunks) "gpT" = ( -/obj/structure/sign/poster/safety{ +/obj/structure/sign/safety/maint{ + pixel_x = 8; pixel_y = 32 }, /turf/open/floor/almayer/blue/north, @@ -56174,9 +58705,6 @@ /obj/structure/platform_decoration/metal/almayer/northwest, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south2) -"grR" = ( -/turf/open/floor/almayer/orangecorner/east, -/area/almayer/living/briefing) "grT" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wet_sign, @@ -56224,9 +58752,6 @@ pixel_x = 23; specialfunctions = 4 }, -/obj/structure/machinery/light{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -56335,24 +58860,6 @@ /obj/structure/reagent_dispensers/tank/fuel/custom, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) -"guW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/mask/gas{ - pixel_y = 7 - }, -/obj/item/clothing/mask/gas{ - pixel_y = 3 - }, -/obj/item/storage/fancy/candle_box{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "gvg" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -56501,17 +59008,6 @@ "gxO" = ( /turf/open/floor/almayer/blue/southwest, /area/almayer/living/gym) -"gxP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) "gxU" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck, @@ -56592,7 +59088,7 @@ pixel_x = 8; pixel_y = -25 }, -/turf/open/floor/almayer/plating_striped/south, +/turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/hallways/lower/port_midship_hallway) "gzN" = ( /obj/structure/sign/safety/maint{ @@ -56605,19 +59101,13 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"gzV" = ( -/obj/structure/ladder/multiz, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -28 - }, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "gAj" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/turf/open/floor/almayer/emeraldfull, +/turf/open/floor/almayer/flooredge/west, /area/almayer/living/briefing) "gAk" = ( /turf/open/floor/almayer/plate, @@ -56626,17 +59116,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/maint/hull/lower/stairs) "gAz" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/golden_cup{ - desc = "A golden cup, won in the championship final against the USS Sulaco ca. 2172"; - pixel_x = -4; - pixel_y = 7 - }, +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/shovel/spade, +/obj/item/reagent_container/spray/hydro, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) -"gAA" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/maint/hull/lower/l_m_p) "gAO" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -56657,18 +59141,17 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "gBc" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "S" }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/engi/delta{ + density = 0; + pixel_x = -1; + pixel_y = 16 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "gBd" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -56676,10 +59159,22 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) "gBo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + pixel_x = -14; + layer = 2.9 }, -/turf/open/floor/almayer, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + layer = 2.9; + pixel_x = -2 + }, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 21; + pixel_x = 10; + layer = 2.9 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "gBs" = ( /obj/structure/machinery/door/airlock/almayer/maint, @@ -56809,12 +59304,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) "gEo" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 +/turf/closed/wall/almayer{ + damage_cap = 15000 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/area/almayer/maint/hull/lower/l_a_p) "gEC" = ( /obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/almayer/plate, @@ -56840,12 +59333,6 @@ /obj/structure/machinery/cm_vending/gear/commanding_officer, /turf/open/floor/almayer/cargo, /area/almayer/living/commandbunks) -"gGf" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "gGj" = ( /obj/effect/decal/heavy_cable/node_n_w, /turf/open/floor/plating/plating_catwalk/no_build, @@ -56886,18 +59373,27 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) "gGx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/filingcabinet/research{ + density = 0; + pixel_x = -16 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/iv_drip, +/obj/structure/transmitter/rotary{ + name = "Main Research Laboratory Telephone"; + phone_category = "Medical & Research Dept."; + phone_id = "Main Research Laboratory"; + pixel_y = 6; + pixel_x = -15 + }, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "gGI" = ( -/obj/structure/disposalpipe/segment, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red, +/area/almayer/hallways/lower/port_fore_hallway) "gGJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56919,19 +59415,34 @@ /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/lower/l_m_s) "gHj" = ( -/obj/structure/machinery/light, -/obj/structure/closet/secure_closet/fridge/groceries/stock, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/obj/structure/surface/table/almayer, +/obj/item/toy/bikehorn/rubberducky{ + pixel_x = -3 + }, +/obj/item/reagent_container/food/drinks/golden_cup{ + desc = "A golden cup, won in the championship final against the USS Sulaco ca. 2172"; + pixel_y = 18; + pixel_x = 7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "gHl" = ( -/obj/structure/largecrate/random/case/small, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/northwest, /area/almayer/engineering/lower/workshop/hangar) "gHo" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/tl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "gHt" = ( /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/red/northwest, @@ -56949,10 +59460,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/ce_room) -"gIm" = ( -/obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "gIB" = ( /obj/structure/platform/metal/almayer, /obj/structure/prop/invuln/overhead_pipe{ @@ -57096,13 +59603,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) -"gKB" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "gKF" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ @@ -57131,9 +59631,19 @@ /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) "gLc" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/hydroponics) "gLl" = ( /turf/closed/wall/almayer, /area/almayer/maint/upper/u_f_s) @@ -57182,9 +59692,9 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/generic{ - id = "Delta_2"; - name = "\improper Bathroom" +/obj/structure/machinery/door/airlock/almayer{ + name = "\improper Bathroom"; + id = "Delta_2" }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/port_emb) @@ -57240,10 +59750,9 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_umbilical) "gMU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/uscm/directional/east, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/hybrisa/coffee_machine, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "gNg" = ( /obj/structure/sign/safety/maint{ @@ -57259,14 +59768,12 @@ /turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/medical_science) "gNq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0 +/obj/structure/sign/poster/corporate{ + pixel_y = 5; + pixel_x = -26 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/bravo) "gNy" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -57308,9 +59815,6 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/almayer/orange/northeast, /area/almayer/engineering/lower) -"gOS" = ( -/turf/open/floor/almayer/emerald/east, -/area/almayer/hallways/lower/port_midship_hallway) "gPc" = ( /obj/structure/terminal{ dir = 1 @@ -57331,63 +59835,10 @@ /turf/open/floor/almayer/red/east, /area/almayer/hallways/lower/vehiclehangar) "gQF" = ( -/obj/structure/machinery/light, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17; - pixel_y = -7 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = -17; - pixel_y = 7 - }, -/obj/structure/surface/rack, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials{ - pixel_y = 9 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 - }, -/obj/item/storage/fancy/vials/empty{ - pixel_y = -2 +/obj/structure/bed/chair/comfy{ + buckling_y = 2; + dir = 8; + pixel_y = 2 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) @@ -57423,18 +59874,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"gRS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "gSa" = ( /turf/open/floor/almayer/plating_striped/southwest, /area/almayer/engineering/lower/engine_core) @@ -57445,14 +59884,13 @@ /turf/open/floor/almayer/blue/northeast, /area/almayer/living/intel) "gSk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 8; + req_one_access = list(2,34,30) }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_m_p) "gSy" = ( /obj/item/frame/rack{ layer = 3.1; @@ -57528,9 +59966,11 @@ /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/upper/starboard_fore) "gUf" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) +/obj/structure/largecrate/random/case{ + layer = 2.98 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "gUg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -57551,10 +59991,6 @@ }, /turf/open/floor/plating, /area/almayer/living/pilotbunks) -"gUn" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "gUu" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -57592,18 +60028,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) "gVu" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 1 - }, -/obj/item/reagent_container/food/snacks/grown/banana{ - pixel_x = 18; - pixel_y = 5 +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/turf/open/floor/almayer/orangefull, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "gVA" = ( /obj/structure/disposalpipe/down/almayer{ @@ -57662,12 +60090,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"gWE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "gWG" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -57676,15 +60098,10 @@ /turf/open/floor/plating, /area/almayer/medical/upper_medical) "gXl" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers{ - name = "fake brflowers"; - desc = "Just like a real plant, but fake!" - }, -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7"; - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/grass, +/turf/open/floor/almayer/sterile_green, /area/almayer/medical/upper_medical) "gXs" = ( /obj/effect/step_trigger/ares_alert/terminals, @@ -57704,13 +60121,6 @@ }, /turf/open/floor/almayer/silvercorner/west, /area/almayer/shipboard/brig/cic_hallway) -"gXB" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/bed/chair/comfy/delta{ - dir = 8 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "gYg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/emails{ @@ -57728,11 +60138,11 @@ /area/almayer/hallways/lower/repair_bay) "gYl" = ( /obj/structure/sign/safety/restrictedarea{ - pixel_y = -26 + pixel_y = -27 }, /obj/structure/sign/safety/three{ pixel_x = 15; - pixel_y = -26 + pixel_y = -27 }, /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomright" @@ -57767,10 +60177,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"gZz" = ( -/obj/structure/platform/metal/almayer/west, -/turf/open/floor/almayer/uscm/directional/southwest, -/area/almayer/living/briefing) "gZK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -57897,12 +60303,19 @@ /turf/open/floor/almayer/red/west, /area/almayer/command/cicconference) "hbI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom"; + dir = 2 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "hcf" = ( /obj/structure/machinery/cryopod{ dir = 1; @@ -57924,11 +60337,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/cryo_cells) "hcI" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/support{ + dir = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) "hcX" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -57976,13 +60393,6 @@ "hdT" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) -"hdV" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/greencorner/west, -/area/almayer/hallways/lower/port_midship_hallway) "hec" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) @@ -58006,8 +60416,7 @@ /area/almayer/shipboard/brig/armory) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Tool Closet" + dir = 2 }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_emb) @@ -58019,21 +60428,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/engineering/lower) -"hfa" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 25 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) "hfb" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -58068,30 +60462,29 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer/plating_striped/southeast, /area/almayer/engineering/lower/engine_core) -"hfO" = ( -/obj/structure/surface/rack, -/obj/item/storage/belt/utility/full{ - pixel_y = 8 +"hgg" = ( +/obj/item/ashtray/plastic{ + pixel_x = -4; + pixel_y = -12 }, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/suit/storage/hazardvest/black, -/obj/item/tool/crowbar, -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 1 +/obj/item/trash/ceramic_plate{ + pixel_y = 10; + pixel_x = -3 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) -"hfQ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"hgg" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 14; + pixel_x = -7 }, -/turf/open/floor/almayer/redfull, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 12; + pixel_x = -1 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "hgk" = ( /obj/structure/largecrate/random, @@ -58110,12 +60503,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) -"hgs" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/lower/starboard_midship_hallway) "hgB" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -58123,12 +60510,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/computerlab) "hgL" = ( -/obj/item/tool/warning_cone{ - pixel_x = 4; - pixel_y = 14 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/device/reagent_scanner, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "hhd" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/hardhat/orange{ @@ -58173,10 +60559,11 @@ /turf/open/floor/almayer/plating_striped/east, /area/almayer/hallways/lower/repair_bay) "hiu" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice13"; - pixel_x = 16; - pixel_y = 16 +/obj/item/trash/crushed_cup, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/corporate{ + pixel_y = 5; + pixel_x = 24 }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) @@ -58193,44 +60580,16 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"hiP" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/lower/starboard_midship_hallway) "hji" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/blue/west, -/area/almayer/squads/delta) +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "hjk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) -"hjs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/delta) "hjA" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/port_missiles) -"hjB" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - access_modified = 1; - name = "Kitchen"; - req_one_access_txt = "30;19" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) "hjM" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -58241,6 +60600,10 @@ /obj/structure/machinery/status_display{ pixel_y = 30 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "hjT" = ( @@ -58269,12 +60632,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) -"hkC" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = -25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_fore_hallway) "hkG" = ( /obj/structure/sign/safety/ammunition{ pixel_y = -25 @@ -58388,9 +60745,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "hme" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/dark_sterile2, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/hydroponics) "hmj" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -58425,26 +60786,18 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/maint/hull/upper/p_bow) "hmC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/item/trash/uscm_mre{ + pixel_x = -5; + pixel_y = -2 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "hmF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/sign/poster{ - pixel_x = -32 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/hallways/lower/starboard_midship_hallway) "hmS" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -58476,13 +60829,27 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "hng" = ( -/obj/structure/machinery/photocopier{ - layer = 2.9; - pixel_y = 16; - density = 0 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 3; + pixel_x = -10 + }, +/obj/structure/sign/calendar{ + pixel_y = 29 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "hnt" = ( /obj/item/toy/deck{ pixel_y = 12 @@ -58580,11 +60947,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"hqp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/hallways/lower/port_fore_hallway) "hqu" = ( /obj/item/stack/sheet/metal, /turf/open/floor/almayer/plate, @@ -58629,17 +60991,18 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_umbilical) "hsg" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/machinery/door/window/ultra{ - dir = 8; - req_access_txt = "19" +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer, /area/almayer/living/briefing) "hsh" = ( -/obj/structure/coatrack, +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/poster/io{ + pixel_x = -23 + }, /obj/structure/sign/poster/clf{ pixel_x = -28 }, @@ -58649,7 +61012,7 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "hsj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -58662,8 +61025,27 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) "hss" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt{ + icon_state = "ucigbutt"; + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/trash/cigbutt/bcigbutt, +/obj/item/tool/lighter/random{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/trash/cigbutt{ + pixel_x = -1; + pixel_y = 17 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "hsu" = ( /obj/structure/bed/sofa/south/grey{ pixel_y = 12 @@ -58678,16 +61060,8 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/maint/hull/lower/l_f_s) "hsW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/orange/northwest, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) "hte" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/hallways/lower/starboard_umbilical) @@ -58780,10 +61154,10 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "huU" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; name = "\improper Security Checkpoint"; + access_modified = 1; req_access = null; req_one_access_txt = "3;19" }, @@ -58853,12 +61227,6 @@ /obj/structure/platform_decoration/metal/almayer_smooth/north, /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/lower/starboard_fore) -"hxe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "hxm" = ( /obj/item/paper_bin/uscm{ pixel_y = 4 @@ -58890,27 +61258,6 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/south1) -"hxZ" = ( -/obj/structure/surface/rack, -/obj/item/tool/shovel/spade{ - pixel_x = -4 - }, -/obj/item/tool/shovel/spade{ - pixel_x = 4 - }, -/obj/item/tool/shovel/spade, -/obj/item/reagent_container/glass/bucket{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_container/glass/bucket{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/reagent_container/glass/bucket, -/obj/item/reagent_container/glass/watertank, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "hyb" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/plate, @@ -58921,8 +61268,16 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "hyk" = ( -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "hyE" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -58934,7 +61289,7 @@ /area/almayer/command/airoom) "hyQ" = ( /turf/closed/wall/almayer, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "hyT" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 @@ -58979,13 +61334,6 @@ }, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/lower_medical_medbay) -"hzu" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) "hzG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59014,22 +61362,9 @@ /turf/closed/wall/almayer/outer, /area/almayer/hallways/lower/port_umbilical) "hAz" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) -"hAA" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/port_midship_hallway) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "hBr" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -59116,12 +61451,6 @@ /obj/item/storage/firstaid/o2/empty, /turf/open/floor/almayer, /area/almayer/living/briefing) -"hDx" = ( -/obj/effect/landmark/start/marine/tl/delta, -/obj/effect/landmark/late_join/delta, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "hDU" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59137,9 +61466,10 @@ /turf/open/floor/almayer/flooredgesmooth2/west, /area/almayer/hallways/lower/port_fore_hallway) "hDV" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, -/turf/open/floor/almayer/orangefull, +/obj/structure/bed/chair/comfy/delta{ + dir = 1 + }, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/living/briefing) "hDX" = ( /obj/effect/decal/warning_stripes{ @@ -59149,11 +61479,17 @@ /turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/lower_medical_lobby) "hEb" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "hEg" = ( /obj/structure/machinery/door_control{ id = "laddersouthwest"; @@ -59172,13 +61508,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/corporateliaison) -"hEm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "hEr" = ( /obj/structure/filingcabinet{ density = 0; @@ -59208,20 +61537,20 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering/starboard) "hFC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) +/obj/structure/bed/chair/comfy, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/medical_science) "hFF" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 + icon_state = "SE-out" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ + dir = 1; + name = "Morgue"; + req_one_access = list(25) }, -/turf/open/floor/almayer/flooredgesmooth3/south, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "hGb" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -59252,11 +61581,20 @@ /area/almayer/squads/req) "hGO" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 +/obj/item/reagent_container/spray/cleaner{ + pixel_y = 17; + pixel_x = -6 }, -/turf/open/floor/almayer/silver/west, +/obj/item/tool/wet_sign{ + pixel_y = 13; + pixel_x = 7 + }, +/obj/item/tool/wet_sign{ + pixel_y = 13; + pixel_x = 4; + layer = 3.01 + }, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "hGV" = ( /obj/effect/decal/warning_stripes{ @@ -59295,16 +61633,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "hII" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/blue/west, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/bravo) "hIX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -59348,12 +61682,24 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) "hLr" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_s"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/containment) "hLu" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -59361,27 +61707,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) -"hLC" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "hLI" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, /turf/open/floor/almayer/red, /area/almayer/living/cryo_cells) "hLJ" = ( /obj/structure/platform/metal/almayer/north, /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) -"hLS" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) "hMi" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -59412,32 +61748,26 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) "hMX" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = -26 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/orange/west, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) "hNh" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"hNv" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/port_midship_hallway) "hNw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "hNB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ @@ -59447,15 +61777,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) -"hNM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/metal{ - layer = 2.9; - pixel_y = 6 - }, -/obj/item/tool/shovel/etool/folded, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "hNP" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -59534,34 +61855,18 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "hPN" = ( -/obj/item/device/flashlight/lamp{ - pixel_y = 14; - layer = 2.96 - }, -/obj/item/prop/tableflag/uscm{ - pixel_x = -8; +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; pixel_y = 1 }, -/obj/item/prop/tableflag{ - pixel_x = -8; - pixel_y = -10 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) -"hQc" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/hydroponics) "hQf" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredgesmooth2/north, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/port_midship_hallway) "hQw" = ( /obj/structure/machinery/light, @@ -59579,14 +61884,15 @@ dir = 8; health = 500 }, +/obj/structure/reagent_dispensers/tank/fuel/gas/hydrogen, /turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "hQU" = ( -/obj/structure/morgue, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/structure/machinery/light/small/blue{ +/obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/almayer/plate, @@ -59597,10 +61903,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) -"hRd" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "hRk" = ( /obj/structure/sign/prop1{ pixel_y = 32 @@ -59665,7 +61967,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "hSo" = ( -/turf/open/floor/grass, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "hSt" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -59683,26 +61990,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_f_s) -"hSw" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) -"hSV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) -"hTc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/mirror{ - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) -"hTf" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "hTl" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -59746,27 +62033,10 @@ /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) "hTT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 3 - }, -/obj/item/device/analyzer/plant_analyzer, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) -"hTU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/largecrate/random/secure, +/obj/item/trash/burger, +/obj/item/trash/barcardine, /turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/lower/l_m_p) "hUb" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -59789,18 +62059,19 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) "hUz" = ( -/obj/structure/largecrate/supply/supplies/mre{ - desc = "A supply crate containing everything you need to stop a CLF uprising."; - name = "\improper USCM crate 'FOB supplies'" - }, -/obj/item/folded_tent/big{ +/obj/structure/surface/table/almayer, +/obj/item/spacecash/c200{ pixel_x = -6; - pixel_y = 10 + pixel_y = 7 }, -/obj/item/storage/box/mousetraps{ - pixel_x = 3; - pixel_y = 12 +/obj/item/clothing/glasses/disco_fever{ + pixel_x = -3; + pixel_y = -2 }, +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = 9 + }, +/obj/item/reagent_container/pill/happy, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) "hUU" = ( @@ -59832,29 +62103,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) "hVz" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge/northwest, +/obj/structure/machinery/power/apc/almayer/east, +/turf/open/floor/almayer/flooredge/west, /area/almayer/medical/morgue) "hWr" = ( -/obj/effect/landmark/start/marine/smartgunner/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"hWs" = ( -/obj/structure/machinery/flasher_button{ - id = "briefing_flash"; - name = "Briefing Flasher"; - pixel_x = 32; - pixel_y = 27; - req_access_txt = "19" - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) +"hWs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/observer_start, +/turf/open/floor/almayer/uscm/directional/logo_c/west, /area/almayer/living/briefing) "hWB" = ( /obj/structure/sign/safety/escapepod{ @@ -59863,22 +62127,6 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south1) -"hWH" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "hWJ" = ( /obj/structure/largecrate/random/case/small, /obj/structure/sign/safety/maint{ @@ -59913,33 +62161,6 @@ /obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"hXb" = ( -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/charlie_delta_shared) -"hXd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = 4; - pixel_y = 15 - }, -/obj/item/storage/box/mre/wy{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/structure/sign/nosmoking_1{ - pixel_x = 25; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "hXg" = ( /obj/vehicle/powerloader, /obj/structure/platform/metal/almayer/west, @@ -59972,9 +62193,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/upper_engineering/port) -"hXY" = ( -/turf/open/floor/almayer/blue/east, -/area/almayer/squads/delta) "hYf" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer/plate, @@ -59991,7 +62209,7 @@ }, /obj/structure/machinery/light, /obj/structure/machinery/door_control{ - id = "or3privacyshutterdoor"; + id = "or3privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = -24; throw_range = 15; @@ -60096,20 +62314,6 @@ /obj/structure/platform/metal/almayer/east, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"ial" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) -"iaq" = ( -/obj/structure/machinery/vending/cola, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "iat" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -60133,10 +62337,6 @@ }, /turf/open/floor/almayer/red/southwest, /area/almayer/hallways/lower/vehiclehangar) -"iaK" = ( -/obj/structure/platform_decoration/metal/almayer/north, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "iaQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -60198,15 +62398,10 @@ /turf/open/floor/almayer/redcorner/west, /area/almayer/shipboard/brig/processing) "idx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/gloves/black, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "idL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60217,24 +62412,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"idX" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) "ied" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"ien" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "ieu" = ( /obj/structure/window/reinforced{ dir = 4; @@ -60264,10 +62445,10 @@ layer = 3.5; pixel_y = 13 }, -/obj/item/bedsheet/red{ +/obj/item/bedsheet/brown{ layer = 3.2 }, -/obj/item/bedsheet/red{ +/obj/item/bedsheet/brown{ pixel_y = 13 }, /turf/open/floor/almayer/plate, @@ -60286,6 +62467,9 @@ pixel_x = -21; pixel_y = -5 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "iez" = ( @@ -60315,11 +62499,18 @@ /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 }, -/obj/item/book/manual/marine_law{ - pixel_y = 3 +/obj/item/clothing/head/cmcap{ + pixel_x = 8; + pixel_y = -1 }, -/obj/item/book/manual/evaguide{ - pixel_y = 9 +/obj/effect/decal/cleanable/dirt, +/obj/item/book/manual/comms{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/book/manual/tychontackle{ + pixel_x = -4; + pixel_y = 8 }, /turf/open/floor/almayer, /area/almayer/living/briefing) @@ -60380,14 +62571,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"igw" = ( -/obj/structure/sign/poster/ad{ - pixel_x = 30 - }, -/obj/structure/closet, -/obj/item/clothing/mask/cigarette/weed, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "iho" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -60402,19 +62585,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) -"ihM" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "ihO" = ( /obj/structure/cargo_container/hybrisa/containersextended/emptymedicalright{ pixel_y = 7; @@ -60436,23 +62609,27 @@ /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) "ihY" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/spec, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "iit" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/flashlight/lamp{ - pixel_y = 11; - pixel_x = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/item/device/megaphone, -/obj/item/device/flash, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = -3 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "iiU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -60480,9 +62657,9 @@ /turf/open/floor/almayer/bluefull, /area/almayer/command/cicconference) "ijd" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredge/north, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredgesmooth2/north, /area/almayer/hallways/upper/midship_hallway) "ijf" = ( /obj/structure/surface/table/almayer, @@ -60491,12 +62668,6 @@ /obj/structure/machinery/cell_charger, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) -"ijr" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "ijQ" = ( /turf/open/floor/almayer/plating_striped/south, /area/almayer/shipboard/sea_office) @@ -60563,8 +62734,9 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "ilJ" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/bed/chair, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) @@ -60642,12 +62814,11 @@ /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) "inL" = ( -/obj/structure/machinery/smartfridge/chemistry{ - pixel_y = 2; - pixel_x = -1; - explo_proof = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "ios" = ( /obj/structure/surface/table/reinforced/almayer_B, @@ -60678,14 +62849,30 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "iow" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_y_offset = 0 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/poster/music{ + pixel_x = -27 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/squads/alpha) "ioM" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_p) @@ -60712,7 +62899,7 @@ pixel_y = 20; uses = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "ipk" = ( /obj/structure/stairs/perspective{ @@ -60746,21 +62933,20 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/p_bow) "ipE" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/orangefull, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/alpha) "ipK" = ( /obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_garden) -"ipM" = ( -/obj/effect/landmark/start/marine/tl/alpha, -/obj/effect/landmark/late_join/alpha, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "iqd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -60819,22 +63005,15 @@ /turf/open/floor/plating, /area/almayer/living/starboard_emb) "irU" = ( -/obj/structure/machinery/light, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) -"isa" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) "ish" = ( /turf/open/floor/almayer/orange/east, /area/almayer/engineering/lower/workshop) @@ -60923,11 +63102,9 @@ /turf/open/floor/almayer/orange/northeast, /area/almayer/hallways/hangar) "ivs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "ivu" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, @@ -60937,11 +63114,17 @@ /turf/open/floor/almayer/plate, /area/almayer/living/port_emb) "ivM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/largecrate/random/secure, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/item/clothing/head/helmet/marine/tech/tanker{ + pixel_y = 8; + pixel_x = -3 }, /turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/area/almayer/maint/hull/lower/l_a_p) "ivS" = ( /obj/structure/machinery/suit_storage_unit/carbon_unit, /obj/structure/machinery/light, @@ -61024,17 +63207,18 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "ixD" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = 8 }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 7 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/support) "ixL" = ( /obj/structure/platform/metal/almayer/north, /turf/open/floor/almayer/red/north, @@ -61090,13 +63274,6 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) -"iyS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "iyY" = ( /obj/structure/platform_decoration/metal/almayer, /turf/open/floor/almayer/plating_striped/northwest, @@ -61134,11 +63311,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"iAz" = ( -/obj/structure/platform/metal/almayer_smooth, -/obj/structure/machinery/light, -/turf/open_space, -/area/almayer/medical/containment) "iAE" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -61257,9 +63429,6 @@ /area/almayer/underdeck/req) "iEn" = ( /obj/structure/platform/metal/almayer/west, -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "iEr" = ( @@ -61349,9 +63518,9 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/generic{ - id = "Delta_1"; - name = "\improper Bathroom" +/obj/structure/machinery/door/airlock/almayer{ + name = "\improper Bathroom"; + id = "Delta_1" }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/port_emb) @@ -61378,11 +63547,8 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) "iGA" = ( -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_corner/east, +/obj/structure/bed/sofa/south/white/left, +/turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/upper_medical) "iHc" = ( /turf/open/floor/plating/plating_catwalk, @@ -61406,13 +63572,13 @@ /turf/open/floor/almayer/cargo, /area/almayer/maint/upper/u_m_p) "iIl" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "iIo" = ( /obj/structure/disposalpipe/down/almayer{ dir = 1; @@ -61421,12 +63587,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) "iIO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/cargo_arrow/east, +/area/almayer/squads/delta) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -61442,13 +63604,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "iIR" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "iIU" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -61469,13 +63633,19 @@ /turf/open/floor/almayer/silver, /area/almayer/command/cichallway) "iJS" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/blue/southwest, -/area/almayer/squads/delta) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "iKb" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/orange, @@ -61501,12 +63671,13 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck) "iKw" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) "iKy" = ( /turf/open/floor/almayer/green/west, /area/almayer/hallways/upper/fore_hallway) @@ -61548,10 +63719,27 @@ /turf/open/floor/almayer/silver/south, /area/almayer/command/computerlab) "iLh" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 +/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ + pixel_x = -6; + pixel_y = -11 }, -/turf/open/floor/almayer/orangefull, +/obj/item/ashtray/plastic{ + pixel_x = 1; + pixel_y = -7 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 15 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 17; + pixel_x = -3 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 19; + pixel_x = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "iLm" = ( /obj/structure/disposalpipe/segment{ @@ -61573,7 +63761,14 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/sign/safety/ladder{ + pixel_x = 36 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer/flooredgesmooth3/north, /area/almayer/medical/lower_medical_lobby) "iLL" = ( /turf/open/floor/almayer/blue/west, @@ -61598,17 +63793,33 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "iMm" = ( -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "iMr" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 1; + pixel_x = 26 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools{ + pixel_y = 16; + pixel_x = -5; + density = 0 + }, +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) "iMD" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/flooredge/south, +/turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/upper/midship_hallway) "iMI" = ( /obj/structure/machinery/bioprinter{ @@ -61618,10 +63829,6 @@ pixel_y = 28; pixel_x = -1 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 1 - }, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/operating_room_two) "iNh" = ( @@ -61682,15 +63889,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"iOo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "iOD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -61724,15 +63922,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) "iPt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /turf/open/floor/almayer/green/southwest, /area/almayer/hallways/lower/starboard_midship_hallway) "iPv" = ( -/obj/structure/bed/chair/comfy, -/obj/structure/window/reinforced/ultra, -/obj/structure/window/reinforced/ultra{ - dir = 8 - }, -/turf/open/floor/almayer/silver/southwest, +/turf/open/floor/almayer/cargo_arrow/east, /area/almayer/living/briefing) "iPD" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ @@ -61756,10 +63952,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) -"iPS" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) "iQd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -61770,35 +63962,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"iQi" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "iQj" = ( -/obj/structure/largecrate/random/barrel/red, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) "iQt" = ( @@ -61815,7 +63986,7 @@ pixel_y = 6; serial_number = 12 }, -/turf/open/floor/almayer/emerald/northwest, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "iQB" = ( /obj/structure/surface/table/almayer, @@ -62064,16 +64235,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) -"iUk" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) "iUm" = ( /obj/structure/closet/emcloset{ pixel_x = 8 @@ -62184,22 +64345,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "iWc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; +/obj/structure/machinery/cm_vending/clothing/engi/support{ + density = 0; + pixel_y = 16; pixel_x = -1 }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "iWn" = ( /obj/item/paper/almayer_storage, /turf/open/floor/plating/plating_catwalk, @@ -62256,10 +64411,7 @@ /turf/open/floor/prison/kitchen, /area/almayer/engineering/upper_engineering) "iXb" = ( -/obj/structure/bed/chair/comfy/delta{ - dir = 8 - }, -/turf/open/floor/almayer/bluefull, +/turf/open/floor/almayer/green/east, /area/almayer/living/briefing) "iXB" = ( /obj/structure/bed/chair{ @@ -62276,9 +64428,20 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "iXT" = ( -/obj/item/trash/uscm_mre, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) "iXU" = ( /obj/structure/machinery/light{ dir = 8 @@ -62312,18 +64475,16 @@ /turf/open/floor/almayer/plating, /area/almayer/living/basketball) "iYf" = ( -/obj/structure/sign/calendar/ua{ - pixel_y = 27; - layer = 2.9 +/obj/structure/machinery/cm_vending/clothing/medical_crew{ + density = 0; + pixel_y = 16 }, -/obj/structure/machinery/faxmachine/uscm/almayer{ - pixel_x = -3; - pixel_y = 5; - sub_name = "Chief Medical Officer" +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/medical/hydroponics) "iYm" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, @@ -62374,17 +64535,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/req) -"jaf" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/holidays/string_lights{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "jak" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62403,15 +64553,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/upper/aft_hallway) -"jas" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/port_midship_hallway) "jay" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/etool{ @@ -62525,14 +64666,6 @@ "jcP" = ( /turf/open/floor/almayer/plating_striped, /area/almayer/engineering/upper_engineering/starboard) -"jdm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "jdn" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -62563,22 +64696,27 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/offices/flight) "jeb" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/hallways/lower/starboard_midship_hallway) "jei" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "jeq" = ( -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) -"jer" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/surface/rack, +/obj/item/storage/box/pillbottles{ + pixel_x = 6; + pixel_y = 7 }, -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_a_p) +/obj/item/storage/box/pillbottles{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/box/pillbottles, +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "jev" = ( /obj/structure/largecrate/random/case/small, /obj/item/device/taperecorder{ @@ -62650,20 +64788,20 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "jge" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/vending/snack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_fore_hallway) +"jgg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/pipes/vents/pump{ +/obj/structure/machinery/light/containment{ dir = 4 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) -"jgg" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) "jgk" = ( /obj/structure/machinery/shower{ dir = 1 @@ -62769,13 +64907,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) -"jht" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "jhx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -62785,11 +64916,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) "jhD" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 +/obj/structure/sign/safety/rewire{ + pixel_x = 33 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/hallways/lower/starboard_midship_hallway) "jhI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ @@ -62846,17 +64977,6 @@ }, /turf/open/floor/almayer/redcorner/north, /area/almayer/shipboard/brig/lobby) -"jiM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "jiU" = ( /obj/structure/sink{ dir = 1; @@ -62922,18 +65042,20 @@ /turf/open/floor/plating, /area/almayer/living/cryo_cells) "jkz" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/handcuffs{ - pixel_x = 6; - pixel_y = 6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/obj/item/storage/box/ids{ - pixel_x = -4; - pixel_y = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 }, -/obj/item/storage/box/handcuffs, /turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/area/almayer/living/grunt_rnr) "jkB" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -62944,23 +65066,10 @@ /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/port) "jkD" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 2 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/east, /area/almayer/living/briefing) "jkN" = ( /obj/structure/largecrate/random/barrel/yellow, @@ -62970,13 +65079,13 @@ /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/starboard) "jlA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/storage{ - pixel_x = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/medical_science) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/containment) "jlD" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_fore_hallway) @@ -63017,17 +65126,6 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) -"jmn" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/dirty{ - pixel_y = 5 - }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = 6 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "jmz" = ( /obj/structure/largecrate/random/case/double, /obj/structure/sign/safety/distribution_pipes{ @@ -63072,11 +65170,6 @@ "jne" = ( /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/upper/u_f_p) -"jno" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, -/area/almayer/hallways/lower/starboard_aft_hallway) "jnp" = ( /obj/structure/surface/table/almayer, /obj/item/cell/high{ @@ -63166,7 +65259,25 @@ /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/south2) "jpl" = ( -/turf/closed/wall/almayer/research/containment/wall/corner, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_n"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/medical_science) "jpp" = ( /obj/structure/window/framed/almayer/white, @@ -63233,8 +65344,9 @@ /area/almayer/shipboard/brig/execution) "jqZ" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "NE-out"; + pixel_y = 2; + pixel_x = 1 }, /turf/open/floor/almayer/flooredgesmooth2/north, /area/almayer/medical/lower_medical_lobby) @@ -63292,34 +65404,16 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_p) "jrM" = ( -/obj/structure/closet/medical_wall{ - pixel_y = 30 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -6; - pixel_y = -2 +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_corner/north, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) "jrR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, +/obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/delta) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "jsa" = ( /obj/structure/machinery/power/apc/almayer/west, /obj/effect/decal/cleanable/dirt, @@ -63355,15 +65449,12 @@ /turf/open/floor/almayer/silver/northeast, /area/almayer/hallways/lower/repair_bay) "jsx" = ( -/obj/structure/machinery/chem_master/vial{ - pixel_y = 2; - explo_proof = 1 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 5; - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/medical_science) "jsA" = ( /turf/open/floor/almayer/plate, @@ -63387,12 +65478,6 @@ "jtU" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) -"jtZ" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/hallways/lower/port_midship_hallway) "juj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -63439,7 +65524,7 @@ pixel_y = 26 }, /obj/structure/machinery/door_control{ - id = "or4privacyshutterdoor"; + id = "or4privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = 26; throw_range = 15; @@ -63455,38 +65540,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/mp_bunks) "jvp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_y = 16; pixel_x = -1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/blue2/northeast, +/area/almayer/squads/delta) "jvt" = ( -/obj/item/tool/warning_cone{ - pixel_x = -20; - pixel_y = 18 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -16 +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "jvB" = ( /obj/structure/closet/firecloset, @@ -63557,17 +65623,6 @@ /obj/structure/platform/metal/almayer/east, /turf/open/floor/almayer, /area/almayer/living/chapel) -"jwK" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha_bravo_shared) -"jwP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "jxq" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/red/north, @@ -63579,11 +65634,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) "jxx" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "jxy" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -63673,7 +65728,8 @@ /area/almayer/living/numbertwobunks) "jzT" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredgesmooth2/south, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/flooredge, /area/almayer/hallways/lower/starboard_midship_hallway) "jAj" = ( /obj/structure/machinery/light{ @@ -63710,14 +65766,8 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "jBy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) "jCg" = ( /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, @@ -63759,7 +65809,7 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/starboard_hallway) "jDk" = ( -/obj/structure/machinery/light_construct{ +/obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer/orange/east, @@ -63773,29 +65823,11 @@ /area/almayer/hallways/lower/port_midship_hallway) "jDO" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer{ - name = "\improper Cold Storage"; - req_access = list(200) +/obj/structure/machinery/door/airlock/almayer/generic/corporate{ + name = "\improper Cold Storage" }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) -"jEA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "jEM" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) @@ -63823,7 +65855,26 @@ /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/upper/starboard_fore) "jFx" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/item/stack/sheet/aluminum{ + amount = 20 + }, +/obj/item/stack/sheet/copper{ + amount = 20; + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 3; + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/silver{ + amount = 5; + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/phoron{ + amount = 25 + }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "jFy" = ( @@ -63834,10 +65885,9 @@ /turf/open/floor/almayer/green/west, /area/almayer/squads/req) "jFE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "jFI" = ( /obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plate, @@ -63882,15 +65932,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) "jGR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "jHh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63949,7 +65996,7 @@ /area/almayer/engineering/lower/engine_core) "jJk" = ( /obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/almayer/blue/northeast, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "jKn" = ( /turf/open/floor/almayer/plating/northeast, @@ -63968,21 +66015,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) -"jKK" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "jLg" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, /area/almayer/hallways/lower/port_aft_hallway) -"jLj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) "jLs" = ( /obj/structure/machinery/shower{ dir = 8 @@ -63998,8 +66034,8 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "jLS" = ( -/obj/structure/bed/chair/comfy/charlie, /obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "jMa" = ( @@ -64017,18 +66053,12 @@ /turf/open/floor/almayer/plate, /area/almayer/lifeboat_pumps/north1) "jMr" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box{ - pixel_y = 4 - }, -/obj/structure/sign/safety/security{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = 7 - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/freezer, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/mushroom, +/obj/item/pizzabox/mushroom, /turf/open/floor/almayer, /area/almayer/living/briefing) "jMx" = ( @@ -64079,6 +66109,10 @@ }, /obj/item/tool/shovel/etool, /obj/item/tool/wirecutters, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 26 + }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "jNw" = ( @@ -64103,35 +66137,9 @@ /obj/effect/spawner/random/balaclavas, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"jNK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "jNT" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/execution) -"jOi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer/orangecorner/east, -/area/almayer/squads/bravo) "jOk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/line_nexter_control{ @@ -64169,25 +66177,13 @@ /obj/item/trash/barcardine, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"jOx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "jOG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/turf/open/floor/almayer/sterile_green_side/southwest, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "jPd" = ( /obj/structure/machinery/camera/autoname/almayer{ @@ -64222,13 +66218,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) -"jPU" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_p) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2/west, /area/almayer/medical/containment/cell) @@ -64260,11 +66249,13 @@ /area/almayer/engineering/upper_engineering/port) "jRH" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "jRK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/cargo, @@ -64287,13 +66278,17 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "jSp" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/emerald/northwest, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "jSw" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -64301,15 +66296,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/processing) -"jSy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "jSU" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -64336,42 +66322,10 @@ /turf/open/floor/almayer/green/west, /area/almayer/living/offices) "jTj" = ( -/obj/structure/surface/rack{ - pixel_y = 16; - pixel_x = -4; - density = 0 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = -4 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = -4 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = -4 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 15; - pixel_x = -4 - }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) -"jTt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_y = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/starboard_midship_hallway) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "jTB" = ( /turf/open/floor/almayer/orangecorner/north, /area/almayer/engineering/lower) @@ -64384,10 +66338,6 @@ }, /turf/open/floor/almayer/flooredgesmooth2/east, /area/almayer/hallways/lower/vehiclehangar) -"jTI" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie_delta_shared) "jTU" = ( /obj/structure/bed, /obj/item/bedsheet/red, @@ -64400,15 +66350,6 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) -"jUq" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "jUx" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock SL-2"; @@ -64423,14 +66364,11 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) "jUM" = ( -/obj/structure/machinery/door_control{ - id = "Test_Chamber"; - name = "\improper Test Chamber Shutters"; - pixel_x = 22; - pixel_y = 29; - req_one_access_txt = "28" +/obj/structure/machinery/camera/autoname/almayer/containment{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/medical_science) "jUV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -64458,44 +66396,15 @@ }, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"jVr" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "jVt" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/hop{ - layer = 3.2 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/item/bedsheet/hop{ - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner3, +/area/almayer/medical/containment/cell) "jVE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_17"; @@ -64608,12 +66517,6 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) "jYc" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, /obj/item/toy/plush/therapy/red{ desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; force = 15; @@ -64645,7 +66548,13 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/blue, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "jYm" = ( /obj/item/reagent_container/food/snacks/wrapped/chunk, @@ -64704,8 +66613,16 @@ /turf/open/floor/carpet, /area/almayer/command/cicconference) "jZv" = ( -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/structure/machinery/cm_vending/clothing/tl/support{ + density = 0; + pixel_x = -1; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "jZB" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer/no_build/plating, @@ -64720,10 +66637,6 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/starboard) -"jZY" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) "kac" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -64757,14 +66670,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating, /area/almayer/living/basketball) -"kaB" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/squads/alpha) "kaE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64773,11 +66678,9 @@ /turf/open/floor/almayer/cargo_arrow/east, /area/almayer/hallways/upper/midship_hallway) "kaI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/orange/west, +/area/almayer/squads/bravo) "kaO" = ( /obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/silver/west, @@ -64789,19 +66692,6 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/starboard_hallway) -"kbc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 8 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) "kbl" = ( /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; @@ -64813,8 +66703,8 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "kbn" = ( -/obj/structure/platform_decoration/metal/almayer/west, -/turf/open/floor/almayer/mono, +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "kbv" = ( /turf/open/floor/plating/plating_catwalk, @@ -64838,13 +66728,13 @@ /turf/open/floor/prison/kitchen, /area/almayer/engineering/upper_engineering) "kbJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/conference_room{ - pixel_x = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/medical_science) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/containment) "kcg" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -64975,20 +66865,28 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/surface/table/almayer, +/obj/structure/largecrate/random/case/small{ + pixel_y = 5 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = -1; + pixel_y = 9 + }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) "kgs" = ( -/obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 1 }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "researchlockdownext_se_2"; name = "\improper Research Window Shutter" }, +/obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) @@ -65036,11 +66934,10 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/upper/aft_hallway) "khd" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +/obj/structure/machinery/cm_vending/gear/engi, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/squads/bravo) "khD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ @@ -65067,6 +66964,9 @@ /turf/open/floor/plating, /area/almayer/hallways/lower/repair_bay) "kin" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/port) "kio" = ( @@ -65079,12 +66979,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) -"kiy" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/blue/west, -/area/almayer/hallways/lower/port_midship_hallway) "kiG" = ( /obj/structure/machinery/power/smes/buildable, /obj/structure/machinery/status_display{ @@ -65100,33 +66994,15 @@ }, /turf/open/floor/almayer/tcomms, /area/almayer/engineering/lower/engine_core) -"kiM" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "kiR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_a_s) -"kiU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) -"kiV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "kiX" = ( -/obj/structure/bed/chair/comfy/delta{ - dir = 1 - }, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "kjk" = ( /obj/structure/machinery/cryopod/right, @@ -65150,7 +67026,6 @@ /area/almayer/hallways/lower/vehiclehangar) "kjD" = ( /obj/structure/machinery/power/apc/almayer/west, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower/workshop/hangar) "kjO" = ( @@ -65221,11 +67096,12 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) "kln" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/west, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "klH" = ( /obj/effect/decal/warning_stripes{ @@ -65236,10 +67112,10 @@ }, /obj/structure/sign/safety/med_cryo{ pixel_x = 15; - pixel_y = -26 + pixel_y = -27 }, /obj/structure/sign/safety/cryo{ - pixel_y = -26 + pixel_y = -27 }, /obj/structure/machinery/light{ dir = 8 @@ -65321,11 +67197,15 @@ /turf/open/floor/almayer/plating_stripedcorner/south, /area/almayer/engineering/lower/engine_core) "knK" = ( -/obj/structure/kitchenspike, -/obj/effect/decal/cleanable/blood/gibs, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/obj/structure/reagent_dispensers/tank/water, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "knL" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, @@ -65354,21 +67234,23 @@ /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/living/gym) "koC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "koI" = ( +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "kpf" = ( /turf/open/floor/almayer/flooredge/northwest, /area/almayer/command/corporateliaison) @@ -65453,15 +67335,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/lower/starboard_fore) "kqB" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 }, -/obj/structure/surface/table/almayer, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "kqC" = ( /obj/structure/machinery/light/red{ @@ -65544,21 +67422,11 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/starboard) "krU" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/tool/screwdriver, -/obj/item/bananapeel{ - desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by Armat, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil"; - icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi'; - icon_state = "iffbarrel"; - name = "Broken B8 Smart-Scope"; - pixel_x = -3; - pixel_y = 7 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/turf/open/floor/almayer/orangefull, +/turf/open/floor/almayer/flooredge/west, /area/almayer/living/briefing) "krZ" = ( /obj/structure/closet/secure_closet/cargotech, @@ -65594,9 +67462,6 @@ "ksw" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_stern) -"ksN" = ( -/turf/open/floor/almayer/uscm/directional/southeast, -/area/almayer/living/briefing) "ksS" = ( /obj/structure/largecrate/random{ pixel_y = 20; @@ -65611,14 +67476,6 @@ }, /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) -"kti" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/starboard_midship_hallway) "ktl" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -65633,12 +67490,9 @@ /turf/open/floor/almayer/aicore/no_build/ai_arrow/west, /area/almayer/command/airoom) "ktR" = ( -/obj/item/trash/crushed_cup, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) -"ktX" = ( -/turf/open/floor/almayer/greencorner/east, -/area/almayer/living/grunt_rnr) "kui" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -65663,9 +67517,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"kuw" = ( -/turf/open/floor/almayer/emeraldcorner/east, -/area/almayer/living/briefing) "kuJ" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer/red/north, @@ -65726,23 +67577,14 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/warden_office) -"kvU" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "kwc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/prop/holidays/string_lights{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/north, /area/almayer/living/briefing) "kwd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -65759,7 +67601,7 @@ /area/almayer/maint/hull/upper/u_f_s) "kwi" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/south, +/turf/open/floor/almayer/flooredge, /area/almayer/hallways/lower/starboard_aft_hallway) "kwo" = ( /obj/structure/surface/rack, @@ -65769,8 +67611,8 @@ /obj/structure/machinery/vending/coffee{ pixel_x = -3 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/sign/safety/coffee{ + pixel_x = -21 }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) @@ -65947,12 +67789,6 @@ name = "General Listening Channel"; pixel_y = 28 }, -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, /obj/structure/window/reinforced{ dir = 4; pixel_x = -2; @@ -65971,7 +67807,13 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/plate, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "kzQ" = ( /obj/structure/platform_decoration/metal/almayer/north, @@ -65984,8 +67826,9 @@ /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/north1) "kAj" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = 26 }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) @@ -66003,16 +67846,11 @@ /area/almayer/shipboard/brig/processing) "kBo" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/medical_science) "kBy" = ( /obj/structure/machinery/ares/processor, @@ -66066,25 +67904,22 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/shipboard/brig/medical) -"kDd" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "kDk" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ResearchStairs"; - name = "\improper Stairway Lockdown" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/containment) "kDH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -66109,14 +67944,6 @@ }, /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/lower_medical_medbay) -"kDY" = ( -/obj/structure/platform/metal/almayer/east, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "kEc" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -66128,26 +67955,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) "kEg" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/toy/deck/uno{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 27; - serial_number = 11 +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/living/briefing) "kEp" = ( -/turf/open/floor/almayer/plating_stripedcorner/west, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = -20; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/upper_medical) "kEq" = ( /obj/structure/machinery/door/window/ultra{ @@ -66157,13 +67980,11 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "kEs" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/alpha{ + dir = 4 }, -/obj/item/prop/helmetgarb/helmet_nvg/cosmetic, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/flooredge/west, /area/almayer/living/briefing) "kEA" = ( /turf/open/floor/plating/plating_catwalk/no_build, @@ -66191,7 +68012,6 @@ /area/almayer/hallways/lower/vehiclehangar) "kFe" = ( /obj/item/storage/toolbox/mechanical, -/obj/structure/largecrate/random/case, /turf/open/floor/almayer/plate, /area/almayer/hallways/upper/fore_hallway) "kFs" = ( @@ -66231,10 +68051,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/cryo) -"kGw" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/port_fore_hallway) "kGA" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -66244,24 +68060,19 @@ /turf/open/floor/almayer/plating_stripedcorner/east, /area/almayer/engineering/lower/engine_core) "kGF" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ +/obj/structure/machinery/cm_vending/gear/tl{ + pixel_x = -1; density = 0; pixel_y = 16 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "kGS" = ( /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/upper/aft_hallway) -"kHd" = ( -/obj/structure/machinery/computer/arcade, -/obj/item/prop/helmetgarb/spacejam_tickets{ - pixel_x = 4; - pixel_y = 12 - }, -/turf/open/floor/almayer/green/southeast, -/area/almayer/living/grunt_rnr) "kHo" = ( /obj/item/device/camera{ pixel_x = 4; @@ -66291,15 +68102,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) -"kIk" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "kIl" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -66315,11 +68117,18 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "kIP" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = 27; + pixel_y = 4 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) +/obj/structure/sign/safety/intercom{ + pixel_y = -13; + pixel_x = 34 + }, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/support) "kJh" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -66328,18 +68137,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"kJi" = ( -/obj/structure/machinery/light, -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 14; - pixel_y = 20 - }, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "kJm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66364,13 +68161,14 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) "kJH" = ( +/obj/structure/reagent_dispensers/tank/fuel/custom, +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/window/reinforced/toughened{ dir = 4; health = 500 }, -/obj/structure/machinery/light_construct{ - dir = 1 - }, /turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "kJQ" = ( @@ -66399,14 +68197,6 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) -"kKk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) "kKB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, @@ -66418,6 +68208,9 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "kKY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_aft_hallway) "kLc" = ( @@ -66428,22 +68221,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "kLk" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) -"kLm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 25 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) "kLE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -66472,15 +68254,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/port) -"kMr" = ( -/obj/item/trash/uscm_mre, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "kMH" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 1"; @@ -66501,11 +68274,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer_hull/outerhull_dir/west, /area/almayer/engineering/upper_engineering/port) -"kMR" = ( -/obj/effect/spawner/random/toolbox, -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "kMV" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -66558,11 +68326,11 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/hallways/upper/starboard) "kNX" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emeraldfull, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "kNY" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -66599,17 +68367,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/auxiliary_officer_office) -"kOJ" = ( -/obj/item/prop{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag_full"; - name = "trash bag"; - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "kOR" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -66637,14 +68394,6 @@ pixel_x = -1 }, /obj/structure/surface/table/almayer, -/obj/item/book/manual/chemistry{ - pixel_y = -7; - pixel_x = -5 - }, -/obj/item/book/manual/chemistry{ - pixel_x = -4; - pixel_y = -3 - }, /obj/structure/flora/pottedplant{ icon_state = "pottedplant_17"; pixel_x = -6; @@ -66658,6 +68407,7 @@ pixel_x = 6; req_one_access_txt = "19;20" }, +/obj/item/book/manual/chemistry, /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/chemistry) "kPB" = ( @@ -66827,10 +68577,6 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/warden_office) -"kUo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "kUA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -66866,7 +68612,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "kUR" = ( -/turf/open/floor/almayer/bluefull, +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" + }, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) "kUV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -66912,17 +68662,24 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_f_s) "kWN" = ( -/obj/structure/sign/poster{ - desc = "It says DRUG."; - icon_state = "poster2"; - pixel_x = -27 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = 16; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = -15; + pixel_x = -12 + }, +/turf/open/floor/almayer/flooredge/south, /area/almayer/living/briefing) "kWR" = ( /obj/structure/surface/table/woodentable/fancy, @@ -66942,15 +68699,15 @@ /turf/open/floor/almayer/blue/west, /area/almayer/living/auxiliary_officer_office) "kXa" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "kXk" = ( /obj/structure/largecrate/random/barrel/true_random, /obj/structure/machinery/light/red{ @@ -67001,7 +68758,7 @@ /area/almayer/hallways/upper/aft_hallway) "kYl" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/port_aft_hallway) "kYt" = ( /obj/structure/surface/table/woodentable/fancy, @@ -67010,10 +68767,6 @@ pixel_x = -3; pixel_y = 9 }, -/obj/item/clothing/accessory/rosary{ - pixel_x = -4; - pixel_y = 5 - }, /obj/item/device/flashlight/lamp{ pixel_x = 3; pixel_y = 1 @@ -67045,21 +68798,18 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices/cryo) -"kZV" = ( -/obj/structure/machinery/smartfridge/chemistry{ - pixel_y = 16; - pixel_x = -1; - explo_proof = 1; - density = 0 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) "lab" = ( /obj/structure/surface/rack, /obj/structure/machinery/camera/autoname/almayer{ dir = 1; name = "ship-grade camera" }, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 10 + }, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = -5 + }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "lah" = ( @@ -67136,12 +68886,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) -"lbf" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) "lbs" = ( /obj/structure/sign/safety/biolab{ pixel_x = -17; @@ -67163,23 +68907,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_p) -"lbX" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "lcg" = ( /obj/structure/machinery/ares/substrate, /turf/open/floor/almayer/no_build/test_floor4, @@ -67218,12 +68945,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"ldb" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/starboard_fore_hallway) "ldc" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/lower/workshop) @@ -67258,22 +68979,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) "ldW" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) "lef" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) -"leg" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/machinery/cm_vending/clothing/tl/support{ + density = 0; + pixel_x = -1; + pixel_y = 16 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/hallways/hangar) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "let" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -67353,31 +69074,19 @@ /turf/open/floor/plating, /area/almayer/living/cryo_cells) "lgC" = ( -/obj/structure/platform/metal/almayer/west, -/turf/open/floor/almayer/uscm/directional/northwest, +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, /area/almayer/living/briefing) "lgF" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = -11; - pixel_y = 5 - }, -/obj/item/tool/pen{ - pixel_x = -10; - pixel_y = -2 +/obj/structure/sign/poster{ + icon_state = "poster14"; + pixel_x = -27 }, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "lhj" = ( /obj/effect/decal/cleanable/dirt, @@ -67393,17 +69102,18 @@ /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering/starboard) "lhB" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; dir = 2; - id = "kitchen"; - name = "\improper Kitchen Shutters" + name = "\improper Processing and Identification Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/turf/open/floor/plating, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/test_floor4, +/area/almayer/hallways/lower/port_fore_hallway) "lhE" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random{ @@ -67439,20 +69149,8 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) "lid" = ( -/obj/structure/machinery/faxmachine/corporate{ - department = "USS Almayer"; - radio_alert_tag = ":m"; - sub_name = "Research"; - pixel_x = -1; - pixel_y = 3 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_y = -1; - pixel_x = -22 - }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/chem_master/vial, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "liJ" = ( /obj/structure/disposalpipe/segment{ @@ -67464,9 +69162,15 @@ /turf/open/floor/almayer/silver/west, /area/almayer/command/computerlab) "liY" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/machinery/iv_drip, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/area/almayer/medical/containment/cell) "liZ" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck, @@ -67496,20 +69200,9 @@ /obj/item/clothing/suit/storage/hazardvest/black, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"ljs" = ( -/obj/effect/landmark/start/marine/spec/bravo, -/obj/effect/landmark/late_join/bravo, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "ljv" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_a_p) -"ljG" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/condiment/coldsauce, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "ljO" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -67528,13 +69221,8 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "ljW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/alpha{ - dir = 8 - }, -/turf/open/floor/almayer/plate, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "lka" = ( /obj/structure/disposalpipe/segment, @@ -67545,14 +69233,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "lkd" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "kitchen2"; - name = "\improper Kitchen Shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/grunt_rnr) +/obj/structure/largecrate/random/barrel/brown, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "lkf" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -67565,28 +69248,11 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/starboard) -"lkL" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, -/obj/structure/barricade/deployable{ - dir = 4 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "lkM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) +/area/almayer/maint/hull/lower/l_a_p) "lkV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67653,15 +69319,14 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/chief_mp_office) -"lnm" = ( -/turf/open/floor/almayer/orangecorner, -/area/almayer/living/briefing) "lnt" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/shipboard/brig/cic_hallway) "lnu" = ( -/turf/closed/wall/almayer/outer/internal, -/area/almayer/living/gym) +/obj/structure/surface/table/almayer, +/obj/item/storage/beer_pack, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_f_s) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -67692,16 +69357,15 @@ /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) "lok" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "lol" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -67714,39 +69378,22 @@ /area/almayer/engineering/upper_engineering/port) "lou" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + icon_state = "S" }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 }, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "loy" = ( -/obj/structure/sign/poster{ - desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; - icon_state = "poster7"; - name = "EAT - poster"; - pixel_x = 27 - }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 2 +/obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter{ + name = "2nd Platoon's Telephone"; + phone_category = "Almayer"; + phone_id = "2nd Platoon's Briefing Room"; + pixel_y = 28 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "loE" = ( /turf/open/floor/plating/plating_catwalk, @@ -67754,27 +69401,17 @@ "loP" = ( /turf/closed/wall/almayer, /area/almayer/engineering/laundry) -"loS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer/bluecorner, -/area/almayer/squads/delta) "loV" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/starboard_aft) "loY" = ( -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "lpg" = ( /obj/structure/machinery/cm_vending/clothing/dress{ req_access = list(1) @@ -67786,8 +69423,27 @@ /turf/open/floor/almayer/cargo, /area/almayer/hallways/hangar) "lpt" = ( -/turf/open/floor/almayer/blue, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/power/apc/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/hallways/lower/port_midship_hallway) "lql" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_umbilical) @@ -67800,7 +69456,7 @@ pixel_x = -13; pixel_y = 8 }, -/turf/open/floor/almayer/emerald/north, +/turf/open/floor/almayer, /area/almayer/hallways/hangar) "lqL" = ( /obj/structure/machinery/firealarm{ @@ -67822,7 +69478,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/orange/southwest, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "lrq" = ( /turf/closed/wall/almayer/reinforced, @@ -67847,9 +69503,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) "lrT" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/cm_vending/clothing/tl/bravo, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "lrW" = ( /obj/structure/surface/rack, /obj/item/storage/belt/medical/full{ @@ -67892,15 +69548,6 @@ /obj/structure/platform_decoration/metal/almayer, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) -"lsn" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/tool/pen, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "lso" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67951,8 +69598,8 @@ /turf/open/floor/almayer/plating_striped/west, /area/almayer/squads/req) "ltc" = ( -/obj/effect/landmark/start/synthetic, -/obj/effect/landmark/late_join/synthetic, +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, /turf/open/floor/plating/plating_catwalk/aicore, /area/almayer/command/airoom) "ltm" = ( @@ -67983,11 +69630,16 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "ltI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/tl{ + pixel_x = -1; + density = 0; + pixel_y = 16 }, -/turf/open/floor/almayer/emerald/northeast, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "ltO" = ( /obj/structure/closet/secure_closet{ name = "\improper Lethal Injection Locker" @@ -68015,9 +69667,6 @@ req_access = null; req_access_txt = "31" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/commandbunks) "luE" = ( @@ -68031,17 +69680,16 @@ /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) "luS" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, -/obj/item/stack/sheet/cardboard{ - amount = 50; - pixel_x = -3 - }, -/obj/item/stack/sheet/cardboard{ - amount = 50; - pixel_x = 4 +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/structure/sign/safety/storage{ + pixel_x = -17; + pixel_y = 7 }, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "luY" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/orange/east, @@ -68095,11 +69743,13 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_umbilical) "lwJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/tl/support{ + density = 0; + pixel_x = 26; + pixel_y = 1 }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/support) "lwY" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ name = "\improper Port Viewing Room" @@ -68114,23 +69764,6 @@ /obj/structure/machinery/cm_vending/clothing/commanding_officer, /turf/open/floor/almayer/cargo, /area/almayer/living/commandbunks) -"lyh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel{ - pixel_x = -1; - pixel_y = 10 - }, -/obj/item/stack/cable_coil{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/stack/sheet/cardboard/small_stack{ - layer = 3.01; - pixel_x = -3; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "lyk" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -68146,8 +69779,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_p) "lyq" = ( -/turf/open/floor/almayer/emerald/west, -/area/almayer/hallways/lower/port_midship_hallway) +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/photocopier, +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) "lyw" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -68155,13 +69792,20 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "lyz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/sign/safety/chem_lab{ + pixel_x = 5; + pixel_y = 25 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/machinery/chem_master/vial, +/obj/item/storage/box/masks{ + pixel_x = -6; + pixel_y = 13 }, -/turf/open/floor/almayer/sterile_green_side/northwest, +/obj/item/storage/box/gloves{ + pixel_x = 6; + pixel_y = 13 + }, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "lyW" = ( /turf/closed/wall/almayer/outer, @@ -68172,13 +69816,6 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) -"lzq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "lzt" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver, @@ -68194,20 +69831,24 @@ /area/almayer/maint/upper/u_m_s) "lAa" = ( /obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/emergency, /obj/item/device/lightreplacer{ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/toolbox/emergency, /obj/structure/sign/safety/water{ pixel_x = 8; pixel_y = 25 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "lAl" = ( -/turf/open/floor/almayer/orange/east, -/area/almayer/squads/bravo) +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) "lAm" = ( /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer/plate, @@ -68227,14 +69868,13 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "lAQ" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/emerald/west, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "lAW" = ( /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, @@ -68244,19 +69884,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) "lBv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/emerald/southwest, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/support) "lCg" = ( /obj/vehicle/powerloader{ dir = 4 @@ -68272,29 +69902,33 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) "lCr" = ( -/turf/open/floor/almayer/redfull, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/alpha{ + dir = 4 + }, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/living/briefing) "lCt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/containment) "lCE" = ( -/obj/structure/bed/chair/comfy/delta, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "lDk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28; + pixel_x = 8 }, -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_y = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +/obj/structure/sign/safety/intercom{ + pixel_y = 26; + pixel_x = -1 }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) @@ -68336,14 +69970,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) -"lDV" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/obj/structure/sign/safety/cryo{ - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "lEe" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -68371,13 +69997,6 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) -"lEO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "lEV" = ( /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) @@ -68394,7 +70013,7 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer/blue/north, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "lFj" = ( /obj/structure/machinery/door_control{ @@ -68407,12 +70026,22 @@ /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) "lFn" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass{ - desc = "Just like a real plant, but fake!"; - name = "fake fullgrass" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = -2 }, -/turf/open/floor/grass, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/computer/crew/alt{ + dir = 8; + pixel_y = -8; + pixel_x = -2 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 32 + }, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/medical/morgue) "lFp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) @@ -68456,6 +70085,7 @@ /turf/open/floor/almayer/green/northeast, /area/almayer/hallways/lower/starboard_midship_hallway) "lGg" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "lGh" = ( @@ -68468,24 +70098,23 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) "lHu" = ( -/turf/open/floor/almayer/greencorner/west, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "lHB" = ( /obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "lHG" = ( /obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_one_access = null; - req_one_access_txt = "30;19" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 1 }, /turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "lIj" = ( /turf/closed/wall/almayer, /area/almayer/maint/upper/mess) @@ -68535,9 +70164,6 @@ /area/almayer/living/cryo_cells) "lJv" = ( /obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "researchlockdownext"; name = "\improper Research Window Shutter" @@ -68545,14 +70171,6 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"lJD" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) "lJG" = ( /obj/structure/bed/roller/hospital_empty/bigrollerempty3, /turf/open/floor/almayer/sterile_green, @@ -68588,33 +70206,9 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) -"lJO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "lJY" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) -"lKb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha_bravo_shared) -"lKM" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/engineering/lower) "lLl" = ( /obj/structure/machinery/door_control{ id = "laddersouthwest"; @@ -68635,10 +70229,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/midship_hallway) -"lLC" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "lLO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68658,13 +70248,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) "lMv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/plate, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/medical_science) "lMw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -68719,25 +70304,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"lNk" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"lNw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "lNL" = ( /obj/item/tool/mop{ pixel_x = -6; @@ -68819,8 +70385,8 @@ /turf/open/floor/almayer/plating_stripedcorner/north, /area/almayer/command/securestorage) "lPY" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, /turf/open/floor/almayer/green/northeast, /area/almayer/hallways/upper/fore_hallway) @@ -68843,11 +70409,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"lQz" = ( -/obj/structure/machinery/vending/coffee, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "lQB" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plate, @@ -68870,32 +70431,13 @@ "lRh" = ( /turf/open/floor/almayer/bluecorner/north, /area/almayer/hallways/upper/midship_hallway) -"lRs" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 20 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "lRt" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "lRP" = ( /obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/chaplain_patch{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 7; - pixel_x = 4 - }, -/obj/item/tool/pen, +/obj/item/prop/helmetgarb/chaplain_patch, /turf/open/floor/wood/ship, /area/almayer/living/chapel) "lRX" = ( @@ -68907,6 +70449,7 @@ /obj/structure/sign/safety/ladder{ pixel_x = -16 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redcorner/north, /area/almayer/living/briefing) "lSs" = ( @@ -68918,6 +70461,9 @@ /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/cells) "lSJ" = ( +/obj/structure/stairs{ + dir = 1 + }, /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/starboard_aft) "lSN" = ( @@ -68953,13 +70499,7 @@ "lTE" = ( /obj/structure/surface/table/almayer, /obj/item/storage/bible{ - desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/book/manual/marine_law{ - pixel_x = 8; - pixel_y = 5 + desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'." }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) @@ -68989,13 +70529,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) "lVS" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "south_central_checkpoint"; - name = "\improper Checkpoint Shutters" +/obj/structure/closet/secure_closet/fridge/groceries, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/nosmoking_1{ + pixel_y = -28 }, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "lVW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -69009,12 +70555,6 @@ /area/almayer/maint/hull/upper/u_f_p) "lVX" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 16 - }, /obj/structure/transmitter/rotary/no_dnd{ name = "Alpha Overwatch Telephone"; phone_category = "Command"; @@ -69024,6 +70564,12 @@ pixel_x = -17; pixel_y = -8 }, +/obj/structure/machinery/computer/overwatch/groundside_operations/section{ + layer = 3.2; + pixel_y = 16; + pixel_x = -17; + dir = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) "lWr" = ( @@ -69035,24 +70581,24 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) "lWG" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "lWS" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) -"lWY" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "lXb" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -69101,15 +70647,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "lYL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "lYN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -69118,14 +70661,13 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "lYS" = ( -/obj/structure/sign/safety/ladder{ - pixel_y = -26 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/medical{ - pixel_x = 14; - pixel_y = -26 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/open/floor/almayer/green, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) "lZb" = ( /obj/structure/surface/rack, @@ -69262,15 +70804,9 @@ /turf/closed/wall/almayer, /area/almayer/hallways/upper/midship_hallway) "mdo" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"mdC" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer/emerald/west, -/area/almayer/hallways/lower/port_midship_hallway) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -69306,18 +70842,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) -"meu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "meE" = ( /obj/structure/sign/safety/maint{ pixel_x = 47; @@ -69348,22 +70872,12 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) -"meY" = ( -/turf/closed/wall/almayer{ - damage_cap = 15000 - }, -/area/almayer/squads/alpha) "mfC" = ( /obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer, /obj/structure/platform/metal/almayer/west, -/obj/structure/platform/metal/almayer/east, -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration/metal/almayer/northeast{ - layer = 4.1 - }, -/obj/structure/platform_decoration/metal/almayer/northwest{ - layer = 4.1 - }, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/platform_decoration/metal/almayer/northeast, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/upper_medical) "mfL" = ( @@ -69377,14 +70891,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) "mfM" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, -/obj/item/device/megaphone, -/obj/structure/window/reinforced/ultra, -/obj/structure/window/reinforced/ultra{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/silver/southeast, +/turf/open/floor/almayer/uscm/directional/southeast, /area/almayer/living/briefing) "mfQ" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -69409,7 +70920,7 @@ /area/almayer/maint/hull/lower/l_m_p) "mgd" = ( /obj/structure/machinery/autolathe/armylathe/partial, -/obj/structure/machinery/light_construct{ +/obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer/cargo, @@ -69438,13 +70949,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/shipboard/brig/cic_hallway) -"mgF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) "mha" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69469,10 +70973,10 @@ /turf/open/floor/almayer/plate, /area/almayer/living/bridgebunks) "mho" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item{ + pixel_y = 3 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "mhG" = ( @@ -69481,18 +70985,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) -"mhI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/surface/table/almayer, -/obj/structure/mirror{ - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "mis" = ( /turf/open/floor/plating, /area/almayer/maint/upper/u_f_s) @@ -69518,8 +71010,8 @@ /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/closed/wall/almayer, +/area/almayer/squads/bravo) "mje" = ( /obj/structure/machinery/light, /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, @@ -69533,12 +71025,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"mjy" = ( -/obj/structure/machinery/conveyor_switch{ - id = "lower_garbage" - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "mjR" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random{ @@ -69548,72 +71034,16 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "mjS" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"mkc" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, -/obj/structure/closet/crate/trashcart, -/obj/item/reagent_container/food/drinks/cans/souto, -/obj/item/reagent_container/food/snacks/margheritaslice{ - desc = "A slice of classic pizza ruined by the corps."; - name = "dirty margherita slice"; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/trash/cigbutt/ucigbutt{ - desc = "A handful of rounds to reload on the go."; - icon = 'icons/obj/items/weapons/guns/handful.dmi'; - icon_state = "bullet_2"; - name = "handful of pistol bullets (9mm)"; - pixel_x = -8 - }, -/obj/item/bananapeel{ - desc = "Ew."; - gender = "plural"; - icon = 'icons/obj/items/shards.dmi'; - icon_state = "shrapnelsmall"; - name = "\improper finger nails"; - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/stack/medical/ointment{ - layer = 3.5; - pixel_x = -7; - pixel_y = 13 - }, -/obj/item/clothing/gloves/latex, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/item/trash/uscm_mre, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) -"mki" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/bed/chair/comfy/alpha{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) -"mkl" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/bravo) "mkw" = ( /obj/structure/sign/safety/security{ pixel_y = -25; @@ -69729,19 +71159,36 @@ /turf/open/floor/almayer/red, /area/almayer/maint/upper/u_a_p) "mnI" = ( -/turf/open/floor/almayer/blue, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 + }, +/turf/open/floor/almayer, /area/almayer/living/briefing) "mnP" = ( /obj/structure/platform/metal/almayer/north, /turf/open/floor/almayer/plating_stripedcorner/north, /area/almayer/engineering/lower/engine_core) "mnW" = ( -/obj/structure/stairs/multiz/down{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/device/reagent_scanner{ + pixel_x = -7; + pixel_y = 4 }, -/obj/structure/platform/metal/stair_cut/almayer_smooth_right, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "moc" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, @@ -69776,12 +71223,6 @@ "moB" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cells) -"moI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) "moK" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, @@ -69799,12 +71240,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) -"moM" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) "moQ" = ( -/turf/open/floor/almayer/silver, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/southwest, /area/almayer/living/briefing) "mph" = ( /obj/structure/sign/safety/maint{ @@ -69812,17 +71253,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"mpn" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/redfull, -/area/almayer/living/briefing) -"mpJ" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "mpP" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, @@ -69864,23 +71294,15 @@ /turf/open/floor/almayer/redfull, /area/almayer/command/cic) "mqt" = ( -/turf/open/floor/almayer/flooredgesmooth2/east, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "mqB" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/orange/west, /area/almayer/hallways/lower/port_umbilical) -"mqK" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "mqU" = ( /obj/structure/machinery/cm_vending/sorted/medical{ pixel_x = -1 @@ -69911,29 +71333,21 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) "msi" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/containment) "msm" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) -"msC" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 8; - req_one_access = list(2,34,30) +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_m_s) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "msP" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -69958,18 +71372,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"mtr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -70004,12 +71406,6 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering) -"muy" = ( -/obj/effect/landmark/start/marine/engineer/alpha, -/obj/effect/landmark/late_join/alpha, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "muQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -70031,7 +71427,7 @@ "muW" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredge/south, +/turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/upper/midship_hallway) "mvg" = ( /obj/docking_port/stationary/escape_pod/west, @@ -70044,20 +71440,18 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"mvl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/machinery/light, -/turf/open/floor/almayer/bluecorner, -/area/almayer/squads/delta) "mvy" = ( -/obj/effect/landmark/start/marine/delta, -/obj/effect/landmark/late_join/delta, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "southcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "mvI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70085,9 +71479,7 @@ /area/almayer/shipboard/brig/cic_hallway) "mwL" = ( /obj/structure/surface/table/almayer, -/obj/item/storage/fancy/candle_box{ - pixel_y = 4 - }, +/obj/item/book/manual/marine_law, /turf/open/floor/wood/ship, /area/almayer/living/chapel) "mwM" = ( @@ -70105,10 +71497,10 @@ "mwR" = ( /obj/structure/ladder/multiz, /obj/structure/machinery/light{ - dir = 1 + dir = 8 }, -/turf/open/floor/almayer/no_build/plating, -/area/almayer/hallways/upper/midship_hallway) +/turf/open/floor/almayer/plating, +/area/almayer/medical/medical_science) "mxo" = ( /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, @@ -70206,12 +71598,27 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/armory) "mzg" = ( -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) "mzq" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/hydroponics) "mzs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -70245,7 +71652,7 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/north2) "mzV" = ( -/turf/open/floor/almayer/blue/north, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "mAe" = ( /obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, @@ -70277,27 +71684,26 @@ /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/starboard) "mAV" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "mAY" = ( /obj/structure/machinery/status_display{ pixel_y = 30 }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/starboard_hallway) -"mBa" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/hallways/lower/starboard_midship_hallway) "mBc" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/bluefull, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/bravo) "mBe" = ( /obj/structure/prop/invuln/overhead_pipe, /obj/effect/decal/warning_stripes{ @@ -70317,9 +71723,6 @@ /obj/structure/machinery/firealarm{ pixel_y = 28 }, -/obj/structure/sign/safety/rewire{ - pixel_x = -17 - }, /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/operating_room_one) "mBx" = ( @@ -70329,10 +71732,6 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) -"mBO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "mCg" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_p) @@ -70352,16 +71751,17 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cicconference) "mCE" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 33; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 25 + pixel_x = 33; + pixel_y = -8 }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) @@ -70445,12 +71845,8 @@ /obj/structure/platform/metal/almayer/north, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/south2) -"mDT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie_delta_shared) "mDW" = ( -/turf/open/floor/almayer/emerald/north, +/turf/open/floor/almayer/green2/southwest, /area/almayer/living/briefing) "mDX" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -70531,18 +71927,11 @@ /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone/lower/port_aft) "mFO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "SW-out" }, -/turf/open/floor/almayer/orange/west, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "mFP" = ( /obj/structure/sign/safety/life_support{ pixel_x = 8; @@ -70711,12 +72100,6 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) -"mJi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "mJj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -70744,24 +72127,17 @@ /turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_m_p) "mJP" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/orange/west, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/alpha) "mKb" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/red/southwest, +/turf/open/floor/almayer/flooredge/east, /area/almayer/squads/alpha) "mKi" = ( /obj/effect/decal/warning_stripes{ @@ -70797,12 +72173,6 @@ /obj/structure/machinery/firealarm{ pixel_y = 28 }, -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, /obj/structure/window/reinforced{ dir = 4; pixel_x = -2; @@ -70821,7 +72191,13 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/plate, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "mKN" = ( /obj/effect/landmark/start/pilot/cas_pilot, @@ -70879,16 +72255,10 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) "mMg" = ( -/obj/structure/platform/metal/almayer/north, -/obj/structure/platform/metal/almayer/east, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 6 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration/metal/almayer/northwest{ - layer = 4.1 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/upper_medical) "mMB" = ( @@ -70897,9 +72267,6 @@ pixel_y = 1 }, /obj/structure/platform_decoration/metal/almayer/east, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "mMP" = ( @@ -71056,24 +72423,13 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) "mRq" = ( -/obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 2 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/turf/open/floor/almayer/plate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, /area/almayer/living/briefing) "mRH" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ @@ -71164,12 +72520,13 @@ /turf/open/floor/almayer/silver/northeast, /area/almayer/command/securestorage) "mSK" = ( -/turf/open/floor/almayer, +/obj/structure/machinery/portable_atmospherics/hydroponics, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/almayer/test_floor5, /area/almayer/medical/hydroponics) -"mSU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/blue, -/area/almayer/squads/charlie_delta_shared) "mTc" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/emails{ @@ -71179,12 +72536,11 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "mTd" = ( -/obj/structure/machinery/centrifuge{ - pixel_y = 8; - pixel_x = -1 +/obj/structure/machinery/smartfridge/chemistry{ + pixel_x = -3; + pixel_y = -1 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/mono, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "mTi" = ( /obj/structure/machinery/cryopod/right, @@ -71230,9 +72586,14 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/cryo) "mUx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/sl, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "mUE" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -71243,21 +72604,8 @@ /area/almayer/maint/hull/lower/l_f_s) "mUI" = ( /obj/structure/platform/metal/almayer/east, -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"mUP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) "mUY" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -71284,23 +72632,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) "mWs" = ( -/obj/structure/sign/safety/biolab{ - pixel_x = 18; - pixel_y = -26 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/sign/safety/water{ - pixel_y = -26; - pixel_x = 4 +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_corner/west, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) -"mWy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha_bravo_shared) "mWD" = ( /obj/structure/machinery/cryopod{ dir = 1; @@ -71319,18 +72658,6 @@ }, /turf/open/floor/almayer/plating, /area/almayer/living/basketball) -"mWQ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/sign/banners/maximumeffort{ - pixel_y = 30 - }, -/turf/open/floor/almayer/blue/northwest, -/area/almayer/squads/delta) "mWR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/supply/weapons/flamers, @@ -71341,13 +72668,10 @@ /turf/open/floor/carpet, /area/almayer/command/cicconference) "mWW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 }, -/obj/structure/closet/secure_closet/scientist, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "mXj" = ( /turf/closed/wall/almayer, /area/almayer/living/commandbunks) @@ -71391,36 +72715,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/vehiclehangar) "mZc" = ( -/obj/structure/sign/poster/blacklight{ - pixel_y = 35 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/reagent_dispensers/beerkeg/alt_dark{ - anchored = 1; - chemical = null; - density = 0; - pixel_x = -7; - pixel_y = 10 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) -"mZf" = ( -/obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/item/tool/kitchen/tray{ - pixel_y = 9 - }, -/obj/item/device/flashlight/lamp{ - pixel_x = 15 - }, -/obj/item/reagent_container/food/snacks/meatpizzaslice{ - pixel_x = -5; - pixel_y = 7 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_s) "mZq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/supply/medicine, @@ -71530,20 +72828,25 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/structure/airlock_assembly, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "OTcenter"; + name = "\improper Secure Storage"; + unacidable = 1 + }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/workshop/hangar) "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) "naR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{ - name = "\improper Chemical Laboratory" +/obj/structure/machinery/sleep_console{ + dir = 8 }, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/medical_science) "naV" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -71605,17 +72908,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_a_s) "ncE" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "researchlockdownext"; - name = "\improper Research Window Shutter"; - dir = 4 +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ +/obj/structure/machinery/autodispenser{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "ncG" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -71669,13 +72968,12 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/starboard) "nex" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1 }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) "neC" = ( /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/red/north, @@ -71686,10 +72984,6 @@ }, /turf/open/floor/almayer/red/southeast, /area/almayer/command/lifeboat) -"neH" = ( -/obj/item/trash/cigbutt, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "neO" = ( /obj/structure/largecrate/random/barrel/true_random, /obj/structure/machinery/light/red{ @@ -71726,14 +73020,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/port) -"nff" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "nfF" = ( /obj/structure/ship_ammo/sentry, /turf/open/floor/almayer/cargo, @@ -71746,12 +73032,12 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/south1) "ngn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/turf/open/floor/almayer/emeraldfull, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "ngo" = ( /obj/effect/decal/cleanable/dirt, @@ -71778,29 +73064,21 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/shipboard/brig/lobby) "ngA" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 1; + pixel_x = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 16; + pixel_x = -5; + density = 0 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/northeast, +/area/almayer/squads/delta) "ngC" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full"; @@ -71823,9 +73101,10 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) "nhi" = ( -/obj/structure/bed/chair/comfy, -/obj/structure/window/reinforced/ultra, -/turf/open/floor/almayer/silver, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer/uscm/directional/southwest, /area/almayer/living/briefing) "nhw" = ( /obj/structure/machinery/light/red{ @@ -71834,21 +73113,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "nhx" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /obj/structure/surface/table/reinforced/prison, -/obj/item/toy/deck{ - desc = "A simple deck of playing cards. You could play Caravan with these!"; - pixel_y = 12 +/obj/item/folded_tent/big{ + pixel_x = -3; + pixel_y = 7 }, -/obj/item/toy/deck/uno{ - pixel_x = 3; - pixel_y = 4 +/obj/item/ashtray/plastic{ + pixel_y = -8; + pixel_x = -6 }, /obj/item/clothing/mask/cigarette{ - pixel_x = -2; - pixel_y = -2 + pixel_x = 5; + pixel_y = -4 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "nhE" = ( /obj/structure/sign/safety/maint{ pixel_y = 25 @@ -71920,9 +73202,7 @@ icon_state = "NE-out"; pixel_y = 1 }, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 8 - }, +/obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/living/port_emb) "nim" = ( @@ -71966,13 +73246,12 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/workshop) "niL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 11 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/sterile_green2, -/area/almayer/medical/upper_medical) +/obj/structure/bed/chair, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/medical_science) "niO" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -71992,31 +73271,12 @@ /obj/item/lore_book/punch_out, /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) -"niY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "nja" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"njd" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) "njn" = ( /turf/closed/wall/almayer, /area/almayer/maint/upper/u_m_s) @@ -72024,17 +73284,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, /area/almayer/lifeboat_pumps/south1) -"njJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/toy/crayon/blue{ - pixel_x = -9; - pixel_y = -5 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "njO" = ( /obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer/redfull, @@ -72057,7 +73306,7 @@ "nkj" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; - pixel_y = 32 + pixel_y = 26 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) @@ -72069,12 +73318,11 @@ /area/almayer/command/lifeboat) "nks" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2; - pixel_x = 1 + icon_state = "S" }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/delta) "nkx" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -72233,8 +73481,8 @@ /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/closed/wall/almayer, +/area/almayer/squads/alpha) "nnD" = ( /obj/structure/machinery/light{ dir = 8 @@ -72310,16 +73558,18 @@ /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) "npt" = ( -/obj/structure/disposalpipe/up/almayer{ - dir = 2; - id = "almayerlink_med_req" +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/hydroponics) -"npw" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer/cargo, -/area/almayer/hallways/lower/starboard_midship_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/containment) "npO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -72345,10 +73595,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"nqO" = ( -/obj/structure/closet/secure_closet/fridge/fish/stock, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "nqW" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -72356,13 +73602,13 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) "nrb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/machinery/cryopod{ + dir = 1; + layer = 3.1; + pixel_y = 13 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "nri" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -72370,16 +73616,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) -"nrw" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/emeraldcorner/west, -/area/almayer/squads/charlie) "nrN" = ( /obj/effect/landmark/start/doctor, /obj/effect/landmark/late_join/doctor, @@ -72467,13 +73703,13 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/command/computerlab) "ntx" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - id = "Alpha_2"; - name = "\improper Bathroom" - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/airlock/almayer{ + name = "\improper Bathroom"; + id = "Alpha_2" + }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_emb) "ntI" = ( @@ -72491,20 +73727,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/perma) -"nuA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) -"nuK" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_x = 2; - pixel_y = 10 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "nuM" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/lifeboat_pumps/south2) @@ -72545,12 +73767,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"nvI" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -72565,11 +73781,16 @@ /area/almayer/medical/chemistry) "nvT" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/extinguisher_cabinet{ + pixel_x = -25 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "nvX" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver{ @@ -72605,9 +73826,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"nwD" = ( -/turf/open/floor/almayer/orange/north, -/area/almayer/command/cic) "nwG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -72681,8 +73899,14 @@ /turf/open/floor/almayer/greencorner, /area/almayer/hallways/upper/fore_hallway) "nyQ" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) "nyS" = ( /obj/structure/platform/metal/almayer_smooth/north, /obj/effect/decal/cleanable/dirt, @@ -72728,7 +73952,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/starboard_hallway) "nAd" = ( -/obj/structure/machinery/power/apc/almayer/hardened/east, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) "nAm" = ( @@ -72749,19 +73973,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) "nBa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_y = 1; + pixel_x = 26 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) -"nBw" = ( -/turf/open/floor/almayer/redcorner/north, -/area/almayer/living/briefing) +/turf/open/floor/almayer/red2/southeast, +/area/almayer/squads/alpha) "nBE" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -72798,10 +74016,12 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) "nCf" = ( -/obj/effect/landmark/start/marine/tl/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "nCj" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/hangar{ @@ -72820,20 +74040,6 @@ /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/engine_core) -"nCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "nCs" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -72905,8 +74111,17 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_umbilical) "nDo" = ( -/turf/closed/wall/almayer/white, -/area/almayer/medical/hydroponics) +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "nDy" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -72931,17 +74146,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"nEo" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "nEF" = ( /obj/structure/machinery/conveyor_switch{ id = "gym_1"; @@ -72982,31 +74186,18 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) "nFI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "kitchen"; - name = "\improper Kitchen Shutters" - }, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/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/almayer/plate, -/area/almayer/living/grunt_rnr) -"nFK" = ( /obj/structure/bed/chair{ - dir = 1 + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/lower/port_fore_hallway) +"nFK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/alpha) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -73158,10 +74349,6 @@ /area/almayer/engineering/lower/engine_core) "nJs" = ( /obj/structure/largecrate/random/case, -/obj/structure/sign/safety/bathunisex{ - pixel_y = 28; - pixel_x = 1 - }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) "nJu" = ( @@ -73215,39 +74402,15 @@ /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/squads/req) "nLI" = ( -/obj/structure/machinery/chem_dispenser/research{ - pixel_x = -2; - pixel_y = 2; - explo_proof = 1 - }, -/obj/structure/sign/safety/ref_chem_storage{ - pixel_x = -17 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/chem_simulator{ + density = 0; + pixel_y = 16 }, -/obj/item/reagent_container/glass/beaker/bluespace, /turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "nLJ" = ( /turf/open/floor/almayer/plating_striped/east, /area/almayer/engineering/upper_engineering) -"nMe" = ( -/obj/structure/sign/safety/galley{ - pixel_x = 32; - pixel_y = 9 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32; - pixel_y = -5 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/medical/medical_science) -"nMp" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "nNg" = ( /obj/structure/bed, /obj/item/bedsheet/red, @@ -73286,20 +74449,10 @@ }, /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) -"nNH" = ( -/turf/open/floor/almayer/emeraldcorner/north, -/area/almayer/living/briefing) "nNT" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) -"nNV" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/squads/charlie_delta_shared) "nNX" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock PU-1" @@ -73351,11 +74504,29 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) "nPf" = ( -/obj/structure/stairs/multiz/down{ - dir = 4 +/obj/structure/machinery/computer/cameras/almayer/containment{ + dir = 8; + pixel_x = -2; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "containmentlockdown_S"; + name = "Containment Lockdown"; + pixel_x = -6; + pixel_y = -12; + req_one_access_txt = "19;28" + }, +/obj/structure/transmitter/rotary{ + name = "Research Containment Telephone"; + phone_category = "Medical & Research Dept."; + phone_id = "Research Containment"; + pixel_y = 19; + pixel_x = -4 + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply/no_boom, +/turf/open/floor/almayer/sterile_green2, +/area/almayer/medical/containment) "nPx" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -73368,12 +74539,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) -"nPB" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/hallways/hangar) "nPE" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -73512,13 +74677,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/telecomms) "nTl" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/smartgun/delta{ + pixel_x = 26; + density = 0 + }, +/turf/open/floor/almayer/blue2/southeast, +/area/almayer/squads/delta) "nTo" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler{ @@ -73628,18 +74796,12 @@ /turf/open/floor/almayer/green/east, /area/almayer/squads/req) "nUd" = ( -/obj/structure/reagent_dispensers/tank/water, -/obj/item/reagent_container/spray/cleaner{ - layer = 3.2; - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = 3; - pixel_y = 12 +/obj/structure/largecrate/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "nUj" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -73694,17 +74856,21 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) -"nVa" = ( -/obj/structure/bed/chair, +"nVi" = ( +/obj/structure/closet/secure_closet/fridge/organic/stock, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/fridge{ + pixel_y = -26; + pixel_x = 7 + }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) -"nVi" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "nVm" = ( /obj/structure/machinery/door_control{ id = "firearm_storage_armory"; @@ -73874,12 +75040,6 @@ "nYE" = ( /turf/open/floor/almayer/uscm/directional/west, /area/almayer/command/lifeboat) -"nYR" = ( -/obj/structure/sign/safety/cryo{ - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_aft_hallway) "nZf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -73888,26 +75048,24 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/midship_hallway) "nZm" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/west, /area/almayer/engineering/lower/workshop/hangar) "nZy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/leader/support{ + pixel_y = 16; + density = 0; + pixel_x = -1 }, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "nZK" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; pixel_x = -1 }, -/obj/structure/sign/safety/maint{ - pixel_x = 7; - pixel_y = -26 - }, /turf/open/floor/almayer/silver, /area/almayer/hallways/upper/midship_hallway) "nZW" = ( @@ -73919,8 +75077,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) "oap" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/dark_sterile2, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/upper_medical) "oaw" = ( /obj/structure/closet/firecloset, @@ -73958,9 +75116,15 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) "oaW" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_y = 1; + pixel_x = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "obf" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -73996,33 +75160,19 @@ /turf/open/floor/almayer/cargo, /area/almayer/living/intel) "obE" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "obK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) "obQ" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) -"ocm" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32 - }, -/obj/structure/machinery/space_heater, -/obj/item/ashtray/glass{ - pixel_x = 3; - pixel_y = 6 - }, -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/squads/bravo) "ocB" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -74092,13 +75242,6 @@ }, /turf/open/floor/almayer/red/southeast, /area/almayer/command/lifeboat) -"odB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/bravo) "odD" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -74132,9 +75275,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer_hull/outerhull_dir/west, /area/almayer/command/lifeboat) -"oef" = ( -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha_bravo_shared) "oer" = ( /turf/closed/wall/almayer{ damage_cap = 15000 @@ -74241,10 +75381,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/south2) -"ohj" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) "ohu" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; @@ -74268,15 +75404,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) -"ohE" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "ohH" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D3"; @@ -74373,39 +75500,28 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/warden_office) -"oiL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) "oiQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "oiX" = ( /obj/docking_port/stationary/vehicle_elevator/almayer, /turf/open/floor/almayer/empty/vehicle_bay, /area/almayer/hallways/lower/vehiclehangar) "oiY" = ( -/obj/structure/filingcabinet/research{ - density = 0; - pixel_y = 20; - pixel_x = -1; - explo_proof = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/disposal, +/obj/structure/sink{ + pixel_x = 1; + pixel_y = -2 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "ojh" = ( /obj/structure/disposalpipe/junction{ @@ -74415,23 +75531,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) "ojF" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "ojH" = ( +/obj/structure/flora/bush/ausbushes/var3/ppflowers, /obj/structure/bed/chair{ dir = 4 }, /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/flora/bush/ausbushes/var3/ppflowers{ - desc = "Just like a real plant, but fake!"; - name = "fake ppflowers" - }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) "ojQ" = ( @@ -74452,10 +75567,14 @@ /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/lower_medical_medbay) "oka" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "okd" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "n_umbilical"; @@ -74511,7 +75630,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/lower/workshop/hangar) "olO" = ( @@ -74703,24 +75821,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) "onN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = -1; + pixel_y = 16 }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "onQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26; - pixel_x = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "onY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -74750,8 +75866,9 @@ /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/hangar) "oos" = ( +/obj/effect/decal/large_stain, /turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "oou" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -74801,19 +75918,6 @@ "opJ" = ( /turf/open/floor/almayer/blue/northeast, /area/almayer/command/cicconference) -"opV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_y = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/lower/port_midship_hallway) "oqc" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/toxin, @@ -74831,20 +75935,15 @@ "oqt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/almayer/plating_striped/southwest, /area/almayer/engineering/lower/workshop/hangar) "oqu" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "oqv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -74897,14 +75996,19 @@ /turf/open/floor/almayer, /area/almayer/squads/req) "oqZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 5 }, -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/item/storage/box/donkpockets{ + pixel_x = -4; + pixel_y = 19 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/sterile_green_side, +/obj/item/storage/box/donkpockets{ + pixel_x = 4; + pixel_y = 16 + }, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "ora" = ( /obj/structure/surface/table/almayer, @@ -74945,13 +76049,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/underdeck/vehicle) -"osc" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "osr" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/red{ @@ -74975,21 +76072,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) -"osA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "osI" = ( /turf/open/floor/almayer/orange, /area/almayer/engineering/lower/workshop) @@ -75001,13 +76083,6 @@ "osT" = ( /turf/open/floor/almayer/bluecorner/west, /area/almayer/living/auxiliary_officer_office) -"osX" = ( -/obj/structure/sign/safety/north{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/lower/starboard_midship_hallway) "oti" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full"; @@ -75109,12 +76184,8 @@ /turf/open/floor/almayer/orangecorner/east, /area/almayer/engineering/upper_engineering/port) "ovp" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 7 - }, -/turf/open/floor/almayer/silver/east, +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/almayer, /area/almayer/living/briefing) "ovt" = ( /obj/structure/surface/rack, @@ -75131,8 +76202,16 @@ /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) "ovG" = ( -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/almayer/medical/containment/cell) "ovQ" = ( /obj/structure/machinery/light{ dir = 1 @@ -75149,12 +76228,6 @@ "owg" = ( /turf/open/floor/almayer/mono, /area/almayer/engineering/upper_engineering/starboard) -"owU" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "oxc" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/snacks/monkeycube/wrapped/farwacube{ @@ -75224,19 +76297,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/starboard_hallway) "oyG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/light{ + dir = 4; + pixel_y = 16 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/machinery/cm_vending/clothing/specialist/delta{ + density = 0; + pixel_x = -1; + pixel_y = -29 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/blue2/southeast, +/area/almayer/squads/delta) "oyO" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -75256,11 +76327,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) "ozq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/test_floor4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, /area/almayer/squads/alpha) "ozz" = ( /obj/structure/surface/table/almayer, @@ -75285,26 +76356,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/starboard) -"ozT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer/emerald/southeast, -/area/almayer/squads/charlie) "oAa" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -75373,15 +76424,11 @@ /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) "oBG" = ( -/obj/structure/platform/metal/almayer/west, -/obj/structure/machinery/flasher{ - id = "briefing_flash"; - range = 12 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/sign/safety/coffee{ + pixel_x = 13; + pixel_y = -6 }, -/turf/open/floor/almayer/uscm/directional/west, +/turf/closed/wall/almayer, /area/almayer/living/briefing) "oCa" = ( /obj/structure/disposalpipe/segment{ @@ -75411,11 +76458,12 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering/port) "oCl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" }, -/obj/structure/bed/chair/comfy/delta, -/turf/open/floor/almayer/bluefull, +/turf/open/floor/almayer/flooredge/west, /area/almayer/living/briefing) "oCK" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -75432,12 +76480,8 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/living/gym) "oDx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_one_access = null; - req_one_access_txt = "30;19" + dir = 2 }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/port_emb) @@ -75448,30 +76492,16 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"oDE" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 6 - }, -/obj/item/reagent_container/spray/cleaner, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -6 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "oDJ" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_one) "oDR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/medical_science) "oDU" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -75492,32 +76522,20 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/almayer/blue/west, /area/almayer/hallways/upper/midship_hallway) "oEo" = ( -/obj/effect/landmark/start/marine/medic/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "oEy" = ( /obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/northwest, /area/almayer/engineering/lower/workshop/hangar) -"oEA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/shotgun/pump{ - pixel_y = 9; - starting_attachment_types = list(/obj/item/attachable/stock/shotgun) - }, -/obj/item/stack/sheet/cardboard/small_stack{ - layer = 3.01 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "oEE" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -75529,7 +76547,11 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer/red/north, +/obj/item/storage/box/mousetraps{ + pixel_x = 3; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "oFm" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -75551,12 +76573,15 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "oFV" = ( -/obj/structure/sign/poster{ - pixel_x = -32; - serial_number = 16 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "oFY" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/lobby) @@ -75569,6 +76594,10 @@ /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_aft_hallway) "oGj" = ( @@ -75581,15 +76610,16 @@ /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_umbilical) "oGx" = ( +/obj/structure/closet/secure_closet/surgical{ + pixel_x = 30 + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ icon_state = "W"; pixel_x = -1 }, -/obj/item/hybrisa/misc/trash_bag_full_prop, -/obj/effect/decal/hybrisa/trash, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "oGy" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -75622,30 +76652,13 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/orange, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "oHc" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/boonie, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "oHf" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -75679,13 +76692,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/green, /area/almayer/hallways/lower/starboard_midship_hallway) -"oHt" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_aft_hallway) "oHx" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -75808,11 +76814,18 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) "oKb" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/wet_sign{ + pixel_x = -8; + pixel_y = 6 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/item/tool/mop{ + pixel_y = 22; + pixel_x = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "oKv" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -75880,20 +76893,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) -"oMr" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"oMH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/squads/alpha_bravo_shared) "oMQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -75917,18 +76916,26 @@ /turf/open/floor/almayer/mono, /area/almayer/engineering/ce_room) "oNj" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) "oNJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/wardrobe/morgue, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) +/obj/structure/transmitter{ + name = "CMO Office Telephone"; + phone_category = "Offices"; + phone_id = "CMO Office"; + dir = 4; + pixel_x = -19 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = -17; + pixel_y = 32 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "oNK" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, @@ -75938,12 +76945,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "oNP" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/machinery/light{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/living/briefing) "oNW" = ( /obj/structure/pipes/vents/scrubber{ @@ -76044,31 +77051,12 @@ /turf/open/floor/almayer/silver/southeast, /area/almayer/command/cichallway) "oPz" = ( -/obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - pixel_x = 15 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = -4 - }, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) -"oPE" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/command/cic) "oPF" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -76102,16 +77090,6 @@ }, /turf/open/floor/almayer/orangecorner/north, /area/almayer/hallways/lower/port_umbilical) -"oQB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "oQH" = ( /turf/open/floor/almayer/cargo_arrow, /area/almayer/living/briefing) @@ -76204,15 +77182,12 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) "oSy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "oSC" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -76228,23 +77203,6 @@ /obj/item/tool/crew_monitor, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"oSL" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) "oSM" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) @@ -76281,12 +77239,13 @@ /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) "oTA" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_s) "oTH" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -76318,11 +77277,7 @@ /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) "oUZ" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/tool/weldingtool, -/obj/item/tool/wrench, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_p) "oVf" = ( /obj/structure/surface/table/almayer, @@ -76391,6 +77346,9 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/stairs{ + dir = 1 + }, /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/starboard_aft) "oWF" = ( @@ -76406,21 +77364,15 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/starboard_hallway) -"oWN" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/port_midship_hallway) "oWU" = ( /obj/structure/platform/metal/almayer/east, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) "oXb" = ( -/obj/effect/landmark/start/marine/charlie, -/obj/effect/landmark/late_join/charlie, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/area/almayer/maint/hull/lower/l_a_p) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, @@ -76501,7 +77453,11 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) "oYZ" = ( -/turf/closed/wall/almayer/white, +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 25 + }, +/turf/open/floor/almayer/blue/northwest, /area/almayer/hallways/upper/midship_hallway) "oZp" = ( /obj/effect/decal/warning_stripes{ @@ -76512,29 +77468,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/flight) "oZD" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /obj/structure/sign/poster/music{ pixel_x = -27 }, -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - pixel_x = 15 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = -10; - pixel_y = -1 - }, -/obj/item/tool/pen{ - pixel_x = 3; - pixel_y = -4 - }, -/obj/item/tool/pen{ - pixel_x = -11; - pixel_y = 5 +/obj/structure/sign/poster/propaganda{ + pixel_x = -32; + pixel_y = 10 }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -76562,11 +77504,8 @@ /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/north1) "paa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/containment) "pas" = ( /obj/structure/machinery/cryopod/right, /obj/structure/sign/safety/cryo{ @@ -76645,9 +77584,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) -"pbV" = ( -/turf/open/floor/almayer/emerald/north, -/area/almayer/command/cic) "pbW" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer/bluefull, @@ -76699,13 +77635,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"pcO" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer/green/northeast, -/area/almayer/living/grunt_rnr) "pdo" = ( /obj/structure/sign/safety/maint{ pixel_x = 32; @@ -76786,10 +77715,6 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"pfJ" = ( -/obj/structure/platform_decoration/metal/almayer, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "pfL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76808,6 +77733,7 @@ /obj/structure/target{ name = "punching bag" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/living/briefing) "pfT" = ( @@ -76870,11 +77796,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "phd" = ( -/obj/structure/sign/poster/safety{ - pixel_x = 27 +/obj/structure/machinery/light, +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "phj" = ( /obj/structure/barricade/handrail{ @@ -76968,12 +77894,6 @@ }, /turf/open/floor/almayer/plating_striped, /area/almayer/squads/req) -"pjP" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_aft_hallway) "pjR" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -77001,9 +77921,6 @@ "pkh" = ( /turf/open/floor/plating, /area/almayer/underdeck/hangar) -"pkz" = ( -/turf/open/floor/almayer/redfull, -/area/almayer/squads/alpha_bravo_shared) "pkA" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/status_display{ @@ -77034,27 +77951,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) -"pmd" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/port_aft_hallway) "pmq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/delta) -"pmv" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/briefing) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "pmA" = ( /obj/docking_port/stationary/vehicle_elevator/adminlevel, /turf/open/floor/almayer/plating/northeast, @@ -77157,10 +78062,6 @@ "ppM" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) -"ppV" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_midship_hallway) "pqi" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood{ pixel_x = -1 @@ -77199,9 +78100,16 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) "pqK" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/clothing/engi/delta{ + density = 0; + pixel_x = -1; + pixel_y = 16 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "pqP" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -77238,10 +78146,11 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) "prx" = ( -/obj/structure/machinery/smartfridge/chemistry{ - pixel_x = -1 +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "prE" = ( /obj/structure/closet/secure_closet/fridge/meat/stock, @@ -77325,11 +78234,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) -"ptj" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) "ptq" = ( /obj/structure/machinery/light{ dir = 1 @@ -77430,12 +78334,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) -"pvJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) "pvK" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel{ @@ -77464,11 +78362,23 @@ /turf/open/floor/almayer/blue/southeast, /area/almayer/hallways/upper/fore_hallway) "pwx" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen/red/clicky{ + pixel_x = 1; + pixel_y = 2 }, -/turf/open/floor/almayer/orange/west, -/area/almayer/hallways/lower/starboard_midship_hallway) +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = 4 + }, +/obj/item/device/megaphone{ + pixel_x = -1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/living/briefing) "pwG" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -77486,26 +78396,14 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) "pxs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"pxD" = ( -/obj/structure/machinery/vending/coffee{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/structure/machinery/vending/snack{ - pixel_x = -18; - pixel_y = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "pxG" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -77534,7 +78432,7 @@ /area/almayer/underdeck/req) "pyc" = ( /obj/structure/bed/stool, -/turf/open/floor/almayer/emerald/north, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "pyi" = ( /obj/structure/prop/almayer/missile_tube{ @@ -77545,25 +78443,6 @@ "pyj" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"pyl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/bravo) "pyy" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer/plate, @@ -77604,6 +78483,7 @@ id = "northcheckpoint"; name = "\improper Checkpoint Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/redfull, /area/almayer/hallways/lower/starboard_midship_hallway) "pzG" = ( @@ -77618,7 +78498,7 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) "pzV" = ( -/turf/open/floor/almayer/bluecorner/north, +/turf/open/floor/almayer/green/southeast, /area/almayer/living/briefing) "pzW" = ( /turf/closed/wall/almayer/reinforced, @@ -77671,31 +78551,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"pDt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/bravo) -"pDB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "pDH" = ( /turf/closed/wall/almayer/outer, /area/almayer/underdeck/hangar) @@ -77712,16 +78567,6 @@ }, /turf/open/floor/almayer/red/southeast, /area/almayer/shipboard/brig/chief_mp_office) -"pEl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/sink{ - pixel_y = 19 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "pEB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77753,8 +78598,9 @@ icon_state = "SE-out"; pixel_x = 1 }, -/obj/structure/machinery/door/airlock/almayer{ - name = "\improper Liaison's Bathroom" +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 8; + name = "\improper Liasion's Bathroom" }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) @@ -77782,43 +78628,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices/cryo) "pGK" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 3; - pixel_x = -4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/flooredge/southeast, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "pGT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"pHh" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/lower/port_midship_hallway) "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) "pHA" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "pHF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77892,14 +78721,11 @@ /area/almayer/lifeboat_pumps/north1) "pJl" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/light{ - dir = 1 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 2 }, -/obj/structure/reagent_dispensers/tank/water, -/turf/open/floor/almayer/cargo, +/turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/upper_medical) "pJr" = ( /obj/structure/pipes/vents/scrubber{ @@ -78011,11 +78837,19 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) "pLO" = ( -/obj/structure/machinery/alarm/almayer{ +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "W_Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1; + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ dir = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "pLW" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/prop/invuln/overhead_pipe{ @@ -78073,7 +78907,7 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/turf/open/floor/almayer/blue, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "pNa" = ( /obj/structure/machinery/door/poddoor/almayer/open{ @@ -78084,12 +78918,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "pNP" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) +/obj/item/reagent_container/food/snacks/cheesewedge{ + pixel_x = -10; + pixel_y = 7 + }, +/mob/living/simple_animal/small/mouse/white/Doc, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/hydroponics) "pOi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -78127,17 +78965,17 @@ "pON" = ( /turf/open/floor/almayer/uscm/directional/west, /area/almayer/command/cic) -"pOW" = ( -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/hallways/lower/port_aft_hallway) "pOY" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/microwave{ - density = 0; - pixel_y = 9 +/obj/structure/machinery/computer/squad_changer{ + pixel_x = -9 + }, +/obj/structure/machinery/computer/card{ + pixel_x = 9 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/hallways/lower/port_fore_hallway) "pPd" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer{ name = "\improper Saferoom Entrance" @@ -78170,20 +79008,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"pPA" = ( -/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 = 27; - serial_number = 12 - }, -/obj/structure/bed/chair/comfy/delta{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "pPN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/east, @@ -78217,16 +79041,14 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/shipboard/navigation) "pQF" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "pQI" = ( /obj/structure/machinery/power/apc/almayer/north{ cell_type = /obj/item/cell/hyper @@ -78234,28 +79056,22 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/mp_bunks) "pQN" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"pQP" = ( -/obj/structure/machinery/computer/research{ - dir = 8; - pixel_y = 3; - pixel_x = -2 +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 1; + pixel_x = 26 }, -/obj/structure/sign/safety/terminal{ - layer = 2.5; - pixel_x = 32; - pixel_y = 6 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"pQP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light, -/obj/structure/sign/safety/intercom{ - pixel_y = -8; - pixel_x = 32 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "pQS" = ( /obj/effect/decal/heavy_cable/node_n_e, @@ -78284,11 +79100,9 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) "pRn" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/machinery/medical_pod/sleeper, +/obj/structure/machinery/light, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/medical_science) "pRs" = ( @@ -78301,39 +79115,6 @@ }, /turf/open/floor/almayer/silvercorner, /area/almayer/shipboard/brig/cic_hallway) -"pRT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 8; - name = "\improper Tool Closet" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/starboard_emb) -"pRX" = ( -/obj/structure/machinery/disposal{ - pixel_x = -1 - }, -/obj/structure/sink{ - pixel_y = -2 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/medical/hydroponics) "pRZ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -78384,18 +79165,11 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/maint/upper/u_a_s) "pUf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/bluecorner/west, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/squads/support) "pUj" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -78416,15 +79190,10 @@ /turf/open/floor/almayer/tcomms, /area/almayer/engineering/lower/engine_core) "pUA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/window/reinforced/ultra{ - dir = 1 - }, -/obj/structure/window/reinforced/ultra{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/item/device/flashlight/lamp/on, -/turf/open/floor/almayer/silver/northeast, +/turf/open/floor/almayer/uscm/directional/northeast, /area/almayer/living/briefing) "pUD" = ( /obj/structure/surface/table/almayer, @@ -78474,18 +79243,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"pVB" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 - }, -/obj/structure/window/reinforced/ultra{ - dir = 1 - }, -/obj/structure/window/reinforced/ultra{ - dir = 8 - }, -/turf/open/floor/almayer/silver/northwest, -/area/almayer/living/briefing) "pVF" = ( /obj/structure/machinery/camera/wey_yu{ dir = 1; @@ -78549,17 +79306,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"pXl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "pXx" = ( /obj/structure/sink{ pixel_y = 20 @@ -78590,21 +79336,14 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/squads/req) "pXZ" = ( -/obj/effect/landmark/start/marine/spec/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"pYh" = ( -/obj/structure/sign/safety/one{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/red/east, -/area/almayer/hallways/lower/starboard_midship_hallway) +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "pYu" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -78647,33 +79386,17 @@ "pZK" = ( /turf/open/floor/almayer/orangecorner/north, /area/almayer/engineering/upper_engineering/port) -"pZR" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "pZS" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) "qam" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 12 - }, -/obj/item/stack/sheet/mineral/phoron{ - amount = 25; - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/reagent_container/dropper{ - pixel_y = -4 - }, -/obj/item/stack/sheet/mineral/silver/small_stack{ - amount = 5 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "qan" = ( /obj/structure/largecrate/random/case/double, @@ -78695,12 +79418,6 @@ "qaV" = ( /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering) -"qaW" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/living/briefing) "qbd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -78725,6 +79442,7 @@ /obj/structure/sign/safety/ladder{ pixel_x = -16 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redcorner/west, /area/almayer/living/briefing) "qbO" = ( @@ -78787,27 +79505,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "qdk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "kitchen"; - name = "\improper Kitchen Shutters" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "qdv" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, /obj/structure/window/reinforced{ dir = 4; pixel_x = -2; @@ -78828,7 +79531,13 @@ }, /obj/item/clothing/head/beret/royal_marine, /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/emerald/southwest, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "qdz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -78853,15 +79562,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/laundry) -"qer" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) "qeF" = ( /obj/structure/sign/safety/reception{ pixel_x = 8; @@ -78883,11 +79583,6 @@ /obj/structure/pipes/vents/scrubber/no_boom, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) -"qeY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/beach_ball/holoball, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "qfa" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -78896,22 +79591,33 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) -"qfh" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) "qfq" = ( /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_umbilical) "qfy" = ( -/obj/structure/machinery/autodispenser{ - pixel_x = -1; - pixel_y = 2; - explo_proof = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/mono, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -11; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 4; + pixel_y = 16 + }, +/obj/item/folder/white{ + layer = 2.9; + pixel_x = -8 + }, +/turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/medical_science) "qfD" = ( /obj/structure/bed/chair/office/dark{ @@ -78919,12 +79625,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"qfI" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_aft_hallway) "qfQ" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ pixel_y = 12; @@ -78989,18 +79689,17 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/combat_correspondent) "qgN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "S" }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/obj/structure/machinery/cm_vending/clothing/engi/support{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "qgU" = ( /obj/structure/machinery/power/apc/almayer/hardened/south, /obj/effect/decal/warning_stripes{ @@ -79051,19 +79750,6 @@ "qhT" = ( /turf/open/floor/almayer/orangecorner, /area/almayer/hallways/upper/aft_hallway) -"qhU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "qid" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -79146,11 +79832,6 @@ "qjZ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/stern_point_defense) -"qki" = ( -/obj/effect/landmark/start/marine/smartgunner/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "qkP" = ( /obj/item/frame/light_fixture{ anchored = 1; @@ -79170,16 +79851,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) "qkY" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = -8; - pixel_y = -1 - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 9 - }, -/obj/item/tool/pen{ - pixel_x = 5 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -79259,17 +79933,17 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) "qmk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 16; + pixel_x = -1 }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/almayer/bluecorner/east, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "qmq" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -79290,31 +79964,50 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "qmy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_windoor"; + name = "Windoor Shutters"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "28" }, -/obj/structure/sign/safety/reception{ - pixel_x = 14; - pixel_y = -26 +/obj/structure/machinery/computer/med_data/laptop{ + dir = 1; + pixel_x = 6; + pixel_y = -4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/sign/safety/biohazard{ + pixel_y = -25 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_y = -26 +/obj/structure/sign/safety/ref_bio_storage{ + pixel_x = 15; + pixel_y = -25 }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_se_2"; + name = "Window Shutters"; + pixel_x = -7; + pixel_y = 4; + req_access_txt = "28" + }, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/medical_science) "qmB" = ( /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) "qmD" = ( -/obj/structure/bed/chair/office/light{ +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/plate, +/obj/structure/bed/chair/comfy, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/medical_science) "qmK" = ( /obj/structure/machinery/light{ @@ -79401,10 +80094,6 @@ "qnA" = ( /turf/open_space, /area/almayer/stair_clone/upper/starboard_fore) -"qnC" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "qnH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange, @@ -79413,30 +80102,24 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/south2) -"qom" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/chem_dispenser/soda{ - density = 0; +"qoJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; pixel_x = 1; - pixel_y = 14; - wrenchable = 0 + dir = 4 }, -/obj/structure/sign/safety/coffee{ - pixel_y = 32 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) -"qoJ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) "qoL" = ( /obj/structure/closet/secure_closet/freezer/industry, +/obj/item/reagent_container/glass/beaker/catalyst/silver, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "qoM" = ( @@ -79452,10 +80135,6 @@ "qoR" = ( /turf/open/floor/almayer/plating_striped/northeast, /area/almayer/engineering/lower/engine_core) -"qoY" = ( -/obj/structure/machinery/vending/hydroseeds, -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) "qpx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagentgrinder{ @@ -79469,11 +80148,11 @@ }, /obj/item/tool/hand_labeler{ pixel_y = 12; - pixel_x = 8 + pixel_x = 7 }, /obj/item/tool/hand_labeler{ pixel_y = 3; - pixel_x = 8 + pixel_x = 7 }, /turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/chemistry) @@ -79562,15 +80241,6 @@ /obj/structure/reagent_dispensers/tank/fuel/custom, /turf/open/floor/almayer/plating_striped/west, /area/almayer/engineering/lower/engine_core) -"qrc" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer/blue/northeast, -/area/almayer/squads/delta) "qrp" = ( /obj/structure/platform_decoration/metal/almayer, /obj/structure/bed/chair{ @@ -79589,9 +80259,6 @@ pixel_x = 2; pixel_y = 6 }, -/obj/structure/machinery/landinglight/delaytwo{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "qrv" = ( @@ -79697,20 +80364,11 @@ dir = 4 }, /obj/structure/sign/safety/rewire{ - pixel_x = 36 + pixel_x = -13; + pixel_y = -26 }, /turf/open/floor/almayer/plating/northeast, /area/almayer/medical/lower_medical_medbay) -"quV" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/bed/stool, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) "qvh" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -79720,7 +80378,7 @@ /area/almayer/hallways/upper/midship_hallway) "qvC" = ( /obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/plating, +/turf/open/floor/almayer, /area/almayer/living/starboard_emb) "qvE" = ( /obj/structure/machinery/light{ @@ -79783,21 +80441,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/offices/cryo) -"qwL" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) "qwS" = ( /obj/structure/platform_decoration/metal/almayer/north, /obj/structure/bed/chair{ dir = 1 }, -/obj/structure/machinery/landinglight{ - dir = 4 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "qwU" = ( @@ -79831,17 +80479,17 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/cells) "qxm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "W_Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1; dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/purple, +/area/almayer/medical/containment/cell) "qxn" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -79876,27 +80524,19 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/stair_clone/upper/port_fore) "qxC" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - id = "Alpha_1"; - name = "\improper Bathroom" - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/airlock/almayer{ + name = "\improper Bathroom"; + id = "Alpha_1" + }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_emb) "qxE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/biolab{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/sign/safety/water{ - pixel_x = 32; - pixel_y = -8 - }, +/obj/structure/largecrate/random/barrel/purewhite, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "qxI" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/window/framed/almayer/hull/hijack_bustable, @@ -79915,18 +80555,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_f_s) "qyi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +/obj/structure/sign/safety/water{ + pixel_x = -17 }, -/turf/open/floor/almayer/blue/northeast, -/area/almayer/squads/delta) +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "qyo" = ( /turf/open/floor/almayer/blue/north, /area/almayer/command/cicconference) @@ -79944,11 +80578,13 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/obj/structure/machinery/light, /turf/open/floor/almayer/sterile_green2, /area/almayer/medical/lower_medical_lobby) "qyK" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 20 + }, /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/lower/workshop/hangar) "qyP" = ( @@ -79964,12 +80600,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) -"qyW" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/squads/charlie_delta_shared) "qyX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80046,13 +80676,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/commandbunks) "qBM" = ( -/obj/item/storage/fancy/crayons{ - layer = 3.1; - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/living/grunt_rnr) +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/plating2, +/area/almayer/maint/hull/lower/l_m_p) "qBS" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -80064,14 +80694,19 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) "qCc" = ( -/obj/structure/sign/safety/security{ - pixel_y = 25 +/obj/structure/machinery/vending/dinnerware{ + pixel_x = 1 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 39 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +/obj/structure/machinery/firealarm{ + pixel_y = 26; + pixel_x = -1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "qCo" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -80099,14 +80734,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"qCH" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Secretroom"; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_m_s) "qCU" = ( /obj/structure/machinery/light{ dir = 4 @@ -80208,6 +80835,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) "qEz" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = -40 + }, /obj/structure/machinery/door_control{ id = "laddersouthwest"; name = "South West Ladders Shutters"; @@ -80234,17 +80864,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/cells) -"qEL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/largecrate/random/case/small{ - pixel_y = 5 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 - }, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/lower) "qEM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddersouthwest"; @@ -80274,29 +80893,31 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"qFG" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"qFK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"qFX" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/mp_bunks) +"qGc" = ( +/obj/structure/machinery/power/apc/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; + icon_state = "N"; + layer = 3.33; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; pixel_x = 1 }, -/turf/open/floor/almayer/bluefull, -/area/almayer/squads/delta) -"qFX" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/mp_bunks) -"qGc" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer/plating/northeast, +/area/almayer/hallways/lower/starboard_midship_hallway) "qGf" = ( /obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/red, @@ -80331,13 +80952,16 @@ /turf/open/floor/almayer/cargo, /area/almayer/lifeboat_pumps/south2) "qHe" = ( -/obj/structure/machinery/cryopod/right, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/turf/closed/wall/almayer{ + damage_cap = 15000 + }, +/area/almayer/maint/hull/lower/l_a_s) "qHg" = ( -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/door/airlock/almayer/marine/alpha/engineer{ + dir = 8 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) "qHq" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock SU-6"; @@ -80423,14 +81047,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"qJS" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = -11; - pixel_y = -1 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) "qJY" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/bottle/orangejuice{ @@ -80451,7 +81067,7 @@ pixel_x = 5; pixel_y = 10 }, -/turf/open/floor/almayer/orange, +/turf/open/floor/almayer, /area/almayer/living/starboard_emb) "qJZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -80482,13 +81098,6 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/panic) -"qKK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "qKN" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -80527,17 +81136,21 @@ /turf/open/floor/almayer/red, /area/almayer/hallways/upper/port) "qLi" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ResearchStairs"; - name = "\improper Stairway Lockdown" +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/containment) "qLk" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -80586,13 +81199,6 @@ /obj/structure/barricade/handrail, /turf/open/floor/almayer/silver/southeast, /area/almayer/command/computerlab) -"qLY" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "qMo" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -80632,48 +81238,22 @@ /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/underdeck/req) "qMP" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; + icon_state = "E"; pixel_x = 1 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = 26 - }, -/obj/structure/surface/table/almayer, -/obj/item/storage/box/pillbottles{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/storage/box/autoinjectors{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/device/reagent_scanner{ - pixel_x = -7; - pixel_y = 4 - }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) "qMR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer, +/turf/open/floor/almayer/green2/northeast, /area/almayer/living/briefing) "qNc" = ( /obj/structure/platform_decoration/metal/almayer_smooth, /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/upper/port_fore) -"qNd" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) "qNI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -80709,6 +81289,9 @@ id = "medicalemergency"; name = "\improper Medical Bay Lockdown" }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_lobby) "qOk" = ( @@ -80751,9 +81334,6 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/structure/machinery/light{ - dir = 1 - }, /turf/open/floor/almayer/sterile_green2, /area/almayer/medical/lower_medical_lobby) "qPk" = ( @@ -80876,11 +81456,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"qSE" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/cholula, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "qSI" = ( /obj/structure/surface/table/almayer, /obj/item/tank/oxygen/red, @@ -80896,7 +81471,7 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "qSX" = ( /obj/effect/decal/warning_stripes{ @@ -80932,10 +81507,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/chief_mp_office) -"qTY" = ( -/obj/structure/machinery/gibber, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "qUh" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17; @@ -80957,15 +81528,18 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "qUq" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/surface/rack, +/obj/item/tool/wet_sign{ + pixel_x = -5; + pixel_y = 9 }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +/obj/item/tool/wet_sign{ + pixel_x = -5; + pixel_y = 2 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/port_midship_hallway) "qUz" = ( /obj/structure/machinery/light{ dir = 8; @@ -80976,15 +81550,6 @@ "qUK" = ( /turf/open/floor/almayer/blue, /area/almayer/hallways/upper/fore_hallway) -"qUL" = ( -/obj/structure/machinery/landinglight/delaythree{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "qUO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -81023,24 +81588,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/port_aft) -"qWt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "qWx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, @@ -81063,19 +81610,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"qWK" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/emerald/west, -/area/almayer/hallways/lower/port_midship_hallway) -"qWL" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/item/frame/rack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "qWQ" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -81091,17 +81625,9 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) "qXo" = ( -/obj/structure/machinery/seed_extractor, -/turf/open/floor/almayer/green/northwest, -/area/almayer/living/grunt_rnr) -"qXp" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - pixel_x = 15 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) +/obj/structure/largecrate/black_market/confiscated_weaponry, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "qXE" = ( /obj/structure/machinery/brig_cell/perma_1{ pixel_x = 32 @@ -81109,28 +81635,25 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "qXO" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/mre_pack/xmas3{ - pixel_x = 5 - }, -/obj/item/reagent_container/food/snacks/mre_pack/xmas2{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/effect/landmark/map_item{ - layer = 3.03; - pixel_x = -7; - pixel_y = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) "qXS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/hallways/upper/midship_hallway) +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + closeOtherId = "ciclobby_s"; + id_tag = "cic_exterior"; + name = "\improper Midship Upper Command Ladders"; + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) "qYd" = ( /turf/open/floor/almayer/red/southeast, /area/almayer/lifeboat_pumps/south2) @@ -81165,27 +81688,16 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/flight) "qYQ" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "qYZ" = ( -/obj/structure/sign/safety/security{ - pixel_y = -25; - pixel_x = 15 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 15; - pixel_y = -39 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/living/grunt_rnr) "qZe" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk/no_build, @@ -81243,12 +81755,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) -"qZX" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) "rae" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -81261,19 +81767,6 @@ }, /turf/open/floor/almayer, /area/almayer/underdeck/hangar) -"raE" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/test_floor4, -/area/almayer/hallways/lower/port_fore_hallway) -"raK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) "raO" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer/plate, @@ -81333,19 +81826,6 @@ /obj/effect/landmark/ert_spawns/distress_cryo, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"rbH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) "rbK" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 @@ -81390,9 +81870,8 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering) "rde" = ( -/obj/structure/sign/prop1, -/turf/closed/wall/almayer, -/area/almayer/living/grunt_rnr) +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/l_m_p) "rdh" = ( /obj/structure/machinery/light{ dir = 1; @@ -81401,15 +81880,14 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "rdt" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "W" }, -/turf/open/floor/almayer/flooredge/east, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner4, +/area/almayer/medical/containment/cell) "rdz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -81471,11 +81949,11 @@ /turf/open/floor/plating, /area/almayer/command/corporateliaison) "rec" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) "ren" = ( /obj/structure/machinery/light{ @@ -81501,26 +81979,9 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/squads/req) -"reL" = ( -/obj/structure/surface/table/almayer, -/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/prison/kitchen, -/area/almayer/living/grunt_rnr) "reN" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/lower/cryo_cells) -"rfa" = ( -/obj/effect/landmark/start/marine/medic/alpha, -/obj/effect/landmark/late_join/alpha, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "rfb" = ( /turf/closed/wall/almayer/research/containment/wall/purple{ dir = 8; @@ -81584,9 +82045,6 @@ /obj/structure/cargo_container/uscm/mid, /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) -"rgW" = ( -/turf/open/floor/almayer/emeraldcorner, -/area/almayer/living/briefing) "rhm" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -81601,18 +82059,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_stern) -"rhy" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/structure/prop/server_equipment/laptop{ - pixel_x = -2; - pixel_y = 1 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "rhD" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid, @@ -81645,10 +82091,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/s_bow) -"riB" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "riC" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -81656,12 +82098,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/panic) "riE" = ( -/obj/structure/bed/chair/comfy{ - buckling_y = 2; - pixel_y = 2; - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/medical_science) "riJ" = ( /turf/open/floor/almayer/orange/northeast, @@ -81680,11 +82123,6 @@ }, /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/stern_point_defense) -"rjn" = ( -/obj/structure/machinery/light, -/obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "rjr" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/hallways/upper/midship_hallway) @@ -81752,29 +82190,14 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower/engine_core) "rlf" = ( -/obj/structure/bed/chair/janicart, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/obj/structure/machinery/cm_vending/own_points/experimental_tools, +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "rlh" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) -"rll" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "rlJ" = ( /obj/structure/platform/metal/almayer/east, /obj/item/storage/firstaid/rad, @@ -81782,22 +82205,26 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "rlQ" = ( -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "rlZ" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) "rmc" = ( -/obj/structure/machinery/vending/snack{ - pixel_x = -2; - pixel_y = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - layer = 3.33; - pixel_x = 1 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) "rmf" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -81936,13 +82363,6 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) -"roU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "rpp" = ( /obj/effect/landmark/start/executive, /turf/open/floor/plating/plating_catwalk, @@ -81986,16 +82406,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck) -"rqz" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_y = 25 - }, -/obj/structure/sign/safety/water{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "rqD" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -82006,15 +82416,12 @@ /turf/open/floor/almayer/bluefull, /area/almayer/living/captain_mess) "rqE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/tool/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/area/almayer/maint/hull/lower/l_a_p) "rqQ" = ( /obj/structure/machinery/door/poddoor/railing{ id = "vehicle_elevator_railing_aux" @@ -82046,15 +82453,6 @@ /obj/structure/cargo_container/uscm/chinook/left, /turf/open/floor/almayer/no_build, /area/almayer/underdeck/req) -"rrq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "rrz" = ( /obj/structure/sign/safety/four{ pixel_x = -17 @@ -82075,17 +82473,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/bridgebunks) "rrD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/structure/machinery/status_display{ - pixel_y = 32; - pixel_x = -2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/upper_medical) "rrK" = ( /obj/structure/filingcabinet{ @@ -82101,12 +82489,6 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/living/offices) -"rrU" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "rsL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -82115,14 +82497,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_aft_hallway) "rsM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/obj/item/storage/bag/trash, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "rsO" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Computer Lab" @@ -82159,8 +82537,12 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) "rth" = ( -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl{ + req_access = list(32,15); + req_one_access = list() + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/alpha) "rtt" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -82178,25 +82560,21 @@ /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) "rtA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/pen{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -5; - pixel_y = 8 +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/alpha) "rtV" = ( -/obj/structure/surface/table/almayer, -/obj/item/pizzabox{ - pixel_x = 6; - pixel_y = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "rtY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/wood/ship, @@ -82210,40 +82588,14 @@ /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/command/computerlab) "ruc" = ( -/obj/structure/closet/secure_closet/hydroresearch, -/obj/item/reagent_container/glass/watertank, -/obj/item/reagent_container/glass/watertank, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) -"rui" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/camera/autoname/almayer/containment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) -"rur" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 + icon_state = "W" }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/living/starboard_emb) +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) "rux" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -82274,9 +82626,23 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) "rvT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/platoon2_shared) "rwe" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -82288,13 +82654,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "rwj" = ( -/turf/open/floor/almayer/orange/east, +/turf/open/floor/almayer/flooredge/east, /area/almayer/hallways/lower/starboard_midship_hallway) -"rwv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "rwB" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -82368,16 +82729,14 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) -"rzy" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredgesmooth2/south, -/area/almayer/hallways/lower/port_aft_hallway) "rzN" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/containment) "rAb" = ( -/turf/open/floor/almayer/bluecorner, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "rAo" = ( /obj/structure/disposalpipe/segment, @@ -82407,14 +82766,14 @@ /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_f_s) "rAx" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_x = -8; + pixel_y = 6 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "rAC" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, @@ -82429,12 +82788,6 @@ /obj/structure/ob_ammo/ob_fuel, /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) -"rAN" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) "rAP" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/orange/northeast, @@ -82452,27 +82805,31 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "rBa" = ( +/obj/structure/machinery/cm_vending/clothing/synth, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/janitorialcart, -/obj/item/storage/bag/trash, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "rBb" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 +/obj/structure/sign/nosmoking_1{ + pixel_x = 25; + pixel_y = 6 + }, +/obj/structure/sign/safety/medical{ + pixel_x = 32; + pixel_y = -10 + }, +/obj/structure/sign/safety/outpatient{ + pixel_x = 46; + pixel_y = -10 }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"rBj" = ( -/obj/structure/machinery/processor, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "rBv" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer/cargo, @@ -82563,19 +82920,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_umbilical) "rDr" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/turf/open/floor/plating, -/area/almayer/medical/hydroponics) +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/sterile_green2, +/area/almayer/medical/medical_science) "rDt" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/item/stool, +/obj/item/trash/cigbutt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "rDy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -82586,15 +82939,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"rDO" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/port_fore_hallway) "rDQ" = ( /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/cryo) @@ -82609,20 +82953,10 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "rDV" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext"; - name = "Window Shutters"; - pixel_y = -9; - req_access_txt = "28" - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/reagent_analyzer{ - pixel_y = 5; - pixel_x = -1; - explo_proof = 1 +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "rEc" = ( /obj/effect/decal/warning_stripes{ @@ -82670,16 +83004,12 @@ /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/lower/l_f_s) "rEv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -26 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "rEK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82718,8 +83048,9 @@ /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_medbay) "rGj" = ( -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer/plate, +/area/almayer/squads/platoon1_shared) "rGr" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -82745,17 +83076,25 @@ /turf/open/floor/carpet, /area/almayer/command/cicconference) "rHf" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = 27; + pixel_y = 4 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -13; + pixel_x = 34 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "rHq" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; pixel_y = -25 }, /obj/structure/ladder/multiz, -/turf/open/floor/almayer/no_build/plating, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "rHr" = ( /obj/structure/closet/emcloset, @@ -82771,14 +83110,10 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "rHz" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/flora/bush/ausbushes/var3/fullgrass{ - desc = "Just like a real plant, but fake!"; - name = "fake fullgrass" - }, -/turf/open/floor/grass, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/upper_medical) "rHB" = ( /obj/item/ammo_box/magazine/misc/mre/empty{ @@ -82822,6 +83157,9 @@ req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_lobby) "rID" = ( @@ -82842,12 +83180,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"rIP" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/orange/west, -/area/almayer/hallways/lower/starboard_midship_hallway) "rIV" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -82859,13 +83191,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) "rIW" = ( -/obj/structure/reagent_dispensers/tank/water, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) -"rJf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_a_p) +/obj/structure/machinery/cm_vending/gear/synth, +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "rJh" = ( /obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -82893,22 +83221,29 @@ /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) "rJu" = ( -/turf/open/floor/almayer/orange/north, -/area/almayer/living/briefing) -"rJx" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue{ - dir = 2 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 1; + pixel_y = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer, +/area/almayer/living/briefing) "rJD" = ( -/obj/item/trash/kepler, +/obj/structure/closet/fireaxecabinet{ + pixel_y = -26 + }, +/obj/effect/landmark/start/synthetic, /turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "rJK" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/closed/wall/almayer, /area/almayer/living/briefing) "rKd" = ( /turf/open/floor/almayer/uscm/directional/northeast, @@ -82929,15 +83264,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/living/pilotbunks) -"rKO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "rKQ" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer/silver, @@ -82976,14 +83302,16 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/lower/cryo_cells) "rLP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/obj/structure/bed/chair/comfy/delta{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "rLU" = ( /turf/open/floor/almayer/research/containment/floor2/west, @@ -83060,11 +83388,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/starboard_emb) "rNd" = ( -/obj/effect/landmark/start/marine/engineer/delta, -/obj/effect/landmark/late_join/delta, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/area/almayer/maint/hull/lower/l_a_p) "rNu" = ( /obj/structure/platform/metal/almayer/west, /obj/structure/machinery/recharge_station{ @@ -83150,35 +83476,18 @@ /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) "rPE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "rPF" = ( /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/starboard_hallway) "rPO" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_x = -6; - pixel_y = 16 - }, -/obj/item/facepaint/black{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, -/turf/open/floor/almayer/blue/southwest, -/area/almayer/squads/delta) +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/support) "rPQ" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Engineering Hallway" @@ -83260,22 +83569,19 @@ /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/hydroponics) "rQA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/delta) -"rQV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) +"rQV" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) "rQW" = ( /obj/item/tool/screwdriver, /obj/structure/machinery/light{ @@ -83335,30 +83641,41 @@ pixel_y = 4 }, /obj/item/ashtray/glass{ - pixel_x = -6 + pixel_x = -6; + pixel_y = -2 }, /obj/item/clothing/mask/cigarette/weed{ name = "cigarette"; pixel_x = 7; pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/weed{ - name = "cigarette"; - pixel_y = 7 - }, /obj/item/trash/cigbutt/ucigbutt{ layer = 3.7; pixel_x = 7; pixel_y = 11 }, +/obj/item/storage/fancy/cigar/tarbacks{ + pixel_x = -5; + pixel_y = 11 + }, +/obj/item/clothing/mask/cigarette/weed{ + name = "cigarette"; + pixel_y = 7 + }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "rSj" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/smartgun/alpha{ + density = 0; + pixel_x = -26; + pixel_y = 1 }, -/turf/open/floor/almayer/orangefull, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/red2/northwest, +/area/almayer/squads/alpha) "rSx" = ( /obj/structure/surface/table/almayer, /obj/item/stack/rods/plasteel{ @@ -83421,9 +83738,6 @@ }, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/starboard) -"rUh" = ( -/turf/open/floor/almayer/emerald/southwest, -/area/almayer/squads/charlie) "rUi" = ( /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/upper/port_aft) @@ -83536,14 +83850,10 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/general_equipment) "rXj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) +/obj/effect/landmark/start/marine/engineer/charlie, +/obj/effect/landmark/late_join/charlie, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "rXk" = ( /obj/structure/barricade/plasteel/metal{ dir = 1 @@ -83596,15 +83906,14 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) "rXS" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, -/area/almayer/squads/delta) +/area/almayer/squads/bravo) "rXT" = ( /obj/structure/platform_decoration/metal/almayer, /obj/structure/prop/invuln/overhead_pipe{ @@ -83626,11 +83935,10 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "rYp" = ( -/obj/effect/landmark/start/marine/medic/delta, -/obj/effect/landmark/late_join/delta, +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "rYv" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -83783,12 +84091,22 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "scy" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "scz" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer5" @@ -83809,21 +84127,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"scN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) -"scX" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray, -/obj/item/reagent_container/food/drinks/bottle/whiskey, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "sdd" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/almayer/plate, @@ -83842,28 +84145,18 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/vehiclehangar) "sdn" = ( -/obj/structure/morgue{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) -"sdu" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_door"; - name = "Door Shutters"; +/obj/structure/reagent_dispensers/water_cooler/stacks{ pixel_y = 23; - req_access_txt = "28" + pixel_x = -8; + density = 0 }, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) +"sdu" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/medical_science) "sdv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -83875,20 +84168,10 @@ /obj/structure/largecrate/supply/weapons/pistols, /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) -"sdC" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "sdO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; - pixel_y = 1 + pixel_y = 2 }, /turf/open/floor/almayer/flooredgesmooth3/north, /area/almayer/medical/lower_medical_lobby) @@ -83954,29 +84237,18 @@ /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/lockerroom) "sgm" = ( -/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ pixel_y = 28 }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = 10; - pixel_y = 14 - }, -/obj/item/trash/USCMtray{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/hotdog{ - pixel_x = -7; - pixel_y = 5 - }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "sgD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" }, -/turf/open/floor/almayer/bluefull, +/turf/open/floor/almayer/flooredge/east, /area/almayer/living/briefing) "sgE" = ( /obj/structure/bed, @@ -83998,21 +84270,9 @@ id = "southcheckpoint"; name = "\improper Checkpoint Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/redfull, /area/almayer/hallways/lower/port_midship_hallway) -"sgR" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/facepaint/green, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "sgU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -84067,6 +84327,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) "siy" = ( +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, /turf/open/floor/almayer/green/northeast, /area/almayer/hallways/lower/port_midship_hallway) "siC" = ( @@ -84098,7 +84365,7 @@ "siW" = ( /obj/structure/machinery/light, /obj/structure/machinery/door_control{ - id = "or4privacyshutterdoor"; + id = "or4privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = -24; throw_range = 15; @@ -84167,14 +84434,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck) "skl" = ( -/obj/structure/morgue{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "test_square_smooth" +/obj/structure/machinery/computer/crew, +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 25 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/upper_medical) "skC" = ( /obj/structure/pipes/standard/simple/visible{ dir = 6 @@ -84183,8 +84449,15 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) "skF" = ( -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "skL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -84232,9 +84505,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) -"smi" = ( -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "smw" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/med_data/laptop{ @@ -84255,15 +84525,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "smA" = ( -/obj/item/trash/cigbutt{ - pixel_x = -10; - pixel_y = 13 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice10"; - pixel_x = -16; - pixel_y = 16 - }, +/obj/structure/surface/rack, +/obj/effect/spawner/random/powercell, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "smH" = ( @@ -84280,9 +84544,6 @@ /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/panic) -"sni" = ( -/turf/open/floor/almayer/orange/northwest, -/area/almayer/command/cic) "snt" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer/cargo, @@ -84315,12 +84576,6 @@ /area/almayer/engineering/upper_engineering/port) "snI" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, /obj/structure/transmitter/rotary/no_dnd{ name = "Delta Overwatch Telephone"; phone_category = "Command"; @@ -84330,6 +84585,12 @@ pixel_x = -17; pixel_y = 7 }, +/obj/structure/machinery/computer/overwatch/groundside_operations/section{ + layer = 3.2; + pixel_y = -17; + pixel_x = -17; + dir = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) "snM" = ( @@ -84346,14 +84607,6 @@ /obj/structure/curtain/red, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) -"snR" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "snT" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/effect/decal/cleanable/dirt, @@ -84376,9 +84629,8 @@ icon_state = "E"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "sov" = ( /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/engine_core) @@ -84393,15 +84645,11 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "soT" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -8 +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "soX" = ( /obj/structure/window/reinforced/toughened, @@ -84436,15 +84684,20 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/starboard) "spS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8; + pixel_x = -8 }, -/turf/open/floor/almayer/emerald/west, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "spT" = ( /obj/structure/closet/crate{ desc = "One of those old special operations crates from back in the day. After a leaked report from a meeting of SOF leadership lambasted the crates as 'waste of operational funds' the crates were removed from service."; @@ -84549,25 +84802,12 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/evidence_storage) "ssk" = ( -/obj/structure/surface/rack, -/obj/item/prop{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag_full"; - name = "trash bag"; - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/prop{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag_full"; - name = "trash bag"; - pixel_x = 3; - pixel_y = -2 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "southcheckpoint"; + name = "\improper Checkpoint Shutters" }, -/obj/item/folded_tent/mess, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/redfull, /area/almayer/maint/hull/lower/l_m_p) "ssz" = ( /obj/item/hardpoint/primary/cannon{ @@ -84642,13 +84882,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/command/securestorage) -"suH" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_midship_hallway) "suJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -84690,17 +84923,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) -"svF" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/effect/landmark/yautja_teleport, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_p) "swd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -84723,21 +84945,18 @@ /turf/open/floor/almayer/orangecorner, /area/almayer/hallways/upper/aft_hallway) "swt" = ( -/turf/open/floor/almayer/greencorner, -/area/almayer/living/grunt_rnr) +/obj/structure/surface/table/almayer, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil/green, +/obj/item/stack/cable_coil/cyan, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "swx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) -"swE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer/green/northeast, -/area/almayer/living/grunt_rnr) "swG" = ( /obj/structure/reagent_dispensers/tank/fuel, /turf/open/floor/almayer/plate, @@ -84823,12 +85042,6 @@ /obj/structure/cryofeed/right, /turf/open/floor/almayer/plating/northeast, /area/almayer/underdeck/hangar) -"syj" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_fore_hallway) "syl" = ( /obj/structure/machinery/light/red{ dir = 4; @@ -84841,21 +85054,8 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) "syp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/turf/open/floor/almayer/silver/southwest, +/turf/open/floor/almayer/silver/southeast, /area/almayer/maint/upper/u_m_p) -"syH" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "syO" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -84906,30 +85106,25 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/warden_office) "szM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 4 }, -/turf/open/floor/almayer/emerald/southeast, -/area/almayer/squads/charlie) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "szU" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda/beer, /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) -"sAc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "sAn" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -84981,11 +85176,6 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) -"sBL" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/light, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "sBQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ closeOtherId = "briglobby"; @@ -85003,37 +85193,13 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "sCg" = ( -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/lower/starboard_midship_hallway) -"sCA" = ( -/obj/structure/bed/chair/comfy/delta{ - dir = 4 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) -"sCD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/vending/cigarette/koorlander{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/area/almayer/maint/hull/lower/l_m_s) +"sCA" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, +/area/almayer/living/briefing) "sCI" = ( /obj/structure/machinery/keycard_auth{ pixel_x = 24; @@ -85068,52 +85234,34 @@ /turf/closed/wall/almayer, /area/almayer/hallways/lower/vehiclehangar) "sDA" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/north, /area/almayer/living/briefing) "sDD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/port_missiles) "sDM" = ( -/turf/open/floor/almayer/blue/northwest, -/area/almayer/squads/delta) -"sEd" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) -"sEg" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 25 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) -"sEi" = ( -/obj/structure/bed/chair{ - can_buckle = 0; +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) +"sEd" = ( +/obj/structure/pipes/vents/pump{ 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/extinguisher_cabinet{ + pixel_x = 26 }, -/turf/open/floor/almayer/green/northwest, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "sEp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -85284,10 +85432,10 @@ /turf/open/floor/almayer/orangecorner/east, /area/almayer/hallways/upper/aft_hallway) "sHY" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer/red, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "sIr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -85334,19 +85482,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) -"sJC" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) -"sJY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/living/starboard_emb) "sKf" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, @@ -85408,13 +85543,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) -"sMu" = ( -/obj/item/trash/uscm_mre, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "sMK" = ( /obj/vehicle/powerloader, /obj/structure/prop/invuln/lattice_prop{ @@ -85444,15 +85572,17 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) "sNz" = ( -/obj/structure/machinery/medical_pod/bodyscanner, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "sNI" = ( -/obj/structure/bed/chair/comfy/delta, -/turf/open/floor/almayer/bluefull, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" + }, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/living/briefing) "sNL" = ( /turf/open/floor/almayer/green/east, @@ -85485,13 +85615,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"sOt" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "sOv" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ @@ -85530,12 +85653,29 @@ /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) "sOZ" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 +/obj/item/paper_bin/wy{ + pixel_y = 8; + pixel_x = -7 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/obj/structure/surface/table/almayer, +/obj/item/tool/pen{ + pixel_y = 4; + pixel_x = -8 + }, +/obj/item/tool/stamp/cmo{ + pixel_x = 6; + pixel_y = 10; + name = "Chief Medical Officer's rubber stamp" + }, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "sPa" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_m_s) @@ -85595,23 +85735,8 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"sSC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer/blue/southeast, -/area/almayer/squads/delta) "sSG" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, /obj/structure/machinery/light{ dir = 1 }, @@ -85624,6 +85749,12 @@ pixel_x = -17; pixel_y = 7 }, +/obj/structure/machinery/computer/overwatch/groundside_operations/section{ + layer = 3.2; + pixel_y = -17; + pixel_x = -17; + dir = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) "sSL" = ( @@ -85657,8 +85788,8 @@ /area/almayer/shipboard/brig/cic_hallway) "sTU" = ( /obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) @@ -85680,15 +85811,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_a_p) -"sUj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/bluefull, -/area/almayer/squads/delta) "sUk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -85716,19 +85838,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/command/cicconference) -"sUO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "sUS" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -85797,13 +85906,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) -"sXt" = ( -/obj/structure/machinery/cm_vending/clothing/tl/alpha{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "sXw" = ( /obj/effect/landmark/start/marine/engineer/bravo, /obj/effect/landmark/late_join/bravo, @@ -85886,13 +85988,6 @@ "sZe" = ( /turf/open/floor/almayer/green, /area/almayer/hallways/lower/starboard_aft_hallway) -"sZq" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "sZs" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -85902,9 +85997,16 @@ /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) "sZy" = ( -/obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/almayer, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/medical_science) "sZH" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/bronze{ @@ -85916,9 +86018,6 @@ pixel_x = -13; pixel_y = 14 }, -/obj/item/prop/magazine/boots/n054{ - pixel_x = 29 - }, /obj/item/prop/magazine/dirty/torn{ pixel_x = -6; pixel_y = 6 @@ -85927,25 +86026,24 @@ pixel_x = 5; pixel_y = 4 }, -/turf/open/floor/almayer/blue/northeast, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "sZY" = ( /obj/structure/blocker/fuelpump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "tab" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/flashbangs{ - pixel_x = -5; +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/rollingpin, +/obj/item/tool/kitchen/rollingpin{ + pixel_x = -3; pixel_y = 5 }, -/obj/item/restraint/handcuffs, -/obj/item/storage/firstaid/regular, /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/area/almayer/living/grunt_rnr) "tal" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cargo_container/armat/left{ @@ -86025,10 +86123,10 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; name = "\improper Security Checkpoint"; + access_modified = 1; req_access = null; req_one_access_txt = "3;19" }, @@ -86046,12 +86144,14 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "tdf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, -/turf/open/floor/almayer/blue/east, -/area/almayer/squads/delta) +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "tdi" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -86082,23 +86182,18 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/lobby) "tdE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/alpha_bravo_shared) -"tdH" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/engi/alpha{ + density = 0; + pixel_x = -26 }, -/obj/item/bedsheet/yellow, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/alpha) "tdI" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -86206,14 +86301,14 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/closed/wall/almayer/white, -/area/almayer/medical/medical_science) -"tfQ" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F" +/obj/structure/machinery/flasher{ + alpha = 1; + id = "Containment Cell 3"; + layer = 2.1; + name = "Mounted Flash"; + pixel_y = -25 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/medical/containment/cell) "tfZ" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -86227,21 +86322,10 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/starboard_hallway) "tge" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 - }, -/turf/open/floor/almayer/emeraldfull, +/obj/structure/bed/chair/comfy/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) -"tgm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "tgy" = ( /obj/structure/machinery/disposal{ pixel_y = -3; @@ -86255,16 +86339,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) -"tgz" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_y = -25 - }, -/obj/structure/sign/safety/manualopenclose{ - pixel_x = 15; - pixel_y = -25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "tgJ" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/warden_office) @@ -86310,16 +86384,6 @@ "thv" = ( /turf/open/floor/almayer/orange, /area/almayer/command/telecomms) -"thA" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/alpha_bravo_shared) "thL" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) @@ -86335,15 +86399,16 @@ /area/almayer/maint/upper/u_a_p) "tig" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/delta) "tii" = ( /obj/structure/machinery/firealarm{ pixel_x = 6; @@ -86421,13 +86486,7 @@ /turf/open/floor/almayer/green/north, /area/almayer/squads/req) "tjn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "tjw" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -86496,14 +86555,17 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) "tkN" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0 +/obj/structure/machinery/light{ + pixel_x = 16 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/cm_vending/clothing/specialist/alpha{ + density = 0; + pixel_y = 1; + pixel_x = -26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red2/southwest, +/area/almayer/squads/alpha) "tkR" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -86524,16 +86586,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/general_equipment) -"tln" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "tlp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -86628,25 +86680,23 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/medical/operating_room_four) "tnz" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "tnY" = ( -/obj/structure/machinery/cryopod{ +/obj/structure/machinery/cryopod/right{ pixel_y = 6 }, /obj/structure/machinery/light{ - dir = 8 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/area/almayer/squads/delta) "tob" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_s) @@ -86719,12 +86769,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_fore_hallway) -"tpa" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "5" - }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/upper_medical) "tpd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -86823,28 +86867,31 @@ /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering/starboard) "trF" = ( -/obj/item/paper_bin/wy{ - pixel_x = 3; - pixel_y = 7 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/item/tool/pen{ - pixel_y = 6; - pixel_x = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/item/tool/pen{ - pixel_x = 5 +/obj/item/storage/firstaid/o2{ + pixel_x = -6; + pixel_y = 6 }, -/obj/item/tool/hand_labeler{ - pixel_x = -10; - pixel_y = 10 +/obj/item/storage/firstaid/fire{ + pixel_x = 8; + pixel_y = 6 }, -/obj/item/tool/stamp/rd{ - pixel_x = -10; - pixel_y = -3; - name = "Research department's rubber stamp" +/obj/item/storage/firstaid/adv{ + pixel_x = -6; + pixel_y = -2 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/mono, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/medical_science) "trU" = ( /obj/structure/surface/table/woodentable/fancy, @@ -86854,18 +86901,11 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliaison) "tsa" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/suit/chef/classic, -/obj/item/tool/kitchen/knife/butcher, -/obj/item/clothing/suit/chef/classic, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_m_p) "tsn" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -26 - }, -/turf/open/floor/almayer/blue, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) "tsr" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -86892,18 +86932,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/command/cicconference) -"tsC" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - pixel_y = 6; - pixel_x = -8; - density = 0 - }, -/obj/structure/machinery/light/double/blue{ - light_color = "#a7dbc7" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) "tsE" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/plating_catwalk, @@ -86937,23 +86965,6 @@ /obj/structure/closet/secure_closet/brig/prison_uni, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/perma) -"tuo" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) -"tup" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/lower/starboard_midship_hallway) "tuq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/north, @@ -86993,13 +87004,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/redcorner/west, /area/almayer/shipboard/weapon_room) -"tvl" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "tvt" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -87025,24 +87029,30 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/shipboard/brig/starboard_hallway) "tvM" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/largecrate/random/barrel/medical, +/obj/structure/sign/poster/propaganda{ + pixel_x = -32; + pixel_y = 10 }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) -"tvN" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/sign/poster/propaganda{ + pixel_x = -25 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) +"tvN" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/structure/sign/safety/autoopenclose{ + pixel_y = 26 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/obj/structure/sign/safety/water{ + pixel_x = 15; + pixel_y = 26 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "tvQ" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/red/northeast, @@ -87115,12 +87125,8 @@ pixel_x = 8; pixel_y = 24 }, -/turf/open/floor/almayer/plating_striped/north, +/turf/open/floor/almayer/plating_stripedcorner/north, /area/almayer/hallways/lower/starboard_midship_hallway) -"txH" = ( -/obj/structure/bed/stool, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "txS" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -87131,8 +87137,11 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "txW" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/sterile_green_side/southeast, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "tyb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -87148,11 +87157,8 @@ /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/south1) "tyD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/almayer/medical/containment/cell) "tyK" = ( /obj/effect/spawner/random/toolbox, /obj/structure/machinery/light{ @@ -87171,20 +87177,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) -"tzr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) "tzw" = ( /obj/structure/machinery/light{ dir = 1 @@ -87213,10 +87205,6 @@ dir = 4 }, /obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker/bluespace{ - pixel_y = 12; - pixel_x = 5 - }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/chemistry) "tzP" = ( @@ -87251,18 +87239,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/auxiliary_officer_office) -"tAN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/squads/bravo) "tAU" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -87358,14 +87334,12 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "tDZ" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "tEd" = ( /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/engineering/lower/workshop/hangar) @@ -87407,22 +87381,6 @@ }, /turf/open/floor/almayer/silver/northeast, /area/almayer/command/combat_correspondent) -"tEC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) -"tEO" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "tFe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -87458,13 +87416,6 @@ /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer/red/north, /area/almayer/maint/upper/u_a_p) -"tFP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "tFS" = ( /obj/structure/machinery/computer/supply/asrs, /obj/structure/sign/safety/terminal{ @@ -87518,10 +87469,12 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) "tGG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy/alpha{ - dir = 1 + dir = 4 }, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "tGH" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -87565,7 +87518,8 @@ /turf/open/floor/almayer/silverfull, /area/almayer/command/airoom) "tHv" = ( -/turf/open/floor/almayer/orangecorner/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/green/northeast, /area/almayer/living/briefing) "tHF" = ( /obj/structure/machinery/light, @@ -87576,8 +87530,8 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) "tIa" = ( -/obj/structure/platform_decoration/metal/almayer/east, -/turf/open/floor/almayer, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "tId" = ( /obj/structure/machinery/recharge_station, @@ -87590,9 +87544,6 @@ /turf/open/floor/almayer/orange/northeast, /area/almayer/engineering/lower/engine_core) "tIp" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Dorms" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -87600,6 +87551,9 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/airlock/almayer{ + name = "\improper Dorms" + }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_emb) "tIu" = ( @@ -87643,9 +87597,19 @@ icon_state = "N"; pixel_y = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/delta) "tIS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -87677,16 +87641,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_s) -"tJz" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "tJV" = ( /obj/structure/machinery/vending/hydronutrients, -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "tKr" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -87696,13 +87654,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/living/bridgebunks) -"tKY" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "tLa" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -87728,27 +87679,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/armory) -"tLc" = ( -/obj/structure/surface/rack, -/obj/item/storage/bag/plants{ - pixel_x = -3 - }, -/obj/item/storage/bag/plants{ - pixel_x = 3 - }, -/obj/item/storage/bag/plants{ - pixel_y = -3 - }, -/obj/item/tool/scythe, -/obj/structure/sign/safety/waterhazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "tLp" = ( /turf/open/floor/almayer/plating_striped/west, /area/almayer/underdeck/req) @@ -87763,6 +87693,7 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "tNB" = ( @@ -87776,39 +87707,31 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) -"tNR" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "tOr" = ( -/obj/structure/machinery/computer/cameras/containment{ - name = "Research Cameras"; - pixel_y = 1; - pixel_x = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/machinery/computer/research/main_terminal{ - pixel_y = 1; - pixel_x = -15 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/hydroponics) "tOu" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/demo_scanner{ - pixel_x = -7; - pixel_y = 8 +/obj/structure/machinery/door_control{ + pixel_x = -6; + pixel_y = -4; + name = "Secure Storage Shutters"; + id = "OTcenter" + }, +/obj/item/reagent_container/glass/beaker/bluespace{ + pixel_y = 12; + pixel_x = 6 }, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/lower/workshop/hangar) -"tOW" = ( -/turf/open/floor/almayer/green/southwest, -/area/almayer/living/grunt_rnr) "tPc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -87848,15 +87771,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) "tPm" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/teal{ + dir = 4; + name = "Kilo squad chair" }, -/turf/open/floor/almayer/bluefull, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "tPA" = ( /obj/structure/surface/rack, @@ -87874,16 +87795,23 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) -"tPD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) "tPI" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + dir = 8; + pixel_x = -1 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/sign/poster/safety{ + pixel_y = 32 + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) "tQd" = ( /obj/structure/machinery/light{ dir = 8 @@ -87944,15 +87872,13 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "tSp" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/obj/structure/kitchenspike, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/obj/structure/reagent_dispensers/tank/fuel, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "tSr" = ( /obj/structure/cargo_container/armat/mid{ pixel_y = 10 @@ -87960,11 +87886,8 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "tSB" = ( -/turf/open/floor/almayer/orangecorner/north, -/area/almayer/living/briefing) -"tSF" = ( -/obj/structure/bed/chair/comfy/delta, -/turf/open/floor/almayer/plate, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/greencorner/east, /area/almayer/living/briefing) "tSX" = ( /obj/structure/surface/table/almayer, @@ -87984,12 +87907,24 @@ /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) "tTp" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 7 +/obj/item/trash/ceramic_plate{ + pixel_y = 10; + pixel_x = -3 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 14; + pixel_x = -7 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_y = 12; + pixel_x = -1 + }, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ + pixel_x = -6; + pixel_y = -11 }, -/turf/open/floor/almayer/emeraldfull, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "tTu" = ( /turf/open/floor/almayer/red/southeast, @@ -88077,11 +88012,15 @@ /area/almayer/living/bridgebunks) "tVq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha) +/obj/structure/machinery/cm_vending/clothing/smartgun/delta{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/blue2/northwest, +/area/almayer/squads/delta) "tVx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -88101,16 +88040,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"tWl" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Disposals" - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_a_p) "tWp" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -88126,11 +88055,12 @@ /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) "tWY" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/redfull, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) "tXa" = ( /obj/structure/largecrate/supply/weapons/m39{ @@ -88142,13 +88072,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) -"tXb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "tXc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -88180,19 +88103,13 @@ /area/almayer/squads/req) "tXn" = ( /obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/almayer/plate, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) "tXM" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "tXT" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, /obj/structure/sign/poster{ desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that."; icon_state = "poster16"; @@ -88219,7 +88136,13 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/plate, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "tYf" = ( /obj/structure/machinery/light/red{ @@ -88333,19 +88256,19 @@ /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/medical/lower_medical_medbay) "ual" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/machinery/disposal/delivery{ - density = 0; - desc = "A pneumatic delivery unit. Sends items to the requisitions."; - icon_state = "delivery_med"; - name = "Requisitions Delivery Unit"; - pixel_y = 28; - pixel_x = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) +/obj/structure/sink{ + pixel_y = 24 + }, +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/almayer/medical/containment/cell) "uaA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, @@ -88429,22 +88352,8 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"ucy" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 - }, -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_a_p) "ucz" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 15 - }, /obj/structure/machinery/light, /obj/structure/transmitter/rotary/no_dnd{ name = "Bravo Overwatch Telephone"; @@ -88455,9 +88364,19 @@ pixel_x = -17; pixel_y = -8 }, +/obj/structure/machinery/computer/overwatch/groundside_operations/section{ + layer = 3.2; + pixel_y = 16; + pixel_x = -17; + dir = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) "udf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, /obj/structure/sign/safety/maint{ pixel_x = 15; pixel_y = 25 @@ -88465,15 +88384,18 @@ /obj/structure/sign/safety/storage{ pixel_y = 25 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 3 - }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) "udi" = ( -/turf/open/floor/almayer/red, -/area/almayer/living/briefing) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/living/grunt_rnr) "udv" = ( /obj/structure/machinery/light{ dir = 8 @@ -88484,14 +88406,25 @@ /turf/open/floor/almayer/blue/west, /area/almayer/living/pilotbunks) "udG" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ - icon_state = "N"; + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "udK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -88517,15 +88450,6 @@ "udZ" = ( /turf/open/floor/almayer/silvercorner/south, /area/almayer/command/computerlab) -"uek" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/prop/magazine/boots/n117{ - pixel_x = 2; - pixel_y = 5 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "uew" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -88603,25 +88527,10 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"ueJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic{ - pixel_x = 10; - pixel_y = -2 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) "ueY" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_s) -"ueZ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha) "ufb" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -88632,13 +88541,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"ufh" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "ufJ" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -88661,8 +88563,8 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "ugu" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silverfull, /area/almayer/living/briefing) "ugw" = ( /obj/structure/disposalpipe/segment{ @@ -88711,6 +88613,7 @@ id = "northcheckpoint"; name = "\improper Checkpoint Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/redfull, /area/almayer/hallways/lower/starboard_midship_hallway) "uhu" = ( @@ -88741,6 +88644,10 @@ "uig" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 8 + }, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_p) "uio" = ( @@ -88800,9 +88707,10 @@ /turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/lower_medical_medbay) "ujV" = ( -/obj/structure/machinery/vending/dinnerware, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/maint/hull/lower/l_m_p) "uky" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -88827,10 +88735,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped, /area/almayer/underdeck/req) -"ukV" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "uli" = ( /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -88952,36 +88856,18 @@ /turf/open/floor/almayer/plate, /area/almayer/lifeboat_pumps/north1) "uoi" = ( -/obj/structure/sign/safety/airlock{ - pixel_y = 32; - pixel_x = 15 - }, -/obj/structure/sign/safety/stairs{ - pixel_y = 32; - pixel_x = 1 - }, -/obj/structure/machinery/door_control{ - id = "ResearchStairs"; - name = "Stairway Lockdown"; - req_one_access_txt = "19;28"; - pixel_y = 23; - pixel_x = 1 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/medical_science) +/obj/structure/pipes/vents/scrubber/no_boom, +/turf/open/floor/almayer/sterile_green2, +/area/almayer/medical/containment) "uoj" = ( /obj/item/tool/pen, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) "uol" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32 - }, -/obj/structure/flora/bush/ausbushes/var3/fullgrass{ - desc = "Just like a real plant, but fake!"; - name = "fake fullgrass" - }, -/turf/open/floor/grass, +/obj/structure/bed/sofa/south/white/left, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "uoA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -89003,19 +88889,19 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "upM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 2; - name = "\improper Psychiatric Care Unit"; - req_one_access = null; - req_access = null +/obj/structure/machinery/door_control{ + dir = 1; + id = "Research Armory"; + name = "Research Armory"; + req_one_access_txt = "4;28"; + pixel_y = 25 }, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "upO" = ( /obj/structure/disposalpipe/segment, @@ -89038,13 +88924,25 @@ /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) "uqd" = ( -/obj/structure/bed/chair/comfy/charlie{ - name = "comfy chair"; - desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in purple."; - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/surface/rack{ + pixel_x = -1 + }, +/obj/item/storage/xeno_tag_case/full{ + pixel_y = 8 + }, +/obj/item/device/camera{ + pixel_x = -3; + pixel_y = 1 + }, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/containment) "uqg" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -89074,13 +88972,14 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "uqA" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/orange/southwest, -/area/almayer/squads/bravo) +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_x = -26 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/delta) "uqI" = ( /obj/structure/machinery/light{ pixel_x = 16 @@ -89115,10 +89014,16 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "urN" = ( -/obj/effect/landmark/start/marine/leader/charlie, -/obj/effect/landmark/late_join/charlie, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/area/almayer/squads/support) "usm" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -89143,28 +89048,27 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/shipboard/panic) "usu" = ( -/obj/structure/sign/safety/stairs{ - pixel_y = -26; - pixel_x = 18 +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = -25 + }, +/obj/structure/sign/safety/escapepod{ + pixel_y = -25 }, /turf/open/floor/almayer/green, /area/almayer/hallways/upper/fore_hallway) "usy" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Research Hydroponics"; - req_one_access = list(28,206,207) +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/hydroponics) +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/medical_science) "usX" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "usZ" = ( @@ -89205,27 +89109,13 @@ /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) "utX" = ( -/obj/structure/machinery/cm_vending/clothing/medical_crew/researcher, -/turf/open/floor/almayer/mono, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/connect_e2{ + icon_state = "containment_wall_connect_e" + }, +/area/almayer/medical/containment/cell) "utZ" = ( /turf/open/floor/almayer/redcorner/east, /area/almayer/shipboard/brig/processing) -"uuj" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = -12; - pixel_y = 14 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "uul" = ( /obj/structure/pipes/standard/cap/hidden{ dir = 4 @@ -89318,33 +89208,15 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/bridgebunks) -"uvu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/orangecorner/west, -/area/almayer/squads/bravo) "uvP" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) -"uvU" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - pixel_x = 5 - }, -/obj/item/facepaint/black{ - pixel_x = -10 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/turf/open/floor/almayer/research/containment/corner/east, +/area/almayer/medical/containment/cell) "uvY" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/cells) @@ -89355,11 +89227,17 @@ /turf/open/floor/almayer/cargo_arrow, /area/almayer/shipboard/port_missiles) "uwt" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/delta{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/plate, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "uwv" = ( /turf/open/floor/plating/plating_catwalk, @@ -89385,31 +89263,11 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) "uwZ" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/device/flashlight/lamp/on{ - pixel_x = -7; - pixel_y = 13 - }, -/obj/item/paper{ - pixel_y = 3; - pixel_x = 5 - }, -/obj/item/tool/pen{ - pixel_x = -1; +/obj/effect/decal/warning_stripes{ + icon_state = "N"; pixel_y = 1 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28; - pixel_x = 2 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = -26; - pixel_x = -8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "uxa" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 @@ -89429,30 +89287,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_stern) "uxp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/door/airlock/almayer/marine/support/sl{ dir = 4 }, -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer/emerald, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/support) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -89481,11 +89320,8 @@ /turf/open/floor/plating, /area/almayer/lifeboat_pumps/south2) "uyH" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/medical_science) +/turf/closed/wall/almayer/research/containment/wall/divide, +/area/almayer/medical/containment/cell) "uyQ" = ( /obj/structure/largecrate/random/case{ layer = 2.98 @@ -89543,12 +89379,6 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/port) "uAC" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, /obj/structure/window/reinforced{ dir = 4; pixel_x = -2; @@ -89567,7 +89397,13 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/emerald, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "uAK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -89588,13 +89424,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) -"uAW" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) "uBi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -89604,13 +89433,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"uBj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "uBx" = ( /obj/structure/stairs{ dir = 8; @@ -89631,56 +89453,56 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/combat_correspondent) "uBN" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/machinery/disposal, -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21; - pixel_y = -6 +/obj/item/prop{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag_full"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32; - pixel_y = 9 +/obj/item/prop{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag_full"; + name = "trash bag"; + pixel_x = 1; + pixel_y = -5 }, /turf/open/floor/almayer, /area/almayer/living/briefing) "uBO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/item/storage/toolbox/emergency{ - pixel_x = -3 +/obj/structure/machinery/cm_vending/gear/smartgun{ + density = 0; + pixel_x = 26; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"uCh" = ( -/obj/structure/reagent_dispensers/tank/water, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red2/northeast, +/area/almayer/squads/alpha) +"uCt" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"uCw" = ( /obj/structure/sign/safety/water{ pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/green/southeast, -/area/almayer/living/grunt_rnr) -"uCt" = ( -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 + pixel_y = 26 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = -14; + pixel_y = -7 }, -/turf/open/floor/almayer/red/west, -/area/almayer/hallways/lower/starboard_midship_hallway) -"uCw" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/snacks/tomatomeat, -/obj/item/reagent_container/food/snacks/tomatomeat, -/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "uCD" = ( @@ -89691,21 +89513,12 @@ /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) "uCM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -26 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "uCR" = ( /obj/item/tool/warning_cone{ pixel_y = 13 @@ -89733,12 +89546,14 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lockerroom) "uDW" = ( -/obj/structure/machinery/cm_vending/clothing/tl/delta{ - density = 0; - pixel_x = 32 +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "uED" = ( /obj/structure/platform/metal/almayer/north, /obj/effect/decal/cleanable/dirt, @@ -89750,7 +89565,7 @@ "uEO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; - pixel_y = 3 + pixel_y = 1 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) @@ -89824,20 +89639,15 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) "uGf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) "uGk" = ( -/obj/structure/curtain/open/medical{ - pixel_x = -1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/turf/open/floor/almayer, +/area/almayer/medical/upper_medical) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -89892,13 +89702,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "uIJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/red, -/area/almayer/squads/alpha) -"uIT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "uJb" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/airlock{ @@ -90069,28 +89876,23 @@ /turf/open/floor/plating, /area/almayer/shipboard/port_missiles) "uMk" = ( -/obj/structure/bed/chair/comfy/delta{ - dir = 1 - }, -/turf/open/floor/almayer/bluefull, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, /area/almayer/living/briefing) "uMl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = -1; + pixel_y = -29 }, -/turf/open/floor/almayer/redfull, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "uMn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/emerald, +/turf/open/floor/almayer, /area/almayer/living/port_emb) -"uMS" = ( -/turf/open/floor/almayer/blue/northeast, -/area/almayer/squads/delta) "uNf" = ( /obj/structure/sign/safety/conference_room{ pixel_y = 25 @@ -90101,12 +89903,6 @@ /obj/structure/machinery/cryopod, /turf/open/floor/almayer/cargo, /area/almayer/living/bridgebunks) -"uNp" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "uNq" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/wooden_tv/ot{ @@ -90114,6 +89910,10 @@ dir = 8; pixel_x = 9 }, +/obj/item/device/demo_scanner{ + pixel_x = -7; + pixel_y = 8 + }, /obj/item/tool/hand_labeler{ pixel_x = 7; pixel_y = 15 @@ -90136,7 +89936,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck) "uNM" = ( -/turf/open/floor/almayer/emeraldcorner/west, +/obj/effect/decal/warning_stripes{ + icon_state = "door_warning2"; + layer = 3.33; + pixel_y = -1 + }, +/turf/open/floor/almayer, /area/almayer/living/briefing) "uNN" = ( /obj/structure/disposalpipe/segment{ @@ -90250,12 +90055,17 @@ /area/almayer/underdeck) "uRo" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 + icon_state = "door_warning2"; + layer = 3.33; + pixel_x = 1; + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/delta) "uRs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -90295,12 +90105,12 @@ layer = 3.5; pixel_y = 13 }, -/obj/item/bedsheet/red{ - layer = 3.2 - }, /obj/item/bedsheet/medical{ pixel_y = 12 }, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, /turf/open/floor/plating, /area/almayer/living/starboard_emb) "uRP" = ( @@ -90353,15 +90163,6 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) -"uSH" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/reagent_dispensers/water_cooler{ - density = 0; - pixel_x = 12; - pixel_y = 6 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "uSS" = ( /obj/structure/medical_supply_link/green, /obj/structure/machinery/cm_vending/sorted/medical{ @@ -90392,13 +90193,23 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/p_bow) "uTv" = ( -/obj/structure/bed/chair, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +/obj/structure/machinery/light, +/obj/structure/surface/table/reinforced/prison, +/obj/item/prop/magazine/boots/n131{ + pixel_x = -1; + pixel_y = 5 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/obj/item/weapon/gun/shotgun/pump{ + pixel_y = 8; + starting_attachment_types = list(/obj/item/attachable/stock/shotgun); + pixel_x = 15 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = 13; + pixel_y = 3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "uTE" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -90526,17 +90337,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) -"uVh" = ( -/obj/structure/filingcabinet/seeds, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) -"uVp" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "uVv" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -90547,9 +90347,8 @@ /turf/open/floor/almayer/flooredgesmooth2/east, /area/almayer/shipboard/brig/cic_hallway) "uVD" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer/plating_striped/west, /area/almayer/living/cryo_cells) @@ -90559,10 +90358,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"uWc" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "uWi" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -90598,26 +90393,12 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"uWY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "uXj" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "W" }, -/turf/open/floor/almayer, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer/research/containment/floor2/west, +/area/almayer/medical/containment/cell) "uXk" = ( /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/engine_core) @@ -90663,11 +90444,29 @@ /turf/open/floor/almayer/tcomms, /area/almayer/engineering/upper_engineering/starboard) "uXU" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, -/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza, -/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = 33 + }, +/turf/open/floor/almayer/plating/northeast, /area/almayer/maint/hull/lower/l_m_p) "uXX" = ( /obj/structure/cargo_container/uscm/mid, @@ -90716,7 +90515,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/emerald/southwest, +/turf/open/floor/almayer, /area/almayer/living/port_emb) "uZF" = ( /obj/structure/machinery/power/apc/almayer/north, @@ -90729,13 +90528,15 @@ /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering/starboard) "uZV" = ( +/obj/structure/reagent_dispensers/tank/fuel/gas/methane{ + anchored = 1 + }, /obj/structure/window/reinforced/toughened{ dir = 8; health = 500 }, -/obj/structure/machinery/light_construct, -/obj/item/stack/rods, -/turf/open/floor/plating, +/obj/structure/machinery/light, +/turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "uZZ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -90775,13 +90576,6 @@ "vaS" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/mp_bunks) -"vaV" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "vaZ" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer/plating_striped/northeast, @@ -90790,9 +90584,6 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/landinglight{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "vbo" = ( @@ -90825,32 +90616,12 @@ }, /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/underdeck/req) -"vbI" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/paper, -/obj/item/tool/pen{ - pixel_x = -5; - pixel_y = 2 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "vbM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/orange/northwest, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/southeast, +/area/almayer/squads/alpha) "vbR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -90931,21 +90702,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "vdO" = ( -/obj/structure/machinery/chem_dispenser/research{ - pixel_y = 2; - explo_proof = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/pipes/standard/cap/hidden{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/cryo_cell{ + dir = 1 }, -/turf/open/floor/almayer/research/containment/floor1, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "vdR" = ( /obj/structure/sign/safety/maint{ @@ -90954,45 +90717,27 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/south2) -"vej" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) -"ven" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer/green, -/area/almayer/living/grunt_rnr) "veq" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "veu" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ +/obj/effect/decal/cleanable/dirt, +/obj/item/ashtray/plastic{ pixel_x = 6; - pixel_y = 4 + pixel_y = 3 }, -/turf/open/floor/almayer/emeraldfull, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "vfa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/emerald/southeast, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/support) "vfo" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock PL-2"; @@ -91001,18 +90746,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/powered) "vfx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "SE-out"; + pixel_x = 1 }, -/turf/open/floor/almayer/orange/north, -/area/almayer/squads/bravo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/delta) "vfP" = ( /turf/open/floor/almayer/research/containment/corner/north, /area/almayer/medical/containment/cell) @@ -91030,27 +90770,6 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) -"vgn" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 2 - }, -/obj/item/tool/pen{ - pixel_x = 9; - pixel_y = 9 - }, -/obj/structure/sign/poster{ - icon_state = "poster14"; - pixel_x = 27 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "vgv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91061,23 +90780,30 @@ /turf/closed/wall/almayer/outer, /area/almayer/engineering/lower) "vgx" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/hydroponics) "vgB" = ( -/obj/structure/window/framed/almayer/white, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "researchlockdownext_se_2"; - name = "\improper Research Window Shutter"; - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/storage/box/autoinjectors{ + pixel_x = -6; + pixel_y = -1 }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 +/obj/item/device/mass_spectrometer{ + pixel_x = 8 }, -/turf/open/floor/plating, +/obj/item/storage/box/pillbottles{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = 8; + pixel_y = 10 + }, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/medical_science) "vgD" = ( /obj/structure/machinery/status_display{ @@ -91118,14 +90844,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "vhR" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/emerald/southwest, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/squads/bravo) "vhX" = ( /obj/structure/sign/safety/reception{ pixel_x = -17; @@ -91143,21 +90870,16 @@ /turf/open/floor/almayer/plate, /area/almayer/living/chapel) "vil" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_x = -1; + pixel_y = 16 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "vio" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -91199,11 +90921,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) "viv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +/obj/structure/bed/sofa/south/white/right{ + pixel_y = 16 }, -/turf/open/floor/almayer/silver/northwest, +/turf/open/floor/almayer/silver/northeast, /area/almayer/maint/upper/u_m_p) "viB" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ @@ -91215,14 +90936,17 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/living/gym) -"viO" = ( -/turf/open/floor/almayer/uscm/directional/northeast, -/area/almayer/living/briefing) "viS" = ( -/obj/effect/landmark/start/marine/engineer/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/engi{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/delta) "vjb" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -91242,19 +90966,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/starboard_hallway) -"vjC" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/machinery/disposal, -/obj/item/reagent_container/food/drinks/coffeecup/wy{ - desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it."; - name = "dip cup"; - pixel_x = -4; - pixel_y = 8 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "vjG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/vents/pump{ @@ -91289,11 +91000,6 @@ "vka" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"vkp" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 8 - }, -/area/almayer/medical/medical_science) "vkx" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, @@ -91399,30 +91105,22 @@ layer = 3.5; pixel_y = 13 }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, /obj/structure/sign/safety/bathunisex{ pixel_x = -16; pixel_y = 8 }, /obj/item/toy/plush/barricade, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) "vlX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha_bravo_shared) -"vme" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/flooredge/southwest, +/area/almayer/hallways/lower/starboard_midship_hallway) "vml" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/structure/sign/safety/storage{ @@ -91457,24 +91155,31 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/stair_clone/upper/port_fore) "vmN" = ( +/obj/structure/machinery/light, /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; - pixel_y = 12 + pixel_y = 8 }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) "vmP" = ( -/obj/structure/bed/chair/comfy/bravo{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light, +/obj/structure/bed/chair/comfy/delta{ dir = 1 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) "vmW" = ( /turf/open/floor/almayer/red/southeast, /area/almayer/shipboard/port_missiles) "vno" = ( -/turf/open/floor/almayer/blue/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "vnD" = ( /obj/structure/barricade/handrail{ @@ -91522,9 +91227,24 @@ /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) "voV" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_n"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/containment) "vpe" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -91572,9 +91292,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) -"vpV" = ( -/turf/open/floor/almayer/emerald/southwest, -/area/almayer/command/cic) "vpW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/plate, @@ -91612,23 +91329,15 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/starboard) "vqI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera_film{ - layer = 3.03; - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/stack/sheet/cardboard/small_stack{ - layer = 3.02; - pixel_x = -5; - pixel_y = 3 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/nosmoking_1{ - pixel_x = 25; - pixel_y = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/bravo) "vqK" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer/orange/east, @@ -91643,20 +91352,35 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) "vqZ" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/shower{ + pixel_y = 16 }, -/obj/structure/sign/safety/rewire{ - layer = 2.4; - pixel_x = -17 +/obj/structure/sign/safety/biolab{ + pixel_x = -8; + pixel_y = 28 }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) +/obj/structure/sign/safety/biohazard{ + pixel_x = 24; + pixel_y = 28 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80; + pixel_y = 6 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/medical_science) "vra" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "vrx" = ( /obj/structure/machinery/status_display{ pixel_x = -32; @@ -91706,7 +91430,7 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) "vrW" = ( -/turf/open/floor/almayer/bluecorner/west, +/turf/open/floor/almayer/greencorner, /area/almayer/living/briefing) "vrZ" = ( /obj/structure/largecrate/random/barrel/true_random, @@ -91723,15 +91447,15 @@ /turf/open/floor/almayer/cargo, /area/almayer/living/offices/cryo) "vsf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28; + pixel_x = 8 }, -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_y = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +/obj/structure/sign/safety/intercom{ + pixel_y = -26; + pixel_x = -1 }, /turf/open/floor/almayer/green, /area/almayer/hallways/lower/starboard_midship_hallway) @@ -91769,8 +91493,7 @@ /area/almayer/medical/medical_science) "vtx" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/dark_sterile2, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) "vtG" = ( /obj/structure/toilet{ @@ -91803,15 +91526,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) -"vuF" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Kitchen Hydroponics"; - req_one_access_txt = "30;19"; - access_modified = 1; - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) "vuG" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -91823,15 +91537,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating, /area/almayer/living/basketball) -"vuL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "vuV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -91858,19 +91563,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"vvw" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/paper, -/obj/item/tool/pen{ - pixel_x = -5; - pixel_y = 2 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "vvy" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -91888,13 +91580,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/starboard) -"vvH" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "vvY" = ( /obj/structure/sink{ dir = 1; @@ -91930,12 +91615,9 @@ /turf/open/floor/almayer/plating, /area/almayer/living/basketball) "vwI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave{ - pixel_y = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "vwT" = ( /turf/open/floor/almayer/blue/east, /area/almayer/hallways/upper/midship_hallway) @@ -91981,25 +91663,13 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) "vxX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/wrench{ - pixel_x = 1; - pixel_y = 10 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{ - pixel_x = -6; - pixel_y = 4 +/obj/structure/machinery/light{ + dir = 1; + pixel_x = -16 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "vxY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -92012,6 +91682,7 @@ "vyg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "vyh" = ( @@ -92088,13 +91759,6 @@ "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"vzi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "vzj" = ( /obj/structure/machinery/door/airlock/almayer/security/reinforced{ name = "\improper Chief MP's Bedroom" @@ -92142,22 +91806,6 @@ "vzK" = ( /turf/open/floor/almayer/mono, /area/almayer/engineering/ce_room) -"vzP" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/cups, -/obj/item/tool/kitchen/utensil/spoon, -/obj/item/tool/kitchen/utensil/spoon, -/obj/item/tool/kitchen/utensil/spoon, -/obj/item/tool/kitchen/utensil/fork, -/obj/item/tool/kitchen/utensil/fork, -/obj/item/tool/kitchen/utensil/fork, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "kitchen"; - name = "\improper Kitchen Shutters" - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "vAg" = ( /obj/structure/largecrate/random/barrel/blue, /obj/structure/sign/safety/restrictedarea{ @@ -92169,15 +91817,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) -"vAq" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/hallways/hangar) "vAx" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/plate, +/obj/structure/surface/rack, +/obj/item/tool/crowbar, +/obj/item/tool/weldingtool, +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "vAz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -92186,12 +91831,14 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) "vAE" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "northcheckpoint"; + name = "\improper Checkpoint Shutters" }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_s) "vAG" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) @@ -92202,13 +91849,10 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/hallways/upper/port) "vBp" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 - }, -/obj/structure/window/reinforced/ultra{ - dir = 1 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/silver/north, +/turf/open/floor/almayer/uscm/directional/northwest, /area/almayer/living/briefing) "vBC" = ( /obj/structure/pipes/vents/pump, @@ -92231,31 +91875,14 @@ /turf/open/floor/almayer/green, /area/almayer/squads/req) "vCk" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = -26 - }, -/obj/structure/transmitter/rotary{ - name = "CMO Office Telephone"; - phone_category = "Offices"; - phone_id = "CMO Office"; - pixel_y = 20; - pixel_x = 6 - }, -/obj/item/ashtray/plastic{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = -26; - pixel_x = 21 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/hydroponics) "vCt" = ( /obj/structure/sign/safety/storage{ - pixel_x = 7; + pixel_x = 8; pixel_y = -26 }, /turf/open/floor/almayer, @@ -92300,11 +91927,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) "vDa" = ( -/obj/structure/bed/chair/office/light{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/area/almayer/medical/hydroponics) "vDd" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -92372,11 +91999,14 @@ pixel_y = 16 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "vEr" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/medical_science) "vEv" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddernorthwest"; @@ -92450,8 +92080,16 @@ /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) "vGG" = ( -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer/orangefull, +/obj/item/ashtray/plastic{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 17 + }, +/turf/open/floor/almayer/plate, /area/almayer/living/briefing) "vGQ" = ( /obj/structure/machinery/light{ @@ -92549,18 +92187,14 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "vHO" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; +/obj/effect/decal/warning_stripes{ + icon_state = "N"; pixel_y = 1 }, -/obj/item/book/manual/research_and_development, -/obj/item/book/manual/ordnance, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/book/manual/chemistry, -/obj/item/book/manual/surgery, -/obj/item/book/manual/security_space_law, -/turf/open/floor/almayer/plate, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/area/almayer/medical/containment/cell) "vHP" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -92584,10 +92218,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) -"vIg" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/lower/l_a_s) "vIo" = ( /turf/closed/wall/almayer, /area/almayer/maint/upper/u_f_p) @@ -92620,18 +92250,6 @@ /obj/structure/barricade/handrail, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_stern) -"vJV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/firealarm{ - pixel_y = -29 - }, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "vJZ" = ( /obj/structure/stairs/multiz/down, /turf/open/floor/almayer/no_build/plating, @@ -92669,21 +92287,17 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"vLg" = ( -/obj/item/trash/uscm_mre, -/obj/structure/bed/chair/comfy/charlie, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "vLj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Medical Bay"; + req_one_access = null + }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Upper Medical Corridors"; - req_access = list() - }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "vLp" = ( @@ -92696,18 +92310,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) -"vLA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) "vMa" = ( /obj/structure/cargo_container/uscm/right, /obj/structure/cargo_container/uscm/right{ @@ -92729,15 +92331,6 @@ "vMt" = ( /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) -"vMA" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/port_midship_hallway) "vME" = ( /turf/open/floor/almayer/orange/northwest, /area/almayer/engineering/upper_engineering/port) @@ -92809,15 +92402,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "vND" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/support) "vNT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -92901,28 +92492,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) "vPv" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "vPw" = ( /obj/structure/machinery/light{ dir = 1 }, /obj/structure/ladder/multiz, -/turf/open/floor/almayer/plating, +/turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"vPK" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_y = -25 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) "vPR" = ( /obj/structure/closet/bombcloset, /turf/open/floor/almayer/cargo, @@ -92963,13 +92546,15 @@ /turf/open/floor/almayer/silver/south, /area/almayer/command/computerlab) "vQN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 16 }, -/turf/open/floor/almayer/sterile_green_side, +/turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/upper_medical) "vRa" = ( /obj/structure/machinery/light{ @@ -93025,35 +92610,13 @@ /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "vSp" = ( -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) -"vSr" = ( -/obj/structure/largecrate/random/case/double, -/obj/item/tool/wet_sign{ - pixel_y = 18 - }, -/obj/item/trash/cigbutt/ucigbutt{ - desc = "A handful of rounds to reload on the go."; - icon = 'icons/obj/items/weapons/guns/handful.dmi'; - icon_state = "bullet_2"; - name = "handful of pistol bullets (9mm)"; - pixel_x = -8; - pixel_y = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/obj/structure/largecrate/supply, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "vSE" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering/port) -"vSK" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer/bluefull, -/area/almayer/living/briefing) "vSN" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -93062,9 +92625,14 @@ /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) "vSW" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/delta) +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "vTf" = ( /obj/structure/barricade/handrail{ dir = 1 @@ -93080,9 +92648,6 @@ icon_state = "pottedplant_22"; pixel_y = 8 }, -/obj/structure/machinery/light{ - dir = 1 - }, /turf/open/floor/almayer/silver/northeast, /area/almayer/command/cic) "vTv" = ( @@ -93109,25 +92674,14 @@ /area/almayer/engineering/lower) "vTX" = ( /obj/structure/sign/safety/distribution_pipes{ - pixel_y = -26 + pixel_y = -32 }, /obj/structure/sign/safety/manualopenclose{ pixel_x = 15; - pixel_y = -26 + pixel_y = -32 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) -"vUb" = ( -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) -"vUe" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "vUh" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -93161,19 +92715,11 @@ "vUP" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cic_hallway) -"vVb" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/red/west, -/area/almayer/squads/alpha) "vVd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "vVk" = ( @@ -93184,15 +92730,8 @@ /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) "vVs" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor5, -/area/almayer/medical/hydroponics) +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "vVu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -93244,28 +92783,8 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) "vWB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/bcigbutt, -/obj/item/trash/cigbutt{ - pixel_x = -1; - pixel_y = 17 - }, -/obj/item/trash/cigbutt{ - icon_state = "ucigbutt"; - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/tool/lighter/random{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/bravo) "vWG" = ( /obj/structure/pipes/vents/pump, /obj/item/tool/soap, @@ -93285,15 +92804,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/shipboard/brig/cells) -"vWJ" = ( -/obj/structure/machinery/landinglight/delaytwo{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "vXd" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -93376,12 +92886,30 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "vYz" = ( -/obj/structure/stairs/multiz/down{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = -6; + pixel_y = 8 }, -/obj/structure/platform/metal/almayer_smooth, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/medical_science) +/obj/item/tool/pen{ + pixel_y = 5; + pixel_x = -5 + }, +/obj/structure/machinery/biohazard_lockdown{ + pixel_x = 5; + pixel_y = 21 + }, +/obj/item/clipboard{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/paper{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "vYC" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -93394,24 +92922,6 @@ "vYM" = ( /turf/open/floor/almayer/plate, /area/almayer/command/cicconference) -"vZb" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/alpha) -"vZt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer/redcorner, -/area/almayer/squads/alpha) "vZv" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -93426,14 +92936,6 @@ /turf/open/floor/almayer/blue/east, /area/almayer/hallways/upper/midship_hallway) "vZJ" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 1; - pixel_y = -26 - }, -/obj/structure/sign/safety/reduction{ - pixel_y = -26; - pixel_x = 15 - }, /turf/open/floor/almayer/green/southeast, /area/almayer/hallways/upper/fore_hallway) "wab" = ( @@ -93442,13 +92944,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"wac" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "wan" = ( /obj/structure/machinery/vending/cigarette/koorlander{ pixel_x = -1 @@ -93490,14 +92985,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck) "wbC" = ( -/obj/structure/machinery/atm{ - pixel_y = 32 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/effect/decal/warning_stripes{ + icon_state = "cargo" }, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "wbJ" = ( /obj/structure/machinery/door_control/airlock{ id = "n_engi"; @@ -93507,10 +93000,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) -"wbN" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "wbO" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -93622,10 +93111,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) "wdz" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = -1; + pixel_y = 16 + }, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/support) "wdG" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -93756,13 +93251,11 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/command/cicconference) "wga" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced/ultra{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/silver/east, +/turf/open/floor/almayer/uscm/directional/east, /area/almayer/living/briefing) "wgc" = ( /turf/open/floor/plating/plating_catwalk/no_build, @@ -93799,7 +93292,7 @@ "whc" = ( /obj/structure/sign/safety/medical{ pixel_x = 7; - pixel_y = 28 + pixel_y = 25 }, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) @@ -93810,7 +93303,10 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "whA" = ( -/turf/open/floor/almayer/uscm/directional, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silver/north, /area/almayer/living/briefing) "whB" = ( /obj/structure/closet/firecloset, @@ -93864,13 +93360,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"wiI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/juicer{ - pixel_y = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) "wiN" = ( /obj/structure/sign/safety/bridge{ pixel_x = 32; @@ -93914,29 +93403,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) -"wiW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/filingcabinet/filingcabinet{ - density = 0; - pixel_x = 7; - pixel_y = 16 - }, -/obj/structure/filingcabinet/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 16 - }, -/obj/item/folder/blue{ - pixel_y = 5 - }, -/obj/item/folder/white, -/obj/item/folder/black, -/obj/item/folder/black, -/obj/item/clipboard, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/upper_medical) "wjq" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -93958,18 +93424,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/telecomms) "wjz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 7; - pixel_y = -26 +/obj/structure/machinery/light{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "wjC" = ( /obj/structure/closet/firecloset, @@ -93994,13 +93453,6 @@ /obj/structure/closet/secure_closet/warrant_officer, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"wka" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "wkh" = ( /obj/structure/largecrate/random, /obj/structure/prop/hybrisa/factory/conveyor_belt{ @@ -94016,13 +93468,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) "wky" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) "wkA" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -94136,10 +93590,11 @@ /turf/open/floor/almayer/blue/northeast, /area/almayer/hallways/upper/fore_hallway) "wmz" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 }, -/turf/open/floor/almayer/orangefull, +/turf/open/floor/almayer/flooredge/southwest, /area/almayer/living/briefing) "wmK" = ( /obj/structure/surface/table/almayer, @@ -94210,39 +93665,23 @@ /obj/structure/machinery/camera/autoname/almayer/brig, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/perma) -"wnL" = ( -/obj/item/stack/tile/carpet{ - amount = 12 - }, -/obj/structure/surface/rack, -/obj/item/tool/crowbar/red, -/obj/item/tool/screwdriver, -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) "wnY" = ( -/obj/item/tool/crowbar/red, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_y = 16; + pixel_x = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/north, +/area/almayer/squads/alpha) "woh" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 4 }, /area/almayer/medical/containment/cell) -"wos" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) "woy" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -94278,8 +93717,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) "wpI" = ( -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/barcardine, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "wpS" = ( /obj/structure/pipes/standard/simple/visible, /obj/structure/sign/safety/nonpress_0g{ @@ -94288,11 +93729,12 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower) "wqc" = ( -/obj/structure/sign/poster{ - pixel_y = 32 +/obj/structure/machinery/cm_vending/clothing/marine/support{ + pixel_x = 26; + density = 0 }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/support) "wqh" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -94380,7 +93822,10 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/port) "wse" = ( -/turf/open_space, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green, /area/almayer/medical/containment) "wsh" = ( /obj/structure/pipes/standard/manifold/hidden/supply, @@ -94408,15 +93853,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) -"wsz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "wsD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -94430,39 +93866,16 @@ "wsS" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_midship_hallway) -"wtk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "wtm" = ( /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) -"wtn" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 25 - }, -/obj/item/storage/firstaid{ - pixel_x = 5; - pixel_y = 13 - }, -/obj/item/clipboard, -/obj/item/paper, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_s) "wty" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/squads/delta) +/obj/effect/spawner/random/toolbox, +/obj/structure/largecrate/random/barrel/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "wtM" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -94547,15 +93960,15 @@ /turf/open/floor/almayer, /area/almayer/squads/req) "wuq" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/engi/delta{ + pixel_x = 26; + density = 0 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/delta) "wuB" = ( /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower/workshop) @@ -94572,16 +93985,9 @@ /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering/starboard) "wuU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie) +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_a_p) "wvb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lattice_prop{ @@ -94630,28 +94036,20 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/perma) "wvU" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 7 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -5 - }, -/obj/item/tool/soap{ - pixel_y = 13; - pixel_x = -6 - }, -/obj/item/reagent_container/glass/rag{ - pixel_y = 13; - pixel_x = 5 +/obj/structure/prop/invuln/lattice_prop{ + alpha = 150; + icon_state = "lattice12"; + pixel_y = 16 }, /obj/effect/decal/warning_stripes{ icon_state = "W"; pixel_x = -1 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "wvX" = ( /obj/structure/sign/safety/analysis_lab{ pixel_y = 26 @@ -94663,12 +94061,15 @@ /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) "wwr" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/technology_scanner, +/obj/effect/spawner/random/technology_scanner, +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_a_p) "wwv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -94705,11 +94106,6 @@ }, /turf/open/floor/almayer/orange/northeast, /area/almayer/engineering/upper_engineering/starboard) -"wxp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "wxq" = ( /obj/structure/machinery/medical_pod/sleeper{ pixel_y = 2 @@ -94719,19 +94115,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/operating_room_four) -"wxu" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "wxy" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/p_stern) "wxD" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/flooredgesmooth2/south, +/turf/open/floor/almayer/flooredge, /area/almayer/hallways/lower/starboard_aft_hallway) "wxF" = ( /obj/structure/closet/secure_closet/cmdcabinet/comms_mp{ @@ -94740,27 +94129,16 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/warden_office) "wxU" = ( -/obj/item/ashtray/bronze{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 7; - pixel_y = 16 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 5; - pixel_y = 8 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/toy/beach_ball/holoball{ - pixel_x = -5; - pixel_y = 1 +/obj/item/device/cassette_tape/indie, +/obj/item/trash/c_tube, +/obj/item/trash/burger, +/obj/item/trash/boonie, +/obj/structure/sign/poster/corporate{ + pixel_y = 5; + pixel_x = 24 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "wyb" = ( /obj/structure/platform/metal/almayer/west, /obj/structure/machinery/light/red{ @@ -94843,40 +94221,39 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_umbilical) -"wBr" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) -"wBw" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/lower/starboard_midship_hallway) "wCe" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orangecorner, /area/almayer/hallways/upper/aft_hallway) "wCn" = ( /obj/structure/sign/safety/galley{ - pixel_x = 8; - pixel_y = -26 + pixel_x = 13; + pixel_y = -25 }, /turf/open/floor/almayer/blue, /area/almayer/hallways/upper/fore_hallway) "wCs" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/power/apc/almayer/west, +/obj/structure/transmitter/rotary{ + name = "Kitchen Telephone"; + phone_category = "Almayer"; + phone_id = "Kitchen"; + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/ashtray/bronze{ + pixel_y = -11; + pixel_x = 1 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_y = 8; + pixel_x = 10; + layer = 3.04 + }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/plate, -/area/almayer/living/briefing) +/area/almayer/living/grunt_rnr) "wCI" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redcorner/east, /area/almayer/living/briefing) "wDg" = ( @@ -94937,30 +94314,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "wDG" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) "wDH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/photocopier{ + layer = 2.9 }, -/turf/open/floor/almayer/flooredge/north, -/area/almayer/medical/morgue) +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/upper_medical) "wDJ" = ( -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie_delta_shared) -"wDK" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/cargo, +/obj/structure/machinery/door/airlock/almayer/marine/bravo/sl, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/test_floor4, /area/almayer/squads/bravo) +"wDK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/northwest, +/area/almayer/squads/delta) "wDM" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/engineering/upper_engineering) @@ -94970,15 +94343,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"wEd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/alpha) "wEq" = ( /obj/structure/platform/metal/almayer/north, /obj/structure/platform/metal/almayer/east, @@ -95002,12 +94366,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) -"wEK" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "wFb" = ( /obj/structure/machinery/body_scanconsole{ pixel_y = 3 @@ -95020,7 +94378,7 @@ pixel_y = 26 }, /obj/structure/machinery/door_control{ - id = "or3privacyshutterdoor"; + id = "or3privacyshutter"; name = "\improper Privacy Shutters Control"; pixel_y = 26; throw_range = 15; @@ -95063,7 +94421,7 @@ /obj/item/prop{ desc = "Predecessor to the M56 the M38 was known for its extreme reliability in the field. This particular M38D is fondly remembered for its stalwart defence of the hangar bay during the Arcturian commando raid of the USS Almayer on Io."; icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/hmg.dmi'; - icon_state = "M38D_gun_e"; + icon_state = "M56D_gun_e"; layer = 3.1; name = "\improper M38D heavy machine gun 'Bess'"; pixel_x = -3; @@ -95126,12 +94484,6 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"wGb" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "wGd" = ( /obj/structure/machinery/light{ dir = 8 @@ -95139,11 +94491,9 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/port) "wGE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/east, +/area/almayer/squads/support) "wGX" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -95164,11 +94514,8 @@ dir = 4; icon_state = "pipe-c" }, -/turf/open/floor/almayer/emerald/northwest, +/turf/open/floor/almayer, /area/almayer/living/port_emb) -"wHo" = ( -/turf/open/floor/almayer/emerald, -/area/almayer/living/briefing) "wHp" = ( /obj/structure/bed/sofa/vert/grey{ pixel_y = 8 @@ -95198,25 +94545,6 @@ "wIC" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/chief_mp_office) -"wIG" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/surface/table/almayer, -/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/peppermill{ - pixel_x = 4 - }, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -4 - }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) "wIQ" = ( /turf/open/floor/almayer/silvercorner/east, /area/almayer/shipboard/brig/cic_hallway) @@ -95239,35 +94567,12 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/cryo) "wJo" = ( -/obj/structure/flora/bush/ausbushes/lavendergrass{ - name = "fake lavendergrass"; - desc = "Just like a real plant, but fake!" - }, -/turf/open/floor/grass, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "wJC" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) -"wJD" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer/emerald/east, -/area/almayer/squads/charlie) "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) @@ -95336,14 +94641,21 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "wKL" = ( +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_s"; + dir = 8; + name = "\improper Containment Airlock" + }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "S" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_corner, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/medical_science) "wKN" = ( /obj/structure/disposalpipe/segment{ @@ -95355,9 +94667,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) "wKP" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/mono, -/area/almayer/medical/hydroponics) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/plating, +/area/almayer/medical/containment) "wLi" = ( /obj/structure/machinery/door_control/airlock{ id = "s_engi"; @@ -95371,17 +94694,11 @@ /turf/open/floor/almayer/plating_striped/east, /area/almayer/living/cryo_cells) "wLy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/vents/pump/no_boom{ + name = "Secure Reinforced Air Vent"; + welded = 1 }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) +/area/almayer/medical/containment/cell) "wLC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95413,12 +94730,6 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/medical) "wLG" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, /obj/item/clothing/head/ushanka{ layer = 3.3 }, @@ -95438,21 +94749,20 @@ layer = 3.5; pixel_y = 13 }, -/turf/open/floor/almayer/blue/southeast, -/area/almayer/living/port_emb) -"wLK" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray{ - pixel_y = 9 +/obj/item/bedsheet/brown{ + layer = 3.2 }, -/obj/item/tool/kitchen/tray{ - pixel_y = 12 +/obj/item/bedsheet/brown{ + pixel_y = 13 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer, +/area/almayer/living/port_emb) "wLN" = ( -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/hydroponics) +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/containment) "wLS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95466,15 +94776,11 @@ /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/starboard_hallway) "wMl" = ( -/obj/structure/sign/safety/two{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 +/obj/structure/sign/safety/north{ + pixel_x = -17; + pixel_y = -10 }, -/turf/open/floor/almayer/orange/east, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/hallways/lower/starboard_midship_hallway) "wMv" = ( /obj/effect/decal/warning_stripes{ @@ -95503,18 +94809,15 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) "wMO" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/medical_science) "wNl" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -95535,7 +94838,7 @@ pixel_x = 8; pixel_y = -3 }, -/turf/open/floor/almayer/orange/southwest, +/turf/open/floor/almayer, /area/almayer/living/starboard_emb) "wNp" = ( /obj/structure/cargo_container/hybrisa/containersextended/blackwyright, @@ -95602,14 +94905,15 @@ /turf/open/floor/almayer/mono, /area/almayer/medical/hydroponics) "wPC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/item/toy/beach_ball/holoball{ + pixel_x = -4; + pixel_y = 8 }, -/turf/open/floor/almayer/cargo_arrow/west, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/support) "wQh" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -95623,6 +94927,7 @@ dir = 5 }, /obj/structure/machinery/light, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/engineering/lower) "wQD" = ( @@ -95670,15 +94975,6 @@ }, /turf/open/floor/almayer/green, /area/almayer/shipboard/brig/cells) -"wRO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "wRP" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -95689,6 +94985,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/rewire{ + pixel_x = 33 + }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "wSm" = ( @@ -95738,14 +95038,12 @@ /turf/open/floor/almayer/plating_striped/northwest, /area/almayer/engineering/lower/engine_core) "wSX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/roller/bedroll, +/obj/structure/sign/poster/clf{ + pixel_x = -28 }, -/turf/open/floor/almayer/green/east, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "wTg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -95766,14 +95064,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) "wTw" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_y_offset = 0 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/west, +/area/almayer/squads/bravo) "wTB" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -95790,17 +95083,8 @@ /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) "wUd" = ( -/obj/structure/surface/rack{ - pixel_y = 16; - pixel_x = -4; - density = 0 - }, -/obj/item/storage/box/gloves{ - pixel_x = -3; - pixel_y = 15 - }, -/turf/open/floor/almayer/flooredge, -/area/almayer/medical/morgue) +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "wUi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/supply/weapons/m41a, @@ -95834,18 +95118,6 @@ }, /turf/open/floor/almayer/blue/southwest, /area/almayer/living/auxiliary_officer_office) -"wUX" = ( -/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/almayer/plate, -/area/almayer/living/grunt_rnr) "wVh" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -95855,25 +95127,15 @@ /area/almayer/shipboard/brig/warden_office) "wVt" = ( /obj/structure/ladder/multiz, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) "wVy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -25 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -25 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/marine/bravo/medic{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/test_floor4, +/area/almayer/squads/bravo) "wVA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -95910,8 +95172,16 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) "wWm" = ( -/turf/open/floor/almayer/flooredge/northeast, -/area/almayer/medical/medical_science) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/almayer/medical/containment/cell) "wWq" = ( /obj/structure/surface/table/reinforced/black, /obj/item/clothing/suit/space/compression/uscm, @@ -95957,9 +95227,10 @@ /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) "wWR" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 1 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, +/turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) "wWX" = ( /obj/effect/landmark/start/marine/engineer/delta, @@ -95987,14 +95258,15 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/starboard_hallway) "wXH" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/machinery/disposal{ + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) -"wXI" = ( -/turf/open/floor/almayer/greencorner/north, -/area/almayer/living/grunt_rnr) +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) "wXJ" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, @@ -96008,10 +95280,6 @@ "wYa" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/lifeboat_pumps/north2) -"wYd" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "wYA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -96019,11 +95287,11 @@ /area/almayer/lifeboat_pumps/north1) "wYS" = ( /obj/structure/sign/safety/restrictedarea{ - pixel_y = -26; + pixel_y = -27; pixel_x = 15 }, /obj/structure/sign/safety/four{ - pixel_y = -26 + pixel_y = -27 }, /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" @@ -96103,18 +95371,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) "xaC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/mre_pack/meal5{ - desc = "How long has this been sitting here?"; - pixel_x = 7; - pixel_y = 7 +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools{ + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer/cargo, +/area/almayer/squads/bravo) "xaJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -96146,19 +95408,15 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "xaN" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/knife, -/obj/item/tool/kitchen/utensil/fork{ - pixel_x = 7 - }, -/obj/item/tool/kitchen/utensil/spoon{ - pixel_x = -8 +/obj/structure/largecrate/supply, +/obj/structure/largecrate/random/mini{ + pixel_y = 13 }, /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/turf/open/floor/almayer/cargo, +/area/almayer/maint/hull/lower/l_m_p) "xaS" = ( /turf/open/floor/almayer/uscm/directional/northeast, /area/almayer/command/lifeboat) @@ -96171,6 +95429,7 @@ pixel_x = 1; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "xbg" = ( @@ -96179,10 +95438,6 @@ "xbk" = ( /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"xbI" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_s) "xcF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -96194,13 +95449,6 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/cargo, /area/almayer/hallways/hangar) -"xdf" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/lower/port_midship_hallway) "xdA" = ( /obj/structure/surface/rack{ density = 0; @@ -96220,28 +95468,15 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/execution) -"xdP" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/uscm_mre, -/obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp{ - layer = 3.3; - pixel_x = 15 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{ - pixel_x = -7; - pixel_y = 10 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "xdS" = ( -/obj/structure/platform/metal/almayer/north, -/obj/structure/platform/metal/almayer/east, -/obj/structure/platform_decoration/metal/almayer/northwest{ - layer = 4.1 - }, -/obj/structure/bed/chair/comfy{ - dir = 8 +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 12; + pixel_x = 2 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/upper_medical) @@ -96310,36 +95545,12 @@ }, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) -"xfq" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -25 - }, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/tool/pen, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "xfr" = ( /obj/structure/platform/metal/almayer, /obj/structure/platform/metal/almayer/east, /obj/structure/platform_decoration/metal/almayer/southeast, /turf/open/floor/almayer/red/southeast, /area/almayer/lifeboat_pumps/south1) -"xfK" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/transmitter{ - name = "Kitchen Telephone"; - phone_category = "Almayer"; - phone_id = "Kitchen"; - pixel_x = -8; - pixel_y = 29 - }, -/obj/structure/machinery/vending/ingredients, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "xfO" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -96378,15 +95589,12 @@ icon_state = "SE-out"; pixel_x = 1 }, -/obj/structure/sign/nosmoking_2{ - pixel_x = 28 +/obj/structure/sign/nosmoking_1{ + pixel_x = 25; + pixel_y = 6 }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_lobby) -"xgk" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/green/north, -/area/almayer/hallways/lower/starboard_midship_hallway) "xgm" = ( /obj/structure/reagent_dispensers/tank/fuel/oxygentank, /turf/open/floor/almayer/plate, @@ -96398,29 +95606,8 @@ "xgJ" = ( /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/lockerroom) -"xgS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_m_p) "xhn" = ( /obj/structure/largecrate/random/case/double, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 28 - }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) "xhx" = ( @@ -96433,21 +95620,10 @@ "xhO" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) -"xhQ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer/plate, -/area/almayer/squads/bravo) "xhU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/starboard_hallway) -"xhW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_midship_hallway) "xhZ" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -96491,13 +95667,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_p) "xjb" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Main Kitchen"; - req_one_access_txt = "30;19"; - access_modified = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 4 }, -/turf/open/floor/prison/kitchen, -/area/almayer/living/grunt_rnr) +/obj/structure/sign/safety/storage{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/lower/l_m_p) "xje" = ( /obj/structure/largecrate/supply/weapons/flamers, /turf/open/floor/almayer/no_build/plate, @@ -96584,11 +95763,11 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) "xkB" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 +/obj/structure/bed/chair/comfy/lime{ + dir = 8; + name = "Oscar squad chair" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/east, /area/almayer/living/briefing) "xkN" = ( /obj/structure/stairs{ @@ -96597,9 +95776,16 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/stair_clone/upper/port_aft) "xlk" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/helmet/marine{ + pixel_y = 8; + pixel_x = 7 + }, +/obj/item/clothing/head/helmet/marine{ + pixel_x = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "xlC" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orangecorner/east, @@ -96638,8 +95824,8 @@ "xmJ" = ( /obj/structure/closet, /obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 + pixel_x = -19; + pixel_y = 1 }, /turf/open/floor/almayer/plate, /area/almayer/living/port_emb) @@ -96686,18 +95872,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/living/offices/flight) -"xoe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer/bluecorner/west, -/area/almayer/squads/delta) "xoj" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) @@ -96734,17 +95908,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/commandbunks) -"xpl" = ( -/obj/structure/sign/safety/four{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer/blue/east, -/area/almayer/hallways/lower/port_midship_hallway) "xpw" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 8 @@ -96866,7 +96029,10 @@ dir = 4; health = 500 }, -/obj/structure/machinery/light_construct, +/obj/structure/reagent_dispensers/tank/ethanol{ + anchored = 1 + }, +/obj/structure/machinery/light, /turf/open/floor/almayer/test_floor5, /area/almayer/engineering/lower/workshop/hangar) "xrC" = ( @@ -96904,15 +96070,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/lower/cryo_cells) "xsv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/support) "xsw" = ( /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_medbay) @@ -96973,12 +96133,25 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/hallways/lower/port_fore_hallway) "xuE" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ dir = 1; - icon_state = "pipe-c" + id = "Containment Cell 5"; + locked = 1; + name = "\improper Containment Cell 5" }, -/turf/closed/wall/almayer/white/hull, -/area/almayer/medical/hydroponics) +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Containment Cell 5"; + name = "\improper Containment Cell 5"; + unacidable = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/containment/cell) "xuQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -96991,12 +96164,19 @@ /turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/cic_hallway) "xvE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ +/obj/item/storage/toolbox/mechanical/green{ + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/charlie) +/obj/item/stack/cable_coil{ + pixel_x = -14; + pixel_y = 1 + }, +/turf/open/floor/almayer/flooredge, +/area/almayer/squads/bravo) "xvQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing{ @@ -97011,21 +96191,16 @@ "xwd" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; - pixel_y = 32 + pixel_y = 26 }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "xwl" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/cargo_arrow, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "xwm" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -97037,31 +96212,16 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) -"xwp" = ( -/obj/item/storage/box/matches{ - pixel_x = -11; - pixel_y = -3 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/item/reagent_container/food/drinks/cans/dr_gibb{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/clothing/glasses/disco_fever{ - pixel_x = -8; - pixel_y = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) "xwE" = ( -/obj/structure/bed/chair/comfy/alpha, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/obj/structure/transmitter{ + name = "1rst Platoon's Telephone"; + phone_category = "Almayer"; + phone_id = "1rst Platoon's Briefing Room"; + pixel_y = 28; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "xwX" = ( /turf/open/floor/almayer/red/northwest, @@ -97139,10 +96299,10 @@ layer = 3.5; pixel_y = 13 }, -/obj/item/bedsheet/red{ +/obj/item/bedsheet/brown{ layer = 3.2 }, -/obj/item/bedsheet/red{ +/obj/item/bedsheet/brown{ pixel_y = 13 }, /turf/open/floor/plating, @@ -97152,14 +96312,9 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "xxG" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/structure/largecrate/random/barrel/red, -/obj/item/reagent_container/food/drinks/cans/cola{ - pixel_x = -2; - pixel_y = 16 - }, +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "xxI" = ( @@ -97234,29 +96389,19 @@ /turf/open/floor/almayer/silver/east, /area/almayer/hallways/upper/midship_hallway) "xyt" = ( -/obj/item/paper_bin/wy{ - pixel_y = 8; - pixel_x = -6 - }, -/obj/item/tool/pen{ - pixel_y = 3; - pixel_x = -6 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/research{ + pixel_x = 1 }, -/obj/item/tool/stamp/cmo{ - pixel_x = 9; - pixel_y = 10; - name = "Chief Medical Officer's rubber stamp" +/obj/structure/machinery/computer/working_joe{ + pixel_x = -18 }, -/obj/structure/machinery/door_control{ - id = "CMO Shutters"; - name = "\improper Office Privacy Shutters"; - pixel_y = -1; - req_one_access_txt = "28"; - pixel_x = 9 +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 25 }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "xyw" = ( /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) @@ -97327,12 +96472,6 @@ "xAe" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell) -"xAt" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 - }, -/turf/open/floor/almayer/emeraldfull, -/area/almayer/living/briefing) "xAu" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 6; @@ -97369,9 +96508,6 @@ pixel_y = 1 }, /obj/structure/platform_decoration/metal/almayer/west, -/obj/structure/machinery/landinglight{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "xBs" = ( @@ -97389,13 +96525,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/upper/u_f_p) -"xBQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "xBS" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -97433,9 +96562,18 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) "xCb" = ( -/obj/structure/closet/secure_closet/fridge/dry, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/handcuffs{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/ids{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/storage/box/handcuffs, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/hallways/lower/port_fore_hallway) "xCs" = ( /turf/open/floor/almayer/silver/southwest, /area/almayer/hallways/upper/midship_hallway) @@ -97488,7 +96626,7 @@ /turf/open/floor/almayer/plating, /area/almayer/maint/hull/upper/u_a_p) "xEe" = ( -/obj/structure/prop/invuln/joey, +/obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "xEO" = ( @@ -97524,25 +96662,6 @@ /obj/structure/machinery/autolathe, /turf/open/floor/almayer/cargo, /area/almayer/squads/req) -"xGE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/squads/bravo) "xGF" = ( /obj/structure/machinery/vending/snack{ density = 0; @@ -97562,12 +96681,18 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "xGJ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_x = -13 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/turf/open/floor/almayer/red/west, -/area/almayer/living/briefing) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/plate, +/area/almayer/living/grunt_rnr) "xGK" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/lights/tubes{ @@ -97601,8 +96726,9 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) "xHp" = ( -/turf/open/floor/almayer/orange, -/area/almayer/squads/alpha_bravo_shared) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "xHA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/east, @@ -97707,9 +96833,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) -"xJH" = ( -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie_delta_shared) "xJR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -97773,13 +96896,17 @@ layer = 2.8 }, /turf/open/floor/almayer/cargo, -/area/almayer/command/cic) +/area/almayer/living/synthcloset) "xLi" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, -/obj/item/paper_bin/uscm{ - pixel_x = -7; - pixel_y = 6 +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28; + pixel_y = 4 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -13; + pixel_x = -21 }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) @@ -97846,13 +96973,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"xMm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/lower/l_a_p) "xMs" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_two) @@ -97888,14 +97008,6 @@ }, /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/shipboard/panic) -"xML" = ( -/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/green/north, -/area/almayer/living/grunt_rnr) "xMO" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -97906,14 +97018,14 @@ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/floor/almayer/flooredge/east, +/turf/open/floor/almayer/flooredgesmooth/east, /area/almayer/hallways/upper/starboard) "xMR" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) +/turf/open/floor/almayer/mono, +/area/almayer/squads/alpha) "xMS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -97976,14 +97088,8 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) "xNu" = ( -/obj/structure/machinery/status_display{ - pixel_y = 32 - }, -/obj/structure/flora/bush/ausbushes/var3/ppflowers{ - name = "fake ppflowers"; - desc = "Just like a real plant, but fake!" - }, -/turf/open/floor/grass, +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "xNv" = ( /obj/structure/platform/metal/almayer/north, @@ -98035,17 +97141,19 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "xOL" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/flashbangs{ + pixel_x = -5; + pixel_y = 5 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/grunt_rnr) -"xOT" = ( -/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/item/restraint/handcuffs, +/obj/item/storage/firstaid/regular, +/obj/structure/sign/safety/terminal{ + pixel_x = -17 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, -/area/almayer/living/grunt_rnr) +/area/almayer/hallways/lower/port_fore_hallway) "xPq" = ( /obj/structure/machinery/disposal{ pixel_y = 4; @@ -98103,14 +97211,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"xQm" = ( -/obj/structure/machinery/vending/dinnerware{ - pixel_y = 16; - density = 0; - pixel_x = 1 - }, -/turf/open/floor/almayer/flooredge/west, -/area/almayer/medical/medical_science) "xQz" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -98123,20 +97223,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) -"xRj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer/emeraldcorner, -/area/almayer/squads/charlie) "xRk" = ( /obj/structure/bed/chair{ dir = 4 @@ -98144,7 +97230,11 @@ /turf/open/floor/almayer/silver/west, /area/almayer/command/computerlab) "xRw" = ( -/turf/open/floor/almayer/uscm/directional/north, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver, /area/almayer/living/briefing) "xRH" = ( /obj/effect/decal/warning_stripes{ @@ -98154,27 +97244,21 @@ /turf/open/floor/almayer/tcomms, /area/almayer/command/telecomms) "xRJ" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/orangefull, +/turf/open/floor/almayer/silver, /area/almayer/living/briefing) "xSs" = ( /obj/structure/cargo_container/hybrisa/containersextended/greenright, /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) -"xSw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" - }, -/turf/open/floor/plating, -/area/almayer/squads/charlie) "xSx" = ( -/turf/open/floor/almayer/red/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/flooredge/northeast, /area/almayer/hallways/lower/starboard_midship_hallway) "xSz" = ( /obj/structure/surface/table/almayer, @@ -98184,12 +97268,10 @@ /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) "xSW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/squads/alpha) +/obj/effect/landmark/start/marine/spec/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "xTt" = ( /obj/structure/largecrate/random{ pixel_y = 4 @@ -98226,51 +97308,27 @@ /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/processing) "xTR" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "rsr01"; - name = "Door Release"; - normaldoorcontrol = 1; - pixel_y = -21; - pixel_x = -5 - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_door"; - name = "Door Shutters"; - pixel_x = 6; - pixel_y = -21; - req_access_txt = "28" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/medical_science) -"xTW" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + density = 0; + pixel_y = 16 }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/bedsheet/yellow{ - layer = 3.2 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/item/bedsheet/red{ - pixel_y = 13 +/obj/item/tool/hand_labeler{ + pixel_x = 5; + pixel_y = 34 }, -/turf/open/floor/almayer/orange/north, -/area/almayer/living/starboard_emb) +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/medical_science) "xUa" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -98279,7 +97337,6 @@ icon_state = "W"; layer = 3.3 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "xUy" = ( @@ -98302,10 +97359,6 @@ "xUV" = ( /turf/open/floor/almayer/silver, /area/almayer/command/combat_correspondent) -"xUY" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "xVc" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 8; @@ -98334,9 +97387,6 @@ /area/almayer/lifeboat_pumps/south1) "xVI" = ( /obj/structure/largecrate/random/case, -/obj/structure/machinery/light{ - pixel_x = -16 - }, /turf/open/floor/almayer/red/southwest, /area/almayer/lifeboat_pumps/north1) "xVS" = ( @@ -98349,10 +97399,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/green, /area/almayer/hallways/lower/port_midship_hallway) -"xWd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer/orange, -/area/almayer/squads/alpha_bravo_shared) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -98437,10 +97483,6 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/hallways/upper/starboard) -"xXW" = ( -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "xYf" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -98456,31 +97498,6 @@ /obj/structure/reagent_dispensers/tank/water, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) -"xZk" = ( -/obj/item/prop/helmetgarb/gunoil{ - layer = 4.2; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/prop/helmetgarb/gunoil{ - layer = 4.2; - pixel_x = -10; - pixel_y = 10 - }, -/obj/item/prop/helmetgarb/gunoil{ - layer = 4.2; - pixel_x = 4; - pixel_y = 9 - }, -/obj/item/weapon/broken_bottle{ - layer = 4.51; - pixel_x = 9; - pixel_y = 1 - }, -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, -/area/almayer/living/briefing) "xZs" = ( /obj/structure/platform/metal/almayer/west, /turf/open/floor/almayer/red/west, @@ -98507,20 +97524,8 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_umbilical) "xZR" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/almayer/orange/east, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/hallways/lower/starboard_midship_hallway) -"xZU" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) "yap" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -98623,13 +97628,6 @@ }, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/port_missiles) -"ycd" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "ycl" = ( /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_s) @@ -98640,11 +97638,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "ycx" = ( -/obj/structure/bed/chair/comfy/delta{ - dir = 8 +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/flooredge/northwest, /area/almayer/living/briefing) "ycH" = ( /obj/structure/surface/table/almayer, @@ -98663,12 +97660,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) -"ycZ" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer/blue/north, -/area/almayer/squads/delta) "ydh" = ( /obj/structure/surface/table/reinforced/black, /obj/item/tank/oxygen, @@ -98685,17 +97676,12 @@ /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/lower/port_fore) "ydE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/white{ - name = "\improper CMO's Bedroom"; - req_one_access = list(28,206,207); - req_one_access_txt = "1;5" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/mono, +/area/almayer/medical/hydroponics) "ydI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -98703,29 +97689,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"ydM" = ( -/obj/structure/flora/pottedplant/random{ - pixel_y = 16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/living/cryo_cells) -"ydO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 - }, -/turf/open/floor/almayer/orangefull, -/area/almayer/living/briefing) "ydY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -98766,9 +97729,6 @@ pixel_x = 2; pixel_y = 6 }, -/obj/structure/machinery/landinglight/delaythree{ - dir = 8 - }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "yeR" = ( @@ -98790,17 +97750,18 @@ /turf/open/floor/almayer/cargo, /area/almayer/command/cic) "yfg" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) "yfm" = ( -/obj/effect/landmark/start/marine/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "yfn" = ( /obj/structure/machinery/pipedispenser/orderable, /turf/open/floor/almayer/plate, @@ -98826,13 +97787,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"yfS" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/plating, -/area/almayer/living/grunt_rnr) "yge" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer/vehicle{ @@ -98843,7 +97797,7 @@ "ygp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/flooredgesmooth2/north, +/turf/open/floor/almayer/flooredge/north, /area/almayer/hallways/lower/starboard_midship_hallway) "ygv" = ( /obj/structure/disposalpipe/segment{ @@ -98859,6 +97813,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) "ygB" = ( +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, /turf/open/floor/almayer/green/southeast, /area/almayer/hallways/lower/starboard_midship_hallway) "ygP" = ( @@ -98939,38 +97900,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) "yiW" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Tool Closet" }, -/turf/open/floor/almayer/cargo, -/area/almayer/squads/charlie) +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/lower/l_a_p) "yiX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/surface/rack, -/obj/item/tool/mop{ - pixel_x = -4 - }, -/obj/item/tool/mop{ - pixel_x = 4 +/obj/structure/machinery/cryopod{ + dir = 1 }, -/obj/item/tool/mop, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) +/turf/open/floor/almayer/cargo, +/area/almayer/living/synthcloset) "yjb" = ( -/obj/structure/platform/metal/almayer/north, -/obj/structure/platform/metal/almayer/west, -/obj/structure/platform_decoration/metal/almayer/northeast{ - layer = 4.1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "yjq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -99007,21 +97952,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/auxiliary_officer_office) "yjU" = ( -/turf/open/floor/almayer/emeraldfull, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/flooredge/southeast, /area/almayer/living/briefing) "ykd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/west, /area/almayer/underdeck/req) -"ykj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Rest and Relaxation Area" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/living/grunt_rnr) "ykv" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /obj/structure/sign/safety/terminal{ @@ -99040,22 +97985,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"yle" = ( -/obj/effect/landmark/start/marine/engineer/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/almayer/plate, -/area/almayer/squads/delta) "ylh" = ( /obj/structure/closet/radiation, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"ylN" = ( -/obj/structure/sign/safety/galley{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/starboard_aft_hallway) "ymg" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -123554,7 +122487,7 @@ aHU aHU xXs xXs -xXs +akm xXs xXs xXs @@ -136847,7 +135780,7 @@ aaa aaa aaa aaa -aaa +bIc aaa aaa aaa @@ -136886,7 +135819,7 @@ aaa aaa aaa aaa -aaa +czB aaa aaa aaa @@ -137610,12 +136543,12 @@ aaa aaa aaa aaa -acm aaa aaa aaa aaa -bdH +aaa +aaa fwK cZB uaG @@ -137663,7 +136596,7 @@ rgt rgt ctw hAh -bIc +aaa aaa aaa aaa @@ -137717,7 +136650,7 @@ aaa aaa aaa aaa -bdH +aaa aaa fwK elY @@ -138659,27 +137592,27 @@ goY hmy bHB sXB -baH -bcd -bdO -bfL -baH -bjS -bdO -bfL -baH -bjS -bdO -bfL -baH -bjS -bdO -bfL -baH -bjS -bdO -bEA -baH +xyw +bcc +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +wqh +xyw fVz bHB bBN @@ -138761,7 +137694,7 @@ xMG aqk xyw bHB -aZO +xyw baI baI baI @@ -138783,7 +137716,7 @@ baI baI baI baI -bGF +xyw bHB aYt bcm @@ -138864,7 +137797,7 @@ wFN tGH xyw bHB -aZP +xyw baI baI baI @@ -138886,7 +137819,7 @@ baI baI baI baI -bGG +xyw bHB btO bcm @@ -138967,7 +137900,7 @@ qxI goY apJ bHB -aZQ +xyw baI baI baI @@ -138989,7 +137922,7 @@ baI baI baI baI -bGH +xyw bHB btO bcm @@ -139070,7 +138003,7 @@ qKl pPd apK hBF -aZR +xyw baI baI baI @@ -139092,7 +138025,7 @@ baI baI baI baI -bGI +xyw bHB xyw bcm @@ -139173,7 +138106,7 @@ aqA aql xyw bHB -aZO +xyw baI baI baI @@ -139195,7 +138128,7 @@ baI baI baI baI -bGF +xyw bHB eEc hOV @@ -139276,7 +138209,7 @@ goY goY xyw bHB -aZP +xyw baI baI baI @@ -139298,7 +138231,7 @@ baI baI baI baI -bGG +xyw bHB bGK rrh @@ -139379,7 +138312,7 @@ sCT eWs apM bHB -aZQ +xyw baI baI baI @@ -139401,7 +138334,7 @@ baI baI baI baI -bGH +xyw bHB cuy rrh @@ -139482,7 +138415,7 @@ dvD meT wqh bHB -aZR +xyw baI baI baI @@ -139504,7 +138437,7 @@ baI baI baI baI -bGI +xyw bHB kwQ rrh @@ -139585,7 +138518,7 @@ jHt jHt cCE bHB -aZO +xyw baI baI baI @@ -139607,7 +138540,7 @@ baI baI baI baI -bGF +xyw bHB iAw hOV @@ -139688,7 +138621,7 @@ gWt jHt amo bHB -aZP +xyw baI baI baI @@ -139710,7 +138643,7 @@ baI baI baI baI -bGG +xyw bHB bLn bcm @@ -139791,7 +138724,7 @@ gYg jHt gRP bHB -aZQ +xyw baI baI baI @@ -139813,7 +138746,7 @@ baI baI baI baI -bGH +xyw bHB btO bcm @@ -139895,27 +138828,27 @@ jHt apN bHB btO -beg -aog -beg -bgj -baX -bks -beg -bgj -baX -bks -beg -bgj -baX -bVm -bVj +xyw +btO +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +vbf +vbf vbf yeN qrp mUI xBr -baM +xyw bcb bHB aYt @@ -140012,7 +138945,7 @@ bHD api aYt sIU -gdp +lcV lcV lcV web @@ -140113,7 +139046,7 @@ pcl gHZ nfF fgE -btO +crf btO btO btO @@ -140218,7 +139151,7 @@ pcl fNi aYt xyw -vAq +hYG hYG aYt gGs @@ -140321,7 +139254,7 @@ pcl oRJ fTm fPu -vAq +hYG hYG hYG aYt @@ -140527,7 +139460,7 @@ pcl xNb aYt fPu -leg +hYG hYG hYG aYt @@ -140836,7 +139769,7 @@ pcl brY aYt cSx -nPB +ggh hYG ggh wvu @@ -140925,27 +139858,27 @@ eXq kCm bHB btO -bdO -aoN -bdO -bfL -baH -bjS -bdO -bfL -baH -bjS -bdO -bfL -baH -bjS -ohE -vWJ -qUL +xyw +btO +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +fPu +fPu +fPu qwS iEn mMB -baH +xyw bGL bHB aYt @@ -141027,7 +139960,7 @@ aqM aqt xyw bHB -aZO +xyw baI baI baI @@ -141049,7 +139982,7 @@ baI baI baI baI -bGF +xyw bHB aqs bcm @@ -141130,7 +140063,7 @@ aBt aqt aXh bHB -aZP +xyw baI baI baI @@ -141152,7 +140085,7 @@ baI baI baI baI -bGG +xyw bHB xAY gHZ @@ -141233,7 +140166,7 @@ akz aqt caM bHB -aZQ +xyw baI baI baI @@ -141255,7 +140188,7 @@ baI baI baI baI -bGH +xyw bHB xAY gHZ @@ -141336,7 +140269,7 @@ rYJ eXq xyw bHB -aZR +xyw baI baI baI @@ -141358,7 +140291,7 @@ baI baI baI baI -bGI +xyw bHB xAY gHZ @@ -141439,7 +140372,7 @@ bLP eXq eVm bHB -aZO +xyw baI baI baI @@ -141461,7 +140394,7 @@ baI baI baI baI -bGF +xyw bHB tIS bcm @@ -141542,7 +140475,7 @@ aBw aqt xyw bHB -aZP +xyw baI baI baI @@ -141564,7 +140497,7 @@ baI baI baI baI -bGG +xyw bHB btO cdA @@ -141645,7 +140578,7 @@ aqO aqt xyw bHB -aZQ +xyw baI baI baI @@ -141667,7 +140600,7 @@ baI baI baI baI -bGH +xyw bHB aYt cdA @@ -141748,7 +140681,7 @@ aBz aqt aXj bHB -aZR +xyw baI baI baI @@ -141770,7 +140703,7 @@ baI baI baI baI -bGI +xyw bHB vxb bcm @@ -141844,14 +140777,14 @@ rjF eWs eXq eXq -eXq -eXq -eXq -eXq -eXq +ctO +ctO +ctO +ctO +ctO mrD bHB -aZO +xyw baI baI baI @@ -141873,7 +140806,7 @@ baI baI baI baI -bGF +xyw bHB btO cdA @@ -141945,16 +140878,16 @@ sGw xzB oes eWs +cvW +cvL +cvu +cuW +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP aXj bHB -aZP +xyw baI baI baI @@ -141976,7 +140909,7 @@ baI baI baI baI -bGG +xyw bHB btO cdA @@ -142048,16 +140981,16 @@ sGw dvD oes eWs +cvX +cvM +cvv +cuX +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP xyw bHB -aZQ +xyw baI baI baI @@ -142079,7 +141012,7 @@ baI baI baI baI -bGH +xyw bHB uAb bcm @@ -142151,37 +141084,37 @@ sGw dvD iQJ eWs +eWs +cvN +cvw +cuZ +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP hmy bHB aZL -baX +xyw bcw -beg -bgj -baX -bks -beg -bgj -baX -bks -beg -bgj -baX -bks -beg -bgj -baX -bks -beg -bEN -baX +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +xyw +wqh +xyw bcp bHB xAY @@ -142254,13 +141187,13 @@ sGw xzB oes eWs +cvY +cvO +cvy +xzB +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP xyw rgy sqa @@ -142357,13 +141290,13 @@ sGw fzx cEA eWs +cwa +dvD +dvD +cva +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP xyw bHB tdc @@ -142372,17 +141305,17 @@ bcx bPr bPr bPr -ado +cqq agE -rBb +csn afV afA -bfZ +ado ehi mha rBb bdI -ado +cqq bPr bPr bPr @@ -142460,13 +141393,13 @@ sGw xzB rsP eWs +cwb +cvP +dvD +cvc +eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP xyw bHB xyw @@ -142561,15 +141494,15 @@ sGw sGw sGw dvD -iOX +cwR +eWs +eWs +cvQ +cvA +cvd eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP bGQ bHB xyw @@ -142664,15 +141597,15 @@ xzB xzB dvD dvD -wsz +oes +kWI +cwc +cvR +cvB +xzB eWs aRu -aRu -aRu -aRu -aRu -aRu -bcm +ctP aYu wTg bGq @@ -142704,7 +141637,7 @@ lFp ddw gHl kjD -ajh +ary poA lFp hSb @@ -142768,14 +141701,14 @@ bJn abj mUE coo +cvC +cvC +cvC +cvC lnu -lnu -lnu -lnu -lnu -aRu +eWs aRu -bcm +ctP aZZ aYC aZZ @@ -142805,9 +141738,9 @@ aYC aZZ lFp mgd -ajQ +wfn alA -alm +dDM alj lFp hSb @@ -142871,14 +141804,14 @@ iOX kIl jmz hsK -lnu +cvC bjZ bjZ -bjZ -lnu -sGU +cvC +wfE wfE wfE +ctR yap bqg eIO @@ -142909,8 +141842,8 @@ tuC lFp lGg wfn -ajO -alm +rNK +dDM jFx lFp lFp @@ -143013,15 +141946,15 @@ lFp xDF wfn rNK -aln +cmw prP ary bFN nmY -bFI +cjG xHS tEd -bFI +bUm nmY siT bUQ @@ -143205,7 +142138,7 @@ bqL bqL aeg pjw -ham +cqB omo gfW gfW @@ -143226,7 +142159,7 @@ ouw nmY alc akW -akT +qGw uZV nmY uKH @@ -143311,7 +142244,7 @@ bqL qdz bei bsj -bfV +bsj gGJ byb baZ @@ -143321,15 +142254,15 @@ knm yfy lFp qUZ -ajP +alC bFQ -aiU +rNK dDM acd nmY -aiL -kyh akT +kyh +qGw akT nmY qpV @@ -143424,9 +142357,9 @@ knm yfy ruL gsd -ajP -ajo -aiY +alC +bFQ +rNK dDM lab nmY @@ -143528,7 +142461,7 @@ amc lFp xPq alF -ajx +alx rNK aln ary @@ -143602,7 +142535,7 @@ pcE aWw qPk hKe -qPk +apu jpp ahZ acg @@ -143624,7 +142557,7 @@ hDX acg abN jpp -knm +amt jZe knm hBW @@ -143632,11 +142565,11 @@ alS xlO alG alz -ajc +alo alo all naw -aiM +qmY oqt oEy qmY @@ -143705,10 +142638,10 @@ uKe aWw qPk wKN -qPk +apu jpp ahw -bkd +ahw ahw qPS kan @@ -143724,10 +142657,10 @@ tYi kan adh ahw -bdU +ahw ahw jpp -knm +amt amn wwE tAb @@ -143740,8 +142673,8 @@ tOu qyK nmY bFM -agr -dKK +akW +qGw bFI nmY lQf @@ -143809,9 +142742,9 @@ wDr qPk wKN aiA -bCd +jpp eyQ -iXW +cpB ahu kan kan @@ -143827,9 +142760,9 @@ adE kan kan acH -iXW +cpB jqZ -bCd +jpp abm jZe knm @@ -143842,8 +142775,8 @@ wDr wDr wDr wDr -bFI -agt +akT +akW qGw qhD nmY @@ -143912,7 +142845,7 @@ wDr qZT pSF eZC -abD +bCd aib iXW ahv @@ -143932,7 +142865,7 @@ kan acJ iXW sdO -abD +bCd hBW dxJ rdT @@ -143947,7 +142880,7 @@ wDr wDr kJH kyh -aaE +qGw xry nmY uKH @@ -144014,29 +142947,29 @@ wDr wDr qPk hKe -bkh -baZ -iLs -bea -ahw +qPk +abD +cte +iXW +csH kan agW sYh rlZ agh +lJG jXf aeU -jXf aeo rlZ dTZ quT kan -ahw -bea +aib +iXW iLs -baZ -baS +abD +knm jZe abm wDr @@ -144151,7 +143084,7 @@ wDr wDr wDr wDr -akT +cjH akY aId akU @@ -144186,19 +143119,19 @@ aaa bLa bKY atU -bVI -bVQ -bVO -bVK -bVV -bVT -bVO -bVK -bVI -bVQ -bVO -bVK -bVI +aKS +aKS +aKS +aKS +bJQ +bJQ +aKS +aKS +aKS +aKS +aKS +aKS +aKS aKS atw aLL @@ -144259,24 +143192,24 @@ nmY nmY nmY lFp -xUY -emC +uKH +bUQ bSf cml bWe -bvS -bUK -bUI -bMz -bvS -bUK -bUI -bMz -bvS -bUK -bUI -bMz -bvS +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe abl bfi aPX @@ -144288,7 +143221,7 @@ aaa aaa bLa bKY -bVW +atU aKS aKS aKS @@ -144302,10 +143235,10 @@ aKS aKS aKS pzG -bVC +aKS bby aLL -bJr +cza bbS aLL aLL @@ -144325,7 +143258,7 @@ qPk hKe qPk aiu -buj +vou dYU ahA cWm @@ -144343,7 +143276,7 @@ biA wFb wzZ tdI -hMN +vbV abI knm jZe @@ -144363,10 +143296,10 @@ bVd sYP bSf weC -bIr +cls bIl cml -bUM +bWe bWe bWe bHb @@ -144391,7 +143324,7 @@ aaa aaa bLa bKY -bVX +atU aKS aKS aKS @@ -144405,7 +143338,7 @@ aKS aKS aKS aKS -bVD +aKS bby bJv bJr @@ -144469,7 +143402,7 @@ weC bHF bIm cml -bUP +bWe bWe bHb bHb @@ -144483,7 +143416,7 @@ bWe bWe bWe bWe -aZU +bhj aVA aPX aaa @@ -144494,7 +143427,7 @@ aaa aaa bLa bKY -bVY +atU aKS aKS aKS @@ -144508,7 +143441,7 @@ aKS aKS aKS aKS -bVF +aKS atw bJv bJr @@ -144531,7 +143464,7 @@ qPk hKe qPk aiu -vou +buj bvz bgC xfT @@ -144549,7 +143482,7 @@ biA lQO bsQ bmj -vbV +hMN abI knm jZe @@ -144572,7 +143505,7 @@ cpk bVd bIm cml -bUR +bWe bWe bHb bHb @@ -144586,7 +143519,7 @@ bWe bWe bWe bWe -baf +abl aVA aPX aaa @@ -144597,7 +143530,7 @@ aaa aaa bLa bKY -bVZ +atU aKS aKS aKS @@ -144611,7 +143544,7 @@ aKS aKS aKS aKS -bVG +aKS bby bJv bbS @@ -144675,7 +143608,6 @@ weC bIt bIm cml -bUS bWe bWe bWe @@ -144689,7 +143621,8 @@ bWe bWe bWe bWe -bag +bWe +abl aVA aPX aaa @@ -144700,7 +143633,7 @@ aaa aaa bLa bKY -bVW +atU aKS aKS aKS @@ -144714,7 +143647,7 @@ aKS bJQ bJQ aKS -bVC +aKS bby bJv bJr @@ -144778,7 +143711,6 @@ weC bHF bIm qzc -bUM bWe bWe bWe @@ -144792,7 +143724,8 @@ bWe bWe bWe bWe -blb +bWe +abl aVA aPX aaa @@ -144803,7 +143736,7 @@ aaa aaa bLa bKY -bVX +atU aKS aKS aKS @@ -144817,7 +143750,7 @@ bJQ bJQ bJQ aKS -bVD +aKS atw bJv bJr @@ -144881,7 +143814,6 @@ fvN bVd bIm qzc -bUP bWe bWe bWe @@ -144895,7 +143827,8 @@ bWe bWe bWe bWe -aZU +bWe +bhj aVA aPX aaa @@ -144920,7 +143853,7 @@ bJQ bJQ aKS aKS -bVH +bJQ atw bJx bJr @@ -144939,7 +143872,7 @@ jXR aaI aaI wDr -kgt +ctB hKe qqf aiv @@ -144965,7 +143898,7 @@ byc abJ tzw jZe -qPU +coG wDr sai sai @@ -144984,7 +143917,7 @@ weC bIu bSf cml -bUV +bWe bWe bWe bWe @@ -144998,7 +143931,7 @@ bWe bWe bHb bWe -bvh +bhj aVA aPX aaa @@ -145010,19 +143943,19 @@ aaa bLa bKY atU -bVJ -bVS -bVP -bVL -bVJ -bVS -bVP -bVL -bVJ -bVS -bVP -bVL -bVJ +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS +aKS aKS bby aLL @@ -145088,19 +144021,19 @@ xbg bSf cml bWe -bGb -bUL -bUJ -bRO -bGb -bUL -bUJ -bRO -bGb -bUL -bUJ -bRO -bGb +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe +bWe abl aVA aPX @@ -145129,7 +144062,7 @@ bJR bJR bJG aLL -bJs +deq lfx jgK lfx @@ -145234,7 +144167,7 @@ aLL aLL deq aNF -bwG +asB asB asB asB @@ -145337,7 +144270,7 @@ bJI bJy deq lfx -bwG +asB weR aPE weR @@ -145378,13 +144311,13 @@ vMo abv ltv qEz -bJt -bJt -bJt -bJt -bJt -bJt -bJt +cmU +cmU +cmU +cmU +cmx +mJO +mJO mJO plv plv @@ -145440,7 +144373,7 @@ bJJ bJz deq cGY -bwG +asB tmX tmX tmX @@ -145454,7 +144387,7 @@ eKT wan cTC aQF -syj +qPk aiG aiE aix @@ -145466,9 +144399,9 @@ ahb cjW agy agn +acD adw afw -adw rZB adS wxc @@ -145480,12 +144413,12 @@ abW abL abx mDZ -hkC -bJt +knm +coi xOL gGI eeu -gfq +cmx eFP gAz mJO @@ -145543,7 +144476,7 @@ bJK aLL xwd veq -bwG +asB pKh atd bmW @@ -145584,13 +144517,13 @@ abM abm sPY knm -lhB +coi pOY -bDs +cnk jge -bDs -bDs -hLC +cmx +cmb +xbg mJO plv plv @@ -145646,7 +144579,7 @@ aKR aKR deq deF -bwG +asB asS asP kYV @@ -145687,13 +144620,13 @@ kan aby sPY knm -lhB +coi xCb -bDs +cnl bIJ -bDs -bDs -qJS +cmx +cmc +vwI mJO plv plv @@ -145749,7 +144682,7 @@ aag kyw deq oWq -bwG +asB asB ate aPH @@ -145789,21 +144722,21 @@ bye kan tzw sPY -knm +coH lhB aQW -bDs +cnn bNw -wIG -wLK -hAz -bJt -bJt -bJt -bJt -bJt -bJt -bJt +cmx +mJO +gSk +mJO +mJO +mJO +mJO +mJO +mJO +mJO akS otW lyW @@ -145834,6 +144767,9 @@ aaa aak aaa aaa +aaa +bdH +bdH bdH bdH bdH @@ -145844,15 +144780,12 @@ bdH bdH bdH bdH -aaa -aaa -aaa bdH aad kyw deq lfx -bwG +asB asU asP asW @@ -145890,23 +144823,23 @@ jZd acE abX kan -knm +cpa sPY -knm -lhB -pxD -bDs -gSk -bDs -bDs -bDs +coI +cmU +cmW +cno +cmW +cmx +gLm +hAz xjb -fbo +mJO duo iIl -bDs +cjj ujV -bJt +mJO xbg xbg lyW @@ -145925,7 +144858,7 @@ bdH bdH bdH bdH -bdH +aaa bdH aab aaa @@ -145953,9 +144886,9 @@ bdH bdH aad kyw -deq +czb sJa -bwG +asB pGG asP asY @@ -145996,20 +144929,20 @@ kan knm sPY knm -bJt -qom -bDs +cok +cnp +cnp rAx -jFE +cmx fuS -jFE -jFE -jFE +mgb +ckD +mJO jFE idx hAz gHj -bJt +mJO oqI xbg lyW @@ -146028,7 +144961,7 @@ bdH bdH bdH bdH -bdH +aaa bdH aab aaa @@ -146056,9 +144989,9 @@ bdH bdH aad kyw -lfx +czc deq -jgK +cyt ati aNs asW @@ -146098,21 +145031,21 @@ kan kan hBW ltv -kGw -bJt -bJt +hBW +col +cnO nFI qdk -vzP -bJt -hjB -bJt -xfK -bDs -gSk -bDs +cmx +iZd +hAz +vwI +lHG +mgb +hAz +cjl bpI -bJt +mJO jLH xbg lyW @@ -146131,7 +145064,7 @@ bdH bdH bdH bdH -bdH +aaa bdH aab aaa @@ -146161,7 +145094,7 @@ aad kyw txp iGc -bwG +asB tmX asP ata @@ -146202,20 +145135,20 @@ nyw knm sPY knm -yfS -sEi -dck -quV -doJ -loY -tOW -lkd -dYR -bDs +cmx +cmx +cmx +cmx +cmx +mJO gSk -reL -wiI -bJt +mJO +mJO +cjI +mgb +hAz +xbg +mJO tqV xbg lyW @@ -146234,7 +145167,7 @@ bdH bdH bdH bdH -bdH +aaa bdH aab aaa @@ -146264,7 +145197,7 @@ aad kyw cme whm -bwG +asB asS asP asW @@ -146305,20 +145238,20 @@ nyw knm sPY knm -yfS +mJO hgL swt wSX wpI -ktX -smi +mJO +xbg lkd tsa -bDs -gSk -bDs +cjJ +hAz +xbg vwI -bJt +mJO lAa mgb lyW @@ -146332,11 +145265,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aab @@ -146367,7 +145300,7 @@ aad kyw cGY ipn -bwG +asB asB ate asW @@ -146391,37 +145324,37 @@ emr uNB quq duv +uMk beH +uMk +crC +uMk beH -beH -bCg -beH -beH -beH +uMk fcf -beH +uMk pmH -rCO -rCO -rCO +cpo +cpC +cpo eVv wwE mDZ amf -ykj +mJO rlQ -ven +hAz agH wxU -tvM -smi -lkd -rBj -bDs +mJO +xbg +ckE +mJO +mJO gSk -bDs +mJO fUB -bJt +mJO mgb nhw lyW @@ -146435,11 +145368,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aab @@ -146470,7 +145403,7 @@ aad kyw oif deq -bwG +cyu asU asP asW @@ -146494,13 +145427,13 @@ pfM bqZ rEf rWT -emr -emr +cso +csc usX -vKe -rCO +crE rCO rCO +cqS vVd eBg wRT @@ -146509,22 +145442,22 @@ dcd eTd nyw knm -rDO -hqp -kKk +sPY +qPU +mJO rDt -gpI -xwp -fLg -tvM +mgb +jFE +mJO +mJO dfC cEi -bJt +mJO oKb -gSk -bDs -nqO -bJt +mgb +mJO +mJO +mJO nQo pgJ lyW @@ -146538,11 +145471,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aab @@ -146573,7 +145506,7 @@ aad kyw byt lfx -bwG +asB tmX iWQ mUq @@ -146594,19 +145527,19 @@ bdd bdd bdd bdd -bdd -bLU -fUA -beH +bJt +qYZ +qYZ +bJt spF uBN -bqZ +crF jMr -eGZ -beH -fUA +crg +bJt qYZ -bdd +qYZ +bJt bdd bdd bdd @@ -146614,21 +145547,21 @@ bdd xwm ltv hBW -yfS +mJO ape -ven -njJ -kiM +hAz +mJO +mJO tvM -smi -lkd -kvU -idX -cnu -bDs -knK -bJt +hAz xbg +lHG +vwI +mgb +cjn +knK +mJO +oUZ oUZ lyW ajZ @@ -146641,11 +145574,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aab @@ -146676,11 +145609,11 @@ aad kyw jNo lfx -bwG -tmX -tmX -tmX -tmX +asB +cxC +cxC +cxC +cxC pQY pQc bll @@ -146690,48 +145623,48 @@ dVO bsR aQr aQF -qPk +kgt wKN -apu +ctr tda ngI dkq lRZ -acc +bJt ank -beH -dwl -bdd -bdd +csq +bJt +qYZ +qYZ gac -bdd -bdd -aMt -beH +qYZ +qYZ +bJt +cqC anb -acc +bJt qby btY bAJ huU -amt +abm sPY knm -yfS -ape -ven -bWT -fKV -tvM -smi -lkd -qTY -bDs -gSk -ljG -tSp -bJt +mJO +kqb +mgb +lHG xbg +vwI +mgb +jFE +mJO +cjK +hAz +mgb +tSp +mJO +ssk ssk lyW ajZ @@ -146744,11 +145677,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aab @@ -146777,9 +145710,9 @@ bdH bdH aad kyw -deq -lfx -bwG +cyG +cyG +cwz mTi ath mTi @@ -146789,52 +145722,52 @@ asB bln xEX arU -aQF -aQF -aQF -aQF -ldb +ctS +ctS +ctS +ctS +fzc rYI fzc -bdg +cpg vyg bni -cwX -vuA -nVi -nVi -nVi -vuA +csJ +bJt +csv +bDs +csp +cse tab udi wCs -vuA -nVi -nVi +crj +cqT +bDs nVi -vuA +bJt cwX xbd bAU -bdg +cpg jlD pYN -raE -bJt +jlD +mJO wbC lHu -oiL +mJO qBM -wXI +hAz nUd -lkd -xOT -bDs +mJO +mJO +mJO gSk -oDE -bJt -bJt -akS +mJO +mJO +bvp +akP akP lyW ajZ @@ -146880,62 +145813,62 @@ bdH bdH aad kyw -xbI -lfx -bwG -asB -asB -asB -asB -asB -asB -aQF -aQF -aQF -aQF +cyH +cyH +cwz +cwz +cwz +cwz +cwz +cwz +cwz +ctS +ctS +ctS +ctS yhR gHi -bwG +ctU pzj uhq pzj -bdg +cph apz dyd fyD -bdd -dhR -dhR +bJt +csw +cqD dhR -vuA -eYu -qaW -wbN -vuA -lVS -lVS +bDs +bDs +udi +bDs +cqD +cqU +cqD lVS -bdd +bJt vPw bvr bBQ -bdg +cph sgL aRL sgL rde -vjC -iMm -mJi -iMm +mJO +mJO +mJO +cmy iMm -mkc -bJt +mJO +mJO xaN -bDs -gSk +cjL +vwI luS -bJt +mJO uCw xbg mgb @@ -146983,9 +145916,9 @@ aaa bdH aad kyw -deq -deq -bwG +cyG +cyG +ctU tEu mUY vOw @@ -146998,48 +145931,48 @@ qxJ hCk deq nRN -bwG +ctU wsS vxY wsS -bdg +cpg auj bbf ber -vuA -nVi -nVi -nVi -vuA +bJt +csx +bDs +bDs +bDs jkz -ngI +crG xGJ -vuA -nVi -nVi -nVi -vuA -bpv +cqD +bDs +cqD +cqr +bJt +ahE tMW bBY -bCh +cpg mPM esd mPM -yfS -xML -iMm -jSy -wGb -iMm -rjn -bJt -wUX -bDs -gSk +mJO vSp +cns +mJO +vwI +cmd +mJO +ckF +mgb +mgb +vwI +mgb lHG -kOJ +xbg mgb mgb lyW @@ -147072,7 +146005,7 @@ bdH aaa aaa aaa -aaa +bdH bdH bdH bdH @@ -147107,41 +146040,41 @@ tdi apj tda mng -wTm -wCI -acc -ank -beH -anb -acc -mng -wTm +csT wCI acc -ank -beH -anb +bDs +cqD +bDs +csf +crO +crH +crp +crk +cqD +bDs +bDs acc -mng +cpV wTm wCI tda amv ter -oSM -bJt -swE -wpI -ocm -wpI -wnL -kHd -bJt -hSw +coq +lHG +mgb +xpL +lHG +hAz +mgb +lHG +ckG +xbg qxE -rui +mgb vSp -bJt +mJO uXU xbg nhw @@ -147175,7 +146108,7 @@ bdH aaa aaa aaa -aaa +bdH bdH bdH bdH @@ -147189,8 +146122,8 @@ lfx lfx deq deq -awq -avC +deq +deq eYp lfx vmq @@ -147209,29 +146142,29 @@ nhE naa nVQ bdd -vuA -vuA -vuA -bdd +cpq +csU +cpq +bJt qCc -fUA -bLL -bdd -vuA +csr +cqD +cqD +crP fnx -vuA -bdd -qCc -fUA +crq +bDs +bDs +cqE bLL -bdd -vuA -vuA -vuA +bJt +cpq +cpD +cpq bdd fvV ter -gvK +coJ bdd bdd bdd @@ -147241,11 +146174,11 @@ bdd bdd bdd bdd -bJt -cDC -vuF -bJt -bJt +mJO +gSk +mJO +mJO +mJO xbg mgb mgb @@ -147259,7 +146192,7 @@ lyW lyW aaa aaa -aaa +bdH aaa aaa aaa @@ -147292,7 +146225,7 @@ deq deq lfx lfx -axW +deq rHq bwG nPO @@ -147300,55 +146233,55 @@ cGB ugj fbC bdd -uvU -xZk +bCg +bqZ dGU lgF -pZR -aSp +bqZ +qkY mho -bdg -fZE +bdd +ctC iLm fZE bdg -bqZ -bqZ -bqZ -bCg -beH -fUA -beH -bCg -bqZ -beH -bqZ -bCg -beH -fUA -beH -bCg -bqZ -bqZ -bqZ +ctf +csV +csK +bJt +bJt +css +cqV +bDs +bDs +crI +cqD +bDs +cqV +cqF +cqs +bJt +cpW +cpE +cpr bdg oSM xub oSM -bdg -lCE +bdd +cnP oZD lCE oPz -lCE +kiX xLi qkY bdd qXo -feq +mgb loY aDU -bJt +mJO vAx mgb xbg @@ -147387,69 +146320,69 @@ bdH bdH bdH kyw -deq +xwd lfx aaJ aaJ -pRT aaJ aaJ aaJ aaJ +czd aaJ aaJ bwG bwG -msC -bwG +cxD +bdd bdd xwE dAQ -tGG +kEs kEs tGG -bpA -mho -bdg +kiX +cul +bdd fZE naa fZE bdg -bqZ -beH -beH -beH -beH -fUA -beH -beH -beH -beH -beH -beH -beH -fUA -beH -beH -beH -beH -bqZ +ctg +csW +csL +csC +bJt +bJt +csg +csg +crQ +bJt +crr +cqW +cqW +bJt +cqt +cqg +cpu +cpF +cps bdg oSM ter -oSM -bdg -lCE -uek +gvK +bdd +cnQ +kiX dkX -qXp +oCl oCl tPm kiX bdd -tLc +bdd rsM -iMm +mgb hTT nsY nsY @@ -147494,66 +146427,66 @@ lfx deq aaJ aaU -aaN +czJ jgk aaJ aaQ -rur +aaN aaK aaJ hsh -cPP -deq -eLH +ktR +cxN bdd -eUZ -lCr +bqZ +vMM lCr fwM -tGG -lJD -mho -bdg -fZE -naa -fZE -bdg +fwM +cve +fUA bqZ -beH -aLJ +ctV +ctD +naa +onn +bdd +cti +crB +fUA bmr -beH -beH -beH -pfJ -kDY -ufh +csz +bdd +cqX +cel +fDg +bdd fDg cel -beH -beH -beH +cqX +bdd +cqu rJK gBo -beH -bqZ -bdg -oSM +cpG +cpt +bdd +tmE ter -oSM -bdg -lCE -fMe +coq +com +bqZ +kiX sNI -jmn +sgD sgD kUR -vMM +kiX +bqZ bdd -hxZ -rsM -iMm -gzV +cjr +mgb +vwI nsY xWT kxd @@ -147567,13 +146500,13 @@ mgb mgb lyW aaa +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -147585,9 +146518,9 @@ aaa aab bdH aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -147605,58 +146538,58 @@ aaN aaL aaJ exb -deq -deq -qLY +lfx +sCg bdd +cwT ljW -bDP -lCr -ijr -lCr -mpn -pZR -bdd -fZE -naa +vMM +kiX +fUA +tIa +vKe +vKe +eVv +ctE +cty apj bCx -bqZ -beH -bgO -boq -boq -boq -boq +cpu +cNf +fUA +csD +csA +cst +cqY byE -pVB +iPv hsg iPv azN +cqY +cqG +cqv uMk -uMk -uMk -uMk -bgO -beH -bqZ +fUA +cpH +cpu bCx amv -ter -oSM -bdd -tSF -lsn -kUR -kUR -mkl -gXB -car +coU +coK +eVv +vKe +vKe +cmX +kiX +fUA +bqZ +bqZ +cjX bdd -hTf -rsM -oos -sBL +cjs +vwI +xbg nsY xWT rfT @@ -147667,7 +146600,7 @@ kxd dDt nsY mgb -xbg +xQd lyW aaa aaa @@ -147688,9 +146621,9 @@ aaa aab bdH aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -147710,56 +146643,56 @@ aaJ jvt hiu deq -vSr bdd +cwU asr -asr -asr -mki -vKe +fUA +uwt +rLP +fUA fZG phd -pmv +bdd apT yfg -apj -nyw -bqZ -beH -bgO -boq -boq -boq +ctt +eVv +cpv +csX +cpX +eBg +cqh +crl boq -byE +csh vBp -kNl +crJ nhi -azN -uMk -uMk -uMk -uMk -tmB +crl +cqZ +cqI eBg -vKe +cqh +cpX +cpI +cpv eVv amy -xdf +ihI ami -hLS -vKe -vKe -uSH +bdd +cnT +cnt +fUA uwt rLP -pPA +fUA ycx +cjY bdd -hTf -rKO -wGb -gUf +ttD +mgb +xbg nsY gwM bxC @@ -147800,7 +146733,7 @@ aaf aaf kyw lfx -deq +iGc aaJ aaJ qxC @@ -147810,58 +146743,58 @@ aaJ ntx aaJ aaJ -qWL -kIk -eXD -kMr -bdd -bdd -bdd -bdd -bdd -bdd -bdd -bdd +bwG +bwG +cxD bdd +cwV +asr +bqZ +cmz +cmg +bqZ +cux +cum +vuA fZE iLm -fZE -bdg -bqZ -beH -bgO -boq -boq -boq -boq -byE -vBp +cto +bdd +vMM +csN +crm +fUA +fUA +fUA +fUA +csi +crR hWs -nhi -azN -uMk -uMk -uMk -uMk +crs +crm +fUA +fUA +fUA +fUA bgO -beH -bqZ -bdg -oSM +cpL +cpw +bdd +cpb xub oSM +vuA +cnU +cnv +bqZ +cmz +cmg +bqZ +ckH +cjZ bdd -bdd -bdd -bdd -bdd -bdd -bdd -bdd -bdd -tuo -rsM -oos +cju +mgb gUf nsY nsY @@ -147894,8 +146827,8 @@ aaa aab bdH aaa -aaa -aaa +bdH +bdH aaa aaa aad @@ -147903,10 +146836,10 @@ kyw kyw kyw deq -aNF +lfx aaJ tUS -bNh +oGP wNl nGh fPp @@ -147916,56 +146849,56 @@ aaJ xxG smA ktR -lfx bdd +cwW dJI -jaf +cnV kwc -ebp -bMe -bMe +kWN +bqZ +cuz bMe -dYX -apT -xhW +vuA +ctD +iLm fZE bdg -bqZ -beH -bgO -boq -boq -boq -boq -byE +ctj +csY +csM +cql +cql +cqi +cqi +csj pUA wga mfM -azN -uMk -uMk -uMk -uMk -bgO -beH -bqZ +crn +cql +cql +cqi +cqi +cpY +cpM +cpx bdg oSM -iOo -ami -iUk -cIx +xub +oSM +vuA +cnU fUC -vKe +vMM sDA kWN -tln +bqZ bko +cjZ bdd -hTf -wRO -iMm -gUf +vwI +mgb +bUB nsY aaq wHj @@ -147983,8 +146916,8 @@ lyW ajZ aaa aaa -aaa -aaa +bdH +bdH aaa aaa aab @@ -147997,8 +146930,8 @@ aaa aab bdH aaa -aaa -aaa +bdH +bdH aaa aaa kyw @@ -148009,66 +146942,66 @@ deq lfx aaJ kio -sJY +oGP qJY qLH -xTW +fPp oGP cnM aaJ kqB -txH -txH deq +ktR bdd +cwY fva -lkL -mBO -cHB -cHB +fUA +cmA +yjU +kiX hDV vmP bdd -fZE +ctF iLm fZE bdg -bqZ -bqZ -bgO -beH -beH -duv -beH -iaK +ctk +vMM +csN +csE +cqK +tTp +veu +rAb lgC oBG -gZz +tmB tIa -beH -duv -beH -beH -bgO -bqZ +cra +cqK +cqw +cqj +cpL bqZ +cpy bdg oSM xub -oSM +coL bdd oNP tge +fUA +cmA yjU -yjU -yjU -tEC -bko +kiX +ckI +cka bdd -gKB -rsM -oos -gUf +kqb +vwI +xbg nsY mKJ deT @@ -148081,7 +147014,7 @@ nsY xbg mgb xbg -xbg +jLH lyW lyW aaa @@ -148100,14 +147033,14 @@ aaa aab bdH aaa -aaa -aaa +bdH +bdH aaa aaa kyw lHB lfx -lfx +czU lfx lfx heK @@ -148119,60 +147052,60 @@ vHh pvh sZs aaJ -bwG +cyg erL -scX -caq +lfx bdd +cwZ cDH -cHB -scN -vvw -wmz -rhy -rec -bdg -fZE -naa +rAb +rCO +rCO +jLS +vKe +vKe +ctW +ctE +cty onn bdd bdd bDQ -bgO -vGG -vGG -bgO -xRJ -xRJ +csN +cqk +cqk +cqk +cqk +csj xRw bPO whA -xAt -xAt -bgO -gAj -gAj -bgO -cab +crn +cqk +cqk +cqk +cqk +cpZ +cpN bdd bdd tmE -ter -oSM -bdg +coU +coK +con jLS -xdP -gAj -dBI -sMu +vKe +vKe +rCO +rCO eYF vMM +cab bdd -sOt cNX cdI -sBL -nsY +lZI +bvy eiN dVs tat @@ -148185,7 +147118,7 @@ sAS sAS sAS rCh -xbg +gLm lyW aaa aaa @@ -148210,9 +147143,9 @@ aaa kyw eqm lfx -vvH -bwG bwG +czS +czS aaJ gAP oEX @@ -148223,58 +147156,58 @@ qSK ieu aaJ mZc +cxZ lfx -neH -deq bdd -xXW +cxa +bqZ gVu -ydO +krU krU wmz -vbI -rec -bdg +kiX +bqZ +nyw atH iEM atH -ppV +atH bdd -bLV -bgO -vGG -vGG +bLB +csO +fUA +fUA +fUA +fUA bgO -xRJ -xRJ -viO +xRw gMU -ksN -xAt -xAt -bgO -gAj -gAj -bgO +whA +crm +kiX +fUA +fUA +kiX +cqa bLB bdd -eoy +brq brq jnc brq -bdg -jLS -frb +nyw +cnV +fUA kNX -mZf +gAj gAj ngn -jUq +kiX +ckb bdd -pEl -roU +xbg oos -uVh +vwI nsY kzK lFh @@ -148284,10 +147217,10 @@ mzV pML ivz nsY -iZd -mgb -xbg -jPx +qZy +jfS +bUH +ciB amT lyW aaa @@ -148313,9 +147246,9 @@ aaa kyw htg deq -deq -qCH +bwG cXm +spT aaJ hUz dbn @@ -148323,61 +147256,61 @@ qvC aaR uRM ipe -ehR +cnM aaJ xEe -lfx -tdH -igw +sCg +iGc +bdd bdd sgm kEg -vmP +jkD jkD rec -vgn -rec -bdg +eeh +bdd +bdd fZE naa fZE -fZE -bdg -bqZ +ctn +bdd +cta qMR -rwv -rwv -dRT -dqD -dqD -bUb +cql +cql +cqi +cqi +csj +kNl dRT +kNl eWp -eWp -eWp -dRT -tXb -tXb -fOk -bqZ -bdg -oSM +cql +cql +cqi +cqi +cpM +cpO +bdd +cpi oSM ter -oSM -bdg -vLg +gvK +bdd +bdd loy -xkB +cmY mRq xkB qXO eeh bdd -pcO +bdd tJV -qoY -uCh +xbg +iZd nsY tXT jJk @@ -148387,10 +147320,10 @@ sZH aVQ ivz nsY -qZy -jfS -bUH -ciB +avG +lZI +lZI +faR soT lyW aaa @@ -148416,9 +147349,9 @@ aaa kyw lfx lfx -yih -qCH -spT +bwG +bwG +bwG aaJ aaJ aaJ @@ -148428,59 +147361,59 @@ aaJ aaJ aaJ aaJ -bwG -bwG -bwG -bwG -bdd -bdd -bdd -bdd -bdd -bdd -bdd -bdd +deF +deq +sCg +qxJ bdd -tvl +vMM +vMM +fUA +cmB +cvf +kFs +vuA +fZE +fZE naa -meQ +fZE fZE bdg -bqZ -beH -vGG +cpQ +nlB +csF vGG -beH -xRJ +cqw +cqj +csk xRJ -xRJ -beH -xAt -xAt -xAt -beH -gAj -gAj -beH -bqZ +crK +whA +eWp +sCA +cqL +cqw +cqj +oQH +cpQ bdg oSM -awE +oSM ter -gvK -bdd -bdd -bdd -bdd -bdd -bdd -bdd -bdd +oSM +oSM +vuA +cnw +cmZ +cmB +cmh +bqZ +bqZ bdd -bJt -bJt -bJt -bJt +cjM +hAz +cjo +gLm nsY nsY nsY @@ -148490,11 +147423,11 @@ nsY nsY nsY nsY -ecj -bZf -lZI -faR -wxu +mJO +mJO +mJO +nEl +xbg lyW aaa aaa @@ -148520,81 +147453,81 @@ kyw lfx deq bwG -bwG -bwG -bwG -bwG +ycl +ycl +ycl +jCg bwG kUI bFB iPt -atH -sCg -hgs -sCg -osX +aaJ +aaJ +aaJ +bwG +bwG uCt sCg -bMl +atR eUf pwx -eUf -eUf -rIP -eUf -atH +bdd +bdd +bdd +bdd +bdd fZE fZE naa -meQ +fZE fZE bdg -bqZ -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -bqZ +cpQ +nlB +cqk +cqk +cqk +cqk +csk +crS +crL +crt +crn +cqk +cqk +cqk +cqk +cqb +cpQ bdg oSM -awE +oSM ter oSM oSM -brq -mdC -qWK -lyq -lyq -lyq +bdd +bdd +bdd +bdd +bdd +cld lyq atR eMI -eMI -gjg -bom -kiy -eMI -brq +mgb +mJO +mJO +nsY +nsY +nsY cSP cSH svt mJO -mJO -mJO -mJO -mJO +plv +plv +plv +mbR mJO jPx mgb @@ -148626,78 +147559,78 @@ bwG ycl ycl ycl -jCg +ycl bwG -eNL -pVr -oHs -osQ -tpR -tpR -tpR -tpR -tpR -tpR -osQ -tpR -tpR -tpR -tpR -tpR -tpR -osQ -wxp -tpR -baW +czC +czu +czn +cze +ctX +cyw +cyi +bwG +bwG +cxD +bdd +bdd +bdd +bdd +meQ +cvh +cuA +cun +fZE +meQ +iEM meQ fZE bdg -bqZ -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -bqZ +cpQ +nlB +fUA +fUA +fUA +fUA +csl +crT +bdd +cru +cro +fUA +fUA +fUA +fUA +cqb +cpQ bdg oSM awE -jas -jhA -cVZ -qWx -jhA -jhA -jhA -jhA -jhA -jhA -qWx -jhA -jhA -jhA -jhA -jhA -jhA -qWx +jnc +awE +oSM +cnW +cnx +cna +awE +bdd +bdd +bdd +bdd +gSk +mJO +mJO +bUF +bvA +bnC +bfO ldW -mkx -eWv +aUP +aFa mJO plv plv plv -mbR +plv mJO eBG nhw @@ -148724,28 +147657,28 @@ aaa aaa kyw lfx -deq +iGc bwG ycl ycl ycl ycl -bwG -xgk -oUi -tLZ -atH -xSx +jUx +atD +czv +czo +czf xSx +cyj +cyj dsY -dsY -mBa -pYh -atH +aAU +xZR +cxb wMl aAU -dsY -dsY +rwj +rwj rwj xZR atH @@ -148753,50 +147686,50 @@ fZE meQ iEM meQ -onn -bdd -bDQ -mng -bCu -bCu -bCu -bCu -wCI +fZE +bdg +cpQ +nlB +cql +cql +cqi +cqi +csj moQ flW fvf -rgW -vUe -vUe -vUe -vUe -kuw -cab -bdd -tmE +crn +cql +cql +cqi +cqi +cqb +cpQ +bdg +oSM awE jnc awE oSM brq -gOS -gOS -mqt -mqt -jtZ -eLu -brq -xpl +oSM +oSM +oSM +oSM +exc +oSM +ckc +oSM exc -mqt mqt vno vno -brq +vno +bgb wDG ihI -fnc -mJO +akB +vfo plv plv plv @@ -148833,73 +147766,73 @@ ycl ycl ycl ycl -jUx -atD -bBR -tup -jeb -jeb -jeb -uIT -lKb -jeb -jeb -jeb -jeb -jeb -uIT -mWy -jeb -jeb -jeb -bMc -meQ -iEM -meQ -fZE +bwG +czD +pVr +oHs +osQ +tpR +tpR +tpR +tpR +tpR +tpR +osQ +tpR +tpR +tpR +tpR +tpR +tpR +osQ +ctG +ctG +ctz +atH +atH bdg -bqZ -udi -ddk -dEQ +cpQ +csP +sCA +cqK hgg ddk -cQc -nlB -ugu -oQH -wHo -uWc -wka +csj +xRJ +crK +whA +eWp +sCA +cqK tTp veu -mDW -bqZ +oQH +cpQ bdg -oSM -awE -jnc -awE -dnP -vra -vra -vra -mDT -cgl -vra -vra -vra -vra -vra -mDT -rJx -vra -vra -vra +brq +brq +coV +qWx +qWx +qWx +jhA +jhA +jhA +jhA +jhA +jhA +qWx +jhA +jhA +jhA +jhA +jhA +jhA +qWx uGf -mkx -akB -vfo +ihI +aGQ +mJO plv plv plv @@ -148908,10 +147841,10 @@ mJO nEl bhy lyW -aaa -aaa -aaa -aaa +aaf +aaf +aaf +ajY aaa aaa aab @@ -148937,71 +147870,71 @@ ycl ycl ycl bwG -hiP -meQ -czN -jeb -vlX -aNx -qGc +eNL +fEF +tLZ +atH +cyI +hmF +hmF jhD jeb -osc +vlX cMV -osc +hmF jeb -aIq -xHp +hmF +hmF hmF vlX -jeb -bMf +atH +fZE meQ iEM meQ fZE -bdg -bqZ -udi -ddk -hgg -ddk -dNM -cQc -nlB +bdd +ctb +csQ +cqk +cqk +cqk +cqk +csk +crU ugu -oQH -wHo -uWc -duw -uWc -fIZ +kNl +crn +cqk +cqk +cqk +cqk mDW -bqZ -bdg -oSM +cpR +bdd +cpl awE jnc awE -eOx -vra -asX -chf -wDJ -tJz +oSM +brq +oSM +oSM +oSM +oSM vra -ukV +oSM oNj -ukV +oSM vra gll -lpt -mgF -asX -vra -pHh -mkx -hNv +oSM +oSM +oSM +brq +wcD +ter +eWv mJO plv plv @@ -149011,10 +147944,10 @@ mJO nEl rxe lyW -aaf -aaf -aaf -ajY +aag +aag +aag +ajZ bdH aaa aab @@ -149035,81 +147968,81 @@ kyw xkb dAA bwG -ycl -ycl -ycl -ycl +bwG +bwG +bwG +bwG bwG cVf -meQ -jTt -jeb +czw +tLZ +atH obE -tdE +xwl qGc -rth -nny -oef -oef -oef +aLT nny -rth -xHp +aLT +aLT +aLT +aLT +aLT +meQ xwl rHf -jeb -rrU +atH +fZE meQ iEM meQ -fZE -bdg -bqZ -ngI -bDP -bDP -bDP -bDP -nBw -moQ +onn +bdd +ctc +csO +fUA +fUA +fUA +fUA +bgO +xRw hGO -fvf +crv uNM -xAt -xAt -xAt -xAt -nNH -bqZ -bdg -oSM +fUA +fUA +fUA +fUA +cqa +cpS +bdd +tmE awE jnc awE -uNp -vra +oSM +brq bMq -qUq -wDJ -nyQ -miV -xJH -xJH -xJH +qYQ +awE +aQL miV -nyQ +aQL +aQL +aQL +aQL +aQL lpt qYQ -ptj -vra -opV -mkx +awE +brq +wcD +aUQ xVY mJO -plv -plv -plv -plv +mJO +mJO +mJO +mJO mJO jPx mgb @@ -149138,81 +148071,81 @@ kyw deq qZK bwG +ycl +ycl +ycl +jCg bwG -bwG -bwG -bwG -bwG -dTd -dTd -div -jeb -vlX -thA -gAA -gAA -bfn -oMH -coB +eNL +fEF +tLZ +aLT +aLT +aLT +aLT +aLT +aLT +aLT +bdr rSj bfn -gAA -gAA -fFD -vlX -jeb -wEK +aLT +aLT +aLT +aLT +aLT +ctC meQ iEM meQ fZE -bdg -bqZ -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -beH -bqZ -bdg +bdd +ctd +csR +cql +cql +cql +cql +csj +crV +crM +crw +eWp +cql +cql +cql +cql +cpZ +cpT +bdd oSM awE jnc awE dNW -vra -asX drj -cgo -cgo -hyk -qyW +drj +drj +aQL +aQL +aQL +aQL khd kaI -hyk -cgo -cgo -hQc -asX -vra -crc -goo -hAA -mJO -mJO -mJO -mJO +brt +aQL +aQL +aQL +aQL +aQL +wcD +ter +eWv mJO +plv +plv +plv +mbR mJO jPx pgJ @@ -149244,87 +148177,87 @@ bwG ycl ycl ycl -jCg +ycl bwG -wBw -bZo +czD +fEF vsf -jeb -vlX +aLT +cyJ tdE -qGc -rth -rth -hNM +aLT +cya +cxO +aLT vxX uBO -rth -rth +cwd +aLT xHp -xwl -vlX -jeb +cvi +cuB +aLT dQV meQ iEM meQ -onn +cto bdd -bDQ -lnm -iLh -iLh -iLh +vMM +csR +csG +cqN iLh -grR -moQ +sCA +cmX +crW ovp -fvf +crx rAb +crb +cqN +cqx sCA -sCA -sCA -sCA -bVw -cab +cpL +vMM bdd -tmE +cpm awE jnc awE gvK -vra +drj asX qUq -wDJ -nyQ +aQL +cmi lrT -bqW +aQL xaC -qeY -nyQ -nyQ -lpt -qYQ -asX -vra +vqY +dnE +aQL +buO +bMi +brr +aQL lDk -dEK -oWN +ter +aGQ mJO plv plv plv -mbR +plv mJO -jPx -mgb +nEl +cgU lyW aag aag aag ajZ -aaa +aaY aaa aab aaa @@ -149335,99 +148268,99 @@ aaa aaa aab bdH -aaa +aaY aad aag -aag -aag kyw -deq +kyw +kyw lfx +deq bwG ycl ycl ycl ycl -bwG -hiP -meQ +cmC +atD +fEF ktl -jeb -obE -thA -qGc -rth -rth -rth -aTW +aLT +cyK +cxP +aLT +cyb +cxP +aLT aTW -rth -rth -xHp +aLT +aLT +aLT +bdr diJ -rHf -jeb -fZE +cuD +aLT +bMc meQ iEM meQ apj bCx -bqZ +cpu cNf -dll -dll -lRs -dll -rJu -nlB -ugu -oQH -mnI -sJC -vSK -qnC -nuK +cqk +cqk +cqk +cqk +csk +crX +crN +cry +crn +cqk +cqk +cqk +cqk dVe -bqZ +cpU bCx amv awE vOZ awE -oSM -vra -bMq -drj -wDJ -nyQ -nyQ -nyQ -obQ +coq +cnX +cny +cnb +aQL +cmj +bpC +aQL +buS obQ -nyQ -nyQ -lpt -eBV -ptj -vra +brt +aQL +bVe +vqY +dnE +aQL xzI -mkx -hdV -mJO +ter +akB +cnd plv plv plv plv mJO -nEl +aoq xbg lyW -aag -aag +lyW +lyW aag ajZ -aaa +aaY aaa aab aaa @@ -149438,38 +148371,38 @@ aaa aaa aab bdH +aaC +aad +aag kyw -kyw -kyw -kyw -kyw -kyw +ety deq -iGc +deq +xJp bwG ycl ycl ycl ycl -cmC -atD -meQ -hvz -jeb -vlX -tdE -qGc -rth -rth -tPI +bwG +czE +czx +tLZ +aLT +cyM +cyx +aLT +cyd +cxQ +aLT tPI iXT +cwe rth -rth -xHp -xwl -vlX -jeb +bdr +cvj +cuE +aLT bMd meQ cmL @@ -149477,21 +148410,21 @@ czR jzT bCy bDS -cNf -dll -qSE -nff -dll +csS +rCO +cpo +cpo +cpo rJu -nlB -ugu -oQH +crY +rCO +crz mnI -nMp -qnC -qnC -qnC -dVe +rCO +rCO +cpo +cpo +cqc cac bCy hQf @@ -149499,38 +148432,38 @@ sTU xLX awE hCf -vra -asX -qUq -wDJ -nyQ -nyQ -pHA -pHA -nyQ -nyQ -nyQ -lpt -qYQ -asX -vra -wcD -mkx -akB -cnd +drj +cnz +cnc +aQL +cmk +aQL +aQL +aQL +cjN +aQL +aQL +bVE +brs +brr +aQL +aVy +aVb +aFa +mJO plv plv plv plv mJO -kLm +nEl xbg +oqI +iDk lyW -lyW -lyW -lyW -lyW -lyW +aag +ajZ +aaC aaa aab aaa @@ -149541,14 +148474,14 @@ aaa aaa aab bdH +aaC +aad +aag kyw -ety -deq -deq -deq -deq -deq -xJp +byt +lfx +lfx +veq bwG ycl ycl @@ -149558,21 +148491,21 @@ bwG lFL sNL ygB -jeb -jeb -hfa -jwK +aLT +cyK +bdr +aLT wnY -cLC -lyh +xHp +aLT rtA esn nFK -lEO -xWd -oSL -jeb -jeb +aLT +aLT +aLT +aLT +aLT fZE meQ dAm @@ -149581,42 +148514,42 @@ onn bdd bDT tHv -xRJ -xRJ -xRJ -xRJ +caO +caO +caO +caO tSB -moQ +crZ caO -fvf +crA vrW iXb -iXb -iXb +cqy +cqy iXb pzV cad bdd -vMA +tmE oYi sIR awE -oSM -vra -vra -eUh -jTI -lzq -nyQ +dnP +aQL +aQL +aQL +aQL +bpC +clf nhx eiq -oEA +bpC wXH -xBQ -mSU +aQL +aQL wVy -vra -vra +aQL +aQL siy wIX aCu @@ -149626,14 +148559,14 @@ plv plv plv mJO -nEl -xbg -jPU -mgb -cgU -oqI -iDk +rxq +cXX +nHG +wdW lyW +aag +ajZ +aaC aaa aab aaa @@ -149644,99 +148577,99 @@ aaa aaa aab bdH +aaC +aad +aag kyw -byt -lfx -lfx -lfx +nRN lfx -txp -veq -bwG -ycl -ycl -ycl -ycl -bwG -atE -atB -atj -jeb -tkN -qHg -gAA +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +dTd +dTd +div +czg +cyN +cxP +aLT beP -bfn -pkz -qfh +cxR +aLT +rtA ipE -bfn -moI -gAA +cwf +aLT +bdr cGV tkN -jeb +aLT hjQ -meQ +ctH fNd oUi fZE bdd bDU -bqZ -bqZ -bqZ -kFs -bqZ -bqZ -bqZ -kFs -bqZ -bqZ +cqn +cqe bqZ kFs -bqZ -bqZ -bqZ +cmZ +csm +csb +cqO +crB +cpG +cmZ +cqO +cqA +cqn +cqe cae bdd huP nbu kcg -awE +bIW bLe -vra -gNq -hXb -cgo -fwY -hyk -nNV -hyk +aQL +xvX +bsW +aQL +cmm +clq +ckf +ckf mBc hyk fwY cgo skF gNq -vra -akM -akJ +aVH akD -mJO -plv -plv -plv -plv -mJO -rxq -cXX -sAS -sAS -sAS -nHG -xbg +akD +akD +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +jPx +mgb lyW +aag +ajZ +aaC aaa aab aaa @@ -149747,12 +148680,12 @@ aaa aaa aab bdH +aaC +aad +aag kyw -deq lfx -wDr -wDr -wDr +iGc wDr wDr wDr @@ -149762,28 +148695,28 @@ wDr wDr wDr txE -atF -atl -jeb -aMx +atB +czp +czg +aLT qHg -qGc -hxe +aLT +aLT aPf -rth -rth -rth -rth -hxe +aLT +cxd +ipE +cwe +bkg xHp -cGV +cvk nBa -jeb -atH -atH +aLT +ctX +ctI dAm aCX -suH +atH bdd beQ beQ @@ -149806,25 +148739,25 @@ bdd oCb wwv sIR -brq -brq -vra -bMu -hXb +coM +kjW +aQL +cmj +vqY wDJ -ivs -nyQ -nyQ +vqY +clt +ckJ pHA -nyQ +cjO nyQ ivs -lpt -skF +caj +bwy pQF -vra -akN -fqA +aVH +aVE +akJ gzM wDr wDr @@ -149834,12 +148767,12 @@ wDr wDr wDr wDr -wDr -wDr -wDr nEl mgb lyW +aag +ajZ +aaC aaa aab aaa @@ -149850,12 +148783,12 @@ aaa aaa aab bdH +aaC +aad +aag kyw -deq -iGc -wDr -wDr -wDr +oxn +oxn wDr wDr cRL @@ -149867,40 +148800,40 @@ loV atF atF atl -jeb +czg iow -aMO +bdr bMp asl +bdr +aLT +rtA +ipE asy -hXd -guW -aQM -asy -asl +aLT bMh -aUi -iow -jeb -fZE -meQ +aLT +aLT +aLT +aLT +ctJ dAm fEF -fZE -bCz +ctq +ctl bDV -bGw -bGw +cqP +cqP bGw bGw bNA -anv +crD anv oMe +crD anv -anv -bNA -bGw +crd +cqP bDV bGw bGw @@ -149909,14 +148842,14 @@ bCz oSM oYi sIR -awE -oSM -vra -wTw -bNE +coN +aQL +aQL +aQL +aQL bbz -akV -ala +aQL +clu vqI vWB bSK @@ -149925,7 +148858,7 @@ akV bUi bUT wTw -vra +aVH akN fqA fqA @@ -149936,13 +148869,13 @@ buY cbg bhV anm -anm -anm -anm wDr -jPx -wdW +cZI +xGT lyW +aag +ajZ +aaC aaa aab aaa @@ -149953,99 +148886,99 @@ aaa aaa aab bdH +aaC +aad +aag kyw -lfx -gSH -wDr -wDr -wDr +czV +czV wDr wDr cRL -qJj -qJj -qJj +czO +czO +czO qJj uZm atF atF atl +czg +cyO +aMz +aMz +ozq +aMz aLT aLT +cwA +cwg aLT -aLT -ozq -ueZ +cvl +cvl +cuF aLT aLT -aQL -wsR -dAq -aQL -aQL -aQL -aQL -dQV -meQ +ctK dAm fEF fZE bCA bCA bdj -bCA -bCA -bdj -bCA -bCA -bdj -bCA -bdj -bCA -bCA +cqo +cqo bdj bCA +cqo +cqf +cqo +cqf +cqo bCA bdj +cqo +cqo +cqf bCA bCA oSM oYi sIR -awE -gvK -bJC -bJC -bJC -bJC -cib +coO +aQL +aQL +cnA +cne +cmD +aQL xvE +ckK bJC -bJC -bSJ -moM +aQL +aQL rXS -bSJ -bSJ -bSJ -bSJ +chc +aQL +aQL +aVH akN fqA fqA mFL aqL -aqL -aqL -aqL +asu +asu +asu acO anm -anm -anm -anm wDr -nEl -mgb +ale +akx lyW +aag +ajZ +aaC aaa aab aaa @@ -150056,40 +148989,40 @@ aaa aaa aab bdH -kyw -oif -nRN -wDr -wDr -wDr +aaC +aad +aag +emA +gPS +gPS wDr wDr cRL -wNz -wNz -wNz +czP +czP +czP wNz suU atC atC atp -aLT -kaB -vVb -aLT +czg +cyO +cxe +cyk aOy -aOz +cxe mKb -aLT +cxe vbM aRP aSH -aQL +cvD mJP bSn -aQL -hEm -kti +cuo +mJj +meQ eFa fEF exQ @@ -150099,8 +149032,8 @@ bCB bCB bCB bCB -bCB -bCB +cpA +cpA bri bdj bri @@ -150109,46 +149042,46 @@ bCB bCB bCB bCB -bCB -bCB -bCB +cpA +cpA +cpA uuI oYi mkx -bIW -eMZ -bJC +awE +kcl +cnY jSp lAQ -bJC +cmE bOZ bPa vhR -bJC -mWQ +aQL +aQL bTy -bUf -bSJ +nYc +ciU hII iJS -bSJ +aVH akO -akK +aVj akK dBg iyE -iyE -iyE -iyE +auv +auv +auv wkH anm -anm -anm -anm wDr -xgS -svF -lyW +nGM +hIp +tcO +aag +ajZ +aaC aaa aab aaa @@ -150159,13 +149092,12 @@ aaa aaa aab bdH -kyw -vaV -qxJ -wDr -wDr -wDr -wDr +aaC +aad +aag +emA +ikT +ikT wDr wDr wDr @@ -150174,25 +149106,26 @@ wDr wDr wDr wDr +czF +czg +czg +czg aLT -aLT -aLT -sXt aMQ aNI bfy -aMz sHY -aLT +sHY +cxf msm -aRT +cwh xMR -aTw -aUj +xHp +bdr kLk -aQL -npw -vzi +cuo +mJj +fZE eFa fEF rbd @@ -150218,25 +149151,26 @@ bdk cxF oYi mkx -fic -kjW -bJC +oSM +kcl +cob ojF -bNG -bOx +vqY +vqY chR bJD mzg -bJC -ycZ -bTA +aQL +ksp +mLF cIr gHo bUU uDW -bSJ -bSJ -ljv +aVH +aVH +aVk +aJD wDr wDr wDr @@ -150245,13 +149179,12 @@ wDr wDr wDr wDr -anm -anm -anm -wDr -wtk -mgb -lyW +alE +gEh +tcO +aag +ajZ +aaC aaa aab aaa @@ -150262,13 +149195,12 @@ aaa aaa aab bdH -kyw -lfx -gUn -wDr -wDr -wDr -wDr +aaC +aad +aag +emA +iTq +iTq wDr wDr wDr @@ -150277,25 +149209,26 @@ wDr wDr wDr wDr +oBr aLT -aLT -aLT -aLT -aLT -aLT -tNR -aMP +czq +xHp +bpK +cyy +cyl +cvE +cvm eAg -aLT -qoJ -aRZ -aSI -aQL -aQL -aQL -aQL -aQL -uBj +cxg +qoJ +aRZ +aSI +cvE +cvm +cuG +cuo +mJj +fZE eFa fEF wMB @@ -150321,40 +149254,40 @@ bdl opd oYi mkx -jwP -bJC -bJC -bJC -bJC -bJC +oSM +kcl +cnY +cnB +cmF +cmF mjS -bNF +akV szM -bJC -qrc -bTE -syH -bSJ -bSJ -bSJ -bSJ -bSJ +aQL +ksp +sXw +dlu +ciV +byq +bnE +bgy +ksp ljv +aLZ wDr -anm -anm -anm -anm -anm -anm -anm -anm -anm -anm wDr -nEl -xbg -lyW +wDr +wDr +wDr +wDr +wDr +wDr +anr +xhO +tcO +aag +ajZ +aaC aaa aab aaa @@ -150365,39 +149298,39 @@ aaa aaa aab bdH -kyw -oxn -oxn -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr +aaC +aad +aag +emA +jEM +ikT +ikT +jEM +ikT +jEM +ikT +jEM +ikT +tIF +bCk aLT +beU +bdv aLT -bbY -bdr bdz -bdr +cym bft bgU -bhG -aLT +ctY +ctY bjs blA -bno -bpC +ctY +brn brn aRT -buM -aQL +aLT +aLT fZE eFa fEF @@ -150425,39 +149358,39 @@ oDU oYi mkx oSM -bJC -cdT +aQL +aQL +cnC cfo -cgq cfo -chM -cjd +aQL +wsR cjA -bJC -ckr -ckQ -clh -clg +aQL +aQL +ksp +rou +ksp clI -clg -clW -bSJ +bot +fIM +ksp ljv -wDr -anm -anm -anm -anm -anm -anm -anm -anm -anm -anm -wDr -cZI -xGT -lyW +aMg +eHy +eHy +eHy +cyp +oaO +ljv +eeR +tWp +goM +pFr +tcO +aag +ajZ +aaC aaa aab aaa @@ -150468,39 +149401,39 @@ aaa aaa aab bdH +aaC +aad +aag emA -vIg -vIg -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr +czW +jEM +ikT +jEM +ikT +lty +eTD +lty +czl +hyb +bCk aLT aLT -bca -aMC aLT -avv -bfu -rGj -aQT aLT +cyz +avv +ctY +ctY +ctY +cxh aTv blB -bnp -aTx -aQL -aUY -buN -aQL +ctY +ctY +ctY +ctY +ctY +ctY fZE eFa fEF @@ -150527,40 +149460,40 @@ bdl jDz oYi mkx -oSM -bJC -cdU -bMy -bJC -cog -chN -mzg +dNW +aQL +aQL +aQL +aQL +aQL +aQL +clv cdP -bJC -dpO -ckX -cli -coj -bSJ +ckg +aQL +aQL +aQL +aQL +bys bVo clX -bSJ +aQL ljv -wDr -anm -anm -anm -anm -anm -anm -anm -anm -anm -anm -wDr -cOo -rJf +eaz +lYg +lYg +aqH +oxl +ava +ljv +aqP +hCq +vUJ +alb tcO +aag +ajZ +aaC aaa aab aaa @@ -150571,39 +149504,39 @@ aaa aaa aab bdH +aaC +aad +aag emA -gPS -gPS -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -aLT -aLT -aLT -aLT +tcm +heO +jEM +jEM +ikT +czT +bFl +nZW +czl +czH +kjY aLT +czh +czh aLT -bfx +cyA +cyn +ctY rGj aQT -aLT -aTv -blB -kiU -aQL -aQL -aQL -aQL -aQL +aUZ +cwB +cwi +crf +cvF +cvn +cuH +ctY +ctY dQV eFa fEF @@ -150631,39 +149564,39 @@ wPi oYi mkx gvK -bJC -bJC -bJC -bJC -bJC -chO -mzg -cdP -bJC +aON +aON +cnD +cnf +cmG +cki +clx +ckL +cki dpO ckX -clj -bSJ -bSJ -bSJ -bSJ -bSJ +aQL +ksp +dlu +boC +bgN +ksp ljv -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -wDr -nGM -hIp +ljv +ljv +ljv +axn +ljv +ljv +ljv +aqS +lYg +sEu +lia tcO +aag +ajZ +aaC aaa aab aaa @@ -150674,40 +149607,40 @@ aaa aaa aab bdH +bdH +aad +aag emA -jEM +hyb +fGB +jkN +kJZ ikT -owU -iTq +uzv +tYr +uzv ikT -jEM -kjY -riB -fGi -qan -jkN -jUh -tIF -bCk -jkN +czK +czG aLT bco +bco aMB bdA -aLT -bfD -rGj -aPl -aLT -aPn -aRU -bnr -aQL -brr +cyq +ctY +cxS +aQT aUZ -buO -aQL -fZE +cwB +cwi +aUZ +aUZ +aUZ +aUZ +cup +ctY +ctL eFa fEF tLZ @@ -150733,40 +149666,40 @@ bdl tkg oYi mkx -oSM -bJC +coP +aON cdV -bMx -cgr -bJC -raK -mzg +cki +cki +cki +cki +clx bgW -bJC -ckR -ckX -iyS -bSJ +ckk +dpO +cjv +aQL +ciW clJ bVn clY -bSJ +aVU ljv -dnZ -eHy -eHy -eHy -cyp -oaO -lWY ljv -jiM -ere +ayO lYg +ayF +ere +ere lYg sEu -lia +xhO +cmN +srl tcO +aag +ajZ +bdH aaa aab aaa @@ -150777,40 +149710,40 @@ aaa aaa aab bdH +bdH +aad +aag emA -kJZ +emA +emA +bCk kjY -fGB -snN -jEM -ikT -jEM -lty -eTD -lty -jEM +yia +ugZ +kcG +czQ ikT -kjY -bCk -heO -aLT -bco -bdr -bdA +czH +czH aLT -bfw -rGj +czr +czi +cyQ +cyB +cyr +ctY +cxT aQT -aLT -aTv -blB -vJV -aQL -brr -aRT -buO -aQL -fZE +crf +cwD +cwj +cvo +cuI +cvo +cuI +cur +ctZ +ctD eFa fEF tLZ @@ -150836,40 +149769,40 @@ bdl fJt oYi mkx -oSM -bJC -cdV -cfo -cgr -bJC +coq +cor +coc chQ -mzg -cdP -bJC -dpO -ckX -clk -bSJ -clJ -clg -clY -bSJ -ljv -eaz -lYg -lYg -aqH -oxl -wac -mjy +chQ +chQ +chQ +cly +bgW +cki +cjP +cjw +aQL +ksp +qDq +dlu +dlu +ksp ljv -ien +gEh +goM +xhO xhO +gEh +sOD +gEh xhO xhO -cmN -srl tcO +tcO +tcO +aag +ajZ +bdH aaa aab aaa @@ -150880,39 +149813,39 @@ aaa aaa aab bdH +bdH +aad +aag +aag +aag emA emA emA emA emA -sEg -ikT -jEM -ahL -bFl -nZW -jEM -ikT -jEM -jEM -bCk +emA +emA +oBr +czL +snN aLT -bcZ -bdr +wMG +wMG +cyS bdC -beR -bfy +wMG +ctY rGj aQT -aLT -aTv -blB -bnt -bpG -brs -aRT +aUZ +cwD +cwk +cuJ +cuL +cuJ +cuJ bew -aQL +cua atH dAm aCX @@ -150937,42 +149870,42 @@ cmo xAB mCo brq -wwv -sIR -brq -bJC +cpc +coW +qWx +cos bKX -cfo -cgs -chk -chR -mzg -cdP -bJC -dpO +cmn +cmn +cmn +cmn +clz +ckM +cki +cjP ckX -cll -clE -clK -clg -bVy -bSJ -ljv -ljv -ljv -ljv -tWl -jer -ljv -ljv +aQL +aQL +ksp +ksp +ksp +aQL ljv -jEA -hCq +xhO +cZp +xhO +tcO tcO tcO tcO tcO tcO +tcO +aag +aag +aag +ajZ +bdH aaa aab aaa @@ -150984,38 +149917,38 @@ aaa aab bdH aaa -aaa -aaa -aaa +aae +aah +aah +aah +aah +aah +aah +aah +aah +aah emA -tcm -ikT -jEM -uzv -tYr -uzv -jEM -ikT -hYf -jEM -ikT +emA +czl +czl aLT -bco -bdr -bdA aLT -bfx +aLT +cyT +cyC +wMG +ctY aPj aPl -aLT +cvo aPn -blB -bnu -aQL -brr -aRT -buO -aQL +cwl +crf +crf +aUZ +aUZ +crf +cub jpW eFa svw @@ -151042,39 +149975,39 @@ sSa bRo dOG gKw -tgz -bJC -cdV -cfo -cgr -bJC -chN -mzg -bgW -bJC +oSM +cot +cki +cki +cki +cki +ckk +clA +ckN +ckl ckR -ckX -loS -bSJ -clJ -clg -clY -bSJ -bXh -lYg -lYg -lYg -sEu -eaz -ere -lYg -lYg -sEu -gEh +cjx +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +ljv +eMx +cZp tcO -aaa -aaa -aaa +tcO +aah +aah +aah +aah +aah +aah +aah +aah +aah +afm aaa aaa aab @@ -151087,38 +150020,38 @@ aaa aab bdH aaa +bdH +bdH aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA -hyb -fGB -kjY -yia -ugZ -kcG -fBo -ikT -jEM -jEM -ikT +czH +czl aLT -bco +czh +czh aMC -bdA -aLT -bfx +cyC +wMG +ctY bgY -aQT -aLT -aTv -blB -nCp -aQL -brr +cxE +cxi +cwE +cwm +ctY +cvG +cus aUY -buO -aQL +cus +ctY fZE eFa fEF @@ -151146,38 +150079,38 @@ wcD oYi mkx oSM -bJC -cdV +aON +cgr bMy cgr -bJC +cmH aON -mzg -cdP -bJC -dpO -ckX -cln -bSJ -clJ -bVo -clY -bSJ -tgm -xhO -xhO -xhO -xhO -gEh -sOD -gEh -xhO -xhO -tWp +clB +ckO +ckm +cjQ +cjy +aVZ +aVZ +aVp +aVp +aVp +aVZ +ljv +aNr +goM tcO +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa +bdH +bdH aaa aaa aab @@ -151190,38 +150123,38 @@ aaa aab bdH aaa +bdH +bdH aaa -aaa -aaa -emA -emA -emA -emA -emA -emA -emA -emA -emA +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA -iTq -snN -aLT -aLT -aLT -aLT +oTA +cuV aLT -ial -bgY -aQT +cjc +iDf +cyU +cyD aLT -aTv -blB -qhU -aQL -aQL -aQL -aQL -aQL +ctY +aPj +cxG +cuL +cwF +cwn +crf +crf +crf +aUZ +crf +cub fZE eFa fEF @@ -151249,38 +150182,38 @@ sXC oYi mkx oSM -bJC -bJC -bJC -bJC -bJC -chP -mzg -cdP -bJC -dpO -ckX -sUO -bSJ -bSJ -bSJ -bSJ -bSJ -cZp -xhO -tcO -tcO -tcO -tcO -tcO -tcO -tcO -tcO -tcO +cot +ckk +ckk +ckk +ckk +ckk +clC +ckS +ckn +cjR +cjx +aVZ +aVp +bGk +clZ +bgX +aVp +ljv +aOd +ayP tcO +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa +bdH +bdH aaa aaa aab @@ -151293,41 +150226,41 @@ aaa aab bdH aaa +bdH +bdH aaa +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa emA -ikT -jEM +czl +kJZ aLT -bcE -aMB +wMG +vug +cyS bdD -aLT +wMG bfz -bgY -aPl -aLT -aPn -blB -bMj -aQL -brt -aUZ -buS -aQL -fZE -eFa -fEF +rGj +cxH +crf +cwG +cwp +cvJ +cvJ +cuK +cuK +cut +cuc +ctM +ctA +oUi tLZ bdl brp @@ -151349,39 +150282,39 @@ bNQ bGz egD oQn -oYi -mkx -oSM -bJC +nbu +coX +coQ +cou cdX -bMx cgt -bJC +cgt +cmI chS bQA -bgW -bJC -ckR +ckT +cki +dpO ckX -atA -bSJ +aVZ +ciX clL -bVn +bqa clZ -bSJ -tgm -xhO +aWS +ljv +aNr +goM tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -151396,39 +150329,39 @@ aaa aab bdH aaa -aaa bdH bdH -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH aaa aaa aaa aaa aaa emA -qGC -jEM +czM +czk aLT -bcE -bdr +wMG +vug +aMC bdD -aLT -rrq -bgY -aQT -aLT -aTv -blB -mtr -aQL -brt -bpC -buS -aQL -bMf +wMG +ctY +cxT +cxH +aUZ +cwH +cwk +cuJ +cuJ +cuJ +cuL +cuu +cua +ctD eFa fEF tLZ @@ -151454,32 +150387,32 @@ lde oSM oYi mkx -oSM -bJC -cdX -cfo -cgt -bJC -chQ +coq +cow +coe +ckn +cmJ +cmJ +ckn cjf -cdP -bJC +ckU +cki dpO -ckX -xoe -bSJ -clL -clg +cjw +aVZ +aVp +bhd +brk clZ -bSJ -xMm -pFr +aVp +ljv +aPp +ayW tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -151499,41 +150432,41 @@ aaa aab bdH aaa -aaa +bdH +bdH +bdH +bdH bdH bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +bdH aaa emA ikT -jEM +qan +aLT aLT abS -bdr -bdC -beS -bfy -bgY -aQT +cyV +cyE aLT -aTv -blB -bnt -bpH -brs -bpC +ctY +cxU +cxH +aUZ +cwH +cwi +crf +crf +crf +crf abT -aQL -atH -dAm -aCX +ctY +ctL +eFa +fEF atH bdl buz @@ -151555,34 +150488,34 @@ bNN vbR eGq uuI -wwv -sIR -brq -bJC +oYi +mkx +coP +aON ack -cfo -cgs -chl -chR -cjf -cdP -bJC +cki +cki +cki +ckk +clD +ckU +cki dpO -ckX -cll -clF +cjz +aVZ +aVZ clK -clg +brl acp -bSJ -qKK -gEh +aVZ +ljv +aRd +cZp tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -151602,39 +150535,39 @@ aaa aab bdH aaa -aaa +bdH +bdH +bdH +bdH bdH bdH aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH aaa emA -jEM ikT +jUh aLT -bcE -aMC -bdD -aLT -bfD -bgY -aPl -aLT -aPn +wMG +iSZ +cyW +nuN +wMG +ctY +rGj +aQT +crf +cwI aRX cSQ -aQL -brt -aUY -buS -aQL -fZE +cvK +cvp +cuM +ctY +ctY +dQV eFa fEF hvz @@ -151660,32 +150593,32 @@ uys bfd oYi mkx -oSM -bJC -cdX -bMy -cgt -bJC -foL -cjf -bgW -bJC -ckR -bTC -mvl -bSJ -clL -bVo -clZ -bSJ -hTU -lNk +gvK +aON +aON +cnD +cng +cmO +cki +clD +ckU +cki +cjP +ckX +aVZ +aVp +bGv +btj +bhd +aVp +ljv +cmN +cZp tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -151707,36 +150640,36 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa emA -rIV -dYc -aLT -aLT -aLT -aLT -aLT -bMo -bgY -aQT +rIV +czI aLT -aTv -blB -bnu -aQL -aQL -aQL -aQL -aQL +wMG +iDf +cjc +cjc +wMG +ctY +ctY +ctY +cxj +cwJ +cwq +ctY +ctY +ctY +ctY +ctY +ctY edn qRd gtH @@ -151764,31 +150697,31 @@ kKB rsL jts kKB -bJC -bJC -bJC -bJC -bJC -chW +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ rvT -cdP -bJC -dpO -ckX -meu -bSJ -bSJ -bSJ -bSJ -bSJ -xsv -gEh +ckV +cko +aVZ +aVZ +aVZ +ciX +bGv +btk +bho +aWS +ljv +xhO +cZp tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -151810,36 +150743,36 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa emA -jEM -kDd +czH +vPv aLT -bdJ -bds aLT -bpL -bfE -njd -aQT +wMG +uJU +wMG aLT -aTv -blB -uvu -bMi -aQL +bSJ +ctY +ctY +ctY +cwK +cwr +ctY +hMX +cvq bsS -mqK -aQL +bSJ +bSJ bqc tcS mww @@ -151867,31 +150800,31 @@ wKm ekM aVM uPE -bJC -cfp +aVZ +aVZ cgu -bJC bLd -chQ -cjf -cdP -bJC -dpO -ckX -clo +bLd +aVZ +clO +ckY +aVZ +aVZ +aVp +aVp aoQ -bSJ +bGW clM clS -bSJ +aVp +ljv +xhO cZp -gEh tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -151913,37 +150846,37 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa aaa emA -jEM +czH ikT aLT -beT -bdr -bkg -aMz -bfy -bgY -aPl aLT -aPn -blB +aLT +aLT +aLT +aLT +bSJ +bSJ +cxI +cxl +cwL +cws bnt -aRT +cvs ihY -bpC -dnE -aQL -qfI +cuO +cuv +cud +lhs dpA ggo lhs @@ -151966,35 +150899,35 @@ uys uys uys uys -gyw +cpn bFX hza bLr -bJC +cox bMA -cfo -chm -bJD -chR -cjf -bgW -bJC -ckR -ckX -cll +cnF +sDM +sDM +cmp +clP +cla +ckp +aVZ +cjB +cjp bTA clG -clg -bVq -bSJ -ien -dFL +buk +aVZ +aVZ +ljv +ljv +ayX tcO -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH bdH bdH bdH @@ -152016,37 +150949,37 @@ bdH aaa aaa aaa +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH aaa aaa aaa aaa emA -sEg -ikT -aLT -aLT -aLT -aLT -aMz -nuA -bgY -aQT -aLT -aTv -blB +oTA +bSJ +bSJ +cxV +cxV +cyX +cxV +cxV +cxV +bSJ +bSJ +cxm +cwM +cwt oiQ -aRT -aQL -aQL -aQL -aQL -oxe +bUN +clg +cuQ +cuv +cud +bqc tcS mww sZe @@ -152073,35 +151006,35 @@ eTx ekM aVM uPE -bJC -bJC -bJC -bJC -bJD +cox +cof +cnG +xsv +rPE jxx -cjf -cdP -bJC -dpO -ckX +jGR +clb +ckq +aVZ +cjD rXj -bTA -bSJ -bSJ -bSJ -bSJ -cZp -xhO +ciY +bLG +bul +bhB +aVp +aVp +ljv +goM tcO aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -152119,36 +151052,36 @@ bdH aaa aaa aaa +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH aaa aaa aaa aaa emA jEM -ikT -aLT -beT -bdr -bpK -aMz -bfy -bgY -aQT -aLT -aTv -blB -bnt -aRT +bSJ +cxV +fXN +vio +fXN +wWX +wWX +wWX +cxV +bSJ +cxn +cwN +cwv +cvS mUx -bpC -dnE -aQL +mUx +cuR +cuv +cud bqc tcS mww @@ -152176,35 +151109,35 @@ amB ekM aVM uPE -bJC +cox bMA -cfo -chn -bJD -chR -cjf -cdP -bJC -dpO -ckX -cll -bTA +cnJ +cmP +cmP +cmq +clQ +clc +cks +aVZ +bcq +bcq +bcq clH oFV bVq -bSJ -vUJ -hCq +bbo +aVv +ljv +aBe tcO aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -152222,37 +151155,37 @@ bdH aaa aaa aaa +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH aaa aaa aaa aaa emA ikT -jEM -aLT -beU -bdv -aLT +bSJ +czy +fXN +czj +cyF +cyF bry bfu -bgY -jVr -aLT +cxW +bSJ +cxo kXa -blB -chL +cww +bSJ lAl -aQL -bsW -xvX -aQL -bqc +cvr +cuS +bSJ +bSJ +ctN noI dJG sZe @@ -152278,37 +151211,37 @@ hpS amB nzt jhs -uPE -bJC -cfq +coR +aVZ +aVZ cgv -bJC +cnh wqc -chN -cjf +aVZ +clR lok -bJC -ihM -ckX -clm -hXY -bSJ -clN -clT -bSJ +ckt +aVZ +aVZ +aVZ +aVZ +bLM +bun +bhO +bcl xsv -gEh +ljv +aCw tcO aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152325,39 +151258,39 @@ bdH aaa aaa aaa +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH aaa aaa aaa aaa emA qGC -jEM -aLT -aLT -aLT -aLT +bSJ +cxV +fXN +uYH +uYH +uYH bwe cuY aPo -aLT -aLT -aQL +bSJ +cxp +cll aSa -bnA -xhQ -aQL -aQL -aQL -aQL -bqc +bSJ +bSJ +bSJ +bSJ +bSJ +bSJ +oxe ubQ -fpM +csB bEk bdl tFS @@ -152381,37 +151314,37 @@ bdl cBC feo vuV -uPE -bJC -bJC -bJC -bJC -qFG -pvJ +xui +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ bQD -bJC -bJC -bSJ +lok +cku +cjS hss clp -hfQ -bSJ -bSJ -bSJ -bSJ -goM -tfQ +aVZ +bMQ +bvk +bhZ +bcq +ljv +ljv +aCF tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152434,30 +151367,30 @@ aaa aaa aaa aaa +aaa +aaa +aaa emA -emA -emA -emA -emA -ikT ikT -aLT -vZb +bSJ +bSJ +kPJ +kPJ tnY -gjy +kPJ tIQ cic -ceg -mdo -mJj +bSJ +bSJ +cxq tnz -nYc -bnB -aVd +cwx +bSJ +hMX hMX uqA -bES -kcl +bSJ +bSJ bqc ubQ uPX @@ -152484,37 +151417,37 @@ bdl jLg uEO vuV -uPE -hNw -wos +coS +aVZ +aVZ bMC fcB -rUh -jLj +bLd +aVZ wPC -xZU +lok hNw hmC rQA -hjs -ivM -hcI +rPE +aVZ +bPi hcI -vPK -bSJ -cZp -gEh -tcO -tcO -tcO -tcO +aVZ +aVZ +ljv +aRJ +goM tcO +bdH +bdH +bdH +bdH +bdH aaa aaa aaa -aaa -aaa -aaa +bdH aaa aaa aaa @@ -152537,30 +151470,30 @@ aaa aaa aaa aaa +aaa +aaa +aaa emA -hyb +czH kjY -kcG -tIF -jEM -ikT -aWT -aMH -beV -gWE +bSJ +bSJ +bSJ +bSJ +bSJ udG aOK -dRv -mdo -mJj -ljs +cxV +bSJ +cxr +cwN hsW mFO -bJE -aRT -hSV -bES -kcl +cvs +cvs +cuO +cuv +cud bqc ubQ slo @@ -152588,15 +151521,15 @@ bdl udf iyC uPE -hNw -oMr -tPD -bJD -nrw +cox +cof +cnF +clr +sDM spS lBv pXZ -hNw +ckv iIR sDM clr @@ -152605,19 +151538,19 @@ aMI wGE erG ewO -sEu -xhO +ljv +aSs ffx -jhK -srl -lWY tcO +bdH +bdH +bdH aaa aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152640,30 +151573,30 @@ aaa aaa aaa aaa +aaa +aaa +aaa emA -jkN -ikT -ikT -ikT -ikT +czH ikT -aLT -aZf -duV +bSJ +bSJ +kPJ duV +clg eUA bfx -bgY -mdo -mJj -byn -mUP -bnt -bJH -aRT -hSV -bES -kcl +cxX +bSJ +cxl +cwM +cwt +cvT +bUN +clg +cuQ +cuv +cud bqc sUk kwi @@ -152691,37 +151624,37 @@ lZM kYl amp uPE -hNw -sZq -tPD -bJD -bOQ -chR +cox +bMA +cnG +xsv +xsv +cms cjg urN -hNw +ckw bNC -ckX -vuL -fDh jGR jGR +fDh +bRZ +jGR oqu -bSJ -gEh -gEh -gEh -gEh -gEh -xhO +bcr +ljv +aUH +aEp tcO +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152741,32 +151674,32 @@ aaa aaa aaa aaa +bdH +bdH +aaa aaa aaa emA -fGi +czH ikT -aLT -aLT -aLT -aLT -aLT -aLT -mhI -bjA +bSJ +bSJ +kPJ +pWb +xSW xSW bAd bCS -aLT -aLT -ksp -bOG -brH +bSJ +cxs +cwN +vfx +mUx chp jRH nks -aQL -aQL +cuv +cud lhs bww tHF @@ -152793,38 +151726,38 @@ cvx cvx xQz uNQ -pmd -bJC -bJC +gyw +cox +cof bMD -bJD +hji vND -chR -tzr +cmt +cja kIP -bJC -bSJ +pUf +cja bTJ pUf hji rPO ixD -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ -gEh -dFL +bid +ljv +ljv +ffx +aEU tcO +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152844,33 +151777,33 @@ aaa aaa aaa aaa +bdH +bdH +aaa aaa aaa emA -jEM -ikT -aLT bBg -vPv -oTA -vPv -rAN -gRS -aNc -aNQ +czl +hyb +bSJ +bSJ +kPJ +kPJ +kPJ aOL iIO -hRd -aLT -aQL +bSJ +cxt +cwO bmh bnX -aRo +bSJ brA -tFP -lQz -aQL -bqc +bSJ +bSJ +bSJ +oxe qIf bqc bbs @@ -152896,38 +151829,38 @@ amD bbs uPE vuV -uPE -bJC -jht -jZv -bJD -cgy -lbX +xui +aVZ +aVZ +aVZ +cni +aVZ +aVZ uxp -bJC -bJC +aVZ +aVZ bSZ -eIG -cll -bUN -sAc -oQB -mAV -hzu -qNd -hzu -hcI -bSJ -xhO -xhO +aVZ +aVZ +ciZ +ljv +ljv +bij +ljv +gEh +ffx +lMO tcO +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -152947,32 +151880,32 @@ aaa aaa aaa aaa +bdH +bdH +aaa aaa aaa emA -jEM -jEM -aLT -nuN -nuN -rfa -ipM -ehx -cBs -vme -bwf +kjY +czH +czl +jkN +bSJ +bSJ +bSJ +bSJ tig nex -aPi -aLT +bSJ +cxl tDZ gip uTv -bKC -bnt -jdm -iaq -aQL +bSJ +clg +clN +bSJ +bSJ bqc qIf bqc @@ -153000,37 +151933,37 @@ bbr uPE vuV uPE -bJC -cjC +aVZ +aVZ jZv -lLC -nEo +cja +aVZ nZy -tzr -lbf -bJC -bTa -bbu +cja +aVZ +ckx +hji +aVZ iWc -bUN -bVb +cja +ljv wty -pWb -hDx +gEh +ayO rYp oEo -uYH -bSJ -xhO -lMO +xHa tcO +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -153052,35 +151985,35 @@ aaa aaa aaa aaa +aaa +aaa +bdH +emA emA -oPF jEM -aLT -vug -iSZ -muy -vug -vug +czl +jEM +bSJ tVq dgE -lJO +bSJ uRo bMn -aLT -aLT +cxJ +cxu hWr gip xlk -uuj +bSJ bRg -dEk -aQL -aQL -ylN +clT +bSJ +nci +bqc qIf bqc bbr -ydM +ccQ ccQ aoF aon @@ -153098,42 +152031,42 @@ vub amV amN ccQ -cdn +ccQ bbr uPE vuV uPE -bJC -bJC +cJs +aVZ kGF -chq -bRf +clU +aVZ onN -cjg -qki -bJC -bSJ -bTM +clU +aVZ +cky +rPE +aVZ bUq rPE -gnu -wty -wWX -wWX -yle +ljv +jay rNd +ffx +aEU rNd -bSJ -xhO -xHa tcO +tcO +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -153155,30 +152088,30 @@ aaa aaa aaa aaa +aaa +aaa +bdH +bdH +emA emA -rIV -nvI -aLT -iPS -vAE iKw -vAE -wMG +czl +bSJ oSy -wBr +bUN efK lWG uIJ -mdo -mJj +cwt +cxv bHp bIU -eyl -tAN -jOi -aVf -bES -kcl +bSJ +bSJ +bSJ +bSJ +bSJ +cue bqc qIf bqc @@ -153203,40 +152136,40 @@ amO amG rbF bbs -uPE +cpd vuV uPE -hNw -oMr +cJs +aVZ lef -xRj -wJD +xsv +aVZ cjE -ozT -pDB -hNw -bNC -ckX +xsv +aVZ +ckz +bTN +aVZ qgN bTN -sdC +ljv ivM -gEo +biE scy vSW -scy -kPJ -bSJ -xhO -eeR tcO +tcO +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -153258,33 +152191,33 @@ aaa aaa aaa aaa +aaa +bdH +bdH +bdH +bdH emA -sEg -kDd -aLT -aLT -aLT -aLT -aLT -aLT +czz +czs +bSJ fbb nTl -bwf -vZt -bEG +bSJ +jRH +wDK mdo -mJj -fIM -fIM -sXw -sXw +cxw +tDZ +cwy +cvU +clE vfx aVf -bES -kcl +bSJ +cuf lhs uvh -lhs +ctu bbs apb bDL @@ -153309,37 +152242,37 @@ bbs kAj uNQ gyw -hNw -oMr +coy +aVZ ltI vfa -wdz +aVZ wdz nCf -nCf -hNw -iIR -uMS +aVZ +ckA +cjT +aVZ qmk rtV -sgR +ljv tvN -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ -qid -lNk +rNd +cZp +jhK tcO +bdH +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -153361,30 +152294,30 @@ aaa aaa aaa aaa +aaa +aaa +bdH +bdH +bdH emA -eTD -ikT -aLT -bBg -vPv oTA vPv -rAN -jNK -aNc -bwf -iIO -cqz -mdo -mJj -sEd -wDK +bSJ +bSJ +bSJ +bSJ +cye +bSJ +cxK +jRH sEd wDK +jRH +bSJ bRV bSe -bES -kcl +bSJ +nci bqc qIf apv @@ -153409,42 +152342,42 @@ bSb bEa bFp bBd -amB +cpe vuV uPE -hNw -sZq +cJs +aVZ lwJ cgA +aVZ +cmu oaW -yiW -oaW -yiW -hNw -iIR -koI +aVZ +ckB +cjU +aVZ bUr pQN -snR +ljv aNT -qNd -hzu +aEU +cZp mAV -hzu -hcI -bSJ -rqz -xhO tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153464,30 +152397,30 @@ aaa aaa aaa aaa +aaa +aaa +bdH +bdH +bdH emA -efP -ikT -aLT -iDf -iDf -vUb -nuN -nuN -tVq -kiV -bwf -nVa -kJi -aLT -aLT -aQL -aQL -aQL -aQL +czl +jEM +kJZ +bSJ +bUN +bUN +clg +bSJ +bSJ +cxx +bSJ +bSJ +cvV +bSJ csZ -odB -aQL -aQL +clg +bSJ +cug bqc sUk kwi @@ -153515,39 +152448,39 @@ bBe kYl amq uPE -bJC -bJC -rbH -cEC -bJC -bJC -bJC -bJC -bJC -bSJ -hTc -bUr -ycd -sAc +coz +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +aVZ +ljv jrR -uYH -oEo -yfm -vio -vio -bSJ -gEh xhO +bdT +yfm tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153565,33 +152498,33 @@ aaa aaa aaa aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA -uzv -ikT -aLT -cjc -iDf bUp -cjc -cjc -cBs +czl +czk +bSJ bsU bwg bCP -jKK -aLT -pqK -uAW +bSJ +bUN +clg +bSJ pqK -isa -qZX +cuU +bSJ vil -bpC -qZX -aQL -pjP +cuT +bSJ +cuh +bqc qIf lfz bbs @@ -153617,40 +152550,40 @@ krA bbs wMI vuV -oHt -bJC -lbf +uPE +coA +ljv cft rQV -ohj +ljv wwr cDs -wwr -lbf -bSJ -gGf +ljv +yfm +jhK +ljv qyi tdf -sSC -wty -vio -fXN -yfm -fXN -fXN -bSJ -xhO -dFL +ljv +ljv +bkM +ffx +aVw tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153667,37 +152600,37 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA -hfO -ikT -aLT -iPS -vAE -iKw +qHe vAE -wMG -tIQ +qHe +oer btc bwh uMl -tKY +bSJ dII -mLF -mLF +cxy +bSJ viS -sXw -sXw -vil -bpC -qDq -kbc +bUN +bSJ +cvt +cuU +bSJ +nci apV ubQ bqc -bbs +lgy bdw bfo rWL @@ -153717,43 +152650,43 @@ wLm lJu bEd bFs -bbs +laU uPE vuV -pOW -fzq -oXb -cft -rQV -wdz -wdz -fDJ -mpJ -mpJ -bZU +uPE +cJs +ljv +rNd +aEU +cmQ +xhO +aNT +ljv +aEU +xhO koI -qFK +rNd pmq -sUj -aNT -vSW -scy +ljv +ljv +ljv +beC gEo -scy -kPJ -bSJ -gEh -pFr tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153770,35 +152703,35 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa +bdH +bdH emA -jkN ikT -aLT -aLT -aLT -aLT -aLT -aLT -sCD -pXl -bxB -uWY -wEd +czt +czl +oer +bSJ +bSJ +bSJ +bSJ jvp oyG +bSJ gBc -gBc -gBc -gBc +cuT +bSJ ngA koC -koC -xGE -jno -fqw +bSJ +nci +apV +ubQ bqc lgy ccb @@ -153822,41 +152755,41 @@ xYP jew laU uPE -dEL -rzy +vuV +uPE uCM -lNw -eFj -iQi -lNw -lNw -lNw -lNw -vej -erh +ljv +xhO +gEh +gEh +gEh +xhO +ljv +tWp +gEh rqE -qWt -fXN +xhO +cjb rEv -rll -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ -gEh -kMR +ljv +aUH +beJ +rNd tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153873,37 +152806,37 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa +bdH +bdH emA -hyb -jEM -jEM -jEM -jEM -hyb +czA wVt -aLT -cjc -cjc -uJU -iDf -cjc -aLT -lDV -fZZ +czm +cyY +jEM +cys +ikT +bSJ +bSJ +bSJ +bSJ hEb -dlu -qDq -jOx -bpC -qDq -aQL -nYR -bww +bSe +bSJ +bSJ +bSJ +bSJ +cui lhs -lgy +bww +ctv +bbs bsG xYP rWL @@ -153923,43 +152856,43 @@ dMB lJu xYP hLI -laU -gyw -uNQ +bbs gyw -bJC +coY +coC +coC gkd -cfo +lYg lkM oXb -oXb +lYg oka -bKM -tEO -bSJ -fXN -fXN -kPJ -fXN +ljv +aEU +aUH +rYp +rYp +cje +bST mvy -bSJ +bmn enY iQj -gEh -xhO -xhO -xhO -jay tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -153976,33 +152909,33 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -emA -emA -emA -emA +bdH +bdH emA -jEM -ikT +czl aqG -aLT -qHe -dKX -meY +ikT qHe dKX -aLT -iMr -wDK +ikT +jEM +ikT +cxL +bSJ +bSJ iMr wuq -ksp -jOx -bpC -ksp -aQL +bSJ +kAv +jkN +bSJ +cuj bqc wqO wxD @@ -154030,39 +152963,39 @@ blq ddL eZR uPE -bJC -qwL -kUo -lkM -oaW -yiW -oaW +coE +ljv +xhO +cnj +cmR +aEU +eaz yiW -kIP -bSJ -vSW -scy -oer -vSW -scy -bSJ +rYp +cjV +xhO +cjq +cjh +aRJ +ljv +rNd mCE gjv -hCq -tcO -tcO -tcO tcO -tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -154079,38 +153012,38 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH emA -oPF +emA +emA +emA +emA +emA +jUh +jEM +jEM ikT +cxz +bSJ +bSJ +bSJ +bSJ jEM -aLT -meY -meY -meY -meY -meY -meY -aQL -aQL -aQL -aQL -aQL -pyl -pDt -aQL -aQL +ikT +cuw +nci bqc ubQ bqc -lgy -ccN +bbs +ctm xYP rWL wLm @@ -154129,43 +153062,43 @@ wLm lJu xYP wbV -laU -uPE +bbs +cpf vuV uPE -bJC -bJC -vLA +cJs +ljv +aEU oHc -bJC -bJC -bJC -bJC -bJC -oer -oer -oer -oer -oer -oer -oer -uVp -gEh -pFr +cmT +cma +cma +ljv +ljv +sUi +gEo +gEo +cji tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcO +tcO +tcO +tcO +tcO +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -154182,33 +153115,33 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA -wtn -ikT -ikT -ikT -ikT -ikT -ikT +emA +emA +cxY ikT jEM -ikT +cwP jEM -aQL -qZX -tDZ -qZX -aSE -bpC -qZX -aQL +ctp +jEM +jEM +ikT +oBr +cuk bqc ubQ bqc @@ -154236,39 +153169,39 @@ laU uPE vuV uPE -bJC -lbf -cfo -wuU -lbf -lbf -lbf -bJC -gEh -cmN -gEh -xhO -dzX -foS +coF +ljv xhO -gEh -gEh +wuU +ljv +ljv +ljv +ljv +rhD gEh gEh tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcO +tcO +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -154285,37 +153218,37 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA pGj uoj +ikT +ikT jEM +gCu jEM -jEM -jEM -fBo -jEM -jEM -jEM -jEM -aQL -dlu -dlu -qDq -aSE -vqY -qDq -bTb +ikT +cuV +oBr +oBr bqc ubQ bqc -bbs +lgy ccd ccN rWL @@ -154335,43 +153268,43 @@ dMB lJu huK jeQ -bbs +laU uPE vuV -uPE -xSw -oXb -cfo -wuU -gkd -oXb -oXb -bJC -gEh -xhO -gEh -xhO +coR +ljv +ljv +cnK +ljv +ljv +cmN gEh -hWH xhO gEh xhO -xhO -rhD +cjF tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -154389,32 +153322,32 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa -aaa -emA -emA -emA -emA -emA -emA -emA -emA +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH emA emA +cxM +cxA +cwQ ikT +ctp jEM -aQL -dlu -qDq -qDq -osA -bcH -cHl -bTb +jEM +jEM +jUh +oBr lhs bww lhs @@ -154442,39 +153375,39 @@ bbs gyw uNQ gyw -xSw -cLc -ejo -niY -gkd -oXb -oXb -bJC +ljv +xhO xhO gEh +xhO +gEh +xhO +xhO +ckC gEh tcO tcO -ucy -tcO -tcO -tcO -tcO -tcO -tcO -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -154488,36 +153421,36 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa emA -qGC -hyb -aQL -ksp -ksp -rou -qDq -dlu -dlu -bTb +emA +emA +emA +jkN +gCu +ikT +ikT +jEM +jEM +oBr bqc ubQ bqc @@ -154545,18 +153478,18 @@ bLu uPE vuV uPE -xSw -gkd -oXb -oXb -kIP -qer -kIP -bJC +ljv +gEh +gEh xhO -wYd -pFr +xhO +sOD +gEh +tcO +tcO tcO +tcO +bdH aaa aaa aaa @@ -154605,27 +153538,27 @@ aaa aaa aaa aaa +bdH +bdH +bdH aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH +emA +emA +emA +emA emA ikT -jEM -aQL -aQL -aQL -aQL -ksp -rou -ksp -aQL +ikT +oBr bqc qas qUO bLY -qUO +reu reu fLf reu @@ -154643,24 +153576,24 @@ kEE kEE ulH kEE -wzJ +kEE bLv wzJ nmH xui -bJC -kIP -qer -kIP -bJC -bJC -bJC -bJC -gEh -gEh -gEh +ljv +xhO +xhO tcO -aaa +tcO +tcO +tcO +tcO +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -154708,21 +153641,21 @@ aaa aaa aaa aaa +bdH +bdH +bdH aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +aad +aag +aag emA -ikT -jEM jEM hYf -jEM -oBr -oBr -oBr -oBr oBr ovQ apF @@ -154732,17 +153665,17 @@ bqc nci mww nci -nci -bqc +csB +csu bqc bqc bqc rVC uPE uPE -uPE -uPE -cJs +cre +cqR +feo cJs vuV cJs @@ -154751,19 +153684,19 @@ bLu uPE amr pqw -bJC -bJC -bJC -bJC -bJC -xhO -xhO -xhO -gEh -xhO -xfq +ljv +coh +qid tcO -aaa +aag +aag +ajZ +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -154811,19 +153744,19 @@ aaa aaa bdH aaa +bdH +bdH +bdH aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +aad +aag +aag emA -kAv -jEM -ikT -ikT -jEM -jEM -gCu ikT ikT oBr @@ -154836,7 +153769,7 @@ knl pum jAj kKY -kKY +rHr oJk lNR lNR @@ -154857,19 +153790,19 @@ ljv ljv xhO xhO -xhO -xhO -xhO -xhO -xhO -xhO -xhO -srl tcO -aaa -aaa -aaa -aaa +aag +aag +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -154914,23 +153847,23 @@ aaa aaa bdH aaa +bdH +bdH +bdH aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +aad +aag +aag emA -jkN -jEM -jEM -jEM -jEM -jEM -gCu jEM jEM tXn -jEM +ikT jEM jEM oBr @@ -154959,20 +153892,20 @@ gEh xhO xhO gEh -gEh -gEh -xhO -xhO -xhO -xhO -gEh -xhO -xhO +cnL tcO -aaa -aaa -aaa -aaa +aag +aag +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -155017,19 +153950,19 @@ aaa aaa bdH aaa +bdH aaa aaa aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +aad +aag +aag emA -jEM -jEM -ecb -ikT -ikT -ikT -ctp ecb jEM jEM @@ -155057,25 +153990,25 @@ nAY cjt ljv ceY -gIm gEh gEh gEh -xhO -wra -xhO gEh -xhO -gEh -gEh -sOD -eMx -cmN +wra +cnN tcO -aaa -aaa -aaa -aaa +aag +aag +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -155120,26 +154053,26 @@ aaa aaa bdH aaa +bdH aaa aaa aaa +bdH +bdH +bdH +bdH aaa -aaa -emA -emA -emA -emA -emA -emA -emA +aad +aag +aag vgw sqg sqg sqg mpP sqg -oBr -qGC +oPF +ikT oBr sKf gdJ @@ -155160,25 +154093,25 @@ nAY cjt ljv gEh -ljv +xhO sqg mpP aep aep aep dKL -tcO -tcO -tcO -tcO -tcO -tcO -tcO -tcO -aaa -aaa -aaa -aaa +aag +aag +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -155240,7 +154173,7 @@ wct hqc sqg rwB -lKM +sqg sqg nSq oBr @@ -155264,7 +154197,7 @@ cjt ljv mPc sqg -qEL +sqg vmE ggQ afk @@ -155275,10 +154208,10 @@ aag ajZ aaa aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -158946,59 +157879,179 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aad -gFP -qjZ -bIH -bIH -bIH -qjZ -bIZ -bIV -bIV -bIV -bIV -bIV -qjZ -qjZ -bIQ -bIK -bIH -qjZ -gFP -ajZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aad +gFP +qjZ +bIH +bIH +bIH +qjZ +bIZ +bIV +bIV +bIV +bIV +bIV +qjZ +qjZ +bIQ +bIK +bIH +qjZ +gFP +ajZ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aab +aaa +aaa +"} +(283,1,2) = {" +aaa +aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aad +gFP +aoH +amZ +amZ +amZ +cLq +amZ +amZ +amZ +amZ +amZ +amZ +amZ +cLq +amZ +amZ +amZ +amR +gFP +ajZ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aab +aaa +aaa +"} +(284,1,2) = {" +aaa +aaa +aak bdH bdH bdH @@ -159007,15 +158060,6 @@ bdH bdH bdH bdH -aaa -aab -aaa -aaa -"} -(283,1,2) = {" -aaa -aaa -aak bdH bdH bdH @@ -159043,35 +158087,27 @@ bdH bdH bdH bdH -bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aad gFP -aoH -amZ -amZ -amZ -cLq -amZ -amZ -amZ -amZ -amZ -amZ -amZ -cLq -amZ -amZ -amZ -amR +vVI +lMb +bIN +bIN +lMb +lMb +lMb +lMb +lMb +lMb +lMb +lMb +lMb +bIN +bIN +lMb +bIA gFP ajZ aaa @@ -159108,14 +158144,14 @@ bdH bdH bdH bdH -bdH -bdH +aaa +aaa aaa aab aaa aaa "} -(284,1,2) = {" +(285,1,2) = {" aaa aaa aak @@ -159158,23 +158194,23 @@ aaa aaa aad gFP -vVI +bJi +lMb +bIN lMb -bVf -bVp -bVk -bVh -bVf -bVp -bVk -bVh -bVf -bVp -bVk -bVh -bVf lMb -bIA +lMb +lMb +lMb +bIN +bIN +lMb +lMb +lMb +lMb +bIP +lMb +bIB gFP ajZ aaa @@ -159218,7 +158254,7 @@ aab aaa aaa "} -(285,1,2) = {" +(286,1,2) = {" aaa aaa aak @@ -159261,28 +158297,28 @@ aaa aaa aad gFP -bJi -bVt +bJj +lMb +lMb +lMb +lMb +lMb lMb lMb bIN bIN bIN lMb -bIN -lMb lMb lMb lMb lMb -bIP -bUW -bIB +bIC gFP ajZ -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -159321,7 +158357,7 @@ aab aaa aaa "} -(286,1,2) = {" +(287,1,2) = {" aaa aaa aak @@ -159364,14 +158400,8 @@ aaa aaa aad gFP -bJj -bVu +bJi lMb -bIN -bIN -bIN -bIN -bIN lMb lMb lMb @@ -159379,8 +158409,14 @@ lMb lMb lMb lMb -bUX -bIC +bIN +bIN +lMb +lMb +lMb +lMb +lMb +amS gFP ajZ bdH @@ -159424,12 +158460,12 @@ aab aaa aaa "} -(287,1,2) = {" +(288,1,2) = {" aaa aaa aak bdH -bdH +aaa bdH bdH bdH @@ -159467,11 +158503,8 @@ aaa aaa aad gFP -bJi -bVz +bJk lMb -bIN -bIN lMb lMb lMb @@ -159482,13 +158515,16 @@ lMb lMb lMb lMb -bUY -amS +lMb +lMb +lMb +lMb +gsi gFP ajZ -bdH -bdH -bdH +aaa +aaa +aaa aaa aaa aaa @@ -159527,12 +158563,12 @@ aab aaa aaa "} -(288,1,2) = {" +(289,1,2) = {" aaa aaa aak bdH -aaa +bdH bdH bdH bdH @@ -159570,8 +158606,7 @@ aaa aaa aad gFP -bJk -bVA +aoO lMb lMb lMb @@ -159585,8 +158620,9 @@ lMb lMb lMb lMb -bUZ -gsi +lMb +lMb +amS gFP ajZ aaa @@ -159597,32 +158633,32 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159630,7 +158666,7 @@ aab aaa aaa "} -(289,1,2) = {" +(290,1,2) = {" aaa aaa aak @@ -159673,14 +158709,15 @@ aaa aaa aad gFP -aoO -bVt +riT lMb +bIN lMb lMb lMb lMb lMb +bIN lMb lMb lMb @@ -159688,8 +158725,7 @@ lMb lMb lMb lMb -bVa -amS +bIC gFP ajZ aaa @@ -159733,7 +158769,7 @@ aab aaa aaa "} -(290,1,2) = {" +(291,1,2) = {" aaa aaa aak @@ -159776,23 +158812,23 @@ aaa aaa aad gFP -riT -bVu -lMb -lMb -lMb +aoO lMb +bIN +bIN lMb lMb lMb +bIN +bIN +bIN lMb lMb lMb lMb lMb lMb -bUX -bIC +bIB gFP ajZ aaa @@ -159836,7 +158872,7 @@ aab aaa aaa "} -(291,1,2) = {" +(292,1,2) = {" aaa aaa aak @@ -159849,6 +158885,8 @@ bdH bdH bdH bdH +aaa +aaa bdH bdH bdH @@ -159861,13 +158899,11 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa bdH bdH bdH @@ -159879,8 +158915,8 @@ aaa aaa aad gFP -aoO -bVB +bJl +lMb lMb lMb lMb @@ -159892,111 +158928,8 @@ lMb lMb lMb lMb -bIN lMb -bVc -bIB -gFP -ajZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(292,1,2) = {" -aaa -aaa -aak -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aad -gFP -bJl lMb -bVg -bVr -bVl -bVi -bVg -bVr -bVl -bVi -bVg -bVr -bVl -bVi -bVg lMb gsi gFP @@ -167084,7 +166017,7 @@ aaa bdH bdH byx -aJh +byx bhr bhr byj @@ -167187,7 +166120,7 @@ bdH bdH byx byx -aJh +byx bhr aJS alU @@ -167289,8 +166222,8 @@ byx byx byx byx -aJh -aJh +byx +byx bhL bhp alU @@ -174404,7 +173337,7 @@ aOl avN bvG aOh -caK +bfU aOk aOX aOX @@ -174505,10 +173438,10 @@ aOA aOt aOm avN -avN -aIA -avN -avN +cBn +aOh +bfU +aOl aOY aOY aOY @@ -174520,10 +173453,10 @@ avN aOY aOY aOY -avN -avN -aIA -avN +aOx +cAj +bah +baC avN aOA aOt @@ -174608,9 +173541,9 @@ aQl aQs aQl avN -biz -aHP -bih +avN +aIA +avN avN avN avN @@ -174624,9 +173557,9 @@ avN avN avN avN -aIb -bcN -aHJ +avN +aIA +avN avN aOn aOu @@ -174711,25 +173644,25 @@ aIA avN aIA avN -aIc -aHQ -bii -aOD -beB -bZF -bmU +biz +aHP +bih +avN +avN +avN +avN avN aPu aPu aPu avN -bXI -bXr -beB -aOD -bdB -aHQ -aHL +avN +avN +avN +avN +aIb +bcN +aHJ avN aIA avN @@ -174819,15 +173752,15 @@ aHQ bii aOD beB -beB -bmU +aHE +aHE aHE aPd aPM aPd aHE -bmV -beB +aHE +aHE beB aOD bdB @@ -174917,25 +173850,25 @@ baB aRH baB aOD -cbk -aJA -bih -avN -bWm -bnn -bmU +aIc +aHQ +bii +aOD +beB +aHE +aHE aHE aHE bmU aHE beB -bmV -bdu -bWm -avN -aIb -aHT -bWm +beB +beB +beB +aOD +bdB +aHQ +aHL aOD baB aRH @@ -175020,25 +173953,25 @@ aIA avN aIA avN -avN -aIA -avN +aIb +aJA +bih avN avN bGT bhD +bnY avN avN avN -avN -avN +cAu bnY bGp avN avN -avN -aIA -avN +aIb +aHT +aHJ avN aIA avN @@ -175124,23 +174057,23 @@ bbh baC avN avN -bns -blH +aIA +avN avN avN baF -bZq -aOl -aOY -aOY -aOY -aOx -bXJ +bmU +aPq +aOk +aOX +aOw +cAv +aOh baF avN avN -blO -blH +avN +aIA avN avN baF @@ -175226,25 +174159,25 @@ baC bah baC avN -cbl -caX +avN +bns blH avN avN baF -bZq +bmU +aPq aOl aOY -aOY -aOY aOx -bXK +bfM +aOh baC avN avN blO bcO -bWs +avN avN bqt bqo @@ -175332,22 +174265,22 @@ avN aVT bns blH -caw +aUO avN baF -bZq +bmU +aPq aOl aOY -aOY -aOY aOx -bXL +bfM +aOh baC avN aUO blO bcO -bcj +aUO avN baF bah @@ -175433,24 +174366,24 @@ bah baC avN biB -bnv +bns blH bcj avN baF -bZs +bmV +aPq aOl aOY -aOY -aOY aOx -bXL +bfM +aOh baC avN -bWV +bcj blO aSj -aSc +bcj avN baF bah @@ -175535,25 +174468,25 @@ baF bah baC avN -bnF +cBo bnv -caL +blH bcj avN baF -bZs +bmV +bfU aOl aOY -aOY -aOY aOx -bXL +bfM +aOh baC avN bec -blP +blO aSj -bck +aSc avN baF bah @@ -175638,25 +174571,25 @@ baF aOh baC avN -bGl +bnF bnv blH -cax +bcj avN bGV -bZs +bmV +bfU aOl aOY -aOY -aOY aOx -bXM +bfM +bah bGr avN bwp -blO -blH -bWt +blP +aSj +bck avN baF aOh @@ -175741,19 +174674,19 @@ baF aOh baC avN -aSc -bGj +cBp +bnv blH -bie +cBh avN btP -bZq +bmU +bfU aOl aOY -aOY -aOY aOx -bXM +bfM +bah baC avN bck @@ -175844,25 +174777,25 @@ bnY bnY bnY avN -avN -bGj +bGl +bnv blH -aVP +cBi avN btP -bZq +bmU +bfU aOl aOY -aOY -aOY aOx -bXM +bfM +bah baF avN -bWW +bck blP blH -avN +bck avN bnY bnY @@ -175945,29 +174878,29 @@ bjj boD bbJ aOh -cbn -avN -avN -aIA -avN +baC avN +aSc +bGj +blH +bie avN baC -bZq +bmU +bfU aOl aOY -aOY -aOY aOx -bXM +bfM +bah baF avN +bcj +blP +blH +cAb avN -avN -aIA -avN -avN -bWa +baF aOh baD bnW @@ -176049,27 +174982,27 @@ boE aYN bxI aYN -bWj -bcP -bcP -bcP -bcP -bWj +avN +cBq +bGj +blH +aVP +avN baC -bZq +bmU +bfU aOl aOY -aOY -aOY aOx -bXN -aQm -bWj -bcP -bcP -bcP -bcP -bWj +cAw +bah +baF +avN +cAn +blP +blH +cAc +avN aYN bxI aYN @@ -176151,29 +175084,29 @@ bjm boE bjf bah -baD -bWj -beB -aPm -beB -beB -bWj -bna -bZq -aOl -aOY -aOY -aOY -aOx -bXM -bmS -bWj -beB -beB -aPm -beB -bWj -bjf +baC +avN +avN +cBl +blH +avN +avN +baC +bmU +bfU +aOm +aPu +aOA +cAw +bah +baF +avN +avN +cAk +blH +avN +avN +baC bah baE aZc @@ -176239,11 +175172,11 @@ bzb bzG bzl aJM -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx aJM aJM aJM @@ -176252,33 +175185,33 @@ aJM aJM aJM aJM -aWK -cbq -aWK -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aWK -aWK -aWK +bnY +bhD +bnY +avN +avN +aIA +avN +avN +avN +cBc +bhD +bnY +avN +avN +avN +bnY +bnY +bGp +avN +avN +avN +aIA +avN +avN +bnY +bnY +bnY aiP aiP aiP @@ -176342,46 +175275,46 @@ bzb bzi bzl aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -aUG -bxK -bxr -aRQ -elR -xXh -xXh -xXh -xXh -xXh -otu -xXh -xXh -xXh -xXh -xXh -otu -xXh -xXh -xXh -xXh -xXh -dMK -aRQ -bxr -bxJ -bxr +aVX +bah +baF +aOD +aIc +bcQ +aHE +aHE +bah +cBe +bah +cAs +aOh +cAK +aOh +cAs +aOh +cAs +bah +aHE +aHE +aHE +aHL +aOD +bbJ +aOh +baF aiP bau bqd @@ -176445,46 +175378,46 @@ bzb bzi bzl aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -bxr -bxK -bxt -aRQ -wWz -bXd -bdE -bWX -bdE -bYf +baF +bah +baC +aOD +aIc +baF +cBk +aYN +cAp +aYN bhF -bXs -bfW -bYK +bcP +cAO +bcP bfW -bYf +bcP bfp -bXs -bdE -bWX +aYN +cAp +aYN bdE -bWw -wTM -aRQ -bxr -bxJ -bxr +bcP +cAd +aOD +baF +aOh +baF aiP bPV bPy @@ -176548,46 +175481,46 @@ bzb bzH bzm aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -bxr -bxK -bxt -aRQ -wWz +baF +bah +baC +avN +avN bit +aOh +bcQ aSK -jQt -caa -bZG -bhF -bZj -bWS -bWS +beB +beB +beB +aOh +beB bWS -bYg -bfp -bXt +beB +beB +beB aSK -jQt -bWF bcQ -wTM -aRQ -bxr -bxJ -bxr +aOh +bcQ +avN +avN +baF +aOh +baF aiP aiP bPA @@ -176651,44 +175584,44 @@ bzb bzI bzn aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -aZp -bbj -aZp +bxR +buo +cBu +aRQ +aRQ +aWK +aWK +aWK +aRQ +aRQ +aRQ +aRQ aRQ -wWz -caY -caP -bWR -bXk -bWy -bZt -vgO -bYT aUp -bYp -vgO -wWz -bXu -bXk -bWR -bWG -bWx -wTM aRQ -aZp +aRQ +aRQ +aRQ +aRQ +aWK +aWK +aWK +aRQ +aRQ +czY bbj aZp aiP @@ -176754,42 +175687,42 @@ bzb bzJ bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -cbt -buo -cbo +bxr +bxK +bxt +aRQ +aRQ +bxr +bxJ +bxr +aRQ +aRQ +bXi aRQ -wWz -caZ -caQ -jQt -vfP -bWy -bZu -bZk bgZ bgs btn -bYh -bXO -bXv -bXl -jQt -bWH -bWy -wTM +aRQ +bXi +aRQ +aRQ +bxr +bxJ +bxt +aRQ aRQ bxR bqp @@ -176857,42 +175790,42 @@ bzb bzJ bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr bxJ bxt aRQ -wWz -bXi -caR -bWY -bWY +aRQ +bxr +bxJ +bxr +aRQ bWz -bZv -bZl +bXi +aRQ bYr bwt -bYr -bYi -bXP +btn +aRQ bXi -bWS -bWY -bWI -bWz -wTM +bXi +aRQ +bxr +bxK +bxt +aRQ aRQ bxr bxJ @@ -176960,42 +175893,42 @@ bzb bzK bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr bxJ bxr aRQ -woh -bWZ -bWK -cay -vgO -vgO -xAe -bZm -bYs +aRQ +bxt +bxJ +bxr +aRQ +brZ +aSU +aRQ +baP bwu -bYs -bYj +aRz +aRQ aSU -vgO -vgO -bWZ -bWK -bWA -xAe +cAt +aRQ +bxr +bxK +bxt +aRQ aRQ bxr bxJ @@ -177063,46 +175996,46 @@ bzb bzK bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr bxJ bxr aRQ -bWu -cba -caS -caz -cam +aRQ +baO +bbn +aIk +aRQ bhP -bZw +aSU bYk -bYt +baP bgt -bYt +aRz bYk -bXQ -aSQ -bXm +aSU +bXi +aRQ brI -bWM -bWB -bWu +bbn +baO +aRQ aRQ aUG -bxJ -bxr +bbj +baG aiP bPZ bPF @@ -177166,42 +176099,42 @@ bzb bzK bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxJ bxr aRQ -bWu -cbb +aRQ +bcU bdP -caA -can -bZH -bZx -rzN +bcU +aRQ +cAX +aSU +bYk bhb -bYM +aRz aWU -rzN -bXR +bYk +aSU bcu -bXn +aRQ brJ bdP bcU -bWu +aRQ aRQ bxr bxJ @@ -177269,42 +176202,42 @@ bzb bzL bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxK bxr aRQ -bWu -cbc -bWN -caB -can +aRQ +bxt +bxK +bxt +aRQ aVN byp -bZn +aRQ aXa aWY -aVq -bYl -bXS +cAC +aRQ +aSU aVl -bXn -bXa -bWN -bWC -bWu +aRQ +bxr +bxK +bxt +aRQ aRQ bxr bbk @@ -177372,42 +176305,42 @@ bzb bzM bzp aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxK bxr aRQ -bWu -cbd -bWO -caD -bWu -bZI -cXC -bWu -aVs -aVs +aRQ +bxt +bxK +bxt +aRQ +cAX +cAX +aRQ aVs -bWu -bXT +aWY +cAD +aRQ +aSU brZ -bWu -bXb -bWO -bWD -bWu +aRQ +bxr +bxK +bxt +aRQ aRQ bxr bxJ @@ -177475,42 +176408,42 @@ bzb bzj bzl aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxK bxt aRQ -bWu -bWu -bWu -bWu -bWu -bZK -aTt -bWu -bYx -bYx -bYx -bWu +aRQ +bxt +bxK +bxt +aRQ +aRQ +cAX +aRQ +aVs +aWY +cAD +aRQ bdW -bXx -bWu -bWu -bWu -bWu -bWu +aRQ +aRQ +bxr +bxJ +bxr +aRQ aRQ bxr bxJ @@ -177578,43 +176511,43 @@ bzb bzN bzq aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -bxS +bbK biX -cbp +bxS +aRQ +aRQ +aRQ +cAl +aRQ aRQ aRQ aRQ aRQ aRQ -bWu -bZL -bZy -bWu -bYU bYN -bYy -bWu -bXU -bXA -bWu aRQ aRQ aRQ aRQ aRQ +aRQ +cAl +aRQ +aRQ +aRQ bbK bbj baG @@ -177681,43 +176614,43 @@ bzb bzj bzr aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxK bxt -bqw +aRQ aRQ aIp bbL +aHV aRQ -bWu bZM -bZz -aVi +cAY +aRQ bvC bvB bYA bfN bXV bXA -bWu aRQ +aIp bbL aHV aRQ -bWk +aRQ bxt bxJ bxr @@ -177784,42 +176717,42 @@ bzb bzj bzr aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -cbu -bbl -baG +bxt +bxK +cBv bqw -bWv +aRz aIr bik -aRQ -bWu -bZN -bZA +aHW +bqw +aZp +bxS bhA -bYV +bYB bgu bYB -bdW -bXW -bXB -bWu -aRQ +cAx +aZp +aZp +bqw +aIr aIj aHW -bWv +aRz bqw bxS bbl @@ -177887,43 +176820,43 @@ bzb bzO bzs aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr bxK bxt -cbm +aRQ aRQ aIp aIk +aHV aRQ -bWu bZP -cXC -bWu -bYX +cAZ +aRQ +bfX bYO bYC -bWu +cAz bXX bXC -bWu aRQ +aIp aIk aHV aRQ -bqw +aRQ bxt bxJ bxr @@ -177990,18 +176923,18 @@ bzb aUd aUd aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bjh biZ @@ -178009,24 +176942,24 @@ aTS aRQ aRQ aRQ +cAl aRQ aRQ -bWu -bZQ -cXC -bYm -bgv +aRQ +aRQ +aRQ +cAP bgv bga -bYm -avH -bXD -bWu aRQ aRQ aRQ aRQ aRQ +cAl +aRQ +aRQ +aRQ bxS bbj baG @@ -178093,42 +177026,42 @@ bzU bzP bzt aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr -bGN +bxJ bxr aRQ -elR -xXh -caU +aRQ +cAo +bxt bvE -dMK +aRQ bZS -cXC -bYm -bYZ +cBa +cAU +bxt bYP -bYD -bYm -bXY +bxt aWO -elR -xXh -xXh -xXh -dMK +aWO +aWO +aRQ +cAo +bxt +cAe +aRQ aRQ bxR bqp @@ -178196,42 +177129,42 @@ bzV bzQ bzu aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxr bxJ bxr aRQ -wWz -cbe -caV -caE -wTM -bZT -bZB -bYm +aRQ +bvq +bxt +bhK +aRR +aWP +aWP +aWP bZb bYQ bYE -bYm -bXZ +aWP +aWP aWP aRR -bXd -bWP +bcY +bxt bvq -wTM +aRQ aRQ bxr bxJ @@ -178299,42 +177232,42 @@ aJM aJM aJM aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt -bGN -bGM +bxJ +bxr +aRQ aRQ -wWz caY -bWR +bxt caF -cao +aRQ bZV -bZC -bYm +bYb +bYb bZd -bYQ -bYG +cAL +bYb bYm bYb beK -bXo -bXg -bWR -bWx -wTM +aRQ +bcY +bxt +bvq +aRQ aRQ bxr bxJ @@ -178394,50 +177327,50 @@ bzb bzi bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM bxt bxJ -bGM +bxr +aRQ +aRQ +bcY +bxr +caF aRQ -wWz -cbf -bXk -caG -wTM bZW bZD -bYm +cAV bhc -bYQ -bYE -bYm -bYc -aUS -bXp -bXi -bWS +bYO +cAG +cAA +aWO +aWO +aRQ bcY -wTM +bxt +bcY +aRQ aRQ bxr bxJ @@ -178497,54 +177430,54 @@ bzb bzi bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx cbx aJM -bxt -bGN -bxr +aJM +cBx +bjb +aIk aRQ -wWz -cbh -bXk +aRQ +bbK +aZp caG -cap -avH -cXC -bYm -bZg +aRQ +aRQ +aRQ +aRQ +aRQ bYR -bYI -bYm -avH -bXA -woh -vgO -vgO -vgO -xAe aRQ -bxt -bGN -bxr +aRQ +aRQ +aRQ +aRQ +bbK +bxS +cAf +aRQ +aRQ +czZ +bbn +baO bnW aYm aYm @@ -178563,9 +177496,9 @@ aHs aKf aKf aHs -aKB -aKB -aKB +bFS +bFS +bFS aHs aKj aKb @@ -178600,54 +177533,54 @@ bzb bAf bAf aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx cbx aJM -bxt -bxJ -bxr -aRQ -wWz -cbi -bgc -caH +bvK +baP +bwz +baP +aWA +cBr +aZH +cAH +aRl cas -avH +aRl bhH -bYm -bYm -bYm -bYm -bYm -aWR -bXE -bWu -bWu -bWu -bWu -bWu -aRQ -bxt +aWA +cAm bxJ -bGM +cAH +aWA +aWR +aZH +cAq +aRl +cAm +aRl +aHW +aWA +aRz +baP +bql bOo bOo bPT @@ -178666,9 +177599,9 @@ aHs aHs aHs aHs -aKB -aKB -aKB +bFS +bFS +bFS aHs bwK aKc @@ -178703,54 +177636,54 @@ bzb bzj bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -aJM +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -cbv -bxK -bxt -aRQ -wWz -cbj -caW -caI -wTM -bZX +bvK +bvJ +bwA +baP +aWA +cBr +bcY +bcY +bcY +cBf bhK -bZp -aWU +bhK +aWA +bxS bgx -bYJ -bYo -bYd -bXF -bXq -bXj -bWU -bWE +bxS +aWA +aZG +aZG +beD +aZp +aZp +aZp bWu -aRQ -bxt -bGN -bGM +aWA +aRz +baP +bql bOo rdZ rdZ @@ -178766,12 +177699,12 @@ aHs bwK aHs aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aXN aYe @@ -178806,54 +177739,54 @@ bzb bAn byF aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -bvK -baO -bjb -aIk -aRQ -woh -vgO -vgO -vgO -xAe -bZY -bZE -bWu -bZh -bYS +aJM +bvJ +bvJ +baP +aWA +cBt +bek +bek +bek +cBg +cAg +cAg +cAB bgd -bWu -bYe -bXG -bWu +bxK +bgd +cAB bek -aUR -bWu -bWu -aRQ -bxt -bGN -bGM +bek +cAr +bek +cAg +cAg +aHW +aWA +aRz +baP +bql bOo rdZ rdZ @@ -178869,12 +177802,12 @@ aYV aYe aYv aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aNR aXu @@ -178909,54 +177842,54 @@ aJM bzt bAg aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx aJM -bvK -baP -bwz -aRz aRQ aRQ -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu -bWu aRQ aRQ -aWK -aWK -aWK +aRQ +cAh +cAh +cAh +cAh +cAh +cAh +cAW +cAQ +cAM +cAI +cAC +cAh +cAh +cAh +cAh +cAh +cAh +aRQ +aRQ +bbL +czX +baQ bOo rdZ rdZ @@ -178972,12 +177905,12 @@ buV aXu aNJ aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aKm aKd @@ -179012,54 +177945,54 @@ bzU bAj bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -aJM -aJM -cbw -bwA -baP +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +bGd +bGd +bGd bGd aRQ +cAi +cAi +cAi +cAi +cAi +cAi +aVs +cAS +cAN +cAJ +cAD +cAi +cAi +cAi +cAi +cAi +cAi aRQ aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -aRQ -bWl -bWb -bbn -baO +bxr +bxK +bxr bOo rdZ rdZ @@ -179075,12 +178008,12 @@ bxc aXu aQv aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aKp aJx @@ -179115,54 +178048,54 @@ bzU bzZ bAj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -aJM -bvJ -cbr -bGO -aRz -aWA -aZG -aZG -caJ -cat -bZZ -aZp -baG -aVz -aZA -aZp -aZp -aZG -aZG -beD -aUT -aZp -aZp -aWA -baP -bWc -bGO -bql +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +bGd +bGd +bGd +bGd +aRQ +cAi +cAi +cAi +cAi +cAi +cAi +aVs +cAS +cAN +cAJ +cAD +cAi +cAi +cAi +cAi +cAi +cAi +aRQ +aRQ +bxr +bxJ +bxr bOo bOp bOp @@ -179178,12 +178111,12 @@ aYW aNN aYw aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aJE aJY @@ -179218,54 +178151,54 @@ aJM bzO bzO aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -aJM +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +bGd +bGd +bGd +bGd aRQ -cbs -aRz -aRz -aWA -aRl -aRl -aRl -cav -aRl -aZH -aZH -bfX +cAi +cAi +cAi +cAi +cAi +cAi +aVs +cAT +cAN +cAJ +cAD +cAi +cAi +cAi +cAi +cAi +cAi +aRQ +aRQ +bxr bxJ -bfX -aZH -aRl -aRl -bxK -aRl -aZH -aZH -aWA -aRz -bWi -bGP -baQ +bxr aHs bFS bFS @@ -179281,12 +178214,12 @@ aHs bwK aHs aHs -aKB -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS +bFS aHs aNK aKe @@ -179321,31 +178254,31 @@ aJM bAo bAk aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -asm -asm -asm -asm +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +bFZ +bFZ +bFZ +bFZ asm asm asm @@ -179387,9 +178320,9 @@ aHs aHs aHs aHs -aKB -aKB -aKB +bFS +bFS +bFS aHs aNL aKf @@ -179424,23 +178357,23 @@ aJM aJM aJM aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz byz @@ -179457,7 +178390,7 @@ lmz lmz lmz asm -bZi +bcX bak bon asm @@ -179491,8 +178424,8 @@ aRw aXt aHs aHs -aKB -aKB +bFS +bFS aHs aHs aHs @@ -179524,26 +178457,26 @@ bzb bzK bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz daz @@ -179563,7 +178496,7 @@ asm bcX bak boo -asm +cAE bsC bsl bvo @@ -179594,11 +178527,11 @@ aXL aRw aXt aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJB aIi @@ -179627,17 +178560,17 @@ bzb bzK bzj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz byz @@ -179697,11 +178630,11 @@ aYc aXL aRw aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJC aIi @@ -179730,17 +178663,17 @@ bzb bzK bzi aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz byz @@ -179800,11 +178733,11 @@ aXu aXM aXu aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJE aIn @@ -179833,17 +178766,17 @@ bzb bAC bAr aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz byz @@ -179887,14 +178820,14 @@ aXv aHs bQg aRe -aHs +bFS bkV bkQ bOr -aHs +bFS aZq -aHs -aHs +bFS +bFS bFS bFS aHs @@ -179903,11 +178836,11 @@ aWl aWl aWl aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJH aIs @@ -179936,17 +178869,17 @@ bzb bzi bjj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz daz @@ -179990,14 +178923,14 @@ aXv aHs bqe aRe -aHs +bFS bpW aXu bkL -aHs +bFS aZq aRc -aHs +bFS bFS bFS bFS @@ -180006,11 +178939,11 @@ bwK bwK bwK aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJK aIu @@ -180039,17 +178972,17 @@ bzb bzi bjj aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz daz @@ -180093,14 +179026,14 @@ aXv aHs bqe aRe -aHs +bFS bkX aXu bkL -aHs +bFS aZq aRc -aHs +bFS bFS bFS bFS @@ -180109,11 +179042,11 @@ aYe aOI aQa aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJH aIs @@ -180142,17 +179075,17 @@ bzb bAD bAt aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz jYH @@ -180202,8 +179135,8 @@ aXv bkL aNG aWG -aHs -aHs +bFS +bFS bFS bFS bFS @@ -180212,11 +179145,11 @@ aXu aXO aXv aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJH aIv @@ -180245,17 +179178,17 @@ bzb bzi bzl aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz cwS @@ -180299,14 +179232,14 @@ aXu aHs bqf aZq -aHs +bFS bkY aXv bkL -aHs +bFS aRe aZi -aHs +bFS bFS bFS bFS @@ -180315,11 +179248,11 @@ aXv aXO aXv aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJH aNJ @@ -180348,17 +179281,17 @@ bzb bzO bAu aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz oRV @@ -180402,14 +179335,14 @@ aXu aHs oHO aZq -aHs +bFS bpY aXv bkL -aHs +bFS aRe aZi -aHs +bFS bFS bFS bFS @@ -180418,11 +179351,11 @@ aXv aXO aXv aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJL aNJ @@ -180443,25 +179376,25 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx aJM bAk buq buq bAv aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz daz daz @@ -180503,16 +179436,16 @@ aXu bbw aXu aHs -aHs +bFS aZq -aHs +bFS bkZ bkR bkO -aHs +bFS aRe -aHs -aHs +bFS +bFS bFS bFS bFS @@ -180521,19 +179454,19 @@ aXw aXP aXw aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJN aIO aHG axX aHs -aKB -aKB +bFS +bFS bwH aaa aab @@ -180546,25 +179479,25 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx aJM bAo buq bAv bAv aJM -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx +cbx byz byz daz @@ -180606,37 +179539,37 @@ bbM bbx aXw aHs -aHs -aHs -aHs -aHs +bFS +bFS +bFS +bFS aQY -aHs -aHs -aHs -aHs -aHs -aHs -aHs -aHs +bFS +bFS +bFS +bFS +bFS +bFS +bFS +bFS aHs aXv aXQ aXv aHs -aKB -aKB -aKB -aKB -aKB +bFS +bFS +bFS +bFS +bFS aHs aJN aXu aNJ azy aHs -aKB -aKB +bFS +bFS bwH aaa aab @@ -180649,8 +179582,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr wDr aJe @@ -180663,11 +179596,11 @@ wDr wDr wDr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz byz daz @@ -180738,8 +179671,8 @@ wDr aJe wDr wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -180752,8 +179685,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr oOw jcu @@ -180766,11 +179699,11 @@ aKt aKr aKr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz daz daz @@ -180841,8 +179774,8 @@ aIR aGz jsa wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -180855,8 +179788,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr aGb jcu @@ -180869,11 +179802,11 @@ aKr aKr aKr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz daz ahJ @@ -180944,8 +179877,8 @@ rUi aGz ahO wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -180958,8 +179891,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr bAF jcu @@ -180972,11 +179905,11 @@ aKr aKr aKr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz daz ahS @@ -181018,19 +179951,19 @@ aYY bbt bvi aHs -aHs -aHs -aHs -aHs +bFS +bFS +bFS +bFS aQY -aHs -aHs -aHs -aHs -aHs -aHs -aHs -aHs +bFS +bFS +bFS +bFS +bFS +bFS +bFS +bFS aHs aXv aXQ @@ -181047,8 +179980,8 @@ rUi aGz aGz wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181061,8 +179994,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr bAG aeL @@ -181075,11 +180008,11 @@ wDr wDr wDr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz izf aid @@ -181087,9 +180020,9 @@ qQS qQS afM ebN -akl -akj -aZV +tId +fVx +qQS ebN naj itg @@ -181121,16 +180054,16 @@ aXu bbq bvj aHs -aHs +bFS blc -aHs +bFS bOV bkQ aUD -aHs +bFS aZq -aHs -aHs +bFS +bFS bFS bFS bFS @@ -181150,8 +180083,8 @@ kEA kEA aHm wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181164,8 +180097,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr bAF bAF @@ -181178,11 +180111,11 @@ aKw aEr wDr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz vVk aih @@ -181190,8 +180123,8 @@ fVx fVx afN ebN -akl -akk +tId +qQS mIJ wiu xDC @@ -181199,9 +180132,9 @@ yaQ clw daz daz -mOi -mOi -mOi +cBm +cBm +cBm bFZ bFZ bFZ @@ -181226,14 +180159,14 @@ bQj aHs bqf aZq -aHs +bFS bkW aXu bkL -aHs +bFS aZq aZl -aHs +bFS bFS bFS bFS @@ -181253,8 +180186,8 @@ rUi atG aGz wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181267,8 +180200,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr bAH bAF @@ -181281,11 +180214,11 @@ aKw aEr wDr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz fhR nKO @@ -181302,9 +180235,9 @@ qQS qQS daz daz -mOi -mOi -mOi +cBm +cBm +cBm bFZ bFZ bFZ @@ -181336,7 +180269,7 @@ bkL aNG aZq aUy -aHs +bFS bFS bFS bFS @@ -181356,8 +180289,8 @@ rUi atG ahO wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181370,8 +180303,8 @@ aaa aab bdH bzb -bGh -bGh +cbx +cbx wDr bAF bAF @@ -181384,11 +180317,11 @@ aKx aEr wDr wDr -bGh -bGh -bGh -bGh -bGh +cbx +cbx +cbx +cbx +cbx byz npq aij @@ -181396,18 +180329,18 @@ ahy ahc afP daz -aZY -aZX -aZW daz daz daz daz daz daz -mOi -mOi -mOi +daz +daz +daz +cBm +cBm +cBm bFZ bFZ bFZ @@ -181439,7 +180372,7 @@ bkP aNG aZq aZi -aHs +bFS bFS bFS bFS @@ -181459,8 +180392,8 @@ rUi atG atG wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181535,14 +180468,14 @@ bEI bAT bQh bEB -bAT +bFU bOW bOF bOt -bAT +bFU bEC aLy -bAT +bFU bFU bFU bFU @@ -181562,8 +180495,8 @@ wDr aJe wDr wDr -aKB -aKB +bFS +bFS bwH aaa aab @@ -181636,16 +180569,16 @@ bBa bbv bEI bAT -bAT +bFU bPU -bAT +bFU bOX bOH bOu -bAT +bFU bEC -bAT -bAT +bFU +bFU bFU bFU bFU @@ -181665,8 +180598,8 @@ bEo aJs buQ bAT -aKB -aKB +bFS +bFS bwH aaa aab @@ -181739,16 +180672,16 @@ bBa bbv bEI bAT -bAT -bAT -bAT -bAT -bAT -bAT -bAT -bAT -bAT -bAT +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bFU bFU bFU @@ -181768,8 +180701,8 @@ bpm bBa buR bAT -aKB -aKB +bFS +bFS bwH aaa aab @@ -181842,19 +180775,19 @@ bqv bqr bqm bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -181945,19 +180878,19 @@ bBa bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT aXF aXF @@ -182048,19 +180981,19 @@ bBa bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT aYj aXW @@ -182151,19 +181084,19 @@ bBa bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXS @@ -182254,19 +181187,19 @@ bFw bFq bEK bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEI aXS @@ -182357,19 +181290,19 @@ bEI bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bpE bpD @@ -182460,19 +181393,19 @@ bEI bbv bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXS @@ -182563,19 +181496,19 @@ bEI bbv bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -182666,19 +181599,19 @@ bFe bFu bEJ bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -182769,19 +181702,19 @@ aJs bbv bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEJ aXX @@ -182872,19 +181805,19 @@ bEI bFo bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -182975,19 +181908,19 @@ bEI bFo bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -183078,19 +182011,19 @@ bFw bFq bEJ bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -183181,19 +182114,19 @@ bEI bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEK bwO @@ -183284,19 +182217,19 @@ bEI bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEI aXS @@ -183387,19 +182320,19 @@ bEI bbv bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXS @@ -183490,19 +182423,19 @@ bFe bFu bEK bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -183593,19 +182526,19 @@ bBa bbv bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT aYh aXX @@ -183696,19 +182629,19 @@ bBa bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -183799,19 +182732,19 @@ bBa bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -183902,19 +182835,19 @@ bbO bFq bEK bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -184005,19 +182938,19 @@ bob bFo bEI bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEJ aXX @@ -184108,19 +183041,19 @@ boc bFo bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bBa aXR @@ -184211,19 +183144,19 @@ bod boa bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEI aXR @@ -184314,19 +183247,19 @@ boe bFq bEJ bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEI aXS @@ -184417,19 +183350,19 @@ bEI bFo bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEY aXY @@ -184520,19 +183453,19 @@ aWI bbv bBa bAT -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU +bFU bAT bEM bEM @@ -185138,12 +184071,12 @@ bxU bEU bxy bAT -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU bAT bAT bFf @@ -185241,12 +184174,12 @@ bxV bEI asL bAT -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU bAT aTG bFh @@ -185344,12 +184277,12 @@ bED bEI asL bAT -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU bAT aTH aRW @@ -185447,12 +184380,12 @@ bED bEI aZj bAT -aUE -aUE -aUE -aUE -aUE -aUE +bFU +bFU +bFU +bFU +bFU +bFU bAT bEZ bEI @@ -185550,9 +184483,9 @@ bxX bEY bxD bAT -aUE -aUE -aUE +bFU +bFU +bFU bAT bAT bAT @@ -187797,7 +186730,7 @@ bxP aHH aSC aSC -ake +aHH aSC aTC aSM @@ -187805,7 +186738,7 @@ bfF bgq aIa aSC -ake +aHH aSC aSC aHH @@ -187900,7 +186833,7 @@ bbm aHH aSC aSC -ake +aHH aSC aTC aSM @@ -187908,7 +186841,7 @@ bfF bgq aIa aSC -ake +aHH aSC aSC aHH @@ -188003,7 +186936,7 @@ bbm aHH aSC aSC -ake +aHH aSC aTC aSM @@ -188011,7 +186944,7 @@ aSN bgq aIa aSC -ake +aHH aSC aSC aHH @@ -188104,19 +187037,19 @@ bxH bgI bbm aHH -ake -ake -ake -ake +aHH +aHH +aHH +aHH aTC aSM aSN bgq aIa -ake -ake -ake -ake +aHH +aHH +aHH +aHH aHH bxw bxz @@ -200264,7 +199197,7 @@ aAs aAs aDz iwW -aLE +sTm gwR sTm tdT @@ -200755,7 +199688,7 @@ aaa aaa aaa aad -ciS +aag aag aag aag @@ -200763,13 +199696,13 @@ aag cZe cCL vDz -wVW -wVW -wVW -wVW -wVW -wVW -wVW +cFr +cFr +cFr +cFr +cFr +cFr +cFr kWq qnh aVG @@ -200866,7 +199799,7 @@ cZe cZe iPq cmr -wVW +cFr aGL aGJ aGy @@ -200969,7 +199902,7 @@ gSy ltw iPq cGA -wVW +cFr rlf soq eYQ @@ -201072,11 +200005,11 @@ sit snx oVY cmr -wVW +cFr rBa -avY +cFB vEj -avY +cFx rJD hyQ fEk @@ -201175,7 +200108,7 @@ nRE cmr cmr sWw -wVW +cFr rIW oGx wvU @@ -201293,11 +200226,11 @@ fHh wVW lZs lVX -sni -ayz +aqN +aAC dAX -aQg -vpV +aAC +aqN snI aGp wVW @@ -201396,11 +200329,11 @@ alX auQ awm avS -nwD -asR +avY +avY pbs -pbV -aPB +avY +avY aJG aGq auQ @@ -201497,15 +200430,15 @@ wVW arG alX lQG -oPE -alZ -auT +asc +awk +alX aBR awD bZJ -aRt -axp -aPI +alX +asc +awk lQG aIf aEB @@ -202631,13 +201564,13 @@ ssW qEk hrm wVW -aYH +rOC aqN tCT tCT tCT aDv -aqN +aEC wVW dNZ qEk @@ -203443,7 +202376,7 @@ uzy abB add add -bny +add adq nwL cUo @@ -203649,7 +202582,7 @@ oMQ evX afr akc -ciL +buc adq jMm nwL @@ -203664,7 +202597,7 @@ kcp aCY aCY qmK -lSN +oIp pTS awF hRk @@ -203767,7 +202700,7 @@ aDM ana aDc hOd -lSN +oIp qUK awF gyh @@ -203855,7 +202788,7 @@ add ajI add add -ciM +add adq iFn nwL @@ -204086,7 +203019,7 @@ fGa azT aRC aUw -cbR +aTE ayC aET axi @@ -204178,7 +203111,7 @@ aCY aCY aCY aDf -cfx +hOd oIp wCn aET @@ -204267,7 +203200,7 @@ add ajI add add -ciO +add adq cUo aTm @@ -204384,7 +203317,7 @@ aqz aKH dcR aDf -hOd +cDA oIp ayg fyT @@ -204479,7 +203412,7 @@ aFC eGH aFF aDf -cik +aqz pLW dcR wex @@ -204487,7 +203420,7 @@ bAM aDN aDF aDf -hOd +cDB oIp qUK aET @@ -204575,14 +203508,14 @@ awW awW abB add -add -ciP +cFD +adq adq aFH aFH aFH aau -aau +cFb aEP aDF aDf @@ -204606,9 +203539,9 @@ ayE ayd axq lIj +pgD nUv aJU -aJU pIV baw baw @@ -204678,14 +203611,14 @@ awW awW acW qdQ -eFT hhA adq +adq aFH dBs dBs -dBs aau +amb tld uOJ aDf @@ -204709,8 +203642,8 @@ wjQ dbX uag lIj -awJ -wHp +pgD +cBF avj gVF kuk @@ -204781,13 +203714,13 @@ oGC awW acW add -add bny adq adq +adq vwV vwV -vwV +aDf aDf aER aDf @@ -204812,9 +203745,9 @@ lIj ayf lIj lIj +pgD nUv aJU -aJU sgU baw baw @@ -204885,18 +203818,18 @@ awW acW awW awW -aSJ +awW +cFz hiy -ciH -geu -geu -geu -cbS -geu -gJC +cFu +iKy +iKy oyB +cER iKy iKy +gJC +iKy udv iKy iKy @@ -204910,12 +203843,12 @@ iKy iKy iKy iKy -cbS oyB -iKy -cbD +cBN +kmT pEY aXe +baw fGg baw sgU @@ -204988,14 +203921,14 @@ oGC xjD ajf ajf +ajf oAO pIZ nsr fSx tTZ tTZ -dNj -dNj +tTZ dNj tTZ tTZ @@ -205008,11 +203941,10 @@ plK tuX tuX plK -ayG +plK plK tuX -tuX -tuX +plK plK plK ayG @@ -205021,6 +203953,7 @@ tFW aZC aZz aZz +aZz nsc baw cxk @@ -205077,7 +204010,7 @@ mis mis mis qqn -awW +cFE akt awW gLl @@ -205089,41 +204022,41 @@ gLl oGC sHp oGC -ciR +awW +awW awW aSJ -hiy +cFy gvu -oIp -qQu +xCB nyK llo epT llo llo +pub llo llo -cfQ llo llo -cfg +aVK llo pub llo -cdQ -cdr -ccT -epT llo llo +llo +llo +epT +llo aWM -qQu -ayJ +ayH tJm -pEY +cBI aXe baw baw +baw mnA baw baw @@ -205135,7 +204068,7 @@ ojX vIo baw sMM -baw +cBy btV ojX ojX @@ -205179,8 +204112,8 @@ mis mis mis mis -ciT -awW +eOM +avd akt aHA qHq @@ -205196,9 +204129,10 @@ gLl gLl gLl gLl +gLl gvu -nbH -nyK +xCB +tJm rnN aoe aoe @@ -205212,17 +204146,16 @@ aoe aoe aoe aoe -ccr -ajl -cds -ccU -ajl -ccr -ajl +aoe +aoe +aoe +aoe +aoe rnN -aWM -ayJ -tJm +gvu +ayH +kaj +vIo vIo vIo vIo @@ -205239,7 +204172,7 @@ eOM atX sMM dVR -cby +eOM ojX ojX ojX @@ -205298,36 +204231,36 @@ qgn eIf mfL hto +cFA gLl -ciI +cFv xCB tJm aoe aoe -chZ aor -chh -cgP -hQU -cfR +isN +fYb +isN +isN isN isN hQU +cDi +isN +isN isN -aoe -cej -cdR fYb -ccV -ccB -ccs -ajl -ajl +isN +isN +aoe +aoe hwB ayH tJm vIo giD +giD wrI lST wrI @@ -205386,7 +204319,7 @@ mis mis mis qqn -afr +cFF akc apg gLl @@ -205401,35 +204334,35 @@ cZq xBW cZq utp +gtI kYF -cbN -xCB -kaj +cBU +nbH +cFj aoe -cim aoh -uGk -chi -cgQ -cgB -aEN -ajN -aEN +cEJ ajN -aEN -cey -ans -aGX -cdt +arb aEi -ccC +arb +aEi +arb +cDp +arb +aEi +arb +aEi +arb +aEi +arb coa -cca -gWG -gvu -ayH -tJm +aoe +lXR +ayJ +ayg lST +wrI awK pep vIo @@ -205444,7 +204377,7 @@ ojX vIo wvj csI -goL +cBz btV ojX ojX @@ -205489,7 +204422,7 @@ qqn qqn qqn qqn -awW +avd akt qWI gLl @@ -205505,33 +204438,33 @@ gLl gLl gLl gLl -ciJ -xCB +gLl +lXR lYS +cFk +cFc dfa -dfa -dfa -dfa -aoe +ceQ +cDM ajG hVz ceQ -ajn +cDM ajp ajn -ceQ +arb ajg -ccX -akA -cdu +aEN +cCD +arb jBy -ccE +arb aHa -ccc -ajl -lXR -ayH -cbE +aoe +gvu +ayJ +tJm +vIo vIo vIo vIo @@ -205592,7 +204525,7 @@ aag aag abs adq -awW +cFG akt awW gLl @@ -205609,32 +204542,32 @@ bmZ bmZ bmZ apk -nbH -aiK +gre +xCB akg -cin -cia -chH -chj -aEN -ajt -ajq -ajr -ajq -aoe -aoe -aoe ajl ajl -cdv +ajl +ajl +ajl +cEd +cEd +ajr +ajq +cDq +cDj +cCW +cCR +cCF +aGW fvd hFF -aRK -cce +aoe +aoe aUB -cbN -ayJ -tJm +ayH +kPa +kmT bmT bmT bmT @@ -205650,7 +204583,7 @@ qTA vIo baw sMM -baw +cBA pgD tQV aag @@ -205712,32 +204645,32 @@ qnA qnA bmZ gvu +qQu nbH aiK -wAE akd aop -chI +ajl aRF ajJ ajw -cfy -aoe -aoe -aoe +ajl +cDO +cDD +cDr lFn aLS -cek -ajl -ajl -ajl +aGW +cCG +cCt +uRt aQz -aRK -ccf -cbT -cbN +cCf +gWG +gvu ayJ -cbG +qQu +tJm bmT alf alf @@ -205815,31 +204748,31 @@ qnA qnA bmZ gvu +qQu nbH -ciz -dfa -dfa -dfa -dfa -aoe -cgR +aiK +cFd +aRK +ajl +cED +wub ajt -cfS +ajl +aoe +aoe +aoe aoe aoe -cfh -ceR -cez -cem +aGW anq -ajl -ajl +cCt +uRt onQ -cct -ccc -ajl -cbO +aRK +gWG +gvu ayJ +qQu tJm bmT alf @@ -205918,31 +204851,31 @@ qnA qnA bmZ sHC +qQu lSN -tJm -aoe -cio -cid -chJ -aoe +cFl +ajl +ajl +ajl +cEE wUd ajy -cfU -aoe -anp +ajl +ajl +cDE cek yjb -ceA -cen -axm -tsC ajl +sqf +cCH +cCt +uRt fOL aRS -cch -gWG -gvu +ajl +cBT ayH +qQu tJm bmT alf @@ -206020,33 +204953,33 @@ qnA qnA qnA bmZ -lXR -xCB +gvu +qQu +nbH tJm -aoe -cip -aEN +ajl +cES hbI uGk -arb -cgC -cfy -aoe +cEt +ajl +ajl +cDQ xNu mfC -ceS +aCo aEO -akw -cdS -cdw +sqf +sqf +sqf upM -tEi +akw vtx -vIf -ajl -gvu -ayH -kaj +cBZ +cBU +ayJ +qQu +tJm bmT alf alf @@ -206124,31 +205057,31 @@ qnA qnA bmZ gvu +qQu nbH tJm -aoe -ciq -aEN -chK +ajl +ajl +ajl fnA -cgS -cgD -cfS -aoe +ajl +ajl +xNu +aCo rHz -wJo +cDt mMg kbn aCo -cdW -iGA ajl -ccF +iGA +aos +akw txW -cci -gWG -gvu +ajl +cBW ayJ +qQu tJm bmT alf @@ -206226,33 +205159,33 @@ qnA qnA qnA bmZ -akp -nbH +gvu +qQu +xCB tJm -aoe -cis +ajl sOZ oNJ -aoe +axm eDo -cgF +ajl cfy -aoe -aoe +cDR +cDF gXl hSo xdS awj -cdY -ajl ajl -ccH +cCu +akw +akw alD -ccj gWG gvu -ayJ -bMM +ayH +qQu +tJm bmT alf alf @@ -206330,31 +205263,31 @@ qnA qnA bmZ gvu -oIp -tJm -aoe -cit +qQu +lSN +kaj +ajl cnZ -aoe -aoe +akw +cEF jTj -cgG -isN -isN -aoe -aoe +ajl +yjb +cDS +cDG +axm wJo uol anp ajl -ajl -ajl +cCv +cCn rrD vQN -ccl -ajl +gWG gvu -ayJ +ayH +qQu tJm bmT alf @@ -206368,7 +205301,7 @@ bmT vIo vIo vIo -njD +cBB atX sMM baw @@ -206433,31 +205366,31 @@ qnA qnA bmZ gvu +qQu xCB -kaj -aoe -aoe -aoe -aoe -cho -arb -cgH -cfV +tJm +ajl +cEU +cEK +tEi +cEu +ajl +ajl ePX -cfy -aoe -sqf -sqf -sqf -sqf -cdx +vtx +axm +akw +cCX +ajl +ajl +ajl fEC -uRt -vQN -ccm -gWG -gvu +cCk +ajl +ajl +cBX ayH +qQu tJm bmT alf @@ -206536,31 +205469,31 @@ qnA qnA bmZ hwB +qQu xCB tJm -aoe -aoe +ajl skl awp -chr -jZY +axm +cDk wDH -cfW -cfG +ajl +ajl sdn -aGW -sqf -ceB -ceo -sqf -sqf +axm +cDk +ajl +ajl +cCI +cCw aBd -uRt +cCg wjz ajl -ajl lXR ayH +qQu tJm bmT alf @@ -206639,31 +205572,31 @@ qnA qnA bmZ atz -xCB -kPa -kmT -aoe -cie -chT +qQu +nbH +cFm +ajl +gKR +gKR axl -arb -cgF -ajq -cfH -aoe -aGW -ceT -ceF +gKR +gKR +ajl +ajl +ajl +cDu +ajl +ajl kEp tWY -sqf +cCx pJl -uRt -ccu +akw +vIf ajl -cbU -gre -ayH +hwB +ayJ +qQu usu bmT alf @@ -206741,33 +205674,33 @@ bmZ bmZ bmZ bmZ -ciK -nbH -qQu -tJm -aoe -aoe -chU -chs -cgV -cgI -aoe -aoe -aoe -aGW -sqf -cep -cep -sqf -sqf -ccW -aos -vQN -ajl -aiN +akp qQu +nbH +ayg +cCb +ans +ans +axm +ans +aGX +cEe +ans +ans +axm +ans +aGX +fFO +akw +akw +akw +akw +cCg +cCb +cBU ayJ -cbH +qQu +bMM bmT bmT bmT @@ -206845,31 +205778,31 @@ iKy iKy iKy gre -oIp qQu -aiK +cFs +cFo aEe -ans +akA kln asw -aos +akA jOG -cfX -aGX -cfz -ans -ceU -aos -ccV -ceb -cbT -fFO +akA +akA +awn +cDv +akA +akA +akA +maT +akA +awn oap aSb aEe cbN +cBO qQu -ayJ kPa iKy iKy @@ -206936,56 +205869,56 @@ awW awW wAE qQu -dcR -dcR -dcR +qQu +qQu +qQu qQu qQu dcR dcR dcR qQu -qQu dcR dcR -ciE -ciA -ciw -ccn -hFC -chV -cht -cgW -cgJ -cfY -awn -ccX -ccX -ccX -akA -awn -maT -cdy -ccX +dcR +dcR +lSN +tJm +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy +vOy wMO wky -ccn -cbV -cbP -cbJ -dcR +sqf +aiN +ayH dcR -qQu -qQu dcR dcR dcR qQu -qQu dcR dcR dcR qQu +qQu +qQu +qQu +qQu +qQu wAE saX baw @@ -207054,25 +205987,25 @@ epT llo bXc vZJ -ajl -ajl -gKR -drT -gKR -vOy vOy +cEV +cEL +drT +cEv +cEh vOy +cDT +cDI +cDw +cDl ncE -ncE -ncE -ncE -vOy -vOy +cCS +cCJ vOy -ajl -ccI +cCo +kXw pxo -ajl +sqf lPY ayN llo @@ -207157,25 +206090,25 @@ abE rSW dNv rSW -ajl -ajl +vOy +cEW aSn lYL pNP +cEj vOy -cco nLI -cfA +rDV dwr rDV mTd gQF -cco +cCK vOy niL -ccJ -ccv -ajl +kXw +pxo +sqf rSW dYl rSW @@ -207260,28 +206193,28 @@ agA mRJ fjA gqH -ajl +vOy anz vgx hme mzq +cEk vOy -cfZ -cfI -cdJ +vti +vti fBO -ceW +vti gGx -ceq +vti lid lJv aCC -ccK -ccw +kXw +pxo asn mRJ oEn -gqH +bBH bUj bUc bTB @@ -207360,30 +206293,30 @@ adF aef aef uZZ -aiO +cCj lGh bBH -ajl +vOy awQ -axm -akw +cEM +cEG vDa +rQy vOy -cga qfy inL oiY -ueJ +cdM cdM cdJ trF lJv edv -ccK -ccw +kXw +pxo asn lXl -yiu +cBP bUu pBG pBG @@ -207463,30 +206396,30 @@ adF bls aeH agq -ccA +ijd efV bBH -ajl +vOy hng -axm +cEN hPN vCk -vOy +cEm qam riE -cdJ +gAS lMv -ceX -cdJ +dVu +cCY qmD aIC lJv aCt -ccK -ccx +kXw +pxo asn lXl -yiu +cBQ bUv bUk pBG @@ -207567,28 +206500,28 @@ aef kqN agA lXl -lGh +qdJ qmW -ajl +vOy xyt -axm +cEO tOr dBj -vOy -cco -cfJ +cEn +kBP +kBP jsx tjn -vti -vti +aCC +kXw pQP -cco +cCM +vOy vOy -ccY ccJ ccx -ajl -psk +sqf +rnM bUC bUw bUl @@ -207672,22 +206605,22 @@ abE tkF qdJ bBH -ajl +vOy iYf bIM -oap -mzq -vOy -cco -cco -cco -cfj -cfa -cdJ -cco -cco -vOy -vOy +wPz +cEw +cEo +cEf +cDU +cCB +tjn +aCC +kXw +cCT +cCN +cCy +cCp sdu btC vLj @@ -207773,29 +206706,29 @@ aef afs agA lXl -poD -cii -ajl -ajl -wiW -chu -jeq +yiu +bBH vOy +cEX +cEO +wPz +jeq +cEp wWR -cfK -vkp -cfl -cfb -ceG -cco -cec +vti +cCB +cfT +hec +gNp +cCU +dVu rmc -vOy +cCq dVu oDR cbT -aiO -poD +cBY +yiu tru pBG pBG @@ -207878,25 +206811,25 @@ agA lXl yiu bBH -ajl -ajl -ajl +vOy +cEY +cEP ydE -ajl +cEx +rQy vOy -cgb vdO -cfB -ceq +cCB +aoM kBo -cfT +cCZ naR -hec -hec -ccZ -aos +vOy +cCz +vOy +cCl aIo -ajl +vOy whc yiu bBH @@ -207980,26 +206913,26 @@ afs agA lXl yiu -cih -ajl +bBH +vOy aAr pGK -chw -tpa +cEq +cEq +cEq vOy -cgb dHV -cfC +cCB jUM lou -ayZ +cDa pRn -ced +vOy ayZ aCD hFC qmy -ajl +vOy lXl yiu bBH @@ -208082,29 +207015,29 @@ aef pHG abE tkF -yiu +poD bBH -ajl +vOy aID gLc -wub +cEH iit +cEr +vOy vOy -cgc -cfL jpl -cfn +vOy wKL -ceH -cer -cee -xTR vOy +vOy +vOy +xTR +aiT aoM vgB -vOy -rnM -yiu +cCc +lXl +poD qmW pBG ojQ @@ -208187,25 +207120,25 @@ agA lXl poD bBH -ajl +vOy aMd -chX -chx -ajl -rQy -nDo -nDo -nDo +pGK +cEs +cEy +cEs +vOy +cDV +cCB jrM mWs -cco +cDc vOy dyb -cfT +cCA prx fpT eVT -kgs +cCc lXl poD bBH @@ -208287,26 +207220,26 @@ adF aef nIS uZZ -aiO +cCj poD bBH -ajl -ajl +vOy +cEZ aSo -ajl -rQy -rQy -cgd +cEs +cEy +cEs +vOy vqZ -nDo +cCB rDr usy nDo -ces +vOy lyz -gAS -aiT -ccM +cCB +cCr +aoM aFf kgs lXl @@ -208340,9 +207273,9 @@ bdH bdH bdH bdH -bdH -bdH -bdH +aaa +aaa +aaa aaa aaa aaa @@ -208390,30 +207323,30 @@ adF aef nIS eWF -aiO -yiu +cCj +poD bBH -ajl +vOy aQZ bkT -chy -rQy -pRX -cge -wPz +cEs +cEy +cEs +vOy +cDW sZy vEr irU -nDo -cet +cDd +vOy ggl -kBP +cCC qMP -ccO -vOy +kBP +cCh vOy tkF -yiu +poD bBH pBG bUg @@ -208444,8 +207377,8 @@ bdH bdH bdH bdH -bdH -bdH +aaa +aaa aaa aaa aaa @@ -208496,26 +207429,26 @@ agA lXl yiu bBH -ajl -ajl -ajl -sqf -rQy -kZV -cgf -cfr -cfr -cfr +vOy +cFa +cEQ +cEI +cEz +cEr +vOy +vOy +eNI +eNI eNI -ceI -kXw -eYM -cdz vOy vOy +eYM +vti +cCs +cCm vOy -cco -dfA +vOy +lXl yiu bBH bvX @@ -208546,9 +207479,9 @@ bdH bdH bdH bdH -bdH -bdH -bdH +aaa +aaa +aaa aaa aaa aaa @@ -208598,27 +207531,27 @@ uNN abE dfA yiu -qmW -oYZ -ccy -ccP -cda -cgX +bBH +vOy +vOy +vOy +rQy mSK -cgg -wKP +mSK +vOy +vOy voV wKP hLr -ceJ -ceu +vOy +vOy oqZ acl -cda -ccP -ccy +vOy +vOy +vOy oYZ -cbW +lXl yiu bBH bvX @@ -208649,9 +207582,9 @@ bdH bdH bdH bdH -bdH -bdH -bdH +aaa +aaa +aaa aaa aaa aaa @@ -208699,30 +207632,30 @@ aeI eva xzf abE -ciF +tkF poD -bMW -ccp -cig -chY -cda -cgY -wPz -cgh -cfs -cfs -cfs +dSI +iLL +qXS +mwR +vOy +vOy +vOy +vOy +vOy eNI -ceI -kXw -cef -cdD -cda +eNI +eNI +vOy +vOy +vOy +vOy +vOy mwR qXS -ccp aiO -poD +lRh +yiu bBH pBG ubI @@ -208752,9 +207685,9 @@ bdH bdH bdH bdH -bdH -bdH -bdH +aaa +aaa +aaa bdH aaa aaa @@ -208805,27 +207738,27 @@ aNi hUu poD tsn -oYZ -ccy -ccR -cda -cgZ -mSK -cgi -cfM +cFe +vOy +vOy +elR +xXh +xXh +xXh +dMK aCR aAT aNY -nDo -cev -cef -cdE -cda -ccR -ccy -oYZ -cbX -poD +elR +xXh +xXh +xXh +dMK +vOy +vOy +cCd +xIj +yiu bUA pBG pBG @@ -208854,8 +207787,8 @@ aaa aaa aaa aaa -bdH -bdH +aaa +aaa aaa aaa aaa @@ -208906,28 +207839,28 @@ vif aOR bsw lXl -qdJ +cFt +cFp +cFf bBH -oYZ -oYZ -vOy vOy -nDo +wWz +vHO ruc uvP -cfN +wTM dNq vVs -nDo -nDo +cDm +wWz liY aiV cco +wTM vOy -cco -oYZ -oYZ -hUu +cCi +lRh +xIj poD bBH pBG @@ -208957,8 +207890,8 @@ aaf aaf ajY aaa -bdH -bdH +aaa +aaa aaa bdH aaa @@ -209008,30 +207941,30 @@ aco aco dYu bsw -lXl -lGh -dSI -iLL -gqH +cOe +vwT +akh +poD +qmW vOy -cco +wWz anw -nDo -nDo -wLN -wLN +wLy +cEg +cDX +cDJ wLN npt xuE -kXw +cCV wLy eiE +wTM vOy -vOy -mRJ -iLL -lRh -lGh +lXl +cCe +mHY +cBR bBH pBG eYn @@ -209109,33 +208042,33 @@ bhx aOR bhx bhx -qiy -egt -ciG -ciD -ciy -ciu -qmW +cCa +aNi +aNi +aNi +rnM +qdJ +bBH vOy -cco +wWz ajK -gxP +cCO aPJ -ceM +wTM apS wse aji -ceL +wWz ual -wLy +cCO aOe -cdb +wTM vOy piQ -ccq -mHY -cbQ -bBH +yiu +sin +vwT +cBM pBG eYn bTR @@ -209145,7 +208078,7 @@ bSO bSz oxc pBG -eAN +cBD bRG pBG pGh @@ -209212,33 +208145,33 @@ bhx aOR bhx bhx -cCa -bgK +qiy ahR -vwT -akh -qdJ +ahR +egt +cFq +cFi bBH vOy -chz -ovG +woh +vgO aoJ alk -ceM -apS +xAe +avH wse -cfc -ceM +cXC +woh pLO qxm -cdF -cdc +vgO +xAe vOy lXl poD -sin -vwT -gsJ +bBH +cBS +gBs pBG pBG pBG @@ -209316,33 +208249,33 @@ wWg aco aco hpY -aNi -cGd -cGd -ayY +aOR +aOR +bgK +cCj qdJ bBH vOy -chA -uqd +vOy +vOy uqd amk -ceM +cDY avF wse -iAz +bZz ceM aIP aoK -cdG -cdd vOy -lXl +vOy +vOy +pLE poD qmW mRU -mRU -mRU +bQk +cBJ aGs bTX pBG @@ -209419,32 +208352,32 @@ aOR aOR eVQ aOR +aOR +cFw aNi -hoT -fkK -aiO +psk lGh -cih +bBH +vOy +vOy vOy -chB -cha ajz -cgj -ceM -apS -wse +rzN +rzN +cDK +cDy cfc -ceM -cew -aoK -cdH -cde +rzN +rzN +cCP vOy -psk +vOy +vOy +lXl lGh bMW -rXF -bQp +mRU +mRU bUn xiU xUa @@ -209523,30 +208456,30 @@ aNi aNi aNi aNi -hoT -cGd +aNi +aNi pLE lGh bBH vOy -ajB -ajB +vOy +vOy ajB apR -ceM +cDe mnW nPf vYz -ceM +cDe uoi aiZ -cdJ -cdf vOy -pLE +vOy +vOy +lXl yiu -cbY -mRU +bUG +bUD mRU bQw bQk @@ -209627,29 +208560,29 @@ vyh hoT tob tob -cGd -rnM -qdJ +fkK +cCj +lGh bBH vOy -chC -ovG +vOy +vOy ajC -cgk -cfO +rzN +rzN lCt -cfu +wse paa -ceN -gNp +rzN +rzN aja -cdK -cdg +vOy +vOy vOy lXl -poD +yiu bUG -bUD +bUE mRU bUs bUh @@ -209735,8 +208668,8 @@ gpT lGh qmW vOy -cco -chd +vOy +vOy ajF msi kDk @@ -209746,13 +208679,13 @@ jlA qLi dEm ajb -cdL -cdh +vOy +vOy vOy tkF yiu -bUG -bUE +bBH +nIN nIN nIN nIN @@ -209836,28 +208769,28 @@ ags aej lXl lGh -cii +bBH vOy -cco -cco -liY +elR +xXh +xXh apU -vOy -vOy -vOy -vOy -vOy +cEa +cDL +otu +cDo +cDf ean -ceh -cdM -cdj +xXh +xXh +dMK vOy lXl yiu -cbZ -nIN +bBH nIN -bUt +iIb +cBK iIb nIN rgL @@ -209937,31 +208870,31 @@ aeP aia aFQ yaz -aiO +cCj qdJ -cii +bBH vOy -chD -cco -cgK -cgm -cco +wWz +vHO +uXj +uXj +cDg jVt uyH vHO -cco -cdJ +cDg +uXj uXj rdt -cdk +wTM vOy mIR poD bBH aQx -cbK +sjM +bUt oIn -cbB nIN rgL rgL @@ -210040,31 +208973,31 @@ aeQ agK agu eup -aiO -lGh +cCj +qdJ bBH vOy -chE -che -wWm -cgn -cco -jVt -cdJ +wWz uwZ -cco -cco +cCQ +jQt +cEb +sNz +uyH +uwZ +cDh +jQt coZ sNz -cdl +wTM vOy lXl -yiu +poD bBH aQx bcg -sjM -iIb +cBL +cBG nIN rgL rgL @@ -210144,29 +209077,29 @@ aGg aFR aej dfA -lGh +qdJ bBH vOy -chF -cco -xQm -cgp -cco -cfD -cfv -cfd +wWz +cEB +cCQ +wLy +cEc +sNz +uyH +uwZ mWW -cco -cco +wLy +cCQ tfH -cco +wTM vOy -lXl -yiu +piQ +poD bBH -nIN +aQx viv -cbI +xzh syp nIN rgL @@ -210250,21 +209183,21 @@ cOe vZI ajX vOy -cco -cco -cgL -cgw -cfP -cfF -cfw -cfe +wWz +uwZ tyD -cex -cei -cdN -cdm +jQt +vfP +sNz +uyH +uwZ +tyD +jQt +vfP +sNz +wTM vOy -ccz +cOe vZI gsJ nIN @@ -210353,19 +209286,19 @@ hOn sYU xCs vOy -chG +wWz wWm -cgM -cgx +ajd jgg -nMe -ovG +cCO +cdN +uyH ovG -tyD +cCO jgg ajd cdN -cdq +wTM vOy hOn sYU @@ -210373,7 +209306,7 @@ xCs wNC kin axr -cbC +laI qwU neZ fpA @@ -210454,21 +209387,21 @@ vnM lLA ejx aFc -cij -vOy +xLw vOy -chg -cgN -cgz -cco -cco +woh +vgO +vgO +vgO +vgO +vgO utX -cff -ceO -cco -cdN -cdO -vOy +vgO +vgO +vgO +vgO +vgO +xAe vOy uAP rgO @@ -210557,8 +209490,7 @@ kNV wNC sfz yiu -iCg -ccS +xLw vOy vOy vOy @@ -210572,14 +209504,15 @@ vOy vOy vOy vOy -ccS -cDP +vOy +vOy +sfz yiu xLw wNC gVW efj -efj +cBH vUn atJ dbc @@ -210660,10 +209593,10 @@ ael ael hyT qdJ -xIj iCg cGO cGO +cGO rpV cGO cGO @@ -210675,8 +209608,8 @@ cGO rpV cGO cGO +cGO cDP -xIj qdJ tkd nIN @@ -210874,9 +209807,9 @@ aMl iSx dUR kaE +cDz kaE -kaE -ceP +dUR qvh aMl aMl @@ -210893,7 +209826,7 @@ aZv xzh avl auP -cbz +lbO nIN uRY aPT @@ -210996,7 +209929,7 @@ nIN avM avm auR -aGm +cBE nIN mzs aPT @@ -211191,7 +210124,7 @@ oqv iqd rUy cnS -ccA +ijd azz xLw auo @@ -211294,7 +210227,7 @@ wDy aGN qrv azY -aiO +cCj azB muW ayR diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index ccabcdb8d77f..a4c36429b790 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -209,7 +209,6 @@ /area/whiskey_outpost/inside/living) "aI" = ( /obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/medical_supply_link, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital/triage) "aJ" = ( @@ -290,18 +289,6 @@ }, /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) -"aU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/transmitter{ - name = "Pillbox Beer Telephone"; - phone_category = "Pillboxes"; - phone_id = "Pillbox Beer"; - pixel_y = 32 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/bunker/bunker/front) "aV" = ( /turf/open/floor/whitegreen/southwest, /area/whiskey_outpost/inside/hospital) @@ -426,6 +413,14 @@ }, /turf/open/floor/almayer/emeraldfull, /area/whiskey_outpost/inside/living) +"bq" = ( +/obj/effect/landmark/start/whiskey/leader, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/bunker/bunker/front) +"br" = ( +/obj/effect/landmark/start/whiskey/medic, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/bunker/bunker/front) "bs" = ( /turf/open/floor/carpet, /area/whiskey_outpost/inside/cic) @@ -457,10 +452,11 @@ /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) "by" = ( -/obj/structure/flora/pottedplant/random, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/faxmachine/uscm, -/turf/open/floor/prison, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) "bz" = ( /obj/structure/machinery/disposal, @@ -806,6 +802,10 @@ /obj/item/weapon/gun/rifle/m41aMK1, /turf/open/floor/wood, /area/whiskey_outpost/inside/cic) +"cJ" = ( +/obj/effect/landmark/start/whiskey/medic, +/turf/open/floor/white, +/area/whiskey_outpost/inside/hospital/triage) "cK" = ( /obj/structure/platform/metal/almayer/north, /turf/open/gm/river, @@ -820,6 +820,10 @@ }, /turf/open/floor/wood, /area/whiskey_outpost/inside/cic) +"cM" = ( +/obj/effect/landmark/start/whiskey/leader, +/turf/open/floor/prison/floor_plate/southwest, +/area/whiskey_outpost/inside/bunker/pillbox/three) "cN" = ( /obj/structure/platform/metal/almayer/east, /obj/structure/disposalpipe/segment, @@ -830,7 +834,6 @@ /area/whiskey_outpost/outside/north/platform) "cO" = ( /obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital/triage) "cP" = ( @@ -1057,11 +1060,6 @@ "dG" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/south) -"dH" = ( -/obj/structure/surface/rack, -/obj/item/device/motiondetector, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/bunker) "dI" = ( /obj/item/lightstick/red/planted, /turf/open/gm/dirtgrassborder/south, @@ -1318,10 +1316,10 @@ /turf/open/floor/asteroidwarning/west, /area/whiskey_outpost/outside/north/platform) "ex" = ( -/obj/structure/machinery/computer/overwatch/groundside_operations{ - pixel_y = 24 +/obj/structure/machinery/computer/groundside_operations{ + pixel_y = -8 }, -/turf/open/floor/prison, +/turf/closed/wall/r_wall, /area/whiskey_outpost/inside/cic) "ey" = ( /obj/effect/landmark/late_join, @@ -1543,13 +1541,6 @@ }, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) -"fn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "fo" = ( /obj/structure/curtain, /turf/open/floor/prison, @@ -1570,18 +1561,17 @@ dir = 4; icon_state = "warning_s" }, -/obj/effect/landmark/start/whiskey/marine, +/obj/effect/landmark/start/whiskey/medic, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) "fr" = ( /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/living) -"fs" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/wo_supplies/storage/belts/grenade, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/bunker) +"ft" = ( +/obj/effect/landmark/start/whiskey/leader, +/turf/open/floor/prison/floor_plate/southwest, +/area/whiskey_outpost/inside/bunker/pillbox/four) "fu" = ( /turf/open/floor/plating/warnplate/southwest, /area/whiskey_outpost/outside/north/northeast) @@ -1603,13 +1593,6 @@ "fy" = ( /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) -"fz" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/wo, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/bunker) "fA" = ( /obj/effect/landmark/start/whiskey/executive, /turf/open/floor/prison/floor_plate, @@ -1626,10 +1609,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) -"fD" = ( -/obj/effect/landmark/start/whiskey/marine, -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/bunker) "fE" = ( /obj/structure/bed/chair{ dir = 8 @@ -1652,27 +1631,14 @@ }, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) -"fI" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/wo, -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/bunker) "fJ" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_south) -"fK" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/wo, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/bunker) "fL" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/south) -"fM" = ( -/obj/structure/platform_decoration/metal/almayer/east, -/obj/structure/platform/metal/almayer/north, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "fN" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -1684,21 +1650,10 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river) -"fP" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "fQ" = ( /obj/structure/flora/jungle/planttop1, /turf/open/jungle, /area/whiskey_outpost/outside/south/far) -"fR" = ( -/obj/structure/machinery/chem_dispenser/corpsman{ - pixel_y = 3 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "fS" = ( /obj/structure/disposalpipe/segment, /turf/open/gm/dirtgrassborder/south, @@ -1746,6 +1701,10 @@ }, /turf/open/floor/whitegreen/northwest, /area/whiskey_outpost/inside/hospital) +"fZ" = ( +/obj/effect/landmark/start/whiskey/leader, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "ga" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -1753,19 +1712,6 @@ }, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) -"gb" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/bunker) -"gc" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/whiskey_outpost/outside/north/platform) -"gd" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/southwest, -/area/whiskey_outpost/inside/engineering) "ge" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecaltopright" @@ -1776,14 +1722,6 @@ }, /turf/open/floor/whitegreen/north, /area/whiskey_outpost/inside/hospital) -"gf" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen, -/area/whiskey_outpost/inside/engineering) -"gg" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/southeast, -/area/whiskey_outpost/inside/engineering) "gh" = ( /obj/effect/decal/medical_decals{ dir = 1; @@ -1805,26 +1743,10 @@ "gj" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_north) -"gk" = ( -/obj/structure/surface/table/woodentable/poor, -/obj/item/device/flashlight/lamp, -/obj/effect/landmark/map_item, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/mortar_pit) "gl" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/white, /area/whiskey_outpost/inside/hospital/triage) -"gm" = ( -/obj/structure/surface/table/woodentable/poor, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Mortar Pit Telephone"; - phone_category = "Support"; - phone_id = "Mortar Pit"; - pixel_y = 6 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/mortar_pit) "gn" = ( /obj/item/stack/cable_coil/cut, /turf/open/gm/dirt, @@ -1837,10 +1759,6 @@ /obj/structure/sign/prop1, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/cic) -"gq" = ( -/obj/structure/machinery/cm_vending/clothing/medic, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "gr" = ( /turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/south) @@ -1867,10 +1785,6 @@ "gv" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/inside/caves/caverns/west) -"gw" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/west, -/area/whiskey_outpost/inside/engineering) "gx" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle, @@ -1891,14 +1805,13 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) -"gB" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) -"gD" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/east, -/area/whiskey_outpost/inside/engineering) +"gC" = ( +/obj/structure/surface/rack, +/obj/item/ammo_box/magazine, +/obj/item/ammo_box/magazine, +/obj/item/ammo_box/magazine/ext, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/bunker) "gE" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/squad_changer{ @@ -1936,11 +1849,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital) -"gK" = ( -/obj/effect/landmark/start/whiskey/maint, -/obj/item/ammo_box/magazine/mk1/ap/empty, -/turf/open/floor/prison/floor_plate/southwest, -/area/whiskey_outpost/inside/engineering) "gL" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/light/small{ @@ -1972,20 +1880,6 @@ }, /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/hospital) -"gQ" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/machinery/cm_vending/clothing/medic, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) -"gR" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/clothing/medic, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "gS" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; @@ -2014,36 +1908,19 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) -"gX" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/northwest, -/area/whiskey_outpost/inside/engineering) -"gY" = ( -/turf/open/floor/whitegreencorner/north, -/area/whiskey_outpost/inside/engineering) "gZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/glass/beaker/bluespace, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital) -"ha" = ( -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "hb" = ( /obj/effect/landmark/start/whiskey/researcher, /turf/open/floor/white, /area/whiskey_outpost/inside/hospital) -"hc" = ( -/turf/open/floor/whitegreencorner/east, -/area/whiskey_outpost/inside/engineering) "hd" = ( /obj/structure/machinery/defenses/sentry/premade, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) -"he" = ( -/obj/effect/landmark/start/whiskey/medic, -/turf/open/floor/whitegreen/northeast, -/area/whiskey_outpost/inside/engineering) "hf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -2052,11 +1929,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/whiskey_outpost/inside/hospital) -"hg" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, -/turf/open/floor/whitegreen/northwest, -/area/whiskey_outpost/inside/engineering) "hh" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) @@ -2066,11 +1938,14 @@ /area/whiskey_outpost/inside/hospital) "hj" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Alpha Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Alpha Overwatch" +/obj/structure/machinery/computer/overwatch/almayer{ + layer = 3.2; + pixel_y = 20 }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/clipboard, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) "hk" = ( @@ -2131,6 +2006,14 @@ "ht" = ( /turf/open/floor/whitegreen/west, /area/whiskey_outpost/inside/hospital) +"hu" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/surface/rack, +/obj/effect/landmark/wo_supplies/storage/belts/grenade, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/bunker) "hv" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet, @@ -2228,9 +2111,6 @@ }, /turf/open/floor/whitegreen/north, /area/whiskey_outpost/inside/hospital) -"hG" = ( -/turf/open/floor/whitegreen/north, -/area/whiskey_outpost/inside/engineering) "hH" = ( /obj/structure/machinery/power/power_generator/reactor/colony, /turf/open/floor/prison/floor_plate/southwest, @@ -2246,11 +2126,6 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) -"hL" = ( -/obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/medical_supply_link, -/turf/open/floor/whitegreen/northeast, -/area/whiskey_outpost/inside/engineering) "hM" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, @@ -2275,21 +2150,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/living) -"hP" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 2; - name = "Corpsman Preperation"; - req_one_access_txt = "2;8;19" - }, -/turf/open/floor/white, -/area/whiskey_outpost/inside/engineering) "hQ" = ( /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/living) -"hR" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/inside/hallway) "hS" = ( /turf/open/floor/plating/warnplate/east, /area/whiskey_outpost/outside/lane/one_north) @@ -2301,14 +2164,11 @@ }, /turf/open/floor/white, /area/whiskey_outpost/inside/hospital/triage) -"hU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/hallway) "hV" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 }, +/obj/effect/landmark/start/whiskey/bridge, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) "hW" = ( @@ -2343,40 +2203,12 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) -"ia" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "whiskey_armory"; - name = "\improper Armory Shutters" - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "ib" = ( /obj/structure/barricade/handrail/wire{ dir = 4 }, /turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) -"ic" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"id" = ( -/obj/structure/machinery/door_control{ - id = "whiskey_armory"; - name = "Armory Lockdown"; - pixel_x = -5; - pixel_y = 2; - req_access = list(19) - }, -/turf/closed/wall/r_wall, -/area/whiskey_outpost/inside/cic) -"ie" = ( -/obj/structure/sign/safety/medical{ - name = "\improper Hospital"; - pixel_x = 12 - }, -/turf/closed/wall/r_wall, -/area/whiskey_outpost/inside/hallway) "if" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/lane/four_south) @@ -2386,10 +2218,6 @@ }, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital) -"ih" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "ii" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ name = "\improper Medical Storage"; @@ -2420,19 +2248,10 @@ /obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) -"in" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "io" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/lane/one_south) -"ip" = ( -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/cic) "iq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/prison/floor_marked/southwest, @@ -2456,23 +2275,9 @@ "iu" = ( /turf/open/floor/whitegreen/west, /area/whiskey_outpost/inside/hospital/triage) -"iv" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/cic) "iw" = ( /turf/open/floor/plating/warnplate/northeast, /area/whiskey_outpost/outside/north/northeast) -"ix" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/roller/bedroll/comfy, -/obj/item/roller/bedroll, -/obj/item/roller/bedroll, -/obj/item/roller/bedroll, -/obj/item/roller/bedroll, -/obj/item/roller/bedroll, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "iy" = ( /obj/effect/landmark/start/whiskey/cargo, /turf/open/floor/prison/darkyellow2, @@ -2510,36 +2315,10 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_south) -"iE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp/on, -/obj/item/ashtray/bronze{ - icon_state = "ashtray_full_bl"; - pixel_x = 7; - pixel_y = 10 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "iF" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_south) -"iG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door_control{ - id = "whiskey_armory"; - name = "Armory Lockdown"; - req_access = list(19) - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"iH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/prop_gun/m41aMK1{ - pixel_y = 2 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "iI" = ( /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/asteroidfloor/north, @@ -2601,6 +2380,12 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) +"iQ" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/storage/fancy/cigarettes/wypacket, +/obj/item/clothing/mask/cigarette, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/mortar_pit) "iR" = ( /turf/open/floor/prison/cell_stripe/north, /area/whiskey_outpost/inside/bunker/bunker/front) @@ -2627,47 +2412,14 @@ }, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) -"iW" = ( +"iY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/food/upp/meat{ - pixel_x = 7 - }, -/obj/item/reagent_container/food/drinks/cans/food/upp/soup{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/reagent_container/food/drinks/cans/food/upp/stew{ - pixel_y = 13; - pixel_x = 3 +/obj/structure/machinery/light/small{ + dir = 4 }, -/obj/item/attachable/bayonet/upp_replica{ - pixel_x = -2; - pixel_y = 2 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"iX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/folder/black_random, -/obj/structure/machinery/computer/overwatch/almayer{ - layer = 3.2; - pixel_y = 20 - }, -/obj/item/tool/crowbar, -/obj/item/device/flashlight/lamp, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) -"iY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/machinery/computer/overwatch/almayer{ - layer = 3.2; - pixel_y = 20 +/obj/structure/machinery/computer/overwatch/almayer{ + layer = 3.2; + pixel_y = 20 }, /obj/item/tool/pen, /obj/item/paper_bin, @@ -2679,29 +2431,8 @@ }, /obj/structure/machinery/autodoc_console/upgraded, /obj/effect/landmark/start/whiskey/doctor, -/obj/structure/transmitter{ - name = "Hospital Telephone"; - phone_category = "Support"; - phone_id = "Hospital"; - pixel_y = 32 - }, /turf/open/floor/whitegreen/northwest, /area/whiskey_outpost/inside/hospital) -"ja" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/overwatch/almayer{ - layer = 3.2; - pixel_y = 20 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/item/clothing/accessory/device/whistle, -/obj/item/device/binoculars, -/obj/item/tool/extinguisher, -/obj/item/device/flashlight/lamp, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "jb" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 4; @@ -2710,18 +2441,6 @@ /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north) -"jc" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Hospital"; - req_one_access = null - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/inside/hospital) -"jd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folded_tent/big, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "je" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ @@ -2734,19 +2453,6 @@ /obj/item/weapon/gun/pistol/m4a3, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) -"jg" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 4 - }, -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/cic) -"jh" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/open/floor/prison/floor_marked/southwest, -/area/whiskey_outpost/inside/cic) "ji" = ( /obj/effect/decal/medical_decals{ dir = 4; @@ -2784,7 +2490,6 @@ dir = 4; icon_state = "shuttle_chair" }, -/obj/item/device/binoculars/range, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/whiskey_outpost/outside/lane/four_north) "jm" = ( @@ -2796,6 +2501,23 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) +"jo" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/tool/lighter, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/mortar_pit) +"jp" = ( +/obj/structure/barricade/handrail{ + dir = 1 + }, +/turf/open/floor/asteroidwarning/northwest, +/area/whiskey_outpost/inside/hallway) +"jq" = ( +/obj/structure/barricade/handrail{ + dir = 1 + }, +/turf/open/floor/asteroidwarning/north, +/area/whiskey_outpost/inside/hallway) "jr" = ( /obj/structure/platform/metal/almayer, /turf/open/gm/river, @@ -2804,6 +2526,16 @@ /obj/effect/decal/medical_decals{ icon_state = "docstriping" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + name = "Emergency NanoMed"; + pixel_x = -30; + req_access = null + }, /turf/open/floor/whitegreen/west, /area/whiskey_outpost/inside/hospital) "jt" = ( @@ -2831,29 +2563,6 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) -"jx" = ( -/obj/structure/sign/poster/pinup{ - pixel_x = 25; - pixel_y = 6 - }, -/obj/structure/machinery/light/spot{ - dir = 4 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"jy" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/obj/effect/landmark/start/whiskey/warden, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"jz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp/on, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "jA" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" @@ -2910,27 +2619,6 @@ "jJ" = ( /turf/open/floor/whitegreencorner/east, /area/whiskey_outpost/inside/hospital) -"jK" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/obj/effect/landmark/start/whiskey/warden, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"jL" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/item/clothing/accessory/helmet/cover/raincover/jungle, -/obj/structure/machinery/light/spot{ - dir = 8 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "jM" = ( /turf/open/floor/prison/cell_stripe/north, /area/whiskey_outpost/inside/living) @@ -2941,15 +2629,6 @@ /obj/effect/landmark/start/whiskey/bridge, /turf/open/floor/almayer/orange/northwest, /area/whiskey_outpost/inside/cic) -"jO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Charlie Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Charlie Overwatch" - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "jP" = ( /turf/closed/shuttle/dropship{ icon_state = "rasputin11" @@ -3001,10 +2680,13 @@ /area/whiskey_outpost/inside/living) "jY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Bravo Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Bravo Overwatch" +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/folder/black_random, +/obj/structure/machinery/computer/overwatch/almayer{ + layer = 3.2; + pixel_y = 20 }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) @@ -3024,73 +2706,10 @@ }, /turf/open/floor/almayer/redfull, /area/whiskey_outpost/inside/living) -"kc" = ( -/obj/structure/closet/crate/medical{ - name = "medical crate (roller beds)" - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/obj/item/roller{ - pixel_y = 4 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/inside/hallway) -"kd" = ( -/obj/structure/medical_supply_link, -/obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/inside/hallway) "ke" = ( /obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/south/far) -"kf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/accessory/poncho, -/obj/item/clothing/accessory/poncho, -/obj/item/clothing/accessory/poncho, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "kg" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 8; @@ -3100,23 +2719,9 @@ /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) "kh" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/cm_vending/gear/medic, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/hallway) -"ki" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/overwatch/almayer{ - layer = 3.2; - pixel_y = 20 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/clipboard, -/obj/item/device/binoculars, -/obj/item/device/flashlight/lamp, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "kj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3145,26 +2750,20 @@ /area/whiskey_outpost/outside/lane/one_north) "kp" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Delta Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Delta Overwatch" +/obj/structure/machinery/computer/overwatch/almayer{ + layer = 3.2; + pixel_y = 20 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/item/clothing/accessory/device/whistle, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) "kq" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer/redfull, /area/whiskey_outpost/inside/living) -"kr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/map_item, -/obj/item/clipboard, -/obj/item/folder/black_random, -/obj/item/device/binoculars, -/obj/effect/landmark/map_item, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "ks" = ( /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/bunker/front) @@ -3172,9 +2771,6 @@ /obj/structure/barricade/metal/wired, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) -"ku" = ( -/turf/closed/wall/r_wall, -/area/space) "kv" = ( /obj/structure/bed/roller, /turf/open/floor/white, @@ -3199,6 +2795,13 @@ /obj/structure/fence, /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/south/far) +"kA" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/wo, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/bunker) "kB" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, @@ -3216,28 +2819,16 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) -"kD" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "kE" = ( /obj/structure/machinery/computer/cryopod, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) -"kF" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/wo, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "kG" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) -"kH" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/wo, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "kI" = ( /obj/structure/barricade/sandbags/wired, /turf/open/floor/asteroidwarning, @@ -3256,10 +2847,6 @@ /obj/effect/landmark/start/whiskey/bridge, /turf/open/floor/almayer/red/northwest, /area/whiskey_outpost/inside/cic) -"kL" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/wo, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "kM" = ( /obj/structure/machinery/sleep_console, /obj/effect/decal/medical_decals{ @@ -3288,9 +2875,6 @@ /obj/effect/landmark/start/whiskey/doctor, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) -"kQ" = ( -/turf/open/floor/prison, -/area/space) "kR" = ( /obj/structure/platform_decoration/metal/almayer/north, /turf/open/gm/river, @@ -3298,20 +2882,6 @@ "kS" = ( /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) -"kT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_box/magazine/misc/mre/upp, -/obj/item/ammo_box/magazine/misc/mre, -/obj/item/ammo_box/magazine/misc/mre, -/obj/item/ammo_box/magazine/misc/mre, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) -"kU" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) "kV" = ( /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/south) @@ -3339,20 +2909,6 @@ "la" = ( /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) -"lb" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Combat Information Center Telephone"; - phone_category = "Command"; - phone_id = "Combat Information Center"; - pixel_y = 7 - }, -/obj/item/prop/magazine/book/theartofwar{ - pixel_y = 5; - pixel_x = 15 - }, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "lc" = ( /turf/open/gm/coast/west, /area/whiskey_outpost/outside/north/northeast) @@ -3372,10 +2928,13 @@ "lg" = ( /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_south) -"lh" = ( -/obj/structure/largecrate/black_market/poncho, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) +"li" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start/whiskey/medic, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) "lj" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3386,22 +2945,13 @@ "lk" = ( /turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/south) -"ll" = ( -/obj/structure/machinery/light/spot{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/wo, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "lm" = ( /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) -"ln" = ( -/obj/structure/machinery/door/airlock/almayer/command{ - name = "\improper Armory" - }, -/turf/open/floor/prison, -/area/whiskey_outpost/inside/cic) +"lo" = ( +/obj/effect/landmark/start/whiskey/medic, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) "lp" = ( /obj/item/lightstick/red/planted, /turf/open/gm/dirt, @@ -3436,6 +2986,9 @@ }, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) +"lv" = ( +/turf/closed/wall/rock/brown, +/area/whiskey_outpost/outside/mortar_pit) "lw" = ( /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/supply) @@ -3453,8 +3006,13 @@ /obj/structure/platform_decoration/metal/almayer/west, /turf/open/gm/river, /area/whiskey_outpost/outside/south) +"lA" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/hallway) "lB" = ( -/obj/structure/bed/roller, +/obj/structure/surface/table/reinforced/prison, +/obj/item/facepaint/green, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/hallway) "lC" = ( @@ -3468,13 +3026,6 @@ /obj/structure/surface/table, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) -"lE" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/flora/pottedplant/random, -/turf/open/floor/prison/floor_plate, -/area/whiskey_outpost/inside/cic) "lF" = ( /obj/structure/surface/table, /obj/item/storage/box/mre{ @@ -3494,6 +3045,9 @@ /obj/structure/machinery/light/small{ dir = 8 }, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ name = "Emergency NanoMed"; pixel_x = -30; @@ -3530,29 +3084,37 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south) -"lL" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"lN" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" }, -/obj/structure/machinery/power/apc/almayer/north, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/paper_bin, -/obj/item/tool/pen, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) +"lO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp, +/obj/item/tool/crowbar, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) -"lM" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/emails{ - dir = 1 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/wood, -/area/whiskey_outpost/inside/cic) "lP" = ( /obj/structure/surface/table, /obj/item/facepaint/green, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) +"lQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp, +/obj/item/tool/extinguisher, +/obj/item/device/binoculars, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) +"lR" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) "lS" = ( /obj/structure/largecrate/supply/medicine/iv, /turf/open/floor/whitegreen/north, @@ -3570,6 +3132,11 @@ icon_state = "rasputin2" }, /area/whiskey_outpost/outside/lane/four_north) +"lW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/bodybags, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) "lX" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 1; @@ -3577,11 +3144,34 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) +"lY" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4; + layer = 3.25 + }, +/obj/effect/landmark/start/whiskey/tank_crew, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) +"lZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item, +/obj/item/clothing/accessory/device/whistle, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "ma" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_south) +"mb" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + layer = 3.25 + }, +/obj/effect/landmark/start/whiskey/tank_crew, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "mc" = ( +/obj/structure/machinery/vending/snack, /obj/structure/machinery/light/small{ dir = 1 }, @@ -3590,9 +3180,19 @@ "md" = ( /turf/open/floor/almayer/orangefull, /area/whiskey_outpost/inside/living) +"me" = ( +/obj/structure/machinery/cm_vending/clothing/medic, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/inside/hallway) "mf" = ( /turf/open/jungle, /area/whiskey_outpost/outside/south/very_far) +"mg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp, +/obj/item/device/binoculars, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "mh" = ( /turf/open/floor/prison, /area/whiskey_outpost/inside/hallway) @@ -3603,10 +3203,25 @@ /obj/effect/spawner/gibspawner/human, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_south) +"mk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/card{ + dir = 8 + }, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "ml" = ( /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) +"mm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/map_item, +/obj/item/clipboard, +/obj/item/folder/black_random, +/obj/item/device/binoculars, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "mn" = ( /obj/structure/surface/rack, /obj/item/storage/large_holster/machete/full, @@ -3633,10 +3248,22 @@ /obj/structure/barricade/metal/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/three_south) +"ms" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/effect/landmark/map_item, +/obj/item/folder/black_random, +/obj/item/clothing/accessory/device/whistle, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "mt" = ( /obj/structure/sign/prop1, /turf/closed/wall, /area/whiskey_outpost/outside/south/far) +"mu" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "mv" = ( /obj/structure/machinery/medical_pod/bodyscanner, /obj/effect/decal/medical_decals{ @@ -3671,6 +3298,10 @@ /obj/item/weapon/gun/rifle/lmg, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/whiskey_outpost/outside/lane/four_north) +"mB" = ( +/obj/structure/flora/pottedplant/random, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/cic) "mC" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison, @@ -3717,12 +3348,6 @@ /obj/item/clothing/accessory/device/whistle{ pixel_y = 14 }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Beer Command Telephone"; - phone_category = "Command"; - phone_id = "Pillbox Beer Command Center"; - pixel_x = 5 - }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) "mI" = ( @@ -3737,6 +3362,15 @@ /obj/effect/spawner/gibspawner/human, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/whiskey_outpost/outside/lane/four_north) +"mK" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin, +/obj/item/tool/pen, +/turf/open/floor/prison/floor_plate, +/area/whiskey_outpost/inside/cic) "mL" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/prison/floor_plate, @@ -3748,6 +3382,12 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) +"mN" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails, +/obj/structure/machinery/light/small, +/turf/open/floor/wood, +/area/whiskey_outpost/inside/cic) "mQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/framed/colony/reinforced, @@ -3843,10 +3483,11 @@ /turf/closed/wall/strata_ice/jungle, /area/whiskey_outpost/outside/south/very_far) "ni" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/vending/walkman, +/obj/structure/medical_supply_link, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/hallway) "nj" = ( @@ -4052,8 +3693,7 @@ /area/whiskey_outpost/inside/living) "oe" = ( /obj/structure/sign/safety/medical{ - name = "\improper Hospital"; - pixel_x = 14 + name = "\improper Hospital" }, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/hallway) @@ -4597,12 +4237,6 @@ "qH" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Engineering Telephone"; - phone_category = "Support"; - phone_id = "Engineering"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/engineering) "qI" = ( @@ -4692,7 +4326,7 @@ dir = 1; id = "WOline2" }, -/turf/open/floor/asteroidfloor/north, +/turf/open/floor/asteroidwarning/north, /area/whiskey_outpost/inside/hallway) "qY" = ( /turf/open/gm/grass/grassbeach/west, @@ -4908,7 +4542,7 @@ /area/whiskey_outpost/outside/lane/two_north) "sc" = ( /obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/marine/charlie{ +/obj/structure/machinery/door/airlock/almayer/marine/support{ dir = 1; name = "\improper Pillbox Vodka"; req_access = null; @@ -5092,8 +4726,6 @@ /area/whiskey_outpost/inside/engineering) "sX" = ( /obj/structure/disposalpipe/segment, -/obj/structure/surface/table/reinforced/prison, -/obj/item/facepaint/green, /turf/open/floor/asteroidwarning/west, /area/whiskey_outpost/inside/hallway) "sY" = ( @@ -5185,12 +4817,6 @@ dir = 8 }, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Pillbox Vodka Telephone"; - phone_category = "Pillboxes"; - phone_id = "Pillbox Vodka"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) "tv" = ( @@ -5306,7 +4932,6 @@ dir = 4 }, /obj/structure/surface/rack, -/obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) "tU" = ( @@ -5483,9 +5108,8 @@ /area/whiskey_outpost/outside/lane/four_north) "ux" = ( /obj/structure/surface/table/woodentable/poor, -/obj/item/storage/fancy/cigarettes/wypacket, -/obj/item/clothing/mask/cigarette, -/obj/item/tool/lighter, +/obj/effect/landmark/map_item, +/obj/item/device/flashlight/lamp, /turf/open/gm/dirt, /area/whiskey_outpost/outside/mortar_pit) "uy" = ( @@ -5594,12 +5218,6 @@ "uT" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Logistics Telephone"; - phone_category = "Support"; - phone_id = "Logistics"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) "uU" = ( @@ -6019,7 +5637,7 @@ dir = 1; id = "WOline1" }, -/turf/open/floor/asteroidfloor/north, +/turf/open/floor/asteroidwarning/north, /area/whiskey_outpost/inside/hallway) "wN" = ( /obj/effect/landmark/start/whiskey/marine, @@ -6155,6 +5773,7 @@ /obj/structure/surface/rack, /obj/item/ammo_box/magazine/m4ra, /obj/item/ammo_box/magazine/m4ra, +/obj/structure/machinery/light/small, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker) "xC" = ( @@ -6176,7 +5795,7 @@ /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) "xF" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ +/obj/structure/machinery/cm_vending/clothing/marine/support{ density = 0; pixel_x = -16 }, @@ -6195,10 +5814,9 @@ /area/whiskey_outpost/inside/caves/caverns/east) "xJ" = ( /obj/structure/surface/rack, -/obj/item/ammo_box/magazine, -/obj/item/ammo_box/magazine, -/obj/item/ammo_box/magazine/ext, -/obj/structure/machinery/light/small, +/obj/item/ammo_box/magazine/m4a3, +/obj/item/ammo_box/magazine/m44, +/obj/item/ammo_box/magazine/mod88, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker) "xK" = ( @@ -6543,7 +6161,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/river/east) "zA" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ +/obj/structure/machinery/cm_vending/clothing/marine/support{ density = 0; pixel_x = 16 }, @@ -6966,7 +6584,7 @@ /turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) "BB" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie{ +/obj/structure/machinery/door/airlock/almayer/marine/support{ dir = 1; name = "\improper Pillbox Vodka"; req_access = null; @@ -7176,17 +6794,6 @@ "CD" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_north) -"CE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/inside/hallway) "CF" = ( /obj/structure/platform_decoration/metal/almayer/west, /obj/structure/disposalpipe/segment, @@ -8400,6 +8007,7 @@ /area/whiskey_outpost/outside/south/far) "Jh" = ( /obj/item/tool/crowbar, +/obj/effect/landmark/start/whiskey/leader, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) "Ji" = ( @@ -8851,7 +8459,6 @@ /area/whiskey_outpost/outside/lane/one_north) "LU" = ( /obj/item/stack/medical/bruise_pack, -/obj/item/device/binoculars/range, /turf/open/floor/plating/warnplate, /area/whiskey_outpost/outside/lane/one_north) "LV" = ( @@ -9408,12 +9015,6 @@ dir = 8 }, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Pillbox Tequilla Telephone"; - phone_category = "Pillboxes"; - phone_id = "Pillbox Tequilla"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) "Pm" = ( @@ -9701,7 +9302,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_south) "Re" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ +/obj/structure/machinery/cm_vending/clothing/marine/support{ density = 0; pixel_x = 16 }, @@ -9869,7 +9470,7 @@ /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker/bunker/front) "Sm" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ +/obj/structure/machinery/cm_vending/clothing/marine/support{ density = 0; pixel_x = 16 }, @@ -10123,13 +9724,9 @@ "TA" = ( /obj/structure/machinery/light/small, /obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/hypospray, +/obj/item/reagent_container/hypospray, /obj/structure/machinery/power/apc/almayer/south, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Triage Telephone"; - phone_category = "Support"; - phone_id = "Triage"; - pixel_y = 6 - }, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital/triage) "TC" = ( @@ -10312,7 +9909,6 @@ dir = 4 }, /obj/structure/surface/rack, -/obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) "Uw" = ( @@ -10332,12 +9928,6 @@ dir = 4 }, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Pillbox Bourbon Telephone"; - phone_category = "Pillboxes"; - phone_id = "Pillbox Bourbon"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/one) "UC" = ( @@ -10578,7 +10168,7 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "VR" = ( /obj/structure/surface/rack, -/obj/item/device/binoculars/range, +/obj/item/device/binoculars, /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker/bunker/front) "VS" = ( @@ -10892,7 +10482,6 @@ dir = 8 }, /obj/structure/surface/rack, -/obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/one) "Xk" = ( @@ -10960,12 +10549,6 @@ dir = 4 }, /obj/structure/machinery/disposal, -/obj/structure/transmitter{ - name = "Pillbox Wine Telephone"; - phone_category = "Pillboxes"; - phone_id = "Pillbox Wine"; - pixel_y = 32 - }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) "XG" = ( @@ -11403,7 +10986,6 @@ dir = 8 }, /obj/structure/surface/rack, -/obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) "ZK" = ( @@ -14527,10 +14109,10 @@ mT mT mT mT -ak -ak -ak -ak +mT +mT +mT +mT mT mT mT @@ -14728,12 +14310,12 @@ mT mT mT mT -ak -ak -ar -ar -ak -ak +mT +mT +mT +mT +mT +mT mT mT mT @@ -14929,14 +14511,14 @@ mT mT mT mT -ak -ak -aX -aC -aC -ai -ak -ak +mT +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -15131,14 +14713,14 @@ mT mT mT mT -ak -aY -aC -aR -fx -aC -af -ak +mT +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -15333,14 +14915,14 @@ mT mT mT mT -ak -aY -aC -fx -aw -aC -af -ak +mT +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -15535,14 +15117,14 @@ mT mT mT mT -ak -ak -al -fx -aB -al -ak -ak +mT +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -15738,12 +15320,12 @@ mT mT mT mT -ak -ak -aT -aD -ak -ak +mT +mT +mT +mT +mT +mT mT mT mT @@ -15931,26 +15513,26 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -fx -aL -ak -nK -nK -nK -nK -nK -nK +mT +mT +mT +mT +mT +mT mT mT mT @@ -16132,28 +15714,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak ak -kT -kD -kf -jL -jd -ix +ar +ar ak ak -gp -nv -mh -mh -nK -nK -gq -gQ -gq -fP -nK -nK +mT +mT +mT +mT +mT +mT mT mT mT @@ -16334,28 +15916,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -lh -in -fx -fx -fx -fx -fx -in +ak +aX +aC +aC +ai ak ak -nv -mh -nI -nK -gq -gX -gw -gw -gd -fP -nK +mT +mT +mT +mT +mT mT mT mT @@ -16536,28 +16118,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -ll -ip -kF -ip -fx -ip -fx -ip +aY +aC +aR fx +aC +af ak -nv -mh -mh -nK -hg -gY -gB -gB -gf -fP -nK +mT +mT +mT +mT +mT mT mT mT @@ -16738,28 +16320,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -kH -ip -kH -ip -fx -ip +aY +aC fx -iv -lm -ia -nv -mh -mh -hP -hG -ha -gB -gB -gf -fR -nK +aw +aC +af +ak +mT +mT +mT +mT +mT mT mT mT @@ -16940,28 +16522,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -kL -ip -kL -ip +ak +al fx -jg -iE -ip -lm -ia -nv -mh -mh -nK -hL -hc -gB -gB -gf -fP -nK +aB +al +ak +ak +mT +mT +mT +mT +mT mT mT mT @@ -17142,28 +16724,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -kL -ip -kL -ip -fx -jh -iG -ip -lm -ic -nv -mh -nI -nK -gq -he -gD -gD -gg -fP -nK +ak +aT +aD +ak +ak +mT +mT +mT +mT +mT +mT mT mT mT @@ -17344,28 +16926,28 @@ mT mT mT mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -lm -lm -lm -lm -lm -lm -iH -lm -lm -ic -nv -mh -mh -nK -nK -gq -gR -gq -fP -nK -nK +fx +aL +ak +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -17542,22 +17124,22 @@ mT mT mT mT +mT ak ak ak ak +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT ak -lm -kU -fx -aB -fx -jx -iW -fx -ih -id -mh mh mh nK @@ -17744,24 +17326,24 @@ mT mT mT mT +mT ak cE ds ak +mT +mT +ak ak -lm -gp ak ak ak ak ak ak -gp ak mh -mh -mh +nI nK uM rq @@ -17946,24 +17528,24 @@ mT mT mT mT +mT ak bH bE ak ak -ln ak ak -ki +ak hj +mg ak -iX jY +lO ak ak mh mh -nI nK pk sP @@ -18148,12 +17730,13 @@ mT mT mT mT +mT ak ak cG ak -lE -fx +mK +mu gp gT kK @@ -18165,7 +17748,6 @@ ak ak mh mh -mh nK qu re @@ -18348,6 +17930,7 @@ mT mT mT mT +mT ak ak ak @@ -18367,7 +17950,6 @@ bg ak mh mh -mh nK qx ri @@ -18550,6 +18132,7 @@ mT mT mT mT +mT ak au cz @@ -18569,7 +18152,6 @@ mi mL nv mh -mh nK qu re @@ -18752,6 +18334,7 @@ mT mT mT mT +mT ak ax bs @@ -18764,13 +18347,12 @@ gA fx hk iS -jy +lY iS fx mi mM nv -mh nI Kr qC @@ -18954,6 +18536,7 @@ mT mT mT mT +mT ak aA bs @@ -18962,18 +18545,17 @@ cL ak eb fB -lb +ms gV -kr +mm iT -jz +lZ kk lr mi mL nv mh -mh nK nK nK @@ -19156,25 +18738,25 @@ mT mT mT mT +mT ak aE bs bT -lM -ak +mN ex +fx fF gE fx hw iS -jK +mb iS eF mo mM nw -hU nL nK qE @@ -19358,6 +18940,7 @@ mT mT mT mT +mT Gu cz bs @@ -19376,13 +18959,12 @@ lm mi mL nv -mh mZ nK qG rf sg -gK +rf tL nK vv @@ -19560,6 +19142,7 @@ mT mT mT mT +mT ak cq bs @@ -19578,7 +19161,6 @@ lm mx ak mh -mh nM nK oy @@ -19762,14 +19344,15 @@ mT mT mT mT +mT ak aN cz bV cz ak -lL by +mB gp gW tY @@ -19780,7 +19363,6 @@ Vq mz ak mh -mh nM nK oC @@ -19964,6 +19546,7 @@ mT mT mT mT +mT ak ak ak @@ -19975,14 +19558,13 @@ ak ak ak iY -jO +mk ak -ja kp +lQ ak ak mh -mh nM nK qH @@ -20166,6 +19748,7 @@ mT mT mT mT +mT ak rj lm @@ -20184,7 +19767,6 @@ ak ak mG mC -mh mZ nK nK @@ -20368,6 +19950,7 @@ mT mT mT mT +mT ak sx xj @@ -20379,13 +19962,12 @@ mT mT mT mT -mT -mG -nR -mG +kh +kh +kh eI mG -mh +lA mh nN oH @@ -20577,16 +20159,16 @@ cr cr cr cr +cr mT mT mT -mT -kc -ab -ab -nR -nR -ie +je +lo +lo +lo +lR +mG mc ab ab @@ -20779,22 +20361,22 @@ dl dl dl dl +dl qz qz qz -qz -kd -ab +je ab ab ab -nn ab +lN ab ab -kj ab kj +lo +li ab ab rm @@ -20986,17 +20568,17 @@ Cv dY qz qz -je -ab -ab -ab -nn +lo +lo +lo ab +lN ab ab -kj ab kj +lo +li ab tj lw @@ -21188,11 +20770,11 @@ hb JT CC qz -CE -ab +me +me +lW lB -lB -nn +lN ab ny nc @@ -21391,7 +20973,7 @@ eO gZ qz qz -jc +qz oU qz qz @@ -21399,8 +20981,8 @@ qz mG nO oN -ab -kj +lo +li cx rm uf @@ -21601,9 +21183,9 @@ qz qz kh kj -ab -kj -cx +lo +li +jp rm rS kS @@ -21803,9 +21385,9 @@ qz qz ni kj -ab -kj -cx +lo +li +jq lw xk kS @@ -22003,11 +21585,11 @@ qB JT mv qz -hR -kj -ab +nR kj -cx +lo +li +jq lw wL kS @@ -22207,9 +21789,9 @@ mS qz oe kj -ab -kj -cx +lo +li +jq dS IP kS @@ -22411,7 +21993,7 @@ no oP ab kj -cx +jq dS ug wQ @@ -22837,7 +22419,7 @@ Dp Au fj fj -dH +xm fj fj Cy @@ -25058,7 +24640,7 @@ sl sl BN ed -ed +fZ BO FS zf @@ -25104,7 +24686,7 @@ HN Ck OG wJ -HN +cJ cO Ck lx @@ -25306,7 +24888,7 @@ HN tn rk Hq -HN +cJ av Ck qo @@ -25319,7 +24901,7 @@ bu ks Rg fV -fV +bq nz IA ks @@ -25442,7 +25024,7 @@ rB nS vp vp -vp +jS vp vp vp @@ -25508,7 +25090,7 @@ HN tn rk Hq -HN +cJ aI Ck xH @@ -25644,11 +25226,11 @@ rB eC qa aj +aj +aj vb vb -gb -vb -vb +aj mI aj aj @@ -25710,7 +25292,7 @@ HN Ck hT MO -HN +cJ cO Ck ks @@ -25846,8 +25428,7 @@ rB fj aj aj -wC -vE +aj aj wC vE @@ -25855,6 +25436,7 @@ aj aj aj aj +aj rB zJ fj @@ -25912,7 +25494,7 @@ HN Lf da HN -HN +cJ TA Ck ka @@ -25924,7 +25506,7 @@ Td tG ks Ov -iI +br fV fV ks @@ -26048,12 +25630,12 @@ rB fj aj wq -kZ -kZ +lq sK kZ kZ -wC +sK +gC xr aj wq @@ -26249,11 +25831,11 @@ pq rB eC aj -wq +kA lq wW -fD -fD +wW +wW wW fj xB @@ -26329,7 +25911,7 @@ HV ks ks jG -iI +br fV ks JM @@ -26454,8 +26036,8 @@ aj wq lq fj -fI -fI +lq +lq fj fj xD @@ -26539,7 +26121,7 @@ nD ks ks ks -aU +Qf Tk HL Ss @@ -26653,13 +26235,13 @@ nB rB fj aj -yO -lq -wW -fD -fD -wW -wC +wq +tk +fj +vc +vc +fj +hu xJ aj aj @@ -26852,17 +26434,17 @@ pN Ys pq nC -rB -eC +oX +nW +aj aj -wq -lq -fj -fK -fK -fj -fj -fs +aj +aj +uV +uV +uV +uV +uV aj aj xM @@ -27053,18 +26635,13 @@ lC Ys dh nH -fj -rB -fj aj -wq -lq -fj -lq -lq -lq -lq -uV +pc +pz +qa +aj +tl +aj uV pS Ib @@ -27072,6 +26649,11 @@ Ib Ib Ib Ib +Ib +Ib +Ib +Ib +Ib wH ed ed @@ -27255,25 +26837,25 @@ kG kG Ys pq -fj -oX -vb -aj -wq -tk -fj -vc -vc -vc -fz -uV -pS -wH -ed -ed -ed +ow +px +qU +ij +sO +ts +iQ +sU +CP ed -fn +Cx +xN +Cx +yR +zo +wZ +zo +sm +sm sm sm sm @@ -27457,25 +27039,25 @@ lP lD Ys mV +oD +pE +ry +ry +ry +ho +jo +sU +CP +Dp +pn aj -pc -pz -qa -aj -tl +Av +Bt +Av aj -uV -uV -uV -uV -uV -CP -ed -ed -ed -ed -ed -rA +CU +Dn +BN BN ed ed @@ -27483,7 +27065,7 @@ Dp Au xP fj -dH +xm fj fj Cy @@ -27659,25 +27241,25 @@ lD lD dh pq -ow -px -qU -ij -sO -ts +pq +pF +pe +rN +pe +ry ux sU -pS -Ib -Ib -Ib -wH -ed -ed -ed -ed -ed -rA +CP +yV +aj +aj +yy +rB +eC +qn +aj +AR +BN BN ed ed @@ -27861,25 +27443,25 @@ pN pN Ys nF -oD -pE +pq +pR ry ry ry -ho -gk +rE +uz sU CP -ed -Cx -xN -Cx -yR -zo -wZ -zo -sm -Bn +Dp +Au +fj +fj +wt +fj +fj +Cy +Dn +BN BN ed ed @@ -28064,22 +27646,22 @@ Ys Ys nG pq -pF +pZ pe rN pe ry -gm -gc -fM +sU +pS +wH Dp -pn -aj -Av -Bt -Av -aj -CU +Ar +fj +wC +Bm +wC +fj +Cz Dn BN BN @@ -28118,7 +27700,7 @@ WT Yk CB zu -YR +cM RR BQ km @@ -28266,24 +27848,24 @@ cy iq pq pq -pR +iM ry ry ry -rE -uz -gc +ij +sU CP -yV -aj -aj -yy -rB -eC -qn -aj -AR -BN +ed +Dp +Au +xP +fj +wC +fj +fj +Cy +Dn +ed ed ed nt @@ -28467,25 +28049,25 @@ pq pq pq pq -pq -pZ +lv +ry pe rN pe -ry +rE sU -pS -wH -Dp -Au -fj -fj -wt -fj +CP +ed +yV +aj +aj +yy fj -Cy -Dn -BN +eC +aj +aj +AR +ed ed kI un @@ -28669,25 +28251,25 @@ pq pq mT mT -pq -iM ry ry ry -ij -sU -CP +ry +ry +dg +mT +wH ed Dp -Ar -fj -wC -Bm -wC -fj -Cz +Xi +aj +xM +Bw +xM +aj +Ef Dn -BN +ed AC kI XL @@ -28872,23 +28454,23 @@ pq mT mT mT -ry -pe -rN -pe -rE -sU -CP +aG +oS +mT +mT +mT +mT +ed +ed +ed +BT +xQ +BT +ww +ww +xQ +BT ed -Dp -Au -xP -fj -wC -fj -fj -Cy -Dn ed ed kI @@ -29073,27 +28655,27 @@ eQ pq mT mT -ry -ry -ry -ry -ry -dg +oE +qb +qb +bS +mT +mT mT -wH -ed -yV -aj -aj -yy -fj -eC -aj -aj -AR ed ed -kI +ed +ed +Be +nt +qm +Kw +Jl +Be +Be +Cx +Cx +Cw XL fy fy @@ -29274,28 +28856,28 @@ eQ eQ pq mT -mT -mT -aG -oS -mT +oE +oE +qb +qb +rO mT mT mT ed ed -Dp -Xi -aj -xM -Bw -xM -aj -Ef -Dn -ed ed kI +un +AG +sj +vf +AG +AG +zn +Bq +Cg +CM XL fy fy @@ -29476,31 +29058,31 @@ eV eL pq mT -mT oE -qb -qb bS +oO +oE +mT mT mT mT mT ed -ed -BT -xQ -BT -ww -ww -xQ -BT -ed -ed -ed +Bc kI XL fy fy +fy +fy +fy +vf +AG +AG +AG +sj +fy +fy vF fy fy @@ -29678,29 +29260,29 @@ pq pq pq mT -oE -oE -qb -qb -rO mT +oO +oO mT mT mT -ed -ed -ed -Be -nt -qm -Kw -Jl -Be -Be -Cx -Cx -Cw -XL +mT +mT +mT +mT +mT +mT +sj +GY +fy +fy +fy +fy +fy +fy +fy +fy +fy fy fy fy @@ -29867,42 +29449,42 @@ mT mT mT mT -ku -kQ -kQ -kQ -kQ -ku -mT -mT -mT -mT -mT -mT -mT -oE -bS -oO -oE -mT -mT +pq +Ys +Ys +Ys +Ys +pq mT +zI +zI +zI +zI +zI +zI mT mT -ed -ed -kI -un -AG -sj -vf -AG -AG -zn -Bq -Cg -CM -XL +zI +zI +zI +xb +xb +xb +xb +xb +xb +xb +fy +fy +fy +fy +fy +fy +fy +fy +fy +fy +fy fy fy MI @@ -30047,64 +29629,64 @@ Zf "} (93,1,1) = {" mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -ku -kQ -kQ -kQ -kQ -ku -mT -mT -mT -mT -mT -mT -mT -mT -oO -oO -mT -mT -mT -mT -mT -mT -ed -Bc -kI -XL +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +hC +Vm +Vm +Vm +Vm +hC +zI +zI +sV +sV +hW +sV +zI +zI +zI +zI +sV +hW +fy +fy +fy +fy +fy fy fy fy fy fy -vf -AG -AG -AG -sj +fy +fy +fy +vF +fy +fy +fy +fy fy fy fy @@ -30249,54 +29831,54 @@ Zf "} (94,1,1) = {" mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT -pq -Ys -Ys -Ys -Ys -pq -mT -zI -zI -zI -zI -zI -zI -mT -mT -zI -zI -zI -xb -xb -xb -xb -xb -xb -xb -sj +hW +sV +sV +sV +sV +sV +hW +sV +sV +sV +sV +sV +hW +ag +sV +bm +bm +bm +dU +ey +bm +sV +hW +sV +sV +sV +sV +hW +iK +sV +sV +sV +sV +sV +sV +gs +hW +sV +sV +sV +fy +fy +fy +fy +fy +fy +fy +fy fy fy fy @@ -30451,46 +30033,46 @@ Zf "} (95,1,1) = {" mT -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -hC -Vm -Vm -Vm -Vm -hC -zI -zI sV sV -hW sV -zI -zI -zI -zI sV -hW +sV +sV +sV +sV +sV +sV +sV +sV +sV +ag +sV +bm +bm +bm +ey +ey +bm +sV +sV +sV +sV +sV +sV +sV +iK +sV +sV +sV +sV +sV +sV +gs +sV +sV +sV +sV fy fy fy @@ -30653,34 +30235,34 @@ Zf "} (96,1,1) = {" mT -hW sV sV sV sV sV -hW sV sV sV sV sV -hW +sV +sV +sV ag sV bm bm bm -dU +ey ey bm sV -hW sV sV sV sV -hW +sV +sV iK sV sV @@ -30689,7 +30271,7 @@ sV sV sV gs -hW +sV sV sV sV @@ -30899,7 +30481,7 @@ fy fy fy fy -fy +vG fy fy fy @@ -31057,31 +30639,31 @@ Zf "} (98,1,1) = {" mT +ae sV sV sV sV sV +ae sV sV sV sV sV -sV -sV -sV +ae ag sV bm bm bm -ey +eX ey bm sV sV sV -sV +ae sV sV sV @@ -31093,7 +30675,7 @@ sV sV sV gs -sV +ae sV sV sV @@ -31259,51 +30841,51 @@ Zf "} (99,1,1) = {" mT +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI sV sV +ae sV -sV -sV -sV -sV -sV -sV -sV -sV -sV -sV -ag -sV -bm -bm -bm -ey -ey -bm -sV -sV -sV -sV -sV -sV -sV -iK -sV -sV -sV -sV -sV -sV -gs -sV -sV -sV -sV +zI +zI +zI +zI +qW +ae +fy fy fy fy fy -vG fy fy fy @@ -31461,55 +31043,55 @@ Zf "} (100,1,1) = {" mT -ae -sV -sV -sV -sV -sV -ae -sV -sV -sV -sV -sV -ae -ag -sV -bm -bm -bm -eX -ey -bm -sV -sV -sV -ae -sV -sV -sV -iK -sV -sV -sV -sV -sV -sV -gs -ae -sV -sV -sV -fy -fy -fy -fy -fy -fy -fy -fy -fy +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +zI +zI +zI +zI +zI +zI +mT +mT +zI +zI +zI +xb +xb +xb +xb +xb +xb +xb +mT +mT fy fy fy @@ -31663,54 +31245,54 @@ Zf "} (101,1,1) = {" mT -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -zI -sV -sV -ae -sV -zI -zI -zI -zI -qW -ae -fy -fy -fy -fy -fy -fy -fy -fy +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT mT mT zs @@ -31894,24 +31476,24 @@ mT mT mT mT -zI -zI -zI -zI -zI -zI mT mT -zI -zI -zI -xb -xb -xb -xb -xb -xb -xb +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT +mT mT mT mT @@ -32959,7 +32541,7 @@ KF KF Sh SK -Xm +ft Ut VN Xe diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 05bf1755ff76..f493057508fe 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -1099,6 +1099,14 @@ em { color: hsl(158, 49%, 47%); } +.kiloradio { + color: #059e96; +} + +.oscarradio { + color: #bde331; +} + .opforcmd { color: hsl(202, 78%, 67%); } diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 360a7ce3d8ac..e3122290a972 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -1130,6 +1130,14 @@ h2.alert { color: hsl(158, 37%, 36%); } +.kiloradio { + color: #059e96; +} + +.oscarradio { + color: #bde331; +} + .opforcmd { color: hsl(202, 35%, 51%); } diff --git a/tgui/packages/tgui-say/constants.ts b/tgui/packages/tgui-say/constants.ts index 614043a90636..5282b503189d 100644 --- a/tgui/packages/tgui-say/constants.ts +++ b/tgui/packages/tgui-say/constants.ts @@ -169,12 +169,12 @@ export const RADIO_PREFIXES = { label: 'UPP CCT', }, ':k ': { - id: 'sof', - label: 'SOF', + id: 'kilo', + label: 'Kilo', }, '.k ': { - id: 'yautja', - label: 'Military', + id: 'kilo', + label: 'Kilo', }, '#k ': { id: 'specops', @@ -209,12 +209,12 @@ export const RADIO_PREFIXES = { label: 'UPP Engi', }, ':o ': { - id: 'colony', - label: 'Colony', + id: 'oscar', + label: 'Oscar', }, '.o ': { - id: 'colony', - label: 'Colony', + id: 'oscar', + label: 'Oscar', }, '#o ': { id: 'pmc-cct', @@ -320,41 +320,61 @@ export const RADIO_PREFIXES = { id: 'wysec', label: 'W-Y Sec', }, + ':z ': { + id: 'highcom', + label: 'HC', + }, + '.z ': { + id: 'highcom', + label: 'HC', + }, + '#z ': { + id: 'pmc-cmd', + label: 'PMC Cmd.', + }, ':1 ': { - id: 'wypub', - label: 'W-Y Pub', + id: 'sof', + label: 'SOF', }, '.1 ': { - id: 'wypub', - label: 'W-Y Pub', - }, - '#1 ': { - id: 'wypub', - label: 'W-Y Pub', + id: 'sof', + label: 'SOF', }, ':2 ': { + id: 'colony', + label: 'Colony', + }, + '.2 ': { + id: 'colony', + label: 'Colony', + }, + ':3 ': { id: 'cia', label: 'CIA', }, - '.2 ': { + '.3 ': { id: 'cia', label: 'CIA', }, - '#2 ': { + '#3 ': { id: 'cia', label: 'CIA', }, - ':z ': { - id: 'highcom', - label: 'HC', + ':4 ': { + id: 'wypub', + label: 'W-Y Pub', }, - '.z ': { - id: 'highcom', - label: 'HC', + '.4 ': { + id: 'wypub', + label: 'W-Y Pub', }, - '#z ': { - id: 'pmc-cmd', - label: 'PMC Cmd.', + '#4 ': { + id: 'wypub', + label: 'W-Y Pub', + }, + ':5 ': { + id: 'yautja', + label: 'Military', }, } as const; diff --git a/tgui/packages/tgui-say/styles/colors.scss b/tgui/packages/tgui-say/styles/colors.scss index 8895a78df380..f9f3ce8d5ec7 100644 --- a/tgui/packages/tgui-say/styles/colors.scss +++ b/tgui/packages/tgui-say/styles/colors.scss @@ -30,6 +30,8 @@ $alpha: hsl(0, 72%, 50%); $bravo: hsl(39, 85%, 42%); $charlie: hsl(300, 33%, 50%); $delta: hsl(203, 100%, 41%); +$kilo: hsl(177, 94%, 32%); +$oscar: hsl(94, 25%, 42%); $echo: hsl(158, 49%, 47%); $foxtrot: hsl(22, 41%, 48%); $jtac: hsl(311, 49%, 45%); @@ -69,6 +71,8 @@ $_channel_map: ( 'bravo': $bravo, 'charlie': $charlie, 'delta': $delta, + 'kilo': $kilo, + 'oscar': $oscar, 'echo': $echo, 'foxtrot': $foxtrot, 'jtac': $jtac, diff --git a/tgui/packages/tgui/interfaces/CentralOverwatchConsole.tsx b/tgui/packages/tgui/interfaces/CentralOverwatchConsole.tsx index 77da6c9750d2..681af9d899fd 100644 --- a/tgui/packages/tgui/interfaces/CentralOverwatchConsole.tsx +++ b/tgui/packages/tgui/interfaces/CentralOverwatchConsole.tsx @@ -9,6 +9,8 @@ import { Divider, Flex, Input, + LabeledControls, + NumberInput, Section, Stack, Table, @@ -79,6 +81,15 @@ type Data = { time_request: number; ob_warhead: string; echo_squad_active: Boolean; + executive: Boolean; + has_crate_loaded: BooleanLike; + saved_coordinates: { + x: number; + y: number; + z: number; + comment: string; + index: number; + }[]; }; type Props = Partial<{ @@ -91,7 +102,7 @@ export const CentralOverwatchConsole = (props) => { return ( @@ -195,32 +206,59 @@ const SecondaryFunctions = (props) => { Squad Monitor setsecondaryCategory('execpanel')} + selected={secondarycategory === 'oblaunch'} + icon="bomb" + onClick={() => setsecondaryCategory('oblaunch')} p="3px" bold > - Executive Panel + Orbital Bombardment setsecondaryCategory('emergencypanel')} + selected={secondarycategory === 'supplydrop'} + icon="wrench" + onClick={() => setsecondaryCategory('supplydrop')} p="3px" bold > - Emergency Measures - - setsecondaryCategory('ob')} - p="3px" - bold - > - Ordnance Systems + Supply Drop + {!data.executive && ( + act('tacmap_unpin')}> + Tactical Map + + )} + {!!data.executive && ( + <> + setsecondaryCategory('execpanel')} + p="3px" + bold + > + Executive Panel + + setsecondaryCategory('emergencypanel')} + p="3px" + bold + > + Emergency Measures + + setsecondaryCategory('ob')} + p="3px" + bold + > + Ordnance Systems + + + )} @@ -233,6 +271,8 @@ const SecondaryFunctions = (props) => { ) : ( ))} + {secondarycategory === 'oblaunch' && } + {secondarycategory === 'supplydrop' && } {secondarycategory === 'execpanel' && } {secondarycategory === 'emergencypanel' && } @@ -333,22 +373,24 @@ const CombinedSquadPanel = (props: Props) => { onClick={() => setMinimised(!minimised)} /> - - - + {!!data.executive && ( + + + + )} @@ -543,34 +585,39 @@ const CombinedSquadPanel = (props: Props) => { inline width="100%" icon="envelope" - onClick={() => act('message')} + onClick={() => act('set_primary')} > - MESSAGE SQUAD + SET PRIMARY + + + @@ -1105,6 +1152,16 @@ const SquadMonitor = (props) => { {marine.distance} + + + + + + + + + + + + + ); +}; + +const OrbitalBombardmentLaunch = (props) => { + const { act, data } = useBackend(); + + const [OBX, setOBX] = useSharedState('obx', 0); + const [OBY, setOBY] = useSharedState('oby', 0); + const [OBZ, setOBZ] = useSharedState('obz', 0); + + let ob_status = 'Ready'; + let ob_color = 'green'; + if (data.ob_cooldown) { + ob_status = 'Cooldown - ' + data.ob_cooldown / 10 + ' seconds'; + ob_color = 'yellow'; + } else if (data.ob_safety) { + ob_status = 'Cannon Safety Engaged'; + ob_color = 'red'; + } else if (!data.ob_loaded) { + ob_status = 'Not chambered'; + ob_color = 'red'; + } + + return ( +
+ + + + + setOBX(value)} + width="75px" + /> + + + setOBY(value)} + width="75px" + /> + + + setOBZ(value)} + width="75px" + /> + + + + + {ob_status} + + + + + + + + + + + + + + +
+ ); +}; + +const SavedCoordinates = (props) => { + const { act, data } = useBackend(); + + const [OBX, setOBX] = useSharedState('obx', 0); + const [OBY, setOBY] = useSharedState('oby', 0); + const [OBZ, setOBZ] = useSharedState('obz', 0); + const [supplyX, setSupplyX] = useSharedState('supplyx', 0); + const [supplyY, setSupplyY] = useSharedState('supply', 0); + const [supplyZ, setSupplyZ] = useSharedState('supplyz', 0); + + const { forOB, forSupply } = props; + + let transferCoords = (x, y, z) => { + if (forSupply) { + setSupplyX(x); + setSupplyY(y); + setSupplyZ(z); + } else if (forOB) { + setOBX(x); + setOBY(y); + setOBZ(z); + } + }; + + return ( + + + Max 3 stored coordinates. Will overwrite oldest first. + + + + + LONG. + + + LAT. + + + HEIGHT + + COMMENT + + + {data.saved_coordinates.map((coords, index) => ( + + {coords.x} + {coords.y} + {coords.z} + + + act('change_coordinate_comment', { + comment: value, + index: coords.index, + }) + } + /> + + +
+ + ); +}; diff --git a/tgui/packages/tgui/interfaces/CrewManifest.tsx b/tgui/packages/tgui/interfaces/CrewManifest.tsx index 97197b453c15..b72a0154237b 100644 --- a/tgui/packages/tgui/interfaces/CrewManifest.tsx +++ b/tgui/packages/tgui/interfaces/CrewManifest.tsx @@ -35,6 +35,8 @@ export const CrewManifest = (props, context) => { 'Bravo', 'Charlie', 'Delta', + 'Kilo', + 'Oscar', 'Echo', 'Foxtrot', 'Intel', diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index fb90b3529071..0c7ab98c9e9d 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -274,6 +274,8 @@ const marineSplitter = (members: Array) => { const bravoSquad: Array = []; const charlieSquad: Array = []; const deltaSquad: Array = []; + const kiloSquad: Array = []; + const oscarSquad: Array = []; const foxtrotSquad: Array = []; const echoSquad: Array = []; const CBRNSquad: Array = []; @@ -304,6 +306,10 @@ const marineSplitter = (members: Array) => { foxtrotSquad.push(x); } else if (x.job?.includes('Echo')) { echoSquad.push(x); + } else if (x.job?.includes('Kilo')) { + kiloSquad.push(x); + } else if (x.job?.includes('Oscar')) { + oscarSquad.push(x); } else if (x.job?.includes('CBRN')) { CBRNSquad.push(x); } else if (x.job?.includes('FORECON')) { @@ -327,6 +333,8 @@ const marineSplitter = (members: Array) => { buildSquadObservable('Bravo', 'yellow', bravoSquad), buildSquadObservable('Charlie', 'purple', charlieSquad), buildSquadObservable('Delta', 'blue', deltaSquad), + buildSquadObservable('Kilo', 'teal', kiloSquad), + buildSquadObservable('Oscar', 'green', oscarSquad), buildSquadObservable('Foxtrot', 'brown', foxtrotSquad), buildSquadObservable('Echo', 'teal', echoSquad), buildSquadObservable('CBRN', 'dark-blue', CBRNSquad), diff --git a/tgui/packages/tgui/interfaces/PriorityInput.tsx b/tgui/packages/tgui/interfaces/PriorityInput.tsx new file mode 100644 index 000000000000..dc6761e4cffb --- /dev/null +++ b/tgui/packages/tgui/interfaces/PriorityInput.tsx @@ -0,0 +1,152 @@ +import { createSearch, decodeHtmlEntities } from 'common/string'; +import { useEffect, useState } from 'react'; +import { useBackend } from 'tgui/backend'; +import { + Button, + Icon, + Input, + NoticeBox, + Section, + Stack, + Table, + Tooltip, +} from 'tgui/components'; +import { TableCell, TableRow } from 'tgui/components/Table'; +import { Window } from 'tgui/layouts'; + +import { InputButtons } from './common/InputButtons'; +import { Loader } from './common/Loader'; + +type Data = { + items: string[]; + message: string; + title: string; + timeout: number; + theme: string; +}; + +export const PriorityInput = (props) => { + const { data } = useBackend(); + const { items = [], message, timeout, title, theme } = data; + + // The full order of items as displayed. Reordering mutates this. + const [itemsOrder, setItemsOrder] = useState(items); + + // Which items are checked/selected. Default to all items checked. + const [selections, setSelections] = useState(items); + + // Keep itemsOrder in sync if `items` prop changes. + useEffect(() => setItemsOrder(items), [items]); + useEffect(() => setSelections(items), [items]); + + const [searchQuery, setSearchQuery] = useState(''); + const search = createSearch(searchQuery, (item: string) => item); + + // Filtered view but preserve relative ordering from itemsOrder + const toDisplay = itemsOrder.filter(search); + + const move = (name: string, dir: -1 | 1) => { + const idx = itemsOrder.indexOf(name); + if (idx === -1) return; + const newIdx = idx + dir; + if (newIdx < 0 || newIdx >= itemsOrder.length) return; + const newOrder = [...itemsOrder]; + const [item] = newOrder.splice(idx, 1); + newOrder.splice(newIdx, 0, item); + setItemsOrder(newOrder); + }; + + return ( + + {!!timeout && } + + + + + {decodeHtmlEntities(message)}{' '} + + + +
+ + {toDisplay.map((item, index) => { + const origIdx = itemsOrder.indexOf(item); + return ( + + + { + const newSelections = selections.includes(item) + ? selections.filter((s) => s !== item) + : [...selections, item]; + setSelections(newSelections); + }} + fluid + > + {item} + + + + + + + + + + + + + + + + + + ); + })} +
+
+ + + + + + + + + setSearchQuery(value)} + /> + + + +
+ selections.includes(i))} + /> +
+ + + + + ); +}; diff --git a/tgui/packages/tgui/styles/interfaces/CrewManifest.scss b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss index 193f4eec8260..9422161f190e 100644 --- a/tgui/packages/tgui/styles/interfaces/CrewManifest.scss +++ b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss @@ -9,6 +9,8 @@ $departmental-colors: ( 'Bravo': hsl(39, 85%, 42%), 'Charlie': hsl(300, 33%, 50%), 'Delta': hsl(203, 100%, 41%), + 'Kilo': hsl(177, 94%, 32%), + 'Oscar': hsl(73, 76%, 54%), 'Echo': hsl(143, 41%, 48%), 'Foxtrot': hsl(22, 38%, 44%), 'Intel': hsl(142, 92%, 30%),