diff --git a/code/__DEFINES/dcs/signals/atom/signals_atom.dm b/code/__DEFINES/dcs/signals/atom/signals_atom.dm index 01e1533189..17915824a0 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_atom.dm @@ -65,3 +65,9 @@ #define COMSIG_ATOM_PHONE_RINGING "atom_phone_ringing" /// From /datum/component/phone/proc/reset_call() #define COMSIG_ATOM_PHONE_STOPPED_RINGING "atom_phone_stopped_ringing" + +/// Called when an atom has something mouse dropped on it, from /client/MouseDrop: (atom/dropped_on) +#define COMSIG_ATOM_DROPPED_ON "atom_dropped_on" + +/// Called when an atom is mouse dropped on another atom, from /client/MouseDrop: (atom/dropped_onto) +#define COMSIG_ATOM_DROP_ON "atom_drop_on" diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm index 9c2f3b92ba..532437e4a0 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -38,3 +38,6 @@ #define COMSIG_ITEM_ZOOM "item_zoom" /// from /obj/item/proc/unzoom() : (mob/user) #define COMSIG_ITEM_UNZOOM "item_unzoom" + +//Additional procs on items that will be triggered right after the human finishes spawns in +#define COMSIG_POST_SPAWN_UPDATE "post_spawn_update" diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm index 1bdf2318d2..9257172eee 100644 --- a/code/__DEFINES/surgery.dm +++ b/code/__DEFINES/surgery.dm @@ -149,7 +149,7 @@ See also /datum/surgery_step/saw_off_limb/failure var/list/cannot_hack, listing #define SURGERY_TOOLS_SEVER_BONE list(\ /obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL,\ /obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBOPTIMAL,\ - /obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\ + /obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\ /obj/item/tool/hatchet = SURGERY_TOOL_MULT_SUBSTITUTE,\ /obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_SUBSTITUTE,\ /obj/item/attachable/bayonet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE\ diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 137095327a..5d3fca1a20 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -1,3 +1,7 @@ +// placeholder strings to be replaced +#define WIKI_PLACEHOLDER "%WIKIURL%" +#define LAW_PLACEHOLDER "%LAWURL%" + // ------ MISC WIKI LINKS ------ // #define URL_WIKI_LAW "Marine_Law" #define URL_WIKI_XENO_QUICKSTART "Xeno_Quickstart_Guide" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 068825714d..07f237fada 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -21,16 +21,16 @@ #define between(low, middle, high) (max(min(middle, high), low)) //Offuscate x for coord system -#define obfuscate_x(x) (x + obfs_x) +#define obfuscate_x(x) (x + GLOB.obfs_x) //Offuscate y for coord system -#define obfuscate_y(y) (y + obfs_y) +#define obfuscate_y(y) (y + GLOB.obfs_y) //Deoffuscate x for coord system -#define deobfuscate_x(x) (x - obfs_x) +#define deobfuscate_x(x) (x - GLOB.obfs_x) //Deoffuscate y for coord system -#define deobfuscate_y(y) (y - obfs_y) +#define deobfuscate_y(y) (y - GLOB.obfs_y) #define can_xeno_build(T) (!T.density && !(locate(/obj/structure/fence) in T) && !(locate(/obj/structure/tunnel) in T) && (locate(/obj/effect/alien/weeds) in T)) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index 565d07168f..3acedaa870 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -30,3 +30,10 @@ GLOBAL_VAR_INIT(time_offset, setup_offset()) /// The last count of possible candidates in the xeno larva queue (updated via get_alien_candidates) GLOBAL_VAR(xeno_queue_candidate_count) + +//Coordinate obsfucator +//Used by the rangefinders and linked systems to prevent coords collection/prefiring +/// A number between -500 and 500. +GLOBAL_VAR(obfs_x) +/// A number between -500 and 500. +GLOBAL_VAR(obfs_y) diff --git a/code/_onclick/click_hold.dm b/code/_onclick/click_hold.dm index f65dd33c2e..996f7ed2bf 100644 --- a/code/_onclick/click_hold.dm +++ b/code/_onclick/click_hold.dm @@ -94,3 +94,12 @@ // Add the hovered atom to the trace LAZYADD(mouse_trace_history, over_obj) + +/client/MouseDrop(datum/over_object, datum/src_location, over_location, src_control, over_control, params) + . = ..() + + if(src_location) + SEND_SIGNAL(src_location, COMSIG_ATOM_DROPPED_ON, over_object, src) + + if(over_object) + SEND_SIGNAL(over_object, COMSIG_ATOM_DROP_ON, src_location, src) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 35b6073ee4..b49bce4111 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -30,6 +30,10 @@ /atom/movable/screen/inventory var/slot_id //The indentifier for the slot. It has nothing to do with ID cards. +/atom/movable/screen/inventory/Initialize(mapload, ...) + . = ..() + + RegisterSignal(src, COMSIG_ATOM_DROPPED_ON, PROC_REF(handle_dropped_on)) /atom/movable/screen/close name = "close" @@ -325,6 +329,22 @@ return 1 return 0 +/atom/movable/screen/inventory/proc/handle_dropped_on(atom/dropped_on, atom/dropping, client/user) + SIGNAL_HANDLER + + if(slot_id != WEAR_L_HAND && slot_id != WEAR_R_HAND) + return + + if(!isstorage(dropping.loc)) + return + + if(!user.mob.Adjacent(dropping)) + return + + var/obj/item/storage/store = dropping.loc + store.remove_from_storage(dropping, get_turf(user.mob)) + user.mob.put_in_active_hand(dropping) + /atom/movable/screen/throw_catch name = "throw/catch" icon = 'icons/mob/hud/human_midnight.dmi' diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index e8b010669c..0066fee5d2 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,6 +22,8 @@ var/static/regex/ic_filter_regex var/list/fail_to_topic_whitelisted_ips + var/is_loaded = FALSE + /datum/controller/configuration/proc/admin_reload() if(IsAdminAdvancedProcCall()) alert_proccall("configuration admin_reload") @@ -55,6 +57,8 @@ LoadChatFilter() LoadTopicRateWhitelist() + is_loaded = TRUE + if(Master) Master.OnConfigLoad() diff --git a/code/datums/components/autofire/autofire.dm b/code/datums/components/autofire/autofire.dm index 2b9401e8d3..d052127eff 100644 --- a/code/datums/components/autofire/autofire.dm +++ b/code/datums/components/autofire/autofire.dm @@ -123,19 +123,19 @@ if(GUN_FIREMODE_BURSTFIRE) shots_fired++ if(shots_fired == burst_shots_to_fire) - callback_bursting.Invoke(FALSE) - callback_display_ammo.Invoke() + callback_bursting?.Invoke(FALSE) + callback_display_ammo?.Invoke() bursting = FALSE stop_firing() if(have_to_reset_at_burst_end)//We failed to reset because we were bursting, we do it now - callback_reset_fire.Invoke() + callback_reset_fire?.Invoke() have_to_reset_at_burst_end = FALSE return - callback_bursting.Invoke(TRUE) + callback_bursting?.Invoke(TRUE) bursting = TRUE next_fire = world.time + burstfire_shot_delay if(GUN_FIREMODE_AUTOMATIC) - callback_set_firing.Invoke(TRUE) + callback_set_firing?.Invoke(TRUE) next_fire = world.time + (auto_fire_shot_delay * automatic_delay_mult) if(GUN_FIREMODE_SEMIAUTO) return diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index a48cdf62a8..e70d47c6be 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -586,7 +586,7 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat /obj/item/storage/box/packet/hefa/toy, /obj/item/toy/inflatable_duck, /obj/item/toy/beach_ball, - /obj/item/toy/farwadoll, + /obj/item/toy/plush/farwa, /obj/item/toy/waterflower, /obj/item/toy/spinningtoy, /obj/item/storage/box/snappops, diff --git a/code/game/area/WhiskeyOutpost.dm b/code/game/area/WhiskeyOutpost.dm index 02d94dc942..aef72d1a99 100644 --- a/code/game/area/WhiskeyOutpost.dm +++ b/code/game/area/WhiskeyOutpost.dm @@ -65,7 +65,7 @@ icon_state = "livingspace" /area/whiskey_outpost/inside/supply - name = "\improper Supply Depo" + name = "\improper Supply Depot" icon_state = "req" /* diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm index c8c90fa51c..bd5302bf7e 100644 --- a/code/game/gamemodes/colonialmarines/huntergames.dm +++ b/code/game/gamemodes/colonialmarines/huntergames.dm @@ -11,11 +11,11 @@ #define HUNTER_GOOD_ITEM pick(\ 50; /obj/item/weapon/shield/riot, \ - 100; /obj/item/weapon/claymore, \ - 100; /obj/item/weapon/katana, \ + 100; /obj/item/weapon/sword, \ + 100; /obj/item/weapon/sword/katana, \ 100; /obj/item/weapon/harpoon/yautja, \ - 150; /obj/item/weapon/claymore/mercsword, \ - 200; /obj/item/weapon/claymore/mercsword/machete, \ + 150; /obj/item/weapon/sword, \ + 200; /obj/item/weapon/sword/machete, \ 125; /obj/item/weapon/twohanded/fireaxe, \ \ 100; /obj/item/device/binoculars, \ @@ -51,7 +51,7 @@ 300; /obj/item/tool/hatchet, \ 100; /obj/item/tool/scythe, \ 100; /obj/item/tool/kitchen/knife/butcher, \ - 50; /obj/item/weapon/katana/replica, \ + 50; /obj/item/weapon/sword/katana/replica, \ 100; /obj/item/weapon/harpoon, \ 75; /obj/item/attachable/bayonet, \ 200; /obj/item/weapon/throwing_knife, \ diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index aeffceee1d..2f46de7556 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -322,9 +322,9 @@ OT = "sup" //no breaking anything. else if (OT == "sup") - randpick = rand(0,50) + randpick = rand(0,90) switch(randpick) - if(0 to 5)//Marine Gear 10% Chance. + if(0 to 3)//Marine Gear 3% Chance. crate = new /obj/structure/closet/crate/secure/gear(T) choosemax = rand(5,10) randomitems = list(/obj/item/clothing/head/helmet/marine, @@ -340,19 +340,19 @@ /obj/effect/landmark/wo_supplies/storage/webbing, /obj/item/device/binoculars) - if(6 to 10)//Lights and shiet 10% + if(4 to 6)//Lights and shiet 2% new /obj/structure/largecrate/supply/floodlights(T) new /obj/structure/largecrate/supply/supplies/flares(T) - if(11 to 13) //6% Chance to drop this !FUN! junk. + if(7 to 10) //3% Chance to drop this !FUN! junk. crate = new /obj/structure/closet/crate/secure/gear(T) spawnitems = list(/obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full) - if(14 to 18)//Materials 10% Chance. + if(11 to 22)//Materials 12% Chance. crate = new /obj/structure/closet/crate/secure/gear(T) choosemax = rand(3,8) randomitems = list(/obj/item/stack/sheet/metal, @@ -363,7 +363,7 @@ /obj/item/stack/sandbags_empty/half, /obj/item/stack/sandbags_empty/half) - if(19 to 20)//Blood Crate 4% chance + if(23 to 25)//Blood Crate 2% chance crate = new /obj/structure/closet/crate/medical(T) spawnitems = list(/obj/item/reagent_container/blood/OMinus, /obj/item/reagent_container/blood/OMinus, @@ -371,7 +371,7 @@ /obj/item/reagent_container/blood/OMinus, /obj/item/reagent_container/blood/OMinus) - if(21 to 25)//Advanced meds Crate 10% + if(26 to 30)//Advanced meds Crate 5% crate = new /obj/structure/closet/crate/medical(T) spawnitems = list(/obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/regular, @@ -386,7 +386,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/device/defibrillator) - if(26 to 30)//Random Medical Items 10% as well. Made the list have less small junk + if(31 to 34)//Random Medical Items 4%. Made the list have less small junk crate = new /obj/structure/closet/crate/medical(T) spawnitems = list(/obj/item/storage/belt/medical/lifesaver/full, /obj/item/storage/belt/medical/lifesaver/full, @@ -394,7 +394,7 @@ /obj/item/storage/belt/medical/lifesaver/full, /obj/item/storage/belt/medical/lifesaver/full) - if(31 to 35)//Random explosives Crate 10% because the lord commeth and said let there be explosives. + if(35 to 40)//Random explosives Crate 5% because the lord commeth and said let there be explosives. crate = new /obj/structure/closet/crate/ammo(T) choosemax = rand(1,5) randomitems = list(/obj/item/storage/box/explosive_mines, @@ -404,7 +404,7 @@ /obj/item/explosive/grenade/high_explosive, /obj/item/storage/box/nade_box ) - if(36 to 40) // Junk + if(41 to 44) crate = new /obj/structure/closet/crate/ammo(T) spawnitems = list( /obj/item/attachable/heavy_barrel, @@ -412,20 +412,75 @@ /obj/item/attachable/heavy_barrel, /obj/item/attachable/heavy_barrel) - if(40 to 48)//Weapon + supply beacon drop. 6% + if(45 to 50)//Weapon + supply beacon drop. 5% crate = new /obj/structure/closet/crate/ammo(T) spawnitems = list(/obj/item/device/whiskey_supply_beacon, /obj/item/device/whiskey_supply_beacon, /obj/item/device/whiskey_supply_beacon, /obj/item/device/whiskey_supply_beacon) - if(49 to 50)//Rare weapons. Around 4% + if(51 to 57)//Rare weapons. Around 6% crate = new /obj/structure/closet/crate/ammo(T) spawnitems = list(/obj/effect/landmark/wo_supplies/ammo/box/rare/m41aap, /obj/effect/landmark/wo_supplies/ammo/box/rare/m41aapmag, /obj/effect/landmark/wo_supplies/ammo/box/rare/m41aextend, /obj/effect/landmark/wo_supplies/ammo/box/rare/smgap, /obj/effect/landmark/wo_supplies/ammo/box/rare/smgextend) + + if(58 to 65) // Sandbags kit + crate = new /obj/structure/closet/crate(T) + spawnitems = list(/obj/item/tool/shovel/etool, + /obj/item/stack/sandbags_empty/half, + /obj/item/stack/sandbags_empty/half, + /obj/item/stack/sandbags_empty/half) + + if(66 to 70) // Mortar shells. Pew Pew! + crate = new /obj/structure/closet/crate/secure/mortar_ammo(T) + choosemax = rand(6,10) + randomitems = list(/obj/item/mortar_shell/he, + /obj/item/mortar_shell/incendiary, + /obj/item/mortar_shell/flare, + /obj/item/mortar_shell/frag) + + if(71 to 79) + crate = new /obj/structure/closet/crate/ammo(T) + choosemax = rand(2, 3) + randomitems = list(/obj/item/ammo_box/rounds, + /obj/item/ammo_box/rounds/ap, + /obj/item/ammo_box/rounds/smg, + /obj/item/ammo_box/rounds/smg/ap, + /obj/item/ammo_box/magazine/ap, + /obj/item/ammo_box/magazine/ext, + /obj/item/ammo_box/magazine/m4ra/ap, + /obj/item/ammo_box/magazine/m4ra/ap, + /obj/item/ammo_box/magazine/m39/ap, + /obj/item/ammo_box/magazine/m39/ext, + ) + + if(80 to 82) + crate = new /obj/structure/closet/crate/ammo(T) + choosemax = rand(2, 3) + randomitems = list(/obj/item/ammo_magazine/rifle/lmg/holo_target, + /obj/item/ammo_magazine/rifle/lmg/holo_target, + /obj/item/ammo_magazine/rifle/lmg, + /obj/item/ammo_magazine/rifle/lmg, + ) + + if(83 to 86) + crate = new /obj/structure/closet/crate/ammo(T) + spawnitems = list( + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/magnetic_harness) + + if(86 to 90) + crate = new /obj/structure/closet/crate/secure/gear(T) + spawnitems = list( + /obj/item/device/binoculars/range, + /obj/item/device/binoculars/range, + ) + if(crate) crate.storage_capacity = 60 diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index 7f73376a05..cbbb871249 100644 --- a/code/game/jobs/job/civilians/other/liaison.dm +++ b/code/game/jobs/job/civilians/other/liaison.dm @@ -6,7 +6,7 @@ selection_class = "job_cl" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/liaison - entry_message_body = "As a representative of Weyland-Yutani Corporation, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal." + entry_message_body = "As a representative of Weyland-Yutani Corporation, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal." var/mob/living/carbon/human/active_liaison /datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index 4b1975015a..97578eb115 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -6,7 +6,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the auxiliary support officer" gear_preset = /datum/equipment_preset/uscm_ship/chef - entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!" + entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!" /obj/effect/landmark/start/chef name = JOB_MESS_SERGEANT diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 8c4690ea20..835f16f7d8 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/code/game/jobs/job/civilians/support/cmo.dm @@ -6,7 +6,7 @@ selection_class = "job_cmo" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo - entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." + entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." AddTimelock(/datum/job/civilian/professor, list( JOB_MEDIC_ROLES = 10 HOURS diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm index 7a0cab16f5..8912011298 100644 --- a/code/game/jobs/job/civilians/support/nurse.dm +++ b/code/game/jobs/job/civilians/support/nurse.dm @@ -6,7 +6,7 @@ selection_class = "job_doctor" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/nurse - entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines." + entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines." /obj/effect/landmark/start/nurse name = JOB_NURSE diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index 61245c8164..21163f2795 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/code/game/jobs/job/civilians/support/researcher.dm @@ -10,7 +10,7 @@ selection_class = "job_researcher" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/researcher - entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor." + entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor." /datum/job/civilian/researcher/set_spawn_positions(count) spawn_positions = rsc_slot_formula(count) diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 3e02385bc9..70060fb36a 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/code/game/jobs/job/civilians/support/synthetic.dm @@ -9,7 +9,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN flags_whitelist = WHITELIST_SYNTHETIC gear_preset = /datum/equipment_preset/synth/uscm - entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!" + entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!" /datum/job/civilian/synthetic/New() . = ..() diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm index e5155c949a..5f62930003 100644 --- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm +++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm @@ -5,7 +5,7 @@ allow_additional = TRUE flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/auxiliary_officer - entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency." + entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency." AddTimelock(/datum/job/command/auxiliary_officer, list( JOB_SQUAD_ROLES = 5 HOURS, diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index c8dfe2a8eb..0770bcd60f 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -7,7 +7,7 @@ supervisors = "the pilot officers" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/dcc - entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." + entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." AddTimelock(/datum/job/command/crew_chief, list( JOB_SQUAD_ROLES = 5 HOURS diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 8d83d49ed1..9905bc9d37 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -8,7 +8,7 @@ supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = "USCM Intelligence Officer (IO) (Cryo)" - entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." + entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." /datum/job/command/intel/set_spawn_positions(count) spawn_positions = int_slot_formula(count) diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index a75846f929..1a7a7c21d5 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -7,7 +7,7 @@ supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/po - entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason." + entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason." // Dropship Roles is both PO and DCC combined to not force people to backtrack AddTimelock(/datum/job/command/pilot, list( diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm index 5e9b7caf1f..014db9569b 100644 --- a/code/game/jobs/job/command/auxiliary/senior.dm +++ b/code/game/jobs/job/command/auxiliary/senior.dm @@ -7,7 +7,7 @@ job_options = list("Gunnery Sergeant" = "GySGT", "Master Sergeant" = "MSgt", "First Sergeant" = "1Sgt", "Master Gunnery Sergeant" = "MGySgt", "Sergeant Major" = "SgtMaj") /datum/job/command/senior/on_config_load() - entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board." + entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board." return ..() /datum/job/command/senior/announce_entry_message(mob/living/carbon/human/H) diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 98db585e1d..72f8613519 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -16,7 +16,7 @@ ) /datum/job/command/commander/generate_entry_message() - entry_message_body = "You are the Commanding Officer of the [MAIN_SHIP_NAME] as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed." + entry_message_body = "You are the Commanding Officer of the [MAIN_SHIP_NAME] as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed." return ..() /datum/job/command/commander/get_whitelist_status(list/roles_whitelist, client/player) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 54ff400763..7e27cb5b3b 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -10,7 +10,7 @@ scaled = FALSE flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/so - entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers." + entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers." job_options = list(FIRST_LT_VARIANT = "1stLt", SECOND_LT_VARIANT = "2ndLt") diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm index b76943c4d0..63e6d8023f 100644 --- a/code/game/jobs/job/command/police/chief_police.dm +++ b/code/game/jobs/job/command/police/chief_police.dm @@ -4,7 +4,7 @@ selection_class = "job_cmp" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/cmp - entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" + entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" AddTimelock(/datum/job/command/warrant, list( JOB_POLICE_ROLES = 15 HOURS, diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm index 7285c5b278..e05bc2e962 100644 --- a/code/game/jobs/job/command/police/police.dm +++ b/code/game/jobs/job/command/police/police.dm @@ -8,7 +8,7 @@ selection_class = "job_mp" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/mp - entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" + entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" /datum/job/command/police/set_spawn_positions(count) spawn_positions = mp_slot_formula(count) diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm index 55cbea9754..d2775e1975 100644 --- a/code/game/jobs/job/command/police/warden.dm +++ b/code/game/jobs/job/command/police/warden.dm @@ -5,7 +5,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the Chief MP" gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/warden - entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig." + entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig." AddTimelock(/datum/job/command/warden, list( JOB_POLICE_ROLES = 10 HOURS diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 0d68d23e55..48ad372e1f 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -49,13 +49,16 @@ if(!disp_title) disp_title = title + if(global.config.is_loaded) + on_config_load() + /datum/job/proc/on_config_load() if(entry_message_body) entry_message_body = replace_placeholders(entry_message_body) /datum/job/proc/replace_placeholders(replacement_string) - replacement_string = replacetextEx(replacement_string, "%WIKIURL%", generate_wiki_link()) - replacement_string = replacetextEx(replacement_string, "%LAWURL%", "[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_LAW]") + replacement_string = replacetextEx(replacement_string, WIKI_PLACEHOLDER, generate_wiki_link()) + replacement_string = replacetextEx(replacement_string, LAW_PLACEHOLDER, "[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_LAW]") return replacement_string /datum/job/proc/generate_wiki_link() diff --git a/code/game/jobs/job/logistics/cargo/cargo_tech.dm b/code/game/jobs/job/logistics/cargo/cargo_tech.dm index 3b588022bd..c4725289c3 100644 --- a/code/game/jobs/job/logistics/cargo/cargo_tech.dm +++ b/code/game/jobs/job/logistics/cargo/cargo_tech.dm @@ -8,7 +8,7 @@ selection_class = "job_ct" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/cargo - entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Stay in your department when possible to ensure the marines have full access to the supplies they may require. Listen to the radio in case someone requests a supply drop via the overwatch system." + entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Stay in your department when possible to ensure the marines have full access to the supplies they may require. Listen to the radio in case someone requests a supply drop via the overwatch system." /datum/job/logistics/cargo/set_spawn_positions(count) spawn_positions = ct_slot_formula(count) diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm index 76b7e98f2d..5d5123e687 100644 --- a/code/game/jobs/job/logistics/cargo/chief_req.dm +++ b/code/game/jobs/job/logistics/cargo/chief_req.dm @@ -3,7 +3,7 @@ selection_class = "job_qm" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/qm - entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship." + entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship." AddTimelock(/datum/job/logistics/requisition, list( JOB_REQUISITION_ROLES = 10 HOURS, diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm index 3a15c86329..b6aa23f9c4 100644 --- a/code/game/jobs/job/logistics/engi/chief_engineer.dm +++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm @@ -3,7 +3,7 @@ selection_class = "job_ce" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/chief_engineer - entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command." + entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command." AddTimelock(/datum/job/logistics/engineering, list( JOB_ENGINEER_ROLES = 10 HOURS, diff --git a/code/game/jobs/job/logistics/engi/maint_tech.dm b/code/game/jobs/job/logistics/engi/maint_tech.dm index 8562408360..b13062127a 100644 --- a/code/game/jobs/job/logistics/engi/maint_tech.dm +++ b/code/game/jobs/job/logistics/engi/maint_tech.dm @@ -6,7 +6,7 @@ selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/maint - entry_message_body = "Your job is to maintain the integrity of the ship, including the orbital cannon. You remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." + entry_message_body = "Your job is to maintain the integrity of the ship, including the orbital cannon. You remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." /obj/effect/landmark/start/maint name = JOB_MAINT_TECH diff --git a/code/game/jobs/job/logistics/engi/ordnance_tech.dm b/code/game/jobs/job/logistics/engi/ordnance_tech.dm index bed0acf158..43a8a7122a 100644 --- a/code/game/jobs/job/logistics/engi/ordnance_tech.dm +++ b/code/game/jobs/job/logistics/engi/ordnance_tech.dm @@ -9,7 +9,7 @@ selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/ordn - entry_message_body = "Your job is to maintain the integrity of the USCM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." + entry_message_body = "Your job is to maintain the integrity of the USCM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." /datum/job/logistics/otech/set_spawn_positions(count) spawn_positions = ot_slot_formula(count) diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index 00a6b91dcf..1910248a61 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -5,7 +5,7 @@ allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/engineer - entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle." + entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle." /datum/job/marine/engineer/set_spawn_positions(count) for(var/datum/squad/sq in RoleAuthority.squads) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index 869336c561..27536f97e5 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -9,7 +9,7 @@ supervisors = "the acting commanding officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD 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." + 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." job_options = list(GYSGT_VARIANT = "GYSGT", SSGT_VARIANT = "SSGT") diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index cbd44bba33..25043c1ada 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -9,7 +9,7 @@ allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/medic - entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters." + entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters." job_options = list(CPL_VARIANT = "CPL", LCPL_VARIANT = "LCPL") diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 4ce8e9a912..6e9f1558ac 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -10,7 +10,7 @@ scaled = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/sg - entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support." + entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support." job_options = list(CPL_VARIANT = "CPL", LCPL_VARIANT = "LCPL") diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 42ee69ef2d..e69241cdc7 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -6,7 +6,7 @@ scaled = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/spec - entry_message_body = "You are the very rare and valuable weapon expert, trained to use special equipment. You can serve a variety of roles, so choose carefully." + entry_message_body = "You are the very rare and valuable weapon expert, trained to use special equipment. You can serve a variety of roles, so choose carefully." /datum/job/marine/specialist/set_spawn_positions(count) spawn_positions = spec_slot_formula(count) diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm index f0b962f1a7..c30b7e149c 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -9,7 +9,10 @@ spawn_positions = -1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/pfc - entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!" + +/datum/job/marine/standard/on_config_load() + entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!" + return ..() job_options = list(PFC_VARIANT = "PFC", PVT_VARIANT = "PVT") diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index 44b71bbfc2..00fd710f38 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -8,7 +8,7 @@ allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl - entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place." + entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place." job_options = list(SGT_VARIANT = "SGT") diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index efb5e2ae8d..5aab13f68a 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -446,85 +446,88 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou M.job = null -/datum/authority/branch/role/proc/equip_role(mob/living/M, datum/job/J, turf/late_join) - if(!istype(M) || !istype(J)) +/datum/authority/branch/role/proc/equip_role(mob/living/new_mob, datum/job/new_job, turf/late_join) + if(!istype(new_mob) || !istype(new_job)) return . = TRUE - if(!ishuman(M)) + if(!ishuman(new_mob)) return - var/mob/living/carbon/human/H = M + var/mob/living/carbon/human/new_human = new_mob - if(J.job_options && H?.client?.prefs?.pref_special_job_options[J.title]) - J.handle_job_options(H.client.prefs.pref_special_job_options[J.title]) + if(new_job.job_options && new_human?.client?.prefs?.pref_special_job_options[new_job.title]) + new_job.handle_job_options(new_human.client.prefs.pref_special_job_options[new_job.title]) - var/job_whitelist = J.title - var/whitelist_status = J.get_whitelist_status(roles_whitelist, H.client) + var/job_whitelist = new_job.title + var/whitelist_status = new_job.get_whitelist_status(roles_whitelist, new_human.client) if(whitelist_status) - job_whitelist = "[J.title][whitelist_status]" + job_whitelist = "[new_job.title][whitelist_status]" - H.job = J.title //TODO Why is this a mob variable at all? + new_human.job = new_job.title //TODO Why is this a mob variable at all? - if(J.gear_preset_whitelist[job_whitelist]) - arm_equipment(H, J.gear_preset_whitelist[job_whitelist], FALSE, TRUE) - var/generated_account = J.generate_money_account(H) - J.announce_entry_message(H, generated_account, whitelist_status) //Tell them their spawn info. - J.generate_entry_conditions(H, whitelist_status) //Do any other thing that relates to their spawn. + if(new_job.gear_preset_whitelist[job_whitelist]) + arm_equipment(new_human, new_job.gear_preset_whitelist[job_whitelist], FALSE, TRUE) + var/generated_account = new_job.generate_money_account(new_human) + new_job.announce_entry_message(new_human, generated_account, whitelist_status) //Tell them their spawn info. + new_job.generate_entry_conditions(new_human, whitelist_status) //Do any other thing that relates to their spawn. else - arm_equipment(H, J.gear_preset, FALSE, TRUE) //After we move them, we want to equip anything else they should have. - var/generated_account = J.generate_money_account(H) - J.announce_entry_message(H, generated_account) //Tell them their spawn info. - J.generate_entry_conditions(H) //Do any other thing that relates to their spawn. + arm_equipment(new_human, new_job.gear_preset, FALSE, TRUE) //After we move them, we want to equip anything else they should have. + var/generated_account = new_job.generate_money_account(new_human) + new_job.announce_entry_message(new_human, generated_account) //Tell them their spawn info. + new_job.generate_entry_conditions(new_human) //Do any other thing that relates to their spawn. - if(J.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(H) + 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(Check_WO() && job_squad_roles.Find(GET_DEFAULT_ROLE(H.job))) //activates self setting proc for marine headsets for WO + if(Check_WO() && job_squad_roles.Find(GET_DEFAULT_ROLE(new_human.job))) //activates self setting proc for marine headsets for WO var/datum/game_mode/whiskey_outpost/WO = SSticker.mode - WO.self_set_headset(H) + WO.self_set_headset(new_human) var/assigned_squad - if(ishuman(H)) - var/mob/living/carbon/human/human = H + if(ishuman(new_human)) + var/mob/living/carbon/human/human = new_human if(human.assigned_squad) assigned_squad = human.assigned_squad.name if(isturf(late_join)) - H.forceMove(late_join) + new_human.forceMove(late_join) else if(late_join) var/turf/late_join_turf if(GLOB.latejoin_by_squad[assigned_squad]) late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad])) - else if(GLOB.latejoin_by_job[J.title]) - late_join_turf = get_turf(pick(GLOB.latejoin_by_job[J.title])) + else if(GLOB.latejoin_by_job[new_job.title]) + late_join_turf = get_turf(pick(GLOB.latejoin_by_job[new_job.title])) else late_join_turf = get_turf(pick(GLOB.latejoin)) - H.forceMove(late_join_turf) + new_human.forceMove(late_join_turf) else var/turf/join_turf - if(assigned_squad && GLOB.spawns_by_squad_and_job[assigned_squad] && GLOB.spawns_by_squad_and_job[assigned_squad][J.type]) - join_turf = get_turf(pick(GLOB.spawns_by_squad_and_job[assigned_squad][J.type])) - else if(GLOB.spawns_by_job[J.type]) - join_turf = get_turf(pick(GLOB.spawns_by_job[J.type])) + if(assigned_squad && GLOB.spawns_by_squad_and_job[assigned_squad] && GLOB.spawns_by_squad_and_job[assigned_squad][new_job.type]) + join_turf = get_turf(pick(GLOB.spawns_by_squad_and_job[assigned_squad][new_job.type])) + else if(GLOB.spawns_by_job[new_job.type]) + join_turf = get_turf(pick(GLOB.spawns_by_job[new_job.type])) else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad]) join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad])) else join_turf = get_turf(pick(GLOB.latejoin)) - H.forceMove(join_turf) + new_human.forceMove(join_turf) for(var/cardinal in GLOB.cardinals) - var/obj/structure/machinery/cryopod/pod = locate() in get_step(H, cardinal) + var/obj/structure/machinery/cryopod/pod = locate() in get_step(new_human, cardinal) if(pod) - pod.go_in_cryopod(H, silent = TRUE) + pod.go_in_cryopod(new_human, silent = TRUE) break - H.sec_hud_set_ID() - H.hud_set_squad() + new_human.sec_hud_set_ID() + new_human.hud_set_squad() - SSround_recording.recorder.track_player(H) + for(var/obj/current_item in new_human.get_contents()) + SEND_SIGNAL(current_item, COMSIG_POST_SPAWN_UPDATE, new_human) + + SSround_recording.recorder.track_player(new_human) //Find which squad has the least population. If all 4 squads are equal it should just use a random one /datum/authority/branch/role/proc/get_lowest_squad(mob/living/carbon/human/H) diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm index ad4df31c35..3bbc6065a8 100644 --- a/code/game/machinery/ARES/ARES_interface_apollo.dm +++ b/code/game/machinery/ARES/ARES_interface_apollo.dm @@ -14,7 +14,7 @@ var/current_menu = "login" var/last_menu = "" - var/authentication = ARES_ACCESS_BASIC + var/authentication = APOLLO_ACCESS_LOGOUT /// The last person to login. var/last_login diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 4dbcf794f7..831f76e489 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -258,3 +258,37 @@ GLOBAL_LIST_INIT(maintenance_categories, list( return "Working Joe" if(APOLLO_ACCESS_DEBUG)//6 return "AI Service Technician" + +/obj/item/device/working_joe_pda/proc/get_ares_access(obj/item/card/id/card) + if(ACCESS_ARES_DEBUG in card.access) + return APOLLO_ACCESS_DEBUG + switch(card.assignment) + if(JOB_WORKING_JOE) + return APOLLO_ACCESS_JOE + if(JOB_CHIEF_ENGINEER, JOB_SYNTH, JOB_CO) + return APOLLO_ACCESS_AUTHED + if(ACCESS_MARINE_AI in card.access) + return APOLLO_ACCESS_AUTHED + if(ACCESS_MARINE_AI_TEMP in card.access) + return APOLLO_ACCESS_TEMP + if((ACCESS_MARINE_SENIOR in card.access ) || (ACCESS_MARINE_ENGINEERING in card.access) || (ACCESS_WY_GENERAL in card.access)) + return APOLLO_ACCESS_REPORTER + else + return APOLLO_ACCESS_REQUEST + +/obj/item/device/working_joe_pda/proc/ares_auth_to_text(access_level) + switch(access_level) + if(APOLLO_ACCESS_LOGOUT)//0 + return "Logged Out" + if(APOLLO_ACCESS_REQUEST)//1 + return "Unauthorized Personnel" + if(APOLLO_ACCESS_REPORTER)//2 + return "Validated Incident Reporter" + if(APOLLO_ACCESS_TEMP)//3 + return "Authorized Visitor" + if(APOLLO_ACCESS_AUTHED)//4 + return "Certified Personnel" + if(APOLLO_ACCESS_JOE)//5 + return "Working Joe" + if(APOLLO_ACCESS_DEBUG)//6 + return "AI Service Technician" diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm new file mode 100644 index 0000000000..26ec9d5120 --- /dev/null +++ b/code/game/machinery/ARES/apollo_pda.dm @@ -0,0 +1,419 @@ +/obj/item/device/working_joe_pda + icon = 'icons/obj/items/synth/wj_pda.dmi' + name = "KN5500 PDA" + desc = "A portable interface used by Working-Joes, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." + icon_state = "karnak_off" + unacidable = TRUE + indestructible = TRUE + req_one_access = list(ACCESS_MARINE_AI_TEMP, ACCESS_MARINE_AI, ACCESS_ARES_DEBUG) + + /// The ID used to link all devices. + var/datum/ares_link/link + /// The datacore storing all the information. + var/datum/ares_datacore/datacore + + var/current_menu = "login" + var/last_menu = "off" + + var/authentication = APOLLO_ACCESS_LOGOUT + /// The last person to login. + var/last_login + + +/obj/item/device/working_joe_pda/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + if(new_link) + new_link.ticket_computers += src + link = new_link + new_link.linked_systems += src + if(!datacore) + datacore = GLOB.ares_datacore + return TRUE + +/obj/item/device/working_joe_pda/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/item/device/working_joe_pda/proc/delink() + if(link) + link.ticket_computers -= src + link.linked_systems -= src + link = null + datacore = null + +/obj/item/device/working_joe_pda/Destroy() + delink() + return ..() + +/obj/item/device/working_joe_pda/update_icon() + . = ..() + if(last_menu == "off") + icon_state = "karnak_off" + else if(current_menu == "login") + icon_state = "karnak_login_anim" + else + icon_state = "karnak_on_anim" + +// ------ Maintenance Controller UI ------ // +/obj/item/device/working_joe_pda/attack_self(mob/user) + if(..() || !allowed(usr)) + return FALSE + + if((last_menu == "off") && (current_menu == "login")) + last_menu = "main" + update_icon() + + tgui_interact(user) + return TRUE + +/obj/item/device/working_joe_pda/tgui_interact(mob/user, datum/tgui/ui, datum/ui_state/state) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "WorkingJoe", name) + ui.open() + +/obj/item/device/working_joe_pda/ui_close(mob/user) + . = ..() + + current_menu = "login" + last_menu = "off" + if(last_login) + datacore.apollo_login_list += "[last_login] logged out at [worldtime2text()]." + last_login = null + update_icon() + +/obj/item/device/working_joe_pda/ui_data(mob/user) + var/list/data = list() + + data["current_menu"] = current_menu + data["last_page"] = last_menu + + data["logged_in"] = last_login + + data["access_text"] = "access level [authentication], [ares_auth_to_text(authentication)]." + data["access_level"] = authentication + + data["alert_level"] = security_level + data["worldtime"] = world.time + + data["access_log"] = list() + data["access_log"] += datacore.apollo_login_list + + data["apollo_log"] = list() + data["apollo_log"] += datacore.apollo_log + + var/list/logged_maintenance = list() + for(var/datum/ares_ticket/maintenance/maint_ticket as anything in link.tickets_maintenance) + if(!istype(maint_ticket)) + continue + var/lock_status = TICKET_OPEN + switch(maint_ticket.ticket_status) + if(TICKET_REJECTED, TICKET_CANCELLED, TICKET_COMPLETED) + lock_status = TICKET_CLOSED + + var/list/current_maint = list() + current_maint["id"] = maint_ticket.ticket_id + current_maint["time"] = maint_ticket.ticket_time + current_maint["priority_status"] = maint_ticket.ticket_priority + current_maint["category"] = maint_ticket.ticket_name + current_maint["details"] = maint_ticket.ticket_details + current_maint["status"] = maint_ticket.ticket_status + current_maint["submitter"] = maint_ticket.ticket_submitter + current_maint["assignee"] = maint_ticket.ticket_assignee + current_maint["lock_status"] = lock_status + current_maint["ref"] = "\ref[maint_ticket]" + logged_maintenance += list(current_maint) + data["maintenance_tickets"] = logged_maintenance + + var/list/logged_access = list() + var/list/requesting_access = list() + for(var/datum/ares_ticket/access/access_ticket as anything in link.tickets_access) + var/lock_status = TICKET_OPEN + switch(access_ticket.ticket_status) + if(TICKET_REJECTED, TICKET_CANCELLED, TICKET_REVOKED) + lock_status = TICKET_CLOSED + + var/list/current_ticket = list() + current_ticket["id"] = access_ticket.ticket_id + current_ticket["time"] = access_ticket.ticket_time + current_ticket["priority_status"] = access_ticket.ticket_priority + current_ticket["title"] = access_ticket.ticket_name + current_ticket["details"] = access_ticket.ticket_details + current_ticket["status"] = access_ticket.ticket_status + current_ticket["submitter"] = access_ticket.ticket_submitter + current_ticket["assignee"] = access_ticket.ticket_assignee + current_ticket["lock_status"] = lock_status + current_ticket["ref"] = "\ref[access_ticket]" + logged_access += list(current_ticket) + + if(lock_status == TICKET_OPEN) + requesting_access += access_ticket.ticket_name + data["access_tickets"] = logged_access + + return data + +/obj/item/device/working_joe_pda/ui_status(mob/user, datum/ui_state/state) + . = ..() + if(!allowed(user)) + return UI_UPDATE + +/obj/item/device/working_joe_pda/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + var/playsound = TRUE + var/mob/living/carbon/human/operator = usr + + switch (action) + if("go_back") + if(!last_menu) + return to_chat(usr, SPAN_WARNING("Error, no previous page detected.")) + var/temp_holder = current_menu + current_menu = last_menu + last_menu = temp_holder + + if("login") + + var/obj/item/card/id/idcard = operator.get_active_hand() + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else if(operator.wear_id) + idcard = operator.wear_id + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else + to_chat(operator, SPAN_WARNING("You require an ID card to access this terminal!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(authentication) + datacore.apollo_login_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." + current_menu = "main" + last_menu = "main" + update_icon() + + if("logout") + last_menu = current_menu + current_menu = "login" + datacore.apollo_login_list += "[last_login] logged out at [worldtime2text()]." + update_icon() + + if("home") + last_menu = current_menu + current_menu = "main" + if("page_logins") + last_menu = current_menu + current_menu = "login_records" + if("page_apollo") + last_menu = current_menu + current_menu = "apollo" + if("page_request") + last_menu = current_menu + current_menu = "access_requests" + if("page_report") + last_menu = current_menu + current_menu = "maint_reports" + if("page_tickets") + last_menu = current_menu + current_menu = "access_tickets" + if("page_maintenance") + last_menu = current_menu + current_menu = "maint_claim" + + if("new_report") + var/priority_report = FALSE + var/maint_type = tgui_input_list(operator, "What is the type of maintenance item you wish to report?", "Report Category", GLOB.maintenance_categories, 30 SECONDS) + switch(maint_type) + if("Major Structural Damage", "Fire", "Communications Failure", "Power Generation Failure") + priority_report = TRUE + + if(!maint_type) + return FALSE + var/details = tgui_input_text(operator, "What are the details for this report?", "Ticket Details", encode = FALSE) + if(!details) + return FALSE + + if((authentication >= APOLLO_ACCESS_REPORTER) && !priority_report) + var/is_priority = tgui_alert(operator, "Is this a priority report?", "Priority designation", list("Yes", "No")) + if(is_priority == "Yes") + priority_report = TRUE + + var/confirm = alert(operator, "Please confirm the submission of your maintenance report. \n\n Priority: [priority_report ? "Yes" : "No"]\n Category: '[maint_type]'\n Details: '[details]'\n\n Is this correct?", "Confirmation", "Yes", "No") + if(confirm == "Yes") + if(link) + var/datum/ares_ticket/maintenance/maint_ticket = new(last_login, maint_type, details, priority_report) + link.tickets_maintenance += maint_ticket + if(priority_report) + ares_apollo_talk("Priority Maintenance Report: [maint_type] - ID [maint_ticket.ticket_id]. Seek and resolve.") + log_game("ARES: Maintenance Ticket '\ref[maint_ticket]' created by [key_name(operator)] as [last_login] with Category '[maint_type]' and Details of '[details]'.") + return TRUE + return FALSE + + if("claim_ticket") + var/datum/ares_ticket/ticket = locate(params["ticket"]) + if(!istype(ticket)) + return FALSE + var/claim = TRUE + var/assigned = ticket.ticket_assignee + if(assigned) + if(assigned == last_login) + var/prompt = tgui_alert(usr, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No")) + if(prompt != "Yes") + return FALSE + /// set ticket back to pending + ticket.ticket_assignee = null + ticket.ticket_status = TICKET_PENDING + return claim + var/choice = tgui_alert(usr, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No")) + if(choice != "Yes") + claim = FALSE + if(claim) + ticket.ticket_assignee = last_login + ticket.ticket_status = TICKET_ASSIGNED + return claim + + if("cancel_ticket") + var/datum/ares_ticket/ticket = locate(params["ticket"]) + if(!istype(ticket)) + return FALSE + if(ticket.ticket_submitter != last_login) + to_chat(usr, SPAN_WARNING("You cannot cancel a ticket that does not belong to you!")) + return FALSE + to_chat(usr, SPAN_WARNING("[ticket.ticket_type] [ticket.ticket_id] has been cancelled.")) + ticket.ticket_status = TICKET_CANCELLED + if(ticket.ticket_priority) + ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been cancelled.") + return TRUE + + if("mark_ticket") + var/datum/ares_ticket/ticket = locate(params["ticket"]) + if(!istype(ticket)) + return FALSE + if(ticket.ticket_assignee != last_login && ticket.ticket_assignee) //must be claimed by you or unclaimed.) + to_chat(usr, SPAN_WARNING("You cannot update a ticket that is not assigned to you!")) + return FALSE + var/choice = tgui_alert(usr, "What do you wish to mark the ticket as?", "Mark", list(TICKET_COMPLETED, TICKET_REJECTED), 20 SECONDS) + switch(choice) + if(TICKET_COMPLETED) + ticket.ticket_status = TICKET_COMPLETED + if(TICKET_REJECTED) + ticket.ticket_status = TICKET_REJECTED + else + return FALSE + if(ticket.ticket_priority) + ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been [choice] by [last_login].") + to_chat(usr, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice].")) + return TRUE + + if("new_access") + var/obj/item/card/id/idcard = operator.get_active_hand() + var/has_id = FALSE + if(istype(idcard)) + has_id = TRUE + else if(operator.wear_id) + idcard = operator.wear_id + if(istype(idcard)) + has_id = TRUE + if(!has_id) + to_chat(operator, SPAN_WARNING("You require an ID card to request an access ticket!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(idcard.registered_name != last_login) + to_chat(operator, SPAN_WARNING("This ID card does not match the active login!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + var/details = tgui_input_text(operator, "What is the purpose of this access ticket?", "Ticket Details", encode = FALSE) + if(!details) + return FALSE + + var/confirm = alert(operator, "Please confirm the submission of your access ticket request.\n\nHolder: '[last_login]'\nDetails: '[details]'\n\nIs this correct?", "Confirmation", "Yes", "No") + if(confirm != "Yes" || !link) + return FALSE + var/datum/ares_ticket/access/access_ticket = new(last_login, details, FALSE, idcard.registered_gid) + link.waiting_ids += idcard + link.tickets_access += access_ticket + log_game("ARES: Access Ticket '\ref[access_ticket]' created by [key_name(operator)] as [last_login] with Details of '[details]'.") + message_admins(SPAN_STAFF_IC("[key_name_admin(operator)] created a new ARES Access Ticket."), 1) + ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] requesting access for '[details].") + return TRUE + + if("return_access") + playsound = FALSE + var/datum/ares_ticket/access/access_ticket + for(var/datum/ares_ticket/access/possible_ticket in link.tickets_access) + if(possible_ticket.ticket_status != TICKET_GRANTED) + continue + if(possible_ticket.ticket_name != last_login) + continue + access_ticket = possible_ticket + break + + for(var/obj/item/card/id/identification in link.active_ids) + if(!istype(identification)) + continue + if(identification.registered_gid != access_ticket.user_id_num) + continue + + access_ticket.ticket_status = TICKET_RETURNED + identification.access -= ACCESS_MARINE_AI_TEMP + identification.modification_log += "Temporary AI Access self-returned by [key_name(operator)]." + + to_chat(operator, SPAN_NOTICE("Temporary Access Ticket surrendered.")) + playsound(src, 'sound/machines/chime.ogg', 15, 1) + ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] surrendered their access.") + + authentication = get_ares_access(identification) + if(authentication) + datacore.apollo_login_list += "[last_login] at [worldtime2text()], Surrendered Temporary Access Ticket." + return TRUE + + to_chat(operator, SPAN_WARNING("This ID card does not have an access ticket!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + if("auth_access") + playsound = FALSE + var/datum/ares_ticket/access/access_ticket = locate(params["ticket"]) + if(!access_ticket) + return FALSE + for(var/obj/item/card/id/identification in link.waiting_ids) + if(!istype(identification)) + continue + if(identification.registered_gid != access_ticket.user_id_num) + continue + identification.handle_ares_access(last_login, operator) + access_ticket.ticket_status = TICKET_GRANTED + playsound(src, 'sound/machines/chime.ogg', 15, 1) + ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was granted access by [last_login].") + return TRUE + for(var/obj/item/card/id/identification in link.active_ids) + if(!istype(identification)) + continue + if(identification.registered_gid != access_ticket.user_id_num) + continue + identification.handle_ares_access(last_login, operator) + access_ticket.ticket_status = TICKET_REVOKED + playsound(src, 'sound/machines/chime.ogg', 15, 1) + ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] had access revoked by [last_login].") + return TRUE + return FALSE + + if("reject_access") + var/datum/ares_ticket/access/access_ticket = locate(params["ticket"]) + if(!istype(access_ticket)) + return FALSE + if(access_ticket.ticket_assignee != last_login && access_ticket.ticket_assignee) //must be claimed by you or unclaimed.) + to_chat(usr, SPAN_WARNING("You cannot update a ticket that is not assigned to you!")) + return FALSE + access_ticket.ticket_status = TICKET_REJECTED + to_chat(usr, SPAN_NOTICE("[access_ticket.ticket_type] [access_ticket.ticket_id] marked as rejected.")) + ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was rejected access by [last_login].") + return TRUE + + if(playsound) + var/sound = pick('sound/machines/pda_button1.ogg', 'sound/machines/pda_button2.ogg') + playsound(src, sound, 15, TRUE) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 18b62b9d77..56a4429146 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -37,8 +37,14 @@ var/vend_delay = 0 //delaying vending of an item (for drinks machines animation, for example). Make sure to synchronize this with animation duration var/vend_sound //use with caution. Potential spam + /// X Offset to vend to var/vend_x_offset = 0 + /// Y Offset to vend to var/vend_y_offset = 0 + /// Vending direction from adjacent users, if not using vend_x_offset or vend_y_offset + var/vend_dir + /// Direction to adjacent user from which we're allowed to do offset vending + var/list/vend_dir_whitelist var/list/listed_products = list() @@ -125,11 +131,20 @@ GLOBAL_LIST_EMPTY(vending_products) GLOB.vending_products[typepath] = 1 //get which turf the vendor will dispense its products on. -/obj/structure/machinery/cm_vending/proc/get_appropriate_vend_turf() - var/turf/T = loc +/obj/structure/machinery/cm_vending/proc/get_appropriate_vend_turf(mob/living/carbon/human/user) + var/turf/turf = loc if(vend_x_offset != 0 || vend_y_offset != 0) //this check should be more less expensive than using locate to locate your own tile every vending. - T = locate(x + vend_x_offset, y + vend_y_offset, z) - return T + turf = locate(x + vend_x_offset, y + vend_y_offset, z) + return turf + if(vend_dir) + if(vend_dir_whitelist) + var/user_dir = get_dir(loc, user) + if(!(user_dir in vend_dir_whitelist)) + return turf + var/turf/relative_turf = get_step(user, vend_dir) + if(relative_turf.Adjacent(src)) + return relative_turf + return turf /obj/structure/machinery/cm_vending/get_examine_text(mob/living/carbon/human/user) . = ..() @@ -245,7 +260,7 @@ GLOBAL_LIST_EMPTY(vending_products) return //Machete holsters handling else if(istype(item_to_stock, /obj/item/storage/large_holster/machete)) - var/obj/item/weapon/claymore/mercsword/machete/mac = locate(/obj/item/weapon/claymore/mercsword/machete) in item_to_stock + var/obj/item/weapon/sword/machete/mac = locate(/obj/item/weapon/sword/machete) in item_to_stock if(!mac) if(user) to_chat(user, SPAN_WARNING("\The [item_to_stock] is empty.")) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a619343244..c109db25b3 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -411,6 +411,7 @@ /obj/item/device/camera = 5, /obj/item/device/camera_film = 10, /obj/item/notepad = 5, + /obj/item/device/toner = 5, ) contraband = list(/obj/item/toy/sword = 2) @@ -431,5 +432,6 @@ /obj/item/toy/deck = 20, /obj/item/toy/deck/uno = 15, /obj/item/device/camera = 30, + /obj/item/device/toner = 15, ) product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index a0be9e2793..3baac270cd 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -179,22 +179,8 @@ //Special cargo-specific vendor with vending offsets /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_LOAD_AMMO_BOXES //We want to vend to turf not hand, since we are in requisitions - -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/get_appropriate_vend_turf(mob/living/carbon/human/H) - var/turf/turf_to_vent_to - if(vend_x_offset != 0 || vend_y_offset != 0) //this will allow to avoid code below that suits only Almayer. - turf_to_vent_to = locate(x + vend_x_offset, y + vend_y_offset, z) - else - turf_to_vent_to = get_turf(get_step(src, NORTH)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = get_turf(get_step(src, SOUTH)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = H.loc - return turf_to_vent_to + vend_dir = WEST + vend_dir_whitelist = list(NORTH, SOUTH) /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend icon_state = "req_guns_wall" @@ -213,6 +199,8 @@ req_access = list(ACCESS_MARINE_CARGO) vendor_theme = VENDOR_THEME_USCM vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_LOAD_AMMO_BOXES + vend_dir = WEST + vend_dir_whitelist = list(SOUTHWEST, NORTHWEST) /obj/structure/machinery/cm_vending/sorted/cargo_ammo/Initialize() . = ..() @@ -316,22 +304,6 @@ /obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_LOAD_AMMO_BOXES //We want to vend to turf not hand, since we are in requisitions -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/get_appropriate_vend_turf(mob/living/carbon/human/H) - var/turf/turf_to_vent_to - if(vend_x_offset != 0 || vend_y_offset != 0) //this will allow to avoid code below that suits only Almayer. - turf_to_vent_to = locate(x + vend_x_offset, y + vend_y_offset, z) - else - turf_to_vent_to = get_turf(get_step(src, NORTHWEST)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = get_turf(get_step(src, SOUTHWEST)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = H.loc - return turf_to_vent_to - //------------ATTACHMENTS VENDOR--------------- /obj/structure/machinery/cm_vending/sorted/attachments @@ -340,6 +312,9 @@ req_access = list(ACCESS_MARINE_CARGO) vendor_theme = VENDOR_THEME_USCM icon_state = "req_attach" + vend_dir = WEST + vend_dir_whitelist = list(SOUTHEAST, NORTHEAST) + vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY //We want to vend to turf not hand, since we are in requisitions /obj/structure/machinery/cm_vending/sorted/attachments/Initialize() . = ..() @@ -393,22 +368,6 @@ list("M44 Magnum Sharpshooter Stock", round(scale * 4.5), /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR) ) -/obj/structure/machinery/cm_vending/sorted/attachments/get_appropriate_vend_turf(mob/living/carbon/human/H) - var/turf/turf_to_vent_to - if(vend_x_offset != 0 || vend_y_offset != 0) //this will allow to avoid code below that suits only Almayer. - turf_to_vent_to = locate(x + vend_x_offset, y + vend_y_offset, z) - else - turf_to_vent_to = get_turf(get_step(src, NORTHEAST)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = get_turf(get_step(src, SOUTHEAST)) - if(H.loc == turf_to_vent_to) - turf_to_vent_to = get_turf(get_step(H.loc, WEST)) - else - turf_to_vent_to = loc - return turf_to_vent_to - /obj/structure/machinery/cm_vending/sorted/attachments/blend icon_state = "req_attach_wall" tiles_with = list( @@ -416,7 +375,6 @@ /obj/structure/machinery/door/airlock, /turf/closed/wall/almayer, ) - vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY //We want to vend to turf not hand, since we are in requisitions //------------UNIFORM VENDOR--------------- diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm index 645640f9dc..557933754f 100644 --- a/code/game/machinery/vending/vendor_types/wo_vendors.dm +++ b/code/game/machinery/vending/vendor_types/wo_vendors.dm @@ -110,52 +110,13 @@ ) //------------REQ AMMUNITION VENDOR--------------- -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/wo +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/wo req_access = list(ACCESS_MARINE_CARGO) req_one_access = list() -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/wo/populate_product_list(scale) - listed_products = list( - list("REGULAR AMMUNITION", -1, null, null), - list("Box Of Buckshot Shells", round(scale * 5), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), - list("Box Of Flechette Shells", round(scale * 5), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), - list("Box Of Shotgun Slugs", round(scale * 5), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), - list("M4RA magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), - list("M39 HV Magazine (10x20mm)", round(scale * 10), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), - list("M41A MK1 Magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle/m41aMK1, VENDOR_ITEM_REGULAR), - list("M41A MK2 Magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), - list("M44 Speed Loader (.44)", round(scale * 10), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), - list("M4A3 Magazine (9mm)", round(scale * 10), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), - - list("ARMOR-PIERCING AMMUNITION", -1, null, null), - list("88 Mod 4 AP Magazine (9mm)", round(scale * 5), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), - list("M4RA AP Magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR), - list("M39 AP Magazine (10x20mm)", round(scale * 5), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR), - list("M41A MK1 AP Magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle/m41aMK1/ap, VENDOR_ITEM_REGULAR), - list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR), - list("M4A3 AP Magazine (9mm)", round(scale * 5), /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR), - - list("EXTENDED AMMUNITION", -1, null, null), - list("M39 Extended Magazine (10x20mm)", round(scale * 1), /obj/item/ammo_magazine/smg/m39/extended, VENDOR_ITEM_REGULAR), - list("M41A MK2 Extended Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), - - list("INCENDIARY AMMUNITION", -1, null, null), - list("M4RA Incendiary Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/m4ra/incendiary, VENDOR_ITEM_REGULAR), - list("M39 Incendiary Magazine (10x20mm)", round(scale * 2), /obj/item/ammo_magazine/smg/m39/incendiary, VENDOR_ITEM_REGULAR), - list("M41A MK2 Incendiary Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/incendiary, VENDOR_ITEM_REGULAR), - list("M4A3 Incendiary Magazine (9mm)", round(scale * 1), /obj/item/ammo_magazine/pistol/incendiary, VENDOR_ITEM_REGULAR), - - list("SPECIAL AMMUNITION", -1, null, null), - list("Incinerator Tank", round(scale * 2.5), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), - list("M41AE2 Ammo Box (10x24mm)", round(scale * 5), /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR), - list("M44 Heavy Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), - list("M44 Marksman Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), - list("M4A3 HP Magazine (9mm)", round(scale * 5), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR), - list("M56 Battery", round(scale * 5), /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR), - list("M56 Smartgun Drum", round(scale * 2), /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), - list("SU-6 Smartpistol Magazine (.45)", round(scale * 6), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), - list("VP78 Magazine", round(scale * 6), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), - +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/wo/populate_product_list(scale) + ..() + listed_products += list( list("EXTRA SCOUT AMMUNITION", -1, null, null, null), list("A19 High Velocity Impact Magazine (10x24mm)", round(scale * 1), /obj/item/ammo_magazine/rifle/m4ra/custom/impact, VENDOR_ITEM_REGULAR), list("A19 High Velocity Incendiary Magazine (10x24mm)", round(scale * 1), /obj/item/ammo_magazine/rifle/m4ra/custom/incendiary, VENDOR_ITEM_REGULAR), @@ -181,96 +142,17 @@ list("Large Incinerator Tank", round(scale * 1), /obj/item/ammo_magazine/flamer_tank/large, VENDOR_ITEM_REGULAR), list("Large Incinerator Tank (B) (Green Flame)", round(scale * 1), /obj/item/ammo_magazine/flamer_tank/large/B, VENDOR_ITEM_REGULAR), list("Large Incinerator Tank (X) (Blue Flame)", round(scale * 1), /obj/item/ammo_magazine/flamer_tank/large/X, VENDOR_ITEM_REGULAR), - - list("AMMUNITION BOXES", -1, null, null), - list("Rifle Ammunition Box (10x24mm)", round(scale * 0.9), /obj/item/ammo_box/rounds, VENDOR_ITEM_REGULAR), - list("Rifle Ammunition Box (10x24mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/ap, VENDOR_ITEM_REGULAR), - list("SMG Ammunition Box (10x20mm HV)", round(scale * 0.9), /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR), - list("SMG Ammunition Box (10x20mm AP)", round(scale * 0.75), /obj/item/ammo_box/rounds/smg/ap, VENDOR_ITEM_REGULAR), ) //------------ARMAMENTS VENDOR--------------- -/obj/structure/machinery/cm_vending/sorted/cargo_guns/wo +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/wo req_access = list(ACCESS_MARINE_CARGO) + vend_dir = NORTH + vend_dir_whitelist = list(EAST, WEST) -/obj/structure/machinery/cm_vending/sorted/cargo_guns/wo/populate_product_list(scale) - listed_products = list( - list("PRIMARY FIREARMS", -1, null, null), - list("M4RA Battle Rifle", round(scale * 20), /obj/item/weapon/gun/rifle/m4ra, VENDOR_ITEM_REGULAR), - list("M37A2 Pump Shotgun", round(scale * 10), /obj/item/weapon/gun/shotgun/pump, VENDOR_ITEM_REGULAR), - list("M39 Submachinegun", round(scale * 15), /obj/item/weapon/gun/smg/m39, VENDOR_ITEM_REGULAR), - list("M41A Pulse Rifle MK1", round(scale * 20), /obj/item/weapon/gun/rifle/m41aMK1, VENDOR_ITEM_REGULAR), - list("M41A Pulse Rifle MK2", round(scale * 20), /obj/item/weapon/gun/rifle/m41a, VENDOR_ITEM_REGULAR), - list("MK221 Tactical Shotgun", round(scale * 3), /obj/item/weapon/gun/shotgun/combat, VENDOR_ITEM_REGULAR), - - list("SIDEARMS", -1, null, null), - list("88 Mod 4 Combat Pistol", round(scale * 15), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), - list("M44 Combat Revolver", round(scale * 10), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), - list("M4A3 Service Pistol", round(scale * 20), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), - list("SU-6 Smartpistol", round(scale * 2), /obj/item/weapon/gun/pistol/smart, VENDOR_ITEM_REGULAR), - list("M82F Flare Gun", round(scale * 5), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), - - list("RESTRICTED FIREARMS", -1, null, null), - list("VP78 Pistol", round(scale * 4), /obj/item/storage/box/guncase/vp78, VENDOR_ITEM_REGULAR), - list("SU-6 Smart Pistol", round(scale * 3), /obj/item/storage/box/guncase/smartpistol, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", round(scale * 2), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), - list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR), - list("M2C Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR), - list("M240 Incinerator Unit", round(scale * 2), /obj/item/storage/box/guncase/flamer, VENDOR_ITEM_REGULAR), - - list("EXPLOSIVES", -1, null, null), - list("M15 Fragmentation Grenade", round(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR), - list("M20 Claymore Anti-Personnel Mine", round(scale * 5), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR), - list("M40 HEDP Grenade Box", round(scale * 1), /obj/item/storage/box/nade_box, VENDOR_ITEM_REGULAR), - list("M40 HIDP Incendiary Grenade", round(scale * 3), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR), - list("M40 HSDP Smoke Grenade", round(scale * 5), /obj/item/explosive/grenade/smokebomb, VENDOR_ITEM_REGULAR), - - list("BACKPACKS", -1, null, null), - list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), - list("Shotgun Scabbard", round(scale * 10), /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR), - list("USCM Pyrotechnician G4-1 Fueltank", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack/flamethrower/kit, VENDOR_ITEM_REGULAR), - list("USCM Technician Welderpack", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR), - - list("BELTS", -1, null, null), - list("G8-A General Utility Pouch", round(scale * 3), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR), - list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR), - list("M276 Pattern General Pistol Holster Rig", round(scale * 10), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR), - list("M276 Pattern M39 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR), - list("M276 Pattern M44 Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR), - list("M276 M82F Holster Rig", round(scale * 2), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR), - list("M276 Pattern Shotgun Shell Loading Rig", round(scale * 10), /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), - - list("WEBBINGS", -1, null, null), - list("Black Webbing Vest", round(scale * 5), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR), - list("Brown Webbing Vest", round(scale * 5), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", round(scale * 5), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR), - list("Webbing", round(scale * 5), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR), - list("Knife Webbing", round(scale * 3), /obj/item/clothing/accessory/storage/knifeharness, VENDOR_ITEM_REGULAR), - list("Drop Pouch", round(scale * 5), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR), - - list("POUCHES", -1, null, null), - list("Construction Pouch", round(scale * 2), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR), - list("Explosive Pouch", round(scale * 2), /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR), - list("First Responder Pouch", round(scale * 2), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", round(scale * 4), /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR), - list("Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR), - list("Medical Pouch", round(scale * 2), /obj/item/storage/pouch/medical, VENDOR_ITEM_REGULAR), - list("Medium General Pouch", round(scale * 2), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", round(scale * 2), /obj/item/storage/pouch/medkit, VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", round(scale * 15), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR), - list("Syringe Pouch", round(scale * 2), /obj/item/storage/pouch/syringe, VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", round(scale * 2), /obj/item/storage/pouch/tools/full, VENDOR_ITEM_REGULAR), - - list("MISCELLANEOUS", -1, null, null), - list("Combat Flashlight", round(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR), - list("Entrenching Tool (ET)", round(scale * 4), /obj/item/tool/shovel/etool, VENDOR_ITEM_REGULAR), - list("Gas Mask", round(scale * 10), /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR), - list("M89-S Signal Flare Pack", round(scale * 2), /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR), - list("M94 Marking Flare Pack", round(scale * 10), /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR), - list("Machete Scabbard (Full)", round(scale * 20), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR), - list("MB-6 Folding Barricades (x3)", round(scale * 1), /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR) - ) +//---- ATTACHIES +/obj/structure/machinery/cm_vending/sorted/attachments/wo + req_access = list(ACCESS_MARINE_CARGO) + vend_dir = NORTH + vend_dir_whitelist = list(SOUTHWEST, SOUTHEAST) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index bf24b07582..d097090736 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -474,23 +474,23 @@ cases. Override_icon_state should be a list.*/ // If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen. // Set disable_warning to TRUE if you wish it to not give you outputs. // warning_text is used in the case that you want to provide a specific warning for why the item cannot be equipped. -/obj/item/proc/mob_can_equip(mob/M, slot, disable_warning = FALSE) +/obj/item/proc/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE) if(!slot) return FALSE - if(!M) + if(!equipping_mob) return FALSE - if(SEND_SIGNAL(src, COMSIG_ITEM_ATTEMPTING_EQUIP, M) & COMPONENT_CANCEL_EQUIP) + if(SEND_SIGNAL(src, COMSIG_ITEM_ATTEMPTING_EQUIP, equipping_mob, slot) & COMPONENT_CANCEL_EQUIP) return FALSE - if(ishuman(M)) + if(ishuman(equipping_mob)) //START HUMAN - var/mob/living/carbon/human/H = M + var/mob/living/carbon/human/human = equipping_mob var/list/mob_equip = list() - if(H.hud_used && H.hud_used.equip_slots) - mob_equip = H.hud_used.equip_slots + if(human.hud_used && human.hud_used.equip_slots) + mob_equip = human.hud_used.equip_slots - if(H.species && !(slot in mob_equip)) + if(human.species && !(slot in mob_equip)) return FALSE if(uniform_restricted) @@ -501,136 +501,136 @@ cases. Override_icon_state should be a list.*/ required_clothing += initial(restriction_type.name) // You can't replace this with a switch(), flags_equip_slot is a bitfield if(valid_equip_slots & SLOT_ICLOTHING) - if(istype(H.w_uniform, restriction_type)) + if(istype(human.w_uniform, restriction_type)) restriction_satisfied = TRUE break if(valid_equip_slots & SLOT_OCLOTHING) - if(istype(H.wear_suit, restriction_type)) + if(istype(human.wear_suit, restriction_type)) restriction_satisfied = TRUE break if(!restriction_satisfied) if(!disable_warning) - to_chat(H, SPAN_WARNING("You cannot wear this without wearing one of the following; [required_clothing.Join(", ")].")) + to_chat(human, SPAN_WARNING("You cannot wear this without wearing one of the following; [required_clothing.Join(", ")].")) return FALSE switch(slot) if(WEAR_L_HAND) - if(H.l_hand) + if(human.l_hand) return FALSE - if(H.lying) - to_chat(H, SPAN_WARNING("You can't equip that while lying down.")) + if(human.lying) + to_chat(human, SPAN_WARNING("You can't equip that while lying down.")) return return TRUE if(WEAR_R_HAND) - if(H.r_hand) + if(human.r_hand) return FALSE - if(H.lying) - to_chat(H, SPAN_WARNING("You can't equip that while lying down.")) + if(human.lying) + to_chat(human, SPAN_WARNING("You can't equip that while lying down.")) return return TRUE if(WEAR_FACE) - if(H.wear_mask) + if(human.wear_mask) return FALSE if(!(flags_equip_slot & SLOT_FACE)) return FALSE return TRUE if(WEAR_BACK) - if(H.back) + if(human.back) return FALSE if(!(flags_equip_slot & SLOT_BACK)) return FALSE return TRUE if(WEAR_JACKET) - if(H.wear_suit) + if(human.wear_suit) return FALSE if(!(flags_equip_slot & SLOT_OCLOTHING)) return FALSE return TRUE if(WEAR_HANDS) - if(H.gloves) + if(human.gloves) return FALSE if(!(flags_equip_slot & SLOT_HANDS)) return FALSE return TRUE if(WEAR_FEET) - if(H.shoes) + if(human.shoes) return FALSE if(!(flags_equip_slot & SLOT_FEET)) return FALSE return TRUE if(WEAR_WAIST) - if(H.belt) + if(human.belt) return FALSE - if(!H.w_uniform && (WEAR_BODY in mob_equip)) + if(!human.w_uniform && (WEAR_BODY in mob_equip)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) + to_chat(human, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) return FALSE if(!(flags_equip_slot & SLOT_WAIST)) return return TRUE if(WEAR_EYES) - if(H.glasses) + if(human.glasses) return FALSE if(!(flags_equip_slot & SLOT_EYES)) return FALSE return TRUE if(WEAR_HEAD) - if(H.head) + if(human.head) return FALSE if(!(flags_equip_slot & SLOT_HEAD)) return FALSE return TRUE if(WEAR_L_EAR) - if(H.wear_l_ear) + if(human.wear_l_ear) return FALSE if(HAS_TRAIT(src, TRAIT_ITEM_EAR_EXCLUSIVE)) - if(H.wear_r_ear && HAS_TRAIT(H.wear_r_ear, TRAIT_ITEM_EAR_EXCLUSIVE)) + if(human.wear_r_ear && HAS_TRAIT(human.wear_r_ear, TRAIT_ITEM_EAR_EXCLUSIVE)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You can't wear [src] while you have [H.wear_r_ear] in your right ear!")) + to_chat(human, SPAN_WARNING("You can't wear [src] while you have [human.wear_r_ear] in your right ear!")) return FALSE if(!(flags_equip_slot & SLOT_EAR)) return FALSE return TRUE if(WEAR_R_EAR) - if(H.wear_r_ear) + if(human.wear_r_ear) return FALSE if(HAS_TRAIT(src, TRAIT_ITEM_EAR_EXCLUSIVE)) - if(H.wear_l_ear && HAS_TRAIT(H.wear_l_ear, TRAIT_ITEM_EAR_EXCLUSIVE)) + if(human.wear_l_ear && HAS_TRAIT(human.wear_l_ear, TRAIT_ITEM_EAR_EXCLUSIVE)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You can't wear [src] while you have [H.wear_l_ear] in your left ear!")) + to_chat(human, SPAN_WARNING("You can't wear [src] while you have [human.wear_l_ear] in your left ear!")) return FALSE if(!(flags_equip_slot & SLOT_EAR)) return FALSE return TRUE if(WEAR_BODY) - if(H.w_uniform) + if(human.w_uniform) return FALSE if(!(flags_equip_slot & SLOT_ICLOTHING)) return FALSE return TRUE if(WEAR_ID) - if(H.wear_id) + if(human.wear_id) return FALSE if(!(flags_equip_slot & SLOT_ID)) return FALSE return TRUE if(WEAR_L_STORE) - if(H.l_store) + if(human.l_store) return FALSE - if(!H.w_uniform && (WEAR_BODY in mob_equip)) + if(!human.w_uniform && (WEAR_BODY in mob_equip)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) + to_chat(human, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) return FALSE if(flags_equip_slot & SLOT_NO_STORE) return FALSE if(w_class <= SIZE_SMALL || (flags_equip_slot & SLOT_STORE)) return TRUE if(WEAR_R_STORE) - if(H.r_store) + if(human.r_store) return FALSE - if(!H.w_uniform && (WEAR_BODY in mob_equip)) + if(!human.w_uniform && (WEAR_BODY in mob_equip)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) + to_chat(human, SPAN_WARNING("You need a jumpsuit before you can attach this [name].")) return FALSE if(flags_equip_slot & SLOT_NO_STORE) return FALSE @@ -638,109 +638,107 @@ cases. Override_icon_state should be a list.*/ return TRUE return FALSE if(WEAR_ACCESSORY) - for(var/obj/item/clothing/C in H.contents) - if(C.can_attach_accessory(src)) + for(var/obj/item/clothing/clothes in human.contents) + if(clothes.can_attach_accessory(src)) return TRUE return FALSE if(WEAR_J_STORE) - if(H.s_store) + if(human.s_store) return FALSE if(flags_equip_slot & SLOT_SUIT_STORE) return TRUE if(flags_equip_slot & SLOT_BLOCK_SUIT_STORE) return FALSE - if(!H.wear_suit && (WEAR_JACKET in mob_equip)) + if(!human.wear_suit && (WEAR_JACKET in mob_equip)) if(!disable_warning) - to_chat(H, SPAN_WARNING("You need a suit before you can attach this [name].")) + to_chat(human, SPAN_WARNING("You need a suit before you can attach this [name].")) return FALSE - if(H.wear_suit && !H.wear_suit.allowed) + if(human.wear_suit && !human.wear_suit.allowed) if(!disable_warning) to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.") return FALSE - if(H.wear_suit && is_type_in_list(src, H.wear_suit.allowed)) + if(human.wear_suit && is_type_in_list(src, human.wear_suit.allowed)) return TRUE return FALSE if(WEAR_HANDCUFFS) - if(H.handcuffed) + if(human.handcuffed) return FALSE if(!istype(src, /obj/item/handcuffs)) return FALSE return TRUE if(WEAR_LEGCUFFS) - if(H.legcuffed) + if(human.legcuffed) return FALSE if(!istype(src, /obj/item/legcuffs)) return FALSE return TRUE if(WEAR_IN_ACCESSORY) - if(H.w_uniform) - for(var/A in H.w_uniform.accessories) - if(istype(A, /obj/item/clothing/accessory/storage)) - var/obj/item/clothing/accessory/storage/S = A - if(S.hold.can_be_inserted(src, M, TRUE)) + if(human.w_uniform) + for(var/accessory in human.w_uniform.accessories) + if(istype(accessory, /obj/item/clothing/accessory/storage)) + var/obj/item/clothing/accessory/storage/holster = accessory + if(holster.hold.can_be_inserted(src, human, TRUE)) return TRUE - else if(istype(A, /obj/item/storage/internal/accessory/holster)) - var/obj/item/storage/internal/accessory/holster/AH = A - if(!(AH.current_gun) && AH.can_be_inserted(src, M)) + else if(istype(accessory, /obj/item/storage/internal/accessory/holster)) + var/obj/item/storage/internal/accessory/holster/internal_storage = accessory + if(!(internal_storage.current_gun) && internal_storage.can_be_inserted(src, human)) return TRUE return FALSE if(WEAR_IN_JACKET) - if(H.wear_suit) - var/obj/item/clothing/suit/storage/S = H.wear_suit - if(istype(S) && S.pockets)//not all suits have pockits - var/obj/item/storage/internal/I = S.pockets - if(I.can_be_inserted(src, M, TRUE)) + if(human.wear_suit) + var/obj/item/clothing/suit/storage/storage = human.wear_suit + if(istype(storage) && storage.pockets)//not all suits have pockits + var/obj/item/storage/internal/internal_storage = storage.pockets + if(internal_storage.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_HELMET) - if(H.head) - var/obj/item/clothing/head/helmet/marine/HM = H.head - if(istype(HM) && HM.pockets)//not all helmuts have pockits - var/obj/item/storage/internal/I = HM.pockets - if(I.can_be_inserted(src, M, TRUE)) + if(human.head) + var/obj/item/clothing/head/helmet/marine/helmet = human.head + if(istype(helmet) && helmet.pockets)//not all helmuts have pockits + var/obj/item/storage/internal/internal_storage = helmet.pockets + if(internal_storage.can_be_inserted(src, human, TRUE)) return TRUE if(WEAR_IN_BACK) - if (H.back && isstorage(H.back)) - var/obj/item/storage/B = H.back - if(B.can_be_inserted(src, M, TRUE)) + if (human.back && isstorage(human.back)) + var/obj/item/storage/backpack = human.back + if(backpack.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_SHOES) - if(H.shoes && istype(H.shoes, /obj/item/clothing/shoes)) - var/obj/item/clothing/shoes/S = H.shoes - if(!S.stored_item && S.items_allowed && S.items_allowed.len) - for (var/i in S.items_allowed) - if(istype(src, i)) - return TRUE + if(human.shoes && istype(human.shoes, /obj/item/clothing/shoes)) + var/obj/item/clothing/shoes/shoes = human.shoes + if(shoes.attempt_insert_item(human, src)) + return TRUE return FALSE if(WEAR_IN_SCABBARD) - if(H.back && istype(H.back, /obj/item/storage/large_holster)) - var/obj/item/storage/large_holster/B = H.back - if(B.can_be_inserted(src, M, TRUE)) + if(human.back && istype(human.back, /obj/item/storage/large_holster)) + var/obj/item/storage/large_holster/backpack = human.back + if(backpack.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_BELT) - if(H.belt && isstorage(H.belt)) - var/obj/item/storage/B = H.belt - if(B.can_be_inserted(src, M, TRUE)) + if(human.belt && isstorage(human.belt)) + var/obj/item/storage/belt = human.belt + if(belt.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_J_STORE) - if(H.s_store && isstorage(H.s_store)) - var/obj/item/storage/B = H.s_store - if(B.can_be_inserted(src, M, TRUE)) + if(human.s_store && isstorage(human.s_store)) + var/obj/item/storage/armor = human.s_store + if(armor.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_L_STORE) - if(H.l_store && istype(H.l_store, /obj/item/storage/pouch)) - var/obj/item/storage/pouch/P = H.l_store - if(P.can_be_inserted(src, M, TRUE)) + if(human.l_store && istype(human.l_store, /obj/item/storage/pouch)) + var/obj/item/storage/pouch/pouch = human.l_store + if(pouch.can_be_inserted(src, human, TRUE)) return TRUE return FALSE if(WEAR_IN_R_STORE) - if(H.r_store && istype(H.r_store, /obj/item/storage/pouch)) - var/obj/item/storage/pouch/P = H.r_store - if(P.can_be_inserted(src, M, TRUE)) + if(human.r_store && istype(human.r_store, /obj/item/storage/pouch)) + var/obj/item/storage/pouch/pouch = human.r_store + if(pouch.can_be_inserted(src, human, TRUE)) return TRUE return FALSE return FALSE //Unsupported slot diff --git a/code/game/objects/items/XMAS.dm b/code/game/objects/items/XMAS.dm index 4b7bca2fb3..b10ea2035d 100644 --- a/code/game/objects/items/XMAS.dm +++ b/code/game/objects/items/XMAS.dm @@ -66,7 +66,7 @@ gift_type = pick( /obj/item/weapon/gun/revolver/mateba, /obj/item/weapon/gun/pistol/heavy, - /obj/item/weapon/claymore, + /obj/item/weapon/sword, /obj/item/weapon/energy/sword/green, /obj/item/weapon/energy/sword/red, /obj/item/attachable/heavy_barrel, diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 7343d14ad1..139ea1cbac 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -26,6 +26,11 @@ icon_state = "coin_silver" black_market_value = 25 +//CO coin +/obj/item/coin/silver/falcon + name = "falling falcons challenge coin" + desc = "A small coin, bearing the falling falcons insignia." + /obj/item/coin/copper name = "copper coin" desc = "A familiar, but cheap form of currency." diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index abd8404d6e..50c5cd7555 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -141,13 +141,13 @@ . = ..() /obj/item/weapon/pole/fancy_cane/this_is_a_knife/machete - stored_item = new /obj/item/weapon/claymore/mercsword/machete + stored_item = new /obj/item/weapon/sword/machete /obj/item/weapon/pole/fancy_cane/this_is_a_knife/ceremonial_sword - stored_item = new /obj/item/weapon/claymore/mercsword/ceremonial + stored_item = new /obj/item/weapon/sword/ceremonial /obj/item/weapon/pole/fancy_cane/this_is_a_knife/katana - stored_item = new /obj/item/weapon/katana + stored_item = new /obj/item/weapon/sword/katana // IN SHOTGUNS.DM!! diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 661c8d4223..72c49a0ea1 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -37,6 +37,11 @@ desc = "The more you fire these, the more you're reminded that a fragmentation grenade is probably more effective at fulfilling the same purpose. Say, aren't these supposed to eject from your gun?" icon_state = "spent_flech" +/obj/item/prop/helmetgarb/cartridge + name = "cartridge" + desc = "This is the bullet from a Type 71 Pulse Rifle. It is deformed from impact against an armored surface. It's been reduced to a lucky keepsake now." + icon_state = "cartridge" + /obj/item/prop/helmetgarb/prescription_bottle name = "prescription medication" desc = "Anti-anxiety meds? Amphetamines? The cure for Sudden Sleep Disorder? The label can't be read, leaving the now absent contents forever a mystery. The cap is screwed on tighter than any ID lock." @@ -515,3 +520,67 @@ desc = "This patch is all that remains of the Chaplaincy of the USS Almayer, along with the Chaplains themselves. Both no longer exist as a result of losses suffered during Operation Tychon Tackle." icon_state = "chaplain_patch" flags_obj = OBJ_NO_HELMET_BAND + +/obj/item/prop/helmetgarb/family_photo + name = "family photo" + desc = "" + icon = 'icons/obj/items/items.dmi' + icon_state = "photo" + ///The human who spawns with the photo + var/mob/living/carbon/human/owner + ///Text written on the back + var/scribble + +/obj/item/prop/helmetgarb/family_photo/Initialize(mapload, ...) + . = ..() + if(!mapload) + RegisterSignal(src, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner)) + +///Sets the owner of the family photo to the human it spawns with, needs var/source for signals +/obj/item/prop/helmetgarb/family_photo/proc/set_owner(source = src, mob/living/carbon/human/user) + UnregisterSignal(src, COMSIG_POST_SPAWN_UPDATE) + owner = user + +/obj/item/prop/helmetgarb/family_photo/get_examine_text(mob/user) + . = ..() + if(scribble) + . += "\"[scribble]\" is written on the back of the photo." + if(user == owner) + . += "A photo of you and your family." + return + if(user.faction == owner?.faction) + . += "A photo of [owner] and their family." + return + . += "A photo of a family you do not know." + +/obj/item/prop/helmetgarb/family_photo/attackby(obj/item/attacking_item, mob/user) + . = ..() + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_PEN) || istype(attacking_item, /obj/item/toy/crayon)) + if(scribble) + to_chat(user, SPAN_NOTICE("[src] has already been written on.")) + return + var/new_text = copytext(strip_html(tgui_input_text(user, "What would you like to write on the back of [src]?", "Photo Writing")), 1, 128) + + if(!loc == user) + to_chat(user, SPAN_NOTICE("You need to be holding [src] to write on it.")) + return + if(!user.stat == CONSCIOUS) + to_chat(user, SPAN_NOTICE("You cannot write on [src] in this state.")) + return + scribble = new_text + playsound(src, "paper_writing", 15, TRUE) + return TRUE + +/obj/item/prop/helmetgarb/compass + name = "compass" + desc = "It always faces north. Are you sure it is not broken?" + icon = 'icons/obj/items/items.dmi' + icon_state = "compass" + w_class = SIZE_SMALL + +/obj/item/prop/helmetgarb/bug_spray + name = "insect repellent" + desc = "A store-brand insect repellent, to keep any variety of pest or mosquito away from you." + icon = 'icons/obj/items/spray.dmi' + icon_state = "pestspray" + w_class = SIZE_SMALL diff --git a/code/game/objects/items/reagent_containers/reagent_container.dm b/code/game/objects/items/reagent_containers/reagent_container.dm index e0561d5a7e..327f6ba1ce 100644 --- a/code/game/objects/items/reagent_containers/reagent_container.dm +++ b/code/game/objects/items/reagent_containers/reagent_container.dm @@ -67,12 +67,6 @@ if (N) R.amount_per_transfer_from_this = N -/obj/item/reagent_container/Initialize() - . = ..() - if (!possible_transfer_amounts) - verbs -= /obj/item/reagent_container/verb/set_APTFT //which objects actually uses it? - create_reagents(volume) - /obj/item/reagent_container/Destroy() possible_transfer_amounts = null return ..() diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 972898e644..6d0736f8ae 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -189,6 +189,13 @@ is_reinforced = 1 construction_options = list("One Direction", "Full Window", "Windoor") +/obj/item/stack/sheet/glass/reinforced/medium_stack + amount = 25 + +/obj/item/stack/sheet/glass/reinforced/large_stack + amount = 50 + + /obj/item/stack/sheet/glass/reinforced/cyborg matter = null diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index b4a6c3a8c1..27026165fc 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -75,20 +75,20 @@ desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the back or the armor." icon_state = "machete_holster" flags_equip_slot = SLOT_WAIST|SLOT_BACK - can_hold = list(/obj/item/weapon/claymore/mercsword/machete) + can_hold = list(/obj/item/weapon/sword/machete) /obj/item/storage/large_holster/machete/full/fill_preset_inventory() - new /obj/item/weapon/claymore/mercsword/machete(src) + new /obj/item/weapon/sword/machete(src) /obj/item/storage/large_holster/machete/arnold name = "\improper QH20 pattern M2100 custom machete scabbard" desc = "A large leather scabbard used to carry a M2100 \"Ngájhe\" machete. It can be strapped to the back or the armor." icon_state = "arnold-machete-pouch" flags_equip_slot = SLOT_WAIST|SLOT_BACK - can_hold = list(/obj/item/weapon/claymore/mercsword/machete) + can_hold = list(/obj/item/weapon/sword/machete) /obj/item/storage/large_holster/machete/arnold/full/fill_preset_inventory() - new /obj/item/weapon/claymore/mercsword/machete/arnold(src) + new /obj/item/weapon/sword/machete/arnold(src) /obj/item/storage/large_holster/katana name = "\improper katana scabbard" @@ -97,10 +97,10 @@ force = 12 attack_verb = list("bludgeoned", "struck", "cracked") flags_equip_slot = SLOT_WAIST|SLOT_BACK - can_hold = list(/obj/item/weapon/katana) + can_hold = list(/obj/item/weapon/sword/katana) /obj/item/storage/large_holster/katana/full/fill_preset_inventory() - new /obj/item/weapon/katana(src) + new /obj/item/weapon/sword/katana(src) /obj/item/storage/large_holster/ceremonial_sword name = "ceremonial sword scabbard" @@ -108,10 +108,10 @@ icon_state = "ceremonial_sword_holster"//object icon is duplicate of katana holster, needs new icon at some point. force = 12 flags_equip_slot = SLOT_WAIST - can_hold = list(/obj/item/weapon/claymore/mercsword/ceremonial) + can_hold = list(/obj/item/weapon/sword/ceremonial) /obj/item/storage/large_holster/ceremonial_sword/full/fill_preset_inventory() - new /obj/item/weapon/claymore/mercsword/ceremonial(src) + new /obj/item/weapon/sword/ceremonial(src) /obj/item/storage/large_holster/m39 name = "\improper M276 pattern M39 holster rig" @@ -249,9 +249,13 @@ if(!ishuman(user) || user.is_mob_incapacitated()) return FALSE - var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand() - if(!istype(F)) - to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]") + if(user.back != src) + to_chat(user, "The [src] must be equipped before you can switch types") + return + + var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand() + if(!istype(flamer)) + to_chat(user, "You must be holding the M240-T incinerator unit to use [src]") return if(!active_fuel) @@ -267,14 +271,13 @@ else active_fuel = fuelB - for(var/X in actions) - var/datum/action/A = X - A.update_button_icon() + for(var/datum/action/action_added as anything in actions) + action_added.update_button_icon() to_chat(user, "You switch the fuel tank to [active_fuel.caliber]") playsound(src, 'sound/machines/click.ogg', 25, TRUE) - F.current_mag = active_fuel - F.update_icon() + flamer.current_mag = active_fuel + flamer.update_icon() return TRUE diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 5f671037ae..618356f44a 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1355,7 +1355,7 @@ item_state = "machete_holster" max_w_class = SIZE_LARGE storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW - can_hold = list(/obj/item/weapon/claymore/mercsword/machete) + can_hold = list(/obj/item/weapon/sword/machete) var/sheathe_sound = 'sound/weapons/gun_rifle_draw.ogg' var/draw_sound = 'sound/weapons/gun_rifle_draw.ogg' @@ -1375,4 +1375,4 @@ playsound(src, draw_sound, vol = 15, vary = TRUE) /obj/item/storage/pouch/machete/full/fill_preset_inventory() - new /obj/item/weapon/claymore/mercsword/machete(src) + new /obj/item/weapon/sword/machete(src) diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index 130bd56709..7681e74a1d 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -642,7 +642,39 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_off = "cobpipeoff" smoketime = 800 SECONDS +/obj/item/clothing/mask/electronic_cigarette + name = "electronic cigarette" + desc = "An electronic cigarette by The American Tobacco Company, who also made Lucky Strikes." + icon_state = "cigoff" + item_state = "cigoff" + w_class = SIZE_SMALL + flags_equip_slot = SLOT_EAR|SLOT_FACE + var/icon_on = "cigon" + var/icon_off = "cigoff" + var/enabled = FALSE +/obj/item/clothing/mask/electronic_cigarette/update_icon() + . = ..() + if(enabled) + icon_state = icon_on + item_state = icon_on + return + icon_state = icon_off + item_state = icon_off + +/obj/item/clothing/mask/electronic_cigarette/attack_self(mob/user) + . = ..() + to_chat(user, SPAN_NOTICE("You [enabled ? "disable" : "enable"] [src].")) + enabled = !enabled + update_icon() + +/obj/item/clothing/mask/electronic_cigarette/cigar + name = "electronic cigar" + desc = "A luxury electronic cigar, with its labels scratched off. Where could this be from?" + icon_state = "cigar_off" + item_state = "cigar_off" + icon_on = "cigar_on" + icon_off = "cigar_off" ///////// //ZIPPO// diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index b5be55eed5..98dc89321d 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -173,7 +173,7 @@ playsound(user.loc, "sound/items/pen_click_[on? "on": "off"].ogg", 100, 1, 5) update_pen_state() -/obj/item/tool/pen/Initialize() +/obj/item/tool/pen/Initialize(mapload, ...) . = ..() update_pen_state() @@ -286,15 +286,15 @@ var/current_colour_index = 1 var/owner = "hard to read text" -/obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user) +/obj/item/tool/pen/fountain/Initialize(mapload, ...) . = ..() - var/turf/current_turf = get_turf(src) - var/mob/living/carbon/human/new_owner = locate() in current_turf - if(new_owner) - owner = new_owner.real_name - var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf - if(new_owners_pod) - owner = new_owners_pod.occupant?.real_name + if(!mapload) + RegisterSignal(src, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner)) + +///Sets the owner of the pen to who it spawns with, requires var/source for signals +/obj/item/tool/pen/fountain/proc/set_owner(source = src, mob/living/carbon/human/user) + UnregisterSignal(src, COMSIG_POST_SPAWN_UPDATE) + owner = user /obj/item/tool/pen/fountain/get_examine_text(mob/user) . = ..() diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index b2a66becd8..7a17904635 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -318,56 +318,6 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11." icon_state = "phazonprize" - -/obj/item/toy/therapy_red - name = "red therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is red." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapyred" - item_state = "egg4" // It's the red egg in items_left/righthand - w_class = SIZE_TINY - -/obj/item/toy/therapy_purple - name = "purple therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is purple." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapypurple" - item_state = "egg1" // It's the magenta egg in items_left/righthand - w_class = SIZE_TINY - -/obj/item/toy/therapy_blue - name = "blue therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is blue." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapyblue" - item_state = "egg2" // It's the blue egg in items_left/righthand - w_class = SIZE_TINY - -/obj/item/toy/therapy_yellow - name = "yellow therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is yellow." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapyyellow" - item_state = "egg5" // It's the yellow egg in items_left/righthand - w_class = SIZE_TINY - -/obj/item/toy/therapy_orange - name = "orange therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is orange." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapyorange" - item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless - w_class = SIZE_TINY - -/obj/item/toy/therapy_green - name = "green therapy doll" - desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is green." - icon = 'icons/obj/items/toy.dmi' - icon_state = "therapygreen" - item_state = "egg3" // It's the green egg in items_left/righthand - w_class = SIZE_TINY - - /obj/item/toy/inflatable_duck name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" @@ -377,7 +327,6 @@ flags_equip_slot = SLOT_WAIST black_market_value = 20 - /obj/item/toy/beach_ball name = "beach ball" icon_state = "beachball" @@ -394,7 +343,6 @@ user.drop_held_item() throw_atom(target, throw_range, throw_speed, user) - /obj/item/toy/dice name = "d6" desc = "A die with six sides." @@ -427,10 +375,6 @@ SPAN_NOTICE("You throw [src]. It lands on a [result]. [comment]"), \ SPAN_NOTICE("You hear [src] landing on a [result]. [comment]")) - - - - /obj/item/toy/bikehorn name = "bike horn" desc = "A horn off of a bicycle." @@ -455,47 +399,6 @@ src.add_fingerprint(user) addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS) - - -/obj/item/toy/farwadoll - name = "Farwa plush doll" - desc = "A Farwa plush doll. It's soft and comforting!" - w_class = SIZE_TINY - icon_state = "farwaplush" - black_market_value = 25 - COOLDOWN_DECLARE(last_hug_time) - -/obj/item/toy/farwadoll/attack_self(mob/user) - ..() - - if(COOLDOWN_FINISHED(src, last_hug_time)) - user.visible_message(SPAN_NOTICE("[user] hugs [src]! How cute! "), \ - SPAN_NOTICE("You hug [src]. Dawwww... ")) - COOLDOWN_START(src, last_hug_time, 5 SECONDS) - -/obj/item/toy/farwadoll/pred - name = "strange plush doll" - desc = "A plush doll depicting some sort of tall humanoid biped..?" - w_class = SIZE_TINY - icon_state = "predplush" - -/obj/item/toy/plushie_cade - name = "plushie barricade" - desc = "Great for squeezing whenever you're scared. Or lightly hurt. Or in any other situation." - icon_state = "plushie_cade" - item_state = "plushie_cade" - w_class = SIZE_SMALL - COOLDOWN_DECLARE(last_hug_time) - -/obj/item/toy/plushie_cade/attack_self(mob/user) - ..() - - if(COOLDOWN_FINISHED(src, last_hug_time)) - user.visible_message(SPAN_NOTICE("[user] hugs [src] tightly!"), SPAN_NOTICE("You hug [src]. You feel safe.")) - playsound(user, "plush", 25, TRUE) - COOLDOWN_START(src, last_hug_time, 2.5 SECONDS) - - /obj/item/computer3_part name = "computer part" desc = "Holy jesus you donnit now" @@ -567,3 +470,178 @@ /obj/item/toy/festivizer/xeno name = "strange resin-covered festivizer decorator" desc = "This bizarre festivizer is covered in goopy goop and schmuck. Ew! It's so sticky, *anything* could grab onto it! Grab it and touch other things to festivize them!" + +/obj/item/toy/plush + name = "generic plushie" + desc = "perfectly generic" + icon = 'icons/obj/items/plush.dmi' + icon_state = "debug" + w_class = SIZE_SMALL + COOLDOWN_DECLARE(last_hug_time) + black_market_value = 10 + +/obj/item/toy/plush/attack_self(mob/user) + ..() + if(!COOLDOWN_FINISHED(src, last_hug_time)) + return + user.visible_message(SPAN_NOTICE("[user] hugs [src] tightly!"), SPAN_NOTICE("You hug [src].")) + playsound(user, "plush", 25, TRUE) + COOLDOWN_START(src, last_hug_time, 2.5 SECONDS) + +/obj/item/toy/plush/farwa + name = "Farwa plush" + desc = "A Farwa plush doll. It's soft and comforting!" + icon_state = "farwa" + black_market_value = 25 + +/obj/item/toy/plush/barricade + name = "plushie barricade" + desc = "Great for squeezing whenever you're scared. Or lightly hurt. Or in any other situation." + icon_state = "barricade" + item_state = "cade_plush" + +/obj/item/toy/plush/shark //A few more generic plushies to increase the size of the plushie loot pool + name = "shark plush" + desc = "A plushie depicting a somewhat cartoonish shark. The tag notes that it was made by an obscure furniture manufacturer in Scandinavia." + icon_state = "shark" + +/obj/item/toy/plush/bee + name = "bee plush" + desc = "A cute toy that awakens the warrior spirit in the most reserved marine." + icon_state = "bee" + +/obj/item/toy/plush/moth + name = "moth plush" + desc = "A plush doll of a bug." + icon_state = "moth" + +/obj/item/toy/plush/rock + name = "rock plush" + desc = "It says it is a plush on the tag, at least." + icon_state = "rock" + +/obj/item/toy/plush/therapy + name = "therapy plush" + desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles." + icon_state = "therapy" + +/obj/item/toy/plush/therapy/red + name = "red therapy plush" + color = "#FC5274" + +/obj/item/toy/plush/therapy/blue + name = "blue therapy plush" + color = "#9EBAE0" + +/obj/item/toy/plush/therapy/green + name = "green therapy plush" + color = "#A3C940" + +/obj/item/toy/plush/therapy/orange + name = "orange therapy plush" + color = "#FD8535" + +/obj/item/toy/plush/therapy/purple + name = "purple therapy plush" + color = "#A26AC7" + +/obj/item/toy/plush/therapy/yellow + name = "yellow therapy plush" + color = "#FFE492" + +/obj/item/toy/plush/therapy/random_color + ///Hexadecimal 0-F (0-15) + var/static/list/hexadecimal = list("0", "1", "2", "3" , "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F") + +/obj/item/toy/plush/therapy/random_color/New(loc, ...) + . = ..() + var/color_code = "#[pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)]" //This is dumb and I hope theres a better way I'm missing + color = color_code + desc = "A custom therapy plush, in a unique color. This one is labeled with \"#[color_code]\"." + +/obj/item/toy/plush/random_plushie //Not using an effect so it can fit into storage from loadout + name = "random plush" + desc = "You should not be seeing this" + /// Standard plushies for the spawner to pick from + var/list/plush_list = list( + /obj/item/toy/plush/farwa, + /obj/item/toy/plush/barricade, + /obj/item/toy/plush/bee, + /obj/item/toy/plush/shark, + /obj/item/toy/plush/moth, + /obj/item/toy/plush/rock, + ) + ///Therapy plushies left separately to not flood the entire list + var/list/therapy_plush_list = list( + /obj/item/toy/plush/therapy, + /obj/item/toy/plush/therapy/red, + /obj/item/toy/plush/therapy/blue, + /obj/item/toy/plush/therapy/green, + /obj/item/toy/plush/therapy/orange, + /obj/item/toy/plush/therapy/purple, + /obj/item/toy/plush/therapy/yellow, + /obj/item/toy/plush/therapy/random_color, + ) + +/obj/item/toy/plush/random_plushie/Initialize(mapload, ...) + . = ..() + if(mapload) //Placed in mapping, will be randomized instantly on spawn + create_plushie() + return + RegisterSignal(src, COMSIG_POST_SPAWN_UPDATE, PROC_REF(create_plushie)) + +///The randomizer picking and spawning a plushie on either the ground or in the humans backpack. Needs var/source due to signals +/obj/item/toy/plush/random_plushie/proc/create_plushie(source = src, mob/living/user) + UnregisterSignal(src, COMSIG_POST_SPAWN_UPDATE) + var/plush_list_variety = pick(60; plush_list, 40; therapy_plush_list) + var/random_plushie = pick(plush_list_variety) + var/obj/item/toy/plush/plush = new random_plushie(get_turf(src)) //Starts on floor by default + + if(!user) //If it didn't spawn on a humanoid + qdel(src) + return + var/obj/item/storage/backpack/storage = locate() in user //If the user has a backpack, put it there + if(storage?.can_be_inserted(plush, user, stop_messages = TRUE)) + storage.attempt_item_insertion(plush, TRUE, user) + qdel(src) + +//Admin plushies +/obj/item/toy/plush/yautja + name = "strange plush" + desc = "A plush doll depicting some sort of tall humanoid biped..?" + icon_state = "yautja" + black_market_value = 100 + +/obj/item/toy/plush/runner + name = "\improper XX-121 therapy plush" + desc = "Don't be sad! Be glad (that you're alive)!" + icon_state = "runner" + /// If the runner is wearing a beret + var/beret = FALSE + +/obj/item/toy/plush/runner/Initialize(mapload, ...) + . = ..() + if(beret) + update_icon() + +/obj/item/toy/plush/runner/attackby(obj/item/attacking_object, mob/user) + . = ..() + if(beret) + return + if(!istypestrict(attacking_object, /obj/item/clothing/head/beret/marine/mp)) + return + var/beret_attack = attacking_object + to_chat(user, SPAN_NOTICE("You put [beret_attack] on [src].")) + qdel(beret_attack) + beret = TRUE + update_icon() + +/obj/item/toy/plush/runner/update_icon() + . = ..() + if(beret) + icon_state = "runner_beret" + return + icon_state = "runner" + +/obj/item/toy/plush/shark/alt + icon_state = "shark_alt" diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 4b4b315390..2fe80f123b 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -1,38 +1,36 @@ -/obj/item/weapon/claymore - name = "claymore" - desc = "What are you standing around staring at this for? Get to killing!" - icon_state = "claymore" - item_state = "claymore" +/obj/item/weapon/sword + name = "combat sword" + desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage." + icon_state = "mercsword" + item_state = "machete" flags_atom = FPRINT|CONDUCT flags_equip_slot = SLOT_WAIST force = MELEE_FORCE_STRONG throwforce = MELEE_FORCE_WEAK sharp = IS_SHARP_ITEM_BIG edge = 1 - w_class = SIZE_MEDIUM + w_class = SIZE_LARGE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_speed = 9 -/obj/item/weapon/claymore/mercsword - name = "combat sword" - desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage." - icon_state = "mercsword" - item_state = "machete" +/obj/item/weapon/sword/claymore + name = "claymore" + desc = "What are you standing around staring at this for? Get to killing!" + icon_state = "claymore" + item_state = "claymore" -/obj/item/weapon/claymore/mercsword/ceremonial +/obj/item/weapon/sword/ceremonial name = "Ceremonial Sword" desc = "A fancy ceremonial sword passed down from generation to generation. Despite this, it has been very well cared for, and is in top condition." icon_state = "ceremonial" - item_state = "machete" -/obj/item/weapon/claymore/mercsword/machete +/obj/item/weapon/sword/machete name = "\improper M2132 machete" desc = "Latest issue of the USCM Machete. Great for clearing out jungle or brush on outlying colonies. Found commonly in the hands of scouts and trackers, but difficult to carry with the usual kit." icon_state = "machete" - w_class = SIZE_LARGE -/obj/item/weapon/claymore/mercsword/machete/attack_self(mob/user) +/obj/item/weapon/sword/machete/attack_self(mob/user) if(user.action_busy) return @@ -49,14 +47,13 @@ return ..() -/obj/item/weapon/claymore/mercsword/machete/arnold +/obj/item/weapon/sword/machete/arnold name = "\improper M2100 \"Ngájhe\" machete" desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit." icon_state = "arnold-machete" - w_class = SIZE_LARGE force = MELEE_FORCE_TIER_11 -/obj/item/weapon/claymore/hefa +/obj/item/weapon/sword/hefa name = "HEFA sword" icon_state = "hefasword" item_state = "hefasword" @@ -65,7 +62,7 @@ var/primed = FALSE -/obj/item/weapon/claymore/hefa/proc/apply_explosion_overlay() +/obj/item/weapon/sword/hefa/proc/apply_explosion_overlay() var/obj/effect/overlay/O = new /obj/effect/overlay(loc) O.name = "grenade" O.icon = 'icons/effects/explosion.dmi' @@ -73,7 +70,7 @@ QDEL_IN(O, 7) return -/obj/item/weapon/claymore/hefa/attack_self(mob/user) +/obj/item/weapon/sword/hefa/attack_self(mob/user) ..() primed = !primed @@ -82,7 +79,7 @@ msg = "You de-activate \the [src]!" to_chat(user, SPAN_NOTICE(msg)) -/obj/item/weapon/claymore/hefa/attack(mob/target, mob/user) +/obj/item/weapon/sword/hefa/attack(mob/target, mob/user) . = ..() if(!primed) return @@ -97,22 +94,15 @@ cell_explosion(epicenter, 40, 18, EXPLOSION_FALLOFF_SHAPE_LINEAR, user.dir, cause_data) qdel(src) -/obj/item/weapon/katana +/obj/item/weapon/sword/katana name = "katana" desc = "A finely made Japanese sword, with a well sharpened blade. The blade has been filed to a molecular edge, and is extremely deadly. Commonly found in the hands of mercenaries and yakuza." icon_state = "katana" - flags_atom = FPRINT|CONDUCT + item_state = "katana" force = MELEE_FORCE_VERY_STRONG - throwforce = MELEE_FORCE_WEAK - sharp = IS_SHARP_ITEM_BIG - edge = 1 - w_class = SIZE_MEDIUM - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - attack_speed = 9 //To do: replace the toys. -/obj/item/weapon/katana/replica +/obj/item/weapon/sword/katana/replica name = "replica katana" desc = "A cheap knock-off commonly found in regular knife stores. Can still do some damage." force = MELEE_FORCE_WEAK @@ -246,3 +236,142 @@ WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_64.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_64.dmi' ) + +/obj/item/weapon/straight_razor + name = "straight razor" + desc = "The commandant's favorite weapon against marines who dare break the grooming standards." + icon_state = "razor" + hitsound = 'sound/weapons/genhit3.ogg' + force = MELEE_FORCE_TIER_1 + throwforce = MELEE_FORCE_TIER_1 + throw_speed = SPEED_VERY_FAST + throw_range = 6 + ///Icon state for opened razor + var/enabled_icon = "razor" + ///Icon state for closed razor + var/disabled_icon = "razor_off" + ///If the razor is able to be used + var/razor_opened = FALSE + ///Time taken to open/close the razor + var/interaction_time = 3 SECONDS + +/obj/item/weapon/straight_razor/Initialize(mapload, ...) + . = ..() + RegisterSignal(src, COMSIG_ITEM_ATTEMPTING_EQUIP, PROC_REF(can_fit_in_shoe)) + change_razor_state(razor_opened) + if(prob(1)) + desc += " There is phrase etched into it, \"It can guarantee the closest shave you'll ever know.\"..." + +/obj/item/weapon/straight_razor/update_icon() + . = ..() + if(razor_opened) + icon_state = enabled_icon + return + icon_state = disabled_icon + +/obj/item/weapon/straight_razor/attack_hand(mob/user) + if(loc != user) //Only do unique stuff if you are holding it + return ..() + + if(!do_after(user, interaction_time, INTERRUPT_INCAPACITATED, BUSY_ICON_HOSTILE)) + return + playsound(user, 'sound/weapons/flipblade.ogg', 15, 1) + change_razor_state(!razor_opened) + to_chat(user, SPAN_NOTICE("You [razor_opened ? "reveal" : "hide"] [src]'s blade.")) + +///Check if the item can fit as a boot knife, var/source for signals +/obj/item/weapon/straight_razor/proc/can_fit_in_shoe(source = src, mob/user, slot) + if(slot != WEAR_IN_SHOES) //Only check if you try putting it in a shoe + return + if(razor_opened) + to_chat(user, SPAN_NOTICE("You cannot store [src] in your shoes until the blade is hidden.")) + return COMPONENT_CANCEL_EQUIP + +///Changes all the vars for the straight razor +/obj/item/weapon/straight_razor/proc/change_razor_state(opening = FALSE) + razor_opened = opening + update_icon() + if(opening) + force = MELEE_FORCE_NORMAL + throwforce = MELEE_FORCE_NORMAL + sharp = IS_SHARP_ITEM_ACCURATE + edge = TRUE + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/slash.ogg' + if(!(flags_item & CAN_DIG_SHRAPNEL)) + flags_item |= CAN_DIG_SHRAPNEL + return + force = MELEE_FORCE_TIER_1 + throwforce = MELEE_FORCE_TIER_1 + sharp = FALSE + edge = FALSE + attack_verb = list("smashed", "beaten", "slammed", "struck", "smashed", "battered", "cracked") + hitsound = 'sound/weapons/genhit3.ogg' + if(flags_item & CAN_DIG_SHRAPNEL) + flags_item &= ~CAN_DIG_SHRAPNEL + +/obj/item/weapon/straight_razor/verb/change_hair_style() + set name = "Change Hair Style" + set desc = "Change your hair style" + set category = "Object" + set src in usr + + var/mob/living/carbon/human/human_user = usr + if(!istype(human_user)) + return + + if(!razor_opened) + to_chat(human_user, SPAN_NOTICE("You need to reveal [src]'s blade to change your hairstyle.")) + return + + var/list/species_facial_hair = GLOB.facial_hair_styles_list + var/list/species_hair = GLOB.hair_styles_list + + if(human_user.species) //Facial hair + species_facial_hair = list() + for(var/current_style in GLOB.facial_hair_styles_list) + var/datum/sprite_accessory/facial_hair/temp_beard_style = GLOB.facial_hair_styles_list[current_style] + if(!(human_user.species.name in temp_beard_style.species_allowed)) + continue + if(!temp_beard_style.selectable) + continue + species_facial_hair += current_style + + if(human_user.species) //Hair + species_hair = list() + for(var/current_style in GLOB.hair_styles_list) + var/datum/sprite_accessory/hair/temp_hair_style = GLOB.hair_styles_list[current_style] + if(!(human_user.species.name in temp_hair_style.species_allowed)) + continue + if(!temp_hair_style.selectable) + continue + species_hair += current_style + + var/new_beard_style + var/new_hair_style + if(human_user.gender == MALE) + new_beard_style = tgui_input_list(human_user, "Select a facial hair style", "Grooming", species_facial_hair) + new_hair_style = tgui_input_list(human_user, "Select a hair style", "Grooming", species_hair) + + if(loc != human_user) + to_chat(human_user, SPAN_NOTICE("You are too far from [src] to change your hair styles.")) + return + + if(!new_beard_style && !new_hair_style) + return + + if(!do_after(human_user, interaction_time, INTERRUPT_ALL, BUSY_ICON_GENERIC)) + return + + if(!razor_opened) + to_chat(human_user, SPAN_NOTICE("You need to reveal [src]'s blade to change your hairstyle.")) + return + + if(new_beard_style) + human_user.f_style = new_beard_style + if(new_hair_style) + human_user.h_style = new_hair_style + + human_user.apply_damage(rand(1,5), BRUTE, "head", src) + human_user.update_hair() + diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 20bf8ac951..0497a410a3 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -89,7 +89,7 @@ /obj/item/weapon/shield/riot/attackby(obj/item/W as obj, mob/user as mob) if(cooldown < world.time - 25) - if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/claymore) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/katana) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand)) + if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand)) user.visible_message(SPAN_WARNING("[user] bashes [src] with [W]!")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1) cooldown = world.time diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index aaa2a33d4e..efa898ba99 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -167,7 +167,7 @@ update_icon(user) -/obj/item/weapon/katana/sharp +/obj/item/weapon/sword/katana/sharp name = "absurdly sharp katana" desc = "

That's it. I'm sick of all this \"Masterwork Bastard Sword\" bullshit that's going on in CM-SS13 right now. Katanas deserve much better than that. Much, much better than that.

\

I should know what I'm talking about. I myself commissioned a genuine katana in Japan for 2,400,000 Yen (that's about $20,000) and have been practicing with it for almost 2 years now. I can even cut slabs of solid steel with my katana.

\ @@ -190,7 +190,7 @@ attack_verb = list("sliced", "diced", "cut") -/obj/item/weapon/katana/sharp/attack(mob/living/M, mob/living/user) +/obj/item/weapon/sword/katana/sharp/attack(mob/living/M, mob/living/user) if(flags_item & NOBLUDGEON) return @@ -223,7 +223,7 @@ //if the target also has a katana (and we aren't attacking ourselves), we add some suspense - if( ( istype(M.get_active_hand(), /obj/item/weapon/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/katana) ) && M != user ) + if( ( istype(M.get_active_hand(), /obj/item/weapon/sword/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/sword/katana) ) && M != user ) if(prob(50)) user.visible_message(SPAN_DANGER("[M] and [user] cross blades!")) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index 0d25b6702e..818aea5a4c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -32,6 +32,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/securecom/Initialize() . = ..() + new /obj/item/storage/box/kit/honorguard(src) + new /obj/item/storage/box/kit/honorguard(src) GLOB.co_secure_boxes += src /obj/structure/closet/secure_closet/securecom/Destroy() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm similarity index 85% rename from code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm rename to code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm index db20a738c8..4531a68c42 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm @@ -65,21 +65,7 @@ contents_explosion(severity - EXPLOSION_THRESHOLD_LOW) deconstruct(FALSE) -/obj/structure/closet/secure_closet/guncabinet/mp_armory -// req_access = list(ACCESS_MARINE_BRIG) - req_level = SEC_LEVEL_RED - -/obj/structure/closet/secure_closet/guncabinet/mp_armory/Initialize() - . = ..() - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/ammo_magazine/shotgun/slugs(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - - - +//this is used on corsat.(leaving it as a prop i guess) /obj/structure/closet/secure_closet/guncabinet/riot_control name = "riot control equipment closet" // req_access = list(ACCESS_MARINE_BRIG) @@ -111,15 +97,10 @@ new /obj/item/clothing/suit/armor/riot/marine(src) new /obj/item/storage/box/flashbangs(src) - /obj/structure/closet/secure_closet/guncabinet/green name = "green level gun cabinet" req_level = SEC_LEVEL_GREEN -/obj/structure/closet/secure_closet/guncabinet/blue - name = "blue level gun cabinet" - req_level = SEC_LEVEL_BLUE - /obj/structure/closet/secure_closet/guncabinet/red name = "red level gun cabinet" req_level = SEC_LEVEL_RED diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm new file mode 100644 index 0000000000..acc43c302e --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm @@ -0,0 +1,37 @@ +/obj/structure/closet/secure_closet/guncabinet/blue + name = "blue level gun cabinet" + req_level = SEC_LEVEL_BLUE + +//riot gear control cabinet adding vehicle clamp to it to... +// make more sense than in red alert cabinet. + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control + name = "riot control equipment closet" + storage_capacity = 55 //lots of stuff to fit in + req_level = SEC_LEVEL_BLUE + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/weapon/gun/launcher/grenade/m81/riot(src, TRUE) + new /obj/item/storage/box/nade_box/tear_gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/storage/box/flashbangs(src) + new /obj/item/vehicle_clamp(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm new file mode 100644 index 0000000000..487ffd546d --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -0,0 +1,112 @@ +/obj/structure/closet/secure_closet/guncabinet/red + name = "red level gun cabinet" + req_level = SEC_LEVEL_RED + +// MP ARMORY + +// 3 shotgun cabinet are in brig armory +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_box/magazine/shotgun/buckshot(src) + new /obj/item/ammo_box/magazine/shotgun(src) + +// 2 M39 cabinet are in brig armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// 2 m4ra cabinet are in brig armory (m4ra guns and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle/Initialize() + . = ..() + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/ammo_box/magazine/m4ra(src) + +// EXECUTION CHAMBER might add that here need to ask first... will reskin if asked. + + + +// CIC ARMORY + +// 4 shotgun cabinet are in cic armory +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +//4 MK1 cabinet(using guncase because it fit well here it seem) +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle/Initialize() + . = ..() + new /obj/item/storage/box/guncase/m41aMK1(src) + +//4 MK1 (with AP) cabinet(using guncase because it fit well here it seem) +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap/Initialize() + . = ..() + new /obj/item/storage/box/guncase/m41aMK1AP(src) + +// UPPER MEDBAY ARMORY + +//1 shotgun armory closet 2 guns and 4 mags +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +// 2 pistol amory closet maybe to replace with full pistol belt... +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol + +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol/Initialize() + . = ..() + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/ammo_box/magazine/m4a3(src) + +// 2 M39 cabinet are in medical armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// UPPER ENGI ARMORY +// same as medical + +// REQ ARMORY +// same as medical + +// Small office in hangar armory same as brig armory.... +// same as brig armory diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0f4ba9f6bd..5220e3d832 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -718,7 +718,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. //hatchets and shiet can clear away undergrowth if(I && (I.sharp >= IS_SHARP_ITEM_ACCURATE) && !stump) var/damage = rand(2,5) - if(istype(I,/obj/item/weapon/claymore/mercsword)) + if(istype(I,/obj/item/weapon/sword)) damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 23231492fc..2d32e808d3 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -213,3 +213,28 @@ FLOOR SAFES /obj/structure/safe/floor/hide(intact) invisibility = intact ? 101 : 0 + +//almayer + +/obj/structure/safe/co_office + +/obj/structure/safe/co_office/Initialize() + . = ..() + new /obj/item/clothing/glasses/monocle(src) + new /obj/item/book/codebook(src) + new /obj/item/coin/silver/falcon(src) + new /obj/item/weapon/telebaton(src) + new /obj/item/moneybag(src) + +/obj/structure/safe/cl_office + +/obj/structure/safe/cl_office/Initialize() + . = ..() + new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/weapon/gun/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/clothing/accessory/storage/holster(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/coin/platinum(src) diff --git a/code/game/world.dm b/code/game/world.dm index 1307ebccbd..04a3433b5a 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -91,8 +91,8 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt") update_status() //Scramble the coords obsfucator - obfs_x = rand(-500, 500) //A number between -100 and 100 - obfs_y = rand(-500, 500) //A number between -100 and 100 + GLOB.obfs_x = rand(-500, 500) //A number between -100 and 100 + GLOB.obfs_y = rand(-500, 500) //A number between -100 and 100 spawn(3000) //so we aren't adding to the round-start lag if(CONFIG_GET(flag/ToRban)) diff --git a/code/global.dm b/code/global.dm index 7c2c268809..26868dd386 100644 --- a/code/global.dm +++ b/code/global.dm @@ -154,14 +154,6 @@ var/list/nato_phonetic_alphabet = list("Alpha", "Bravo", "Charlie", "Delta", "Ec var/distress_cancel = 0 var/destroy_cancel = 0 -//Coordinate obsfucator -//Used by the rangefinders and linked systems to prevent coords collection/prefiring - -/// A number between -500 and 500. -var/global/obfs_x = 0 -/// A number between -500 and 500. -var/global/obfs_y = 0 - // Which lobby art is on display // This is updated by the lobby art turf when it initializes var/displayed_lobby_art = -1 diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index b007acb29d..0df471e4af 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -337,6 +337,10 @@ var/global/list/gear_datums_by_name = list() display_name = "Spent slugs" path = /obj/item/prop/helmetgarb/spent_slug +/datum/gear/helmet_garb/cartridge + display_name = "Cartridge" + path = /obj/item/prop/helmetgarb/cartridge + /datum/gear/helmet_garb/spacejam_tickets display_name = "Tickets to Space Jam" path = /obj/item/prop/helmetgarb/spacejam_tickets @@ -511,6 +515,72 @@ var/global/list/gear_datums_by_name = list() display_name = "Crayon" path = /obj/item/toy/crayon/rainbow +/datum/gear/plush + category = "Plushies" + cost = 4 + +/datum/gear/plush/random + display_name = "Random plush" + path = /obj/item/toy/plush/random_plushie + cost = 2 + +/datum/gear/plush/farwa + display_name = "Farwa plush" + path = /obj/item/toy/plush/farwa + +/datum/gear/plush/barricade + display_name = "Barricade plush" + path = /obj/item/toy/plush/barricade + +/datum/gear/plush/bee + display_name = "Bee plush" + path = /obj/item/toy/plush/bee + +/datum/gear/plush/shark + display_name = "Shark plush" + path = /obj/item/toy/plush/shark + +/datum/gear/plush/moth + display_name = "Moth plush" + path = /obj/item/toy/plush/moth + +/datum/gear/plush/rock + display_name = "Rock plush" + path = /obj/item/toy/plush/rock + +/datum/gear/plush/therapy + display_name = "Therapy plush" + path = /obj/item/toy/plush/therapy + +/datum/gear/plush/therapy/red + display_name = "Therapy plush (Red)" + path = /obj/item/toy/plush/therapy/red + +/datum/gear/plush/therapy/blue + display_name = "Therapy plush (Blue)" + path = /obj/item/toy/plush/therapy/blue + +/datum/gear/plush/therapy/green + display_name = "Therapy plush (Green)" + path = /obj/item/toy/plush/therapy/green + +/datum/gear/plush/therapy/orange + display_name = "Therapy plush (Orange)" + path = /obj/item/toy/plush/therapy/orange + +/datum/gear/plush/therapy/purple + display_name = "Therapy plush (Purple)" + path = /obj/item/toy/plush/therapy/purple + +/datum/gear/plush/therapy/yellow + display_name = "Therapy plush (Yellow)" + path = /obj/item/toy/plush/therapy/yellow + +/datum/gear/plush/therapy/random + display_name = "Therapy plush (???)" + path = /obj/item/toy/plush/therapy/random_color + cost = 7 + /datum/gear/weapon category = "Weapons" cost = 4 @@ -781,6 +851,16 @@ var/global/list/gear_datums_by_name = list() display_name = "Lighter, zippo" path = /obj/item/tool/lighter/zippo +/datum/gear/smoking/electronic_cigarette + display_name = "Electronic cigarette" + path = /obj/item/clothing/mask/electronic_cigarette + cost = 3 + +/datum/gear/smoking/electronic_cigarette/cigar + display_name = "Electronic cigar" + path = /obj/item/clothing/mask/electronic_cigarette/cigar + cost = 4 + /datum/gear/misc category = "Miscellaneous" @@ -837,3 +917,25 @@ var/global/list/gear_datums_by_name = list() /datum/gear/misc/patch_uscm/devils display_name = "Solar Devils shoulder patch" path = /obj/item/clothing/accessory/patch/devils + +/datum/gear/misc/patch_uscm/falcon + display_name = "Falling Falcons shoulder patch" + path = /obj/item/clothing/accessory/patch/falcon + +/datum/gear/misc/family_photo + display_name = "Family photo" + path = /obj/item/prop/helmetgarb/family_photo + +/datum/gear/misc/compass + display_name = "Compass" + path = /obj/item/prop/helmetgarb/compass + cost = 1 + +/datum/gear/misc/bug_spray + display_name = "Bug spray" + path = /obj/item/prop/helmetgarb/bug_spray + +/datum/gear/misc/straight_razor + display_name = "Cut-throat razor" + path = /obj/item/weapon/straight_razor + cost = 3 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b03132c15d..a8f2a17767 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -335,10 +335,40 @@ var/list/items_allowed var/shoes_blood_amt = 0 +///Checks if you can put the item inside of the shoes +/obj/item/clothing/shoes/proc/attempt_insert_item(mob/user, obj/item/attacking_item, insert_after = FALSE) + if(!items_allowed) + return + if(stored_item) + return + for(var/allowed_item in items_allowed) + if(!istype(attacking_item, allowed_item)) + continue + if(!insert_after) + return TRUE + insert_item(user, attacking_item) + +///Puts the item inside of the shoe +/obj/item/clothing/shoes/proc/insert_item(mob/user, obj/item/attacking_item) + stored_item = attacking_item + user.drop_inv_item_to_loc(attacking_item, src) + to_chat(user, SPAN_NOTICE("You slide [attacking_item] into [src].")) + playsound(user, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, 1) + update_icon() + +///Removes the item from the shoes +/obj/item/clothing/shoes/proc/remove_item(mob/user) + if(!user.put_in_active_hand(stored_item)) + return + to_chat(user, SPAN_NOTICE("You slide [stored_item] out of [src].")) + playsound(user, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, 1) + stored_item = null + update_icon() + /obj/item/clothing/shoes/update_clothing_icon() - if (ismob(src.loc)) - var/mob/M = src.loc - M.update_inv_shoes() + if(ismob(loc)) + var/mob/user = loc + user.update_inv_shoes() /obj/item/clothing/shoes/Destroy() if(stored_item) @@ -346,29 +376,23 @@ stored_item = null . = ..() -/obj/item/clothing/shoes/attack_hand(mob/living/M) - if(stored_item && src.loc == M && !M.is_mob_incapacitated()) //Only allow someone to take out the stored_item if it's being worn or held. So you can pick them up off the floor - if(M.put_in_active_hand(stored_item)) - to_chat(M, SPAN_NOTICE("You slide [stored_item] out of [src].")) - playsound(M, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, 1) - stored_item = 0 - update_icon() - desc = initial(desc) - return - ..() - -/obj/item/clothing/shoes/attackby(obj/item/I, mob/living/M) - if(items_allowed && items_allowed.len) - for (var/i in items_allowed) - if(istype(I, i)) - if(stored_item) return - stored_item = I - M.drop_inv_item_to_loc(I, src) - to_chat(M, "
You slide the [I] into [src].
") - playsound(M, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, 1) - update_icon() - desc = initial(desc) + "\nIt is storing \a [stored_item]." - break +/obj/item/clothing/shoes/get_examine_text(mob/user) + . = ..() + if(stored_item) + . += "\nIt is storing \a [stored_item]." + +/obj/item/clothing/shoes/attack_hand(mob/living/user) + if(!stored_item) //Only allow someone to take out the stored_item if it's being worn or held. So you can pick them up off the floor + return ..() + if(user.is_mob_incapacitated()) + return ..() + if(loc != user) + return ..() + remove_item(user) + +/obj/item/clothing/shoes/attackby(obj/item/attacking_item, mob/living/user) + . = ..() + user.equip_to_slot_if_possible(attacking_item, WEAR_IN_SHOES) /obj/item/clothing/equipped(mob/user, slot, silent) if(is_valid_slot(slot, TRUE)) //is it going to a matching clothing slot? diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 4871a008dd..ac4eb485c1 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -114,6 +114,12 @@ 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." else icon_state = "beret" desc = initial(desc) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c461fd016c..28543af614 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -278,6 +278,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/prop/helmetgarb/spent_buckshot = "spent_buckshot", /obj/item/prop/helmetgarb/spent_slug = "spent_slug", /obj/item/prop/helmetgarb/spent_flech = "spent_flech", + /obj/item/prop/helmetgarb/cartridge = "cartridge", /obj/item/prop/helmetgarb/prescription_bottle = "prescription_bottle", /obj/item/prop/helmetgarb/raincover = "raincover", /obj/item/prop/helmetgarb/rabbitsfoot = "rabbitsfoot", @@ -297,6 +298,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/prop/helmetgarb/flair_uscm = "flair_uscm", /obj/item/prop/helmetgarb/bullet_pipe = "bullet_pipe", /obj/item/prop/helmetgarb/spacejam_tickets = "tickets_to_space_jam", + /obj/item/prop/helmetgarb/family_photo = "family_photo", + /obj/item/prop/helmetgarb/compass = "compass", + /obj/item/prop/helmetgarb/bug_spray = "bug_spray", // MISC /obj/item/tool/pen = "helmet_pen_black", @@ -334,7 +338,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/stack/medical/bruise_pack ="brutepack (bandages)", /obj/item/stack/medical/ointment = "ointment", /obj/item/tool/surgery/scalpel = "scalpel", - /obj/item/reagent_container/hypospray/autoinjector = "helmet_injector" + /obj/item/reagent_container/hypospray/autoinjector = "helmet_injector", + /obj/item/storage/pill_bottle/packet = "brutepack (bandages)", )) /obj/item/clothing/head/helmet/marine diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 6c69c750fe..b5ec4f3ab9 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -41,7 +41,7 @@ /obj/item/clothing/shoes/red/knife name = "dirty red shoes" desc = "Stylish red shoes with a small space to hold a knife." - items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/tool/screwdriver) + items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/tool/screwdriver, /obj/item/weapon/straight_razor) /obj/item/clothing/shoes/white name = "white shoes" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index fc11a74a69..4d576d1449 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -19,7 +19,7 @@ max_heat_protection_temperature = SHOE_MAX_HEAT_PROT siemens_coefficient = 0.7 var/armor_stage = 0 - items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/tool/screwdriver, /obj/item/tool/surgery/scalpel) + items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/tool/screwdriver, /obj/item/tool/surgery/scalpel, /obj/item/weapon/straight_razor) var/knife_type /obj/item/clothing/shoes/marine/Initialize(mapload, ...) @@ -119,7 +119,7 @@ flags_heat_protection = BODY_FLAG_FEET flags_inventory = FPRINT|NOSLIPPING siemens_coefficient = 0.6 - items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol) + items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/weapon/straight_razor) /obj/item/clothing/shoes/veteran/pmc/update_icon() if(stored_item) @@ -187,7 +187,7 @@ flags_heat_protection = BODY_FLAG_FEET flags_inventory = FPRINT|NOSLIPPING siemens_coefficient = 0.6 - items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol) + items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, /obj/item/weapon/straight_razor) var/weed_slowdown_mult = 0.5 /obj/item/clothing/shoes/hiking/equipped(mob/user, slot, silent) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index cc7fee7724..2c023fed2e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -215,7 +215,7 @@ time_to_unequip = 20 time_to_equip = 20 allowed = list( - /obj/item/weapon/claymore/mercsword, + /obj/item/weapon/sword, /obj/item/weapon/shield/riot, /obj/item/device/flashlight, ) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 94361c420d..e736ce18a1 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -292,7 +292,7 @@ /obj/item/storage/backpack/general_belt, /obj/item/device/hailer, /obj/item/storage/belt/gun, - /obj/item/weapon/claymore/mercsword/ceremonial, + /obj/item/weapon/sword/ceremonial, /obj/item/device/motiondetector, /obj/item/device/walkman, ) @@ -1052,7 +1052,7 @@ /obj/item/tool/crowbar, /obj/item/storage/large_holster/katana, /obj/item/storage/large_holster/machete, - /obj/item/weapon/claymore/mercsword/machete, + /obj/item/weapon/sword/machete, /obj/item/attachable/bayonet, /obj/item/device/motiondetector, /obj/item/tool/crew_monitor, @@ -1569,7 +1569,7 @@ /obj/item/tool/lighter, /obj/item/explosive/grenade, /obj/item/storage/bible, - /obj/item/weapon/claymore/mercsword/machete, + /obj/item/weapon/sword/machete, /obj/item/attachable/bayonet, /obj/item/device/motiondetector, /obj/item/device/walkman, @@ -1604,7 +1604,7 @@ /obj/item/tool/lighter, /obj/item/explosive/grenade, /obj/item/storage/bible, - /obj/item/weapon/claymore/mercsword/machete, + /obj/item/weapon/sword/machete, /obj/item/attachable/bayonet, /obj/item/device/motiondetector, /obj/item/device/walkman, @@ -1709,7 +1709,7 @@ /obj/item/storage/backpack/general_belt, /obj/item/device/hailer, /obj/item/storage/belt/gun, - /obj/item/weapon/claymore/mercsword/ceremonial, + /obj/item/weapon/sword/ceremonial, /obj/item/device/motiondetector, /obj/item/device/walkman, ) @@ -1765,7 +1765,7 @@ /obj/item/tool/lighter, /obj/item/explosive/grenade, /obj/item/storage/bible, - /obj/item/weapon/claymore/mercsword/machete, + /obj/item/weapon/sword/machete, /obj/item/attachable/bayonet, /obj/item/device/motiondetector, /obj/item/device/walkman, diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 8503dc5981..955b009fbe 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -509,42 +509,40 @@ /obj/structure/dropship_equipment/electronics/landing_zone_detector name = "\improper AN/AVD-60 LZ detector" - desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone mid-flight." + desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone." icon_state = "lz_detector" point_cost = 50 var/obj/structure/machinery/computer/cameras/dropship/linked_cam_console +/obj/structure/dropship_equipment/electronics/landing_zone_detector/proc/connect_cameras() //searches for dropship_camera_console and connects with it + if(linked_cam_console) + return + var/obj/structure/machinery/computer/cameras/dropship/dropship_camera_console = locate() in range(5, loc) + linked_cam_console = dropship_camera_console + linked_cam_console.network.Add(CAMERA_NET_LANDING_ZONES) + +/obj/structure/dropship_equipment/electronics/landing_zone_detector/proc/disconnect_cameras() //clears up vars and updates users + if(!linked_cam_console) + return + linked_cam_console.network.Remove(CAMERA_NET_LANDING_ZONES) + for(var/datum/weakref/ref as anything in linked_cam_console.concurrent_users) + var/mob/user = ref.resolve() + if(user) + linked_cam_console.update_static_data(user) + linked_cam_console = null + /obj/structure/dropship_equipment/electronics/landing_zone_detector/update_equipment() if(ship_base) - if(!linked_cam_console) - for(var/obj/structure/machinery/computer/cameras/dropship/D in range(5, loc)) - linked_cam_console = D - break + connect_cameras() icon_state = "[initial(icon_state)]_installed" else - linked_cam_console = null + disconnect_cameras() icon_state = initial(icon_state) - /obj/structure/dropship_equipment/electronics/landing_zone_detector/Destroy() - linked_cam_console = null + disconnect_cameras() return ..() -/obj/structure/dropship_equipment/electronics/landing_zone_detector/on_launch() - linked_cam_console.network.Add(CAMERA_NET_LANDING_ZONES) //only accessible while in the air. - for(var/datum/weakref/ref in linked_cam_console.concurrent_users) - var/mob/user = ref.resolve() - if(user) - linked_cam_console.update_static_data(user) - -/obj/structure/dropship_equipment/electronics/landing_zone_detector/on_arrival() - linked_cam_console.network.Remove(CAMERA_NET_LANDING_ZONES) - for(var/datum/weakref/ref in linked_cam_console.concurrent_users) - var/mob/user = ref.resolve() - if(user) - linked_cam_console.update_static_data(user) - - /////////////////////////////////// COMPUTERS ////////////////////////////////////// //unfinished and unused diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index ddf010547b..8ab83116f6 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -81,6 +81,18 @@ new /obj/item/ammo_magazine/rifle/m41aMK1(src) new /obj/item/ammo_magazine/rifle/m41aMK1(src) + +/obj/item/storage/box/guncase/m41aMK1AP + name = "\improper M41A pulse rifle MK1 AP case" + desc = "A gun case containing the M41A pulse rifle MK1 loaded with AP rounds. It can only use proprietary MK1 magazines." + storage_slots = 3 + can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1) + +/obj/item/storage/box/guncase/m41aMK1AP/fill_preset_inventory() + new /obj/item/weapon/gun/rifle/m41aMK1/ap(src) + new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src) + new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src) + //------------ //M79 grenade launcher /obj/item/storage/box/guncase/m79 diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 05ed5d57c6..42737e7a8a 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -172,6 +172,9 @@ var/list/ob_type_fuel_requirements flick("OBC_chambering",src) + + + playsound(loc, 'sound/machines/hydraulics_2.ogg', 40, 1) ob_cannon_busy = TRUE @@ -179,14 +182,29 @@ var/list/ob_type_fuel_requirements sleep(6) ob_cannon_busy = FALSE - chambered_tray = TRUE + var/misfuel = get_misfuel_amount() + var/message = "[key_name(user)] chambered the Orbital Bombardment cannon." + if(misfuel) + message += " It is misfueled by [misfuel] units!" + message_admins(message, x, y, z) update_icon() /var/global/list/orbital_cannon_cancellation = new -/obj/structure/orbital_cannon/proc/fire_ob_cannon(turf/T, mob/user) + +/obj/structure/orbital_cannon/proc/get_misfuel_amount() + switch(tray.warhead.warhead_kind) + if("explosive") + return abs(ob_type_fuel_requirements[1] - tray.fuel_amt) + if("incendiary") + return abs(ob_type_fuel_requirements[2] - tray.fuel_amt) + if("cluster") + return abs(ob_type_fuel_requirements[3] - tray.fuel_amt) + return 0 + +/obj/structure/orbital_cannon/proc/fire_ob_cannon(turf/T, mob/user, squad_behalf) set waitfor = 0 if(!chambered_tray || !loaded_tray || !tray || !tray.warhead || ob_cannon_busy) @@ -204,17 +222,22 @@ var/list/ob_type_fuel_requirements playsound(loc, 'sound/weapons/vehicles/smokelauncher_fire.ogg', 70, 1) playsound(loc, 'sound/weapons/pred_plasma_shot.ogg', 70, 1) - var/inaccurate_fuel = 0 - - switch(tray.warhead.warhead_kind) - if("explosive") - inaccurate_fuel = abs(ob_type_fuel_requirements[1] - tray.fuel_amt) - if("incendiary") - inaccurate_fuel = abs(ob_type_fuel_requirements[2] - tray.fuel_amt) - if("cluster") - inaccurate_fuel = abs(ob_type_fuel_requirements[3] - tray.fuel_amt) + var/inaccurate_fuel = get_misfuel_amount() + var/area/area = get_area(T) + var/off_x = (inaccurate_fuel + 1) * round(rand(-3,3), 1) + var/off_y = (inaccurate_fuel + 1) * round(rand(-3,3), 1) + var/target_x = Clamp(T.x + off_x, 1, world.maxx) + var/target_y = Clamp(T.y + off_y, 1, world.maxy) + var/turf/target = locate(target_x, target_y, T.z) + var/area/target_area = get_area(target) + + message_admins(FONT_SIZE_HUGE("ALERT: [key_name(user)] fired an orbital bombardment in '[target_area]' for squad '[squad_behalf]' landing at ([target.x],[target.y],[target.z])"), target.x, target.y, target.z) + var/message = "Orbital bombardment original target was ([T.x],[T.y],[T.z]) - offset by [abs(off_x)+abs(off_y)]" + if(inaccurate_fuel) + message += " - It was misfueled by [inaccurate_fuel] units!" + message_admins(message, T.x, T.y, T.z) + log_attack("[key_name(user)] fired an orbital bombardment in [area.name] for squad '[squad_behalf]'") - var/turf/target = locate(T.x + inaccurate_fuel * round(rand(-3,3), 1), T.y + inaccurate_fuel * round(rand(-3,3), 1), T.z) if(user) tray.warhead.source_mob = user diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index eda8bb1737..273fb07ecb 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -807,7 +807,7 @@ playsound(T,'sound/effects/alert.ogg', 25, 1) //Placeholder addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/overwatch, alert_ob), T), 2 SECONDS) addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/overwatch, begin_fire)), 6 SECONDS) - addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/overwatch, fire_bombard), user, A, T), 6 SECONDS + 6) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/overwatch, fire_bombard), user, T), 6 SECONDS + 6) /obj/structure/machinery/computer/overwatch/proc/begin_fire() for(var/mob/living/carbon/H in GLOB.alive_mob_list) @@ -818,23 +818,20 @@ visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Orbital bombardment for squad '[current_squad]' has fired! Impact imminent!")]") current_squad.send_message("WARNING! Ballistic trans-atmospheric launch detected! Get outside of Danger Close!") -/obj/structure/machinery/computer/overwatch/proc/fire_bombard(mob/user, area/A, turf/T) - if(!A || !T) +/obj/structure/machinery/computer/overwatch/proc/fire_bombard(mob/user,turf/T) + if(!T) return var/ob_name = lowertext(almayer_orbital_cannon.tray.warhead.name) var/mutable_appearance/warhead_appearance = mutable_appearance(almayer_orbital_cannon.tray.warhead.icon, almayer_orbital_cannon.tray.warhead.icon_state) - notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [A.name] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) - message_admins(FONT_SIZE_HUGE("ALERT: [key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]' [ADMIN_JMP(T)]")) - log_attack("[key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]'") + notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) /// Project ARES interface log. - log_ares_bombardment(user.name, ob_name, "X[x_bomb], Y[y_bomb] in [A.name]") + log_ares_bombardment(user.name, ob_name, "X[x_bomb], Y[y_bomb] in [get_area(T)]") busy = FALSE - var/turf/target = locate(T.x + rand(-3, 3), T.y + rand(-3, 3), T.z) - if(target && istype(target)) - almayer_orbital_cannon.fire_ob_cannon(target, user) + if(istype(T)) + almayer_orbital_cannon.fire_ob_cannon(T, user, current_squad) user.count_niche_stat(STATISTICS_NICHE_OB) /obj/structure/machinery/computer/overwatch/proc/handle_supplydrop() diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index 5fa83d1fa0..2b333085e0 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -475,8 +475,6 @@ var/autofire_slow_mult = 1 /// If the gun is currently burst firing VAR_PROTECTED/burst_firing = FALSE - /// If the gun is currently auto firing - VAR_PROTECTED/auto_firing = FALSE /// If the gun should display its ammo count var/display_ammo = TRUE /// How many degrees in each direction the gun should be able to fire @@ -514,13 +512,14 @@ ammo = GLOB.ammo_list[ammo] //dunno how this works but just sliding this in from sentry-code. burst_scatter_mult = SCATTER_AMOUNT_TIER_7 update_icon() - AddComponent(/datum/component/automatedfire/autofire, fire_delay, burst_fire_delay, burst_amount, gun_firemode, autofire_slow_mult, CALLBACK(src, PROC_REF(set_burst_firing)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(try_fire)), CALLBACK(src, PROC_REF(display_ammo)), CALLBACK(src, PROC_REF(set_auto_firing))) + AddComponent(/datum/component/automatedfire/autofire, fire_delay, burst_fire_delay, burst_amount, gun_firemode, autofire_slow_mult, CALLBACK(src, PROC_REF(set_burst_firing)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(try_fire)), CALLBACK(src, PROC_REF(display_ammo))) -/obj/structure/machinery/m56d_hmg/Destroy() //Make sure we pick up our trash. - if(operator) - operator.unset_interaction() +/obj/structure/machinery/m56d_hmg/Destroy(force) //Make sure we pick up our trash. + operator?.unset_interaction() + operator = null + QDEL_NULL(in_chamber) STOP_PROCESSING(SSobj, src) - . = ..() + return ..() /obj/structure/machinery/m56d_hmg/get_examine_text(mob/user) //Let us see how much ammo we got in this thing. . = ..() @@ -751,6 +750,8 @@ update_icon() //final safeguard. /obj/structure/machinery/m56d_hmg/proc/try_fire() + if(!operator) + return if(!rounds) to_chat(operator, SPAN_WARNING("*click*")) playsound(src, 'sound/weapons/gun_empty.ogg', 25, 1, 5) @@ -855,6 +856,7 @@ /obj/structure/machinery/m56d_hmg/on_unset_interaction(mob/user) flags_atom &= ~RELAY_CLICK + SEND_SIGNAL(src, COMSIG_GUN_INTERRUPT_FIRE) user.status_flags &= ~IMMOBILE_ACTION user.visible_message(SPAN_NOTICE("[user] lets go of \the [src]."),SPAN_NOTICE("You let go of \the [src], letting the gun rest.")) user.unfreeze() @@ -947,7 +949,6 @@ /// Clean up the target, shots fired, and other things related to when you stop firing /obj/structure/machinery/m56d_hmg/proc/reset_fire() set_target(null) - set_auto_firing(FALSE) shots_fired = 0 ///Set the target and take care of hard delete @@ -960,10 +961,6 @@ if(target) RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clean_target)) -/// Setter for auto_firing -/obj/structure/machinery/m56d_hmg/proc/set_auto_firing(auto = FALSE) - auto_firing = auto - /// Print how much ammo is left to chat /obj/structure/machinery/m56d_hmg/proc/display_ammo() if(!operator) diff --git a/code/modules/cm_preds/thrall_items.dm b/code/modules/cm_preds/thrall_items.dm index f9ae1af269..80b4d42c16 100644 --- a/code/modules/cm_preds/thrall_items.dm +++ b/code/modules/cm_preds/thrall_items.dm @@ -40,6 +40,7 @@ /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol, + /obj/item/weapon/straight_razor, ) /obj/item/clothing/shoes/yautja/thrall/New(mapload, greaves_number = 1, armor_material = pick("cloth", "bare")) diff --git a/code/modules/cm_preds/thrall_procs.dm b/code/modules/cm_preds/thrall_procs.dm index 50a2800ef8..8ea0f2abb5 100644 --- a/code/modules/cm_preds/thrall_procs.dm +++ b/code/modules/cm_preds/thrall_procs.dm @@ -60,11 +60,11 @@ if(YAUTJA_GEAR_STICK) spawned_weapon = new /obj/item/weapon/yautja/combistick(wearer.loc) if(YAUTJA_THRALL_GEAR_MACHETE) - spawned_weapon = new /obj/item/weapon/claymore/mercsword/machete(wearer.loc) + spawned_weapon = new /obj/item/weapon/sword/machete(wearer.loc) if(YAUTJA_THRALL_GEAR_RAPIER) - spawned_weapon = new /obj/item/weapon/claymore/mercsword/ceremonial(wearer.loc) + spawned_weapon = new /obj/item/weapon/sword/ceremonial(wearer.loc) if(YAUTJA_THRALL_GEAR_CLAYMORE) - spawned_weapon = new /obj/item/weapon/claymore(wearer.loc) + spawned_weapon = new /obj/item/weapon/sword(wearer.loc) if(YAUTJA_THRALL_GEAR_FIREAXE) spawned_weapon = new /obj/item/weapon/twohanded/fireaxe(wearer.loc) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 111ce38a67..6bd7a52c96 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -171,18 +171,18 @@ /datum/equipment_preset/proc/load_vanity(mob/living/carbon/human/new_human, client/mob_client) if(!new_human.client || !new_human.client.prefs || !new_human.client.prefs.gear) return//We want to equip them with custom stuff second, after they are equipped with everything else. - var/datum/gear/G for(var/gear_name in new_human.client.prefs.gear) - G = gear_datums_by_name[gear_name] - if(G) - if(G.allowed_roles && !(assignment in G.allowed_roles)) - to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Role")) + var/datum/gear/current_gear = gear_datums_by_name[gear_name] + if(current_gear) + if(current_gear.allowed_roles && !(assignment in current_gear.allowed_roles)) + to_chat(new_human, SPAN_WARNING("Custom gear [current_gear.display_name] cannot be equipped: Invalid Role")) return - if(G.allowed_origins && !(new_human.origin in G.allowed_origins)) - to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Origin")) + if(current_gear.allowed_origins && !(new_human.origin in current_gear.allowed_origins)) + to_chat(new_human, SPAN_WARNING("Custom gear [current_gear.display_name] cannot be equipped: Invalid Origin")) return - if(!(G.slot && new_human.equip_to_slot_or_del(new G.path, G.slot))) - new_human.equip_to_slot_or_del(new G.path, WEAR_IN_BACK) + if(!(current_gear.slot && new_human.equip_to_slot_or_del(new current_gear.path, current_gear.slot))) + var/obj/equipping_gear = new current_gear.path + new_human.equip_to_slot_or_del(equipping_gear, WEAR_IN_BACK) //Gives ranks to the ranked var/current_rank = paygrade diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index b66f3b236e..70f4e22060 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -970,7 +970,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index e3511722af..23350768a6 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -191,8 +191,8 @@ var/satchel_success = new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) var/waist_success = new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(new_human), WEAR_WAIST) var/pouch_r_success = new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/hefa(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/hefa(new_human), WEAR_IN_BACK) if(shoes_success) var/obj/item/clothing/shoes/marine/knife/shoes = new_human.shoes diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index b60e3f0314..0308c8d9e3 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -694,7 +694,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" @@ -720,7 +720,7 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" @@ -746,7 +746,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index c686ae91bb..be0efb1bcc 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -487,7 +487,8 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/electronics(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/sling(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/working_joe_pda(new_human.back), WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(new_human.back), WEAR_IN_BACK) @@ -496,13 +497,13 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/wet_sign(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/lights/mixed(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/circuitboard/apc(new_human.back), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/circuitboard/airlock(new_human.back), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/cell(new_human.back), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/cell(new_human.back), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/circuitboard/apc(new_human.back), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/circuitboard/airlock(new_human.back), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/cell(new_human.back), WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack(new_human.back), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/medium_stack(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/reinforced/medium_stack(new_human.back), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack(new_human), WEAR_J_STORE) @@ -529,11 +530,12 @@ if(2) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe/engi/overalls(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/sling(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/working_joe_pda(new_human.back), WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human.back), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/large_stack(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/reinforced/large_stack(new_human.back), WEAR_IN_R_STORE) /datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) . = ..() diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 3b4671a651..acc795dc68 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -76,7 +76,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/command(new_human), WEAR_BODY) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword/ceremonial(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/ceremonial(new_human), WEAR_J_STORE) //waist new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST) //limbs diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 933e9490d3..5ce40810e0 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -351,12 +351,13 @@ W.forceMove(B) equipped = 1 if(WEAR_IN_SHOES) - if(src.shoes && istype(src.shoes, /obj/item/clothing/shoes)) - var/obj/item/clothing/shoes/S = src.shoes - if(!S.stored_item) - S.stored_item = W - W.forceMove(S) - equipped = 1 + if(!shoes) + return + if(!istype(shoes, /obj/item/clothing/shoes)) + return + if(shoes.stored_item) + return + shoes.attempt_insert_item(src, shoes, TRUE) if(WEAR_IN_SCABBARD) if(src.back && istype(src.back, /obj/item/storage/large_holster)) var/obj/item/storage/large_holster/B = src.back diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 45fb657710..b86a6a625f 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -205,95 +205,98 @@ //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible() //set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc. -/mob/living/carbon/human/equip_to_slot(obj/item/W as obj, slot, disable_warning) - if(!slot) return - if(!istype(W)) return - if(!has_limb_for_slot(slot)) return +/mob/living/carbon/human/equip_to_slot(obj/item/equipping_item, slot, disable_warning) + if(!slot) + return + if(!istype(equipping_item)) + return + if(!has_limb_for_slot(slot)) + return - if(W == l_hand) - if(W.flags_item & NODROP) + if(equipping_item == l_hand) + if(equipping_item.flags_item & NODROP) return l_hand = null update_inv_l_hand() //removes item's actions, may be readded once re-equipped to the new slot - for(var/X in W.actions) - var/datum/action/A = X - A.remove_from(src) + for(var/item_actions in equipping_item.actions) + var/datum/action/action = item_actions + action.remove_from(src) - else if(W == r_hand) - if(W.flags_item & NODROP) + else if(equipping_item == r_hand) + if(equipping_item.flags_item & NODROP) return r_hand = null update_inv_r_hand() //removes item's actions, may be readded once re-equipped to the new slot - for(var/X in W.actions) - var/datum/action/A = X - A.remove_from(src) + for(var/item_actions in equipping_item.actions) + var/datum/action/action = item_actions + action.remove_from(src) - W.screen_loc = null - if(W.loc != src) - W.pickup(src, disable_warning) - W.forceMove(src) - W.layer = ABOVE_HUD_LAYER - W.plane = ABOVE_HUD_PLANE + equipping_item.screen_loc = null + if(equipping_item.loc != src) + equipping_item.pickup(src, disable_warning) + equipping_item.forceMove(src) + equipping_item.layer = ABOVE_HUD_LAYER + equipping_item.plane = ABOVE_HUD_PLANE switch(slot) if(WEAR_BACK) - back = W - W.equipped(src, slot, disable_warning) + back = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_back() if(WEAR_FACE) - wear_mask = W - W.equipped(src, slot, disable_warning) + wear_mask = equipping_item + equipping_item.equipped(src, slot, disable_warning) sec_hud_set_ID() - wear_mask_update(W, TRUE) + wear_mask_update(equipping_item, TRUE) update_inv_wear_mask() if(WEAR_HANDCUFFS) - handcuffed = W + handcuffed = equipping_item handcuff_update() if(WEAR_LEGCUFFS) - legcuffed = W - W.equipped(src, slot, disable_warning) + legcuffed = equipping_item + equipping_item.equipped(src, slot, disable_warning) legcuff_update() if(WEAR_L_HAND) - l_hand = W - W.equipped(src, slot, disable_warning) + l_hand = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_l_hand() if(WEAR_R_HAND) - r_hand = W - W.equipped(src, slot, disable_warning) + r_hand = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_r_hand() if(WEAR_WAIST) - belt = W - W.equipped(src, slot, disable_warning) + belt = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_belt() if(WEAR_ID) - wear_id = W - W.equipped(src, slot, disable_warning) + wear_id = equipping_item + equipping_item.equipped(src, slot, disable_warning) sec_hud_set_ID() hud_set_squad() update_inv_wear_id() name = get_visible_name() if(WEAR_L_EAR) - wear_l_ear = W - W.equipped(src, slot, disable_warning) + wear_l_ear = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_ears() if(WEAR_R_EAR) - wear_r_ear = W - W.equipped(src, slot, disable_warning) + wear_r_ear = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_ears() if(WEAR_EYES) - glasses = W - W.equipped(src, slot, disable_warning) + glasses = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_tint() - update_glass_vision(W) + update_glass_vision(equipping_item) update_inv_glasses() if(WEAR_HANDS) - gloves = W - W.equipped(src, slot, disable_warning) + gloves = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_gloves() if(WEAR_HEAD) - head = W + head = equipping_item if(head.flags_inv_hide & HIDEFACE) name = get_visible_name() if(head.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR)) @@ -304,104 +307,104 @@ update_inv_wear_mask() if(head.flags_inv_hide & HIDEEYES) update_inv_glasses() - W.equipped(src, slot, disable_warning) + equipping_item.equipped(src, slot, disable_warning) update_tint() update_inv_head() if(WEAR_FEET) - shoes = W - W.equipped(src, slot, disable_warning) + shoes = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_shoes() if(WEAR_JACKET) - wear_suit = W + wear_suit = equipping_item if(wear_suit.flags_inv_hide & HIDESHOES) update_inv_shoes() if(wear_suit.flags_inv_hide & HIDEJUMPSUIT) update_inv_w_uniform() if( wear_suit.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) update_hair() - W.equipped(src, slot, disable_warning) + equipping_item.equipped(src, slot, disable_warning) update_inv_wear_suit() if(WEAR_BODY) - w_uniform = W - W.equipped(src, slot, disable_warning) + w_uniform = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_suit_sensors() update_inv_w_uniform() if(WEAR_L_STORE) - l_store = W - W.equipped(src, slot, disable_warning) + l_store = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_pockets() if(WEAR_R_STORE) - r_store = W - W.equipped(src, slot, disable_warning) + r_store = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_pockets() if(WEAR_ACCESSORY) - var/obj/item/clothing/accessory/A = W - for(var/obj/item/clothing/C in contents) - if(C.can_attach_accessory(A)) - C.attach_accessory(src, A) + var/obj/item/clothing/accessory/accessory = equipping_item + for(var/obj/item/clothing/clothes in contents) + if(clothes.can_attach_accessory(accessory)) + clothes.attach_accessory(src, accessory) break update_inv_w_uniform() update_inv_wear_suit() if(WEAR_J_STORE) - s_store = W - W.equipped(src, slot, disable_warning) + s_store = equipping_item + equipping_item.equipped(src, slot, disable_warning) update_inv_s_store() if(WEAR_IN_BACK) - var/obj/item/storage/S = back - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = back + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) back.update_icon() if(WEAR_IN_SHOES) - shoes.attackby(W,src) + shoes.attempt_insert_item(src, equipping_item, TRUE) shoes.update_icon() if(WEAR_IN_SCABBARD) - var/obj/item/storage/S = back - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = back + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) back.update_icon() if(WEAR_IN_JACKET) - var/obj/item/clothing/suit/storage/S = wear_suit - if(istype(S) && S.pockets.storage_slots) - S.pockets.attempt_item_insertion(W, disable_warning, src) + var/obj/item/clothing/suit/storage/current_storage = wear_suit + if(istype(current_storage) && current_storage.pockets.storage_slots) + current_storage.pockets.attempt_item_insertion(equipping_item, disable_warning, src) wear_suit.update_icon() if(WEAR_IN_HELMET) - var/obj/item/clothing/head/helmet/marine/HM = src.head - if(istype(HM) && HM.pockets.storage_slots) - HM.pockets.attempt_item_insertion(W, disable_warning, src) - HM.update_icon() + var/obj/item/clothing/head/helmet/marine/helmet = head + if(istype(helmet) && helmet.pockets.storage_slots) + helmet.pockets.attempt_item_insertion(equipping_item, disable_warning, src) + helmet.update_icon() if(WEAR_IN_ACCESSORY) - var/obj/item/clothing/accessory/A = W - if(istype(A)) - for(var/obj/item/clothing/C in contents) - if(C.can_attach_accessory(A)) - C.attach_accessory(src, A) + var/obj/item/clothing/accessory/accessory = equipping_item + if(istype(accessory)) + for(var/obj/item/clothing/clothes in contents) + if(clothes.can_attach_accessory(accessory)) + clothes.attach_accessory(src, accessory) break else - w_uniform.attackby(W,src) + w_uniform.attackby(equipping_item,src) update_inv_w_uniform() if(WEAR_IN_BELT) - var/obj/item/storage/S = belt - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = belt + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) belt.update_icon() if(WEAR_IN_J_STORE) - var/obj/item/storage/S = s_store - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = s_store + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) s_store.update_icon() if(WEAR_IN_L_STORE) - var/obj/item/storage/S = l_store - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = l_store + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) l_store.update_icon() if(WEAR_IN_R_STORE) - var/obj/item/storage/S = r_store - S.attempt_item_insertion(W, disable_warning, src) + var/obj/item/storage/current_storage = r_store + current_storage.attempt_item_insertion(equipping_item, disable_warning, src) r_store.update_icon() else to_chat(src, SPAN_DANGER("You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it...")) return - SEND_SIGNAL(src, COMSIG_HUMAN_EQUIPPED_ITEM, W, slot) + SEND_SIGNAL(src, COMSIG_HUMAN_EQUIPPED_ITEM, equipping_item, slot) recalculate_move_delay = TRUE return 1 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 3840a029ad..82d4aef4a5 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1986,6 +1986,7 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed /// Setter proc for fa_firing /obj/item/weapon/gun/proc/set_auto_firing(auto = FALSE) + SIGNAL_HANDLER fa_firing = auto /// Getter for gun_user diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index 81d7dc166c..d93796fbb1 100644 --- a/code/modules/projectiles/guns/lever_action.dm +++ b/code/modules/projectiles/guns/lever_action.dm @@ -405,9 +405,9 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/weapon/gun/lever_action/xm88/wield(mob/user) . = ..() - - RegisterSignal(src, COMSIG_ITEM_ZOOM, PROC_REF(scope_on)) - RegisterSignal(src, COMSIG_ITEM_UNZOOM, PROC_REF(scope_off)) + if(.) + RegisterSignal(src, COMSIG_ITEM_ZOOM, PROC_REF(scope_on)) + RegisterSignal(src, COMSIG_ITEM_UNZOOM, PROC_REF(scope_off)) /obj/item/weapon/gun/lever_action/xm88/proc/scope_on(atom/source, mob/current_user) SIGNAL_HANDLER diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 643130559e..2c08e9f4e6 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -713,5 +713,6 @@ // Convenience proc to create a reagents holder for an atom // Max vol is maximum volume of holder /atom/proc/create_reagents(max_vol) + QDEL_NULL(reagents) reagents = new/datum/reagents(max_vol) reagents.my_atom = src diff --git a/code/modules/recycling/recycler.dm b/code/modules/recycling/recycler.dm index 73d00b763f..abbf010bf4 100644 --- a/code/modules/recycling/recycler.dm +++ b/code/modules/recycling/recycler.dm @@ -9,32 +9,39 @@ density = TRUE var/recycle_dir = NORTH var/list/stored_matter = list("metal" = 0, "glass" = 0) + /// Amount of metal refunded per crate, by default about 2 metal sheets (building one takes 5) + var/crate_reward = 7500 + /// Amount of sheets to stack before outputting a stack + var/sheets_per_batch = 10 var/last_recycle_sound //for sound cooldown var/ignored_items = list(/obj/item/limb) -/obj/structure/machinery/recycler/New() - ..() - update_icon() +/obj/structure/machinery/recycler/whiskey + crate_reward = 15000 // Boosted reward (4 sheets) to make up for workload and the fact you can't sell them +/obj/structure/machinery/recycler/Initialize(mapload, ...) + . = ..() + update_icon() /obj/structure/machinery/recycler/power_change() ..() update_icon() - /obj/structure/machinery/recycler/update_icon() + . = ..() icon_state = "separator-AO[(inoperable()) ? "0":"1"]" - -/obj/structure/machinery/recycler/Collided(atom/movable/AM) +/obj/structure/machinery/recycler/Collided(atom/movable/movable) if(inoperable()) return - var/move_dir = get_dir(loc, AM.loc) - if(!AM.anchored && move_dir == recycle_dir) - if(istype(AM, /obj/item)) - recycle(AM) + var/move_dir = get_dir(loc, movable.loc) + if(!movable.anchored && move_dir == recycle_dir) + if(istype(movable, /obj/item)) + recycle(movable) + else if(istype(movable, /obj/structure/closet/crate)) + recycle_crate(movable) else - AM.forceMove(loc) + movable.forceMove(loc) /obj/structure/machinery/recycler/proc/recycle(obj/item/I) @@ -63,7 +70,32 @@ stored_matter[material] += total_material qdel(I) + play_recycle_sound() + output_materials() + +/obj/structure/machinery/recycler/proc/recycle_crate(obj/structure/closet/crate) + for(var/atom/movable/movable in crate) + movable.forceMove(loc) + recycle(movable) + stored_matter["metal"] += crate_reward + qdel(crate) + play_recycle_sound() + output_materials() + +/obj/structure/machinery/recycler/proc/play_recycle_sound() if(last_recycle_sound < world.time) playsound(loc, 'sound/items/Welder.ogg', 30, 1) last_recycle_sound = world.time + 50 +/obj/structure/machinery/recycler/proc/output_materials() + for(var/material in stored_matter) + if(stored_matter[material] >= sheets_per_batch * 3750) + var/sheets = round(stored_matter[material] / 3750) + stored_matter[material] -= sheets * 3750 + var/obj/item/stack/sheet/sheet_stack + switch(material) + if("metal") sheet_stack = new /obj/item/stack/sheet/metal(loc) + if("glass") sheet_stack = new /obj/item/stack/sheet/glass(loc) + if(sheet_stack) + sheet_stack.amount = sheets + sheet_stack.update_icon() diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 96dc5caaa1..1f9029317b 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -203,19 +203,19 @@ // door controls being overriden if(!dropship_control_lost) - to_chat(xeno, SPAN_XENONOTICE("You override the doors.")) - xeno_message(SPAN_XENOANNOUNCE("The doors of the metal bird have been overridden! Rejoice!"), 3, xeno.hivenumber) dropship.control_doors("unlock", "all", TRUE) dropship_control_lost = TRUE door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE) - notify_ghosts(header = "Dropship Locked", message = "[xeno] has locked [dropship]!", source = xeno, action = NOTIFY_ORBIT) - if(almayer_orbital_cannon) almayer_orbital_cannon.is_disabled = TRUE addtimer(CALLBACK(almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE) - if(!GLOB.resin_lz_allowed) set_lz_resin_allowed(TRUE) + + to_chat(xeno, SPAN_XENONOTICE("You override the doors.")) + xeno_message(SPAN_XENOANNOUNCE("The doors of the metal bird have been overridden! Rejoice!"), 3, xeno.hivenumber) + message_admins("[key_name(xeno)] has locked the dropship '[dropship]'", xeno.x, xeno.y, xeno.z) + notify_ghosts(header = "Dropship Locked", message = "[xeno] has locked [dropship]!", source = xeno, action = NOTIFY_ORBIT) return if(dropship_control_lost) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 767f50fc97..ea07508012 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -390,7 +390,7 @@ /obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL, /obj/item/attachable/bayonet = SURGERY_TOOL_MULT_SUBOPTIMAL, /obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBSTITUTE, - /obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBSTITUTE, + /obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBSTITUTE, /obj/item/tool/hatchet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, /obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, ) diff --git a/colonialmarines.dme b/colonialmarines.dme index 43cb54bd99..eedb4b4da7 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -840,6 +840,7 @@ #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\weather_siren.dm" +#include "code\game\machinery\ARES\apollo_pda.dm" #include "code\game\machinery\ARES\ARES.dm" #include "code\game\machinery\ARES\ARES_interface.dm" #include "code\game\machinery\ARES\ARES_interface_apollo.dm" @@ -1300,13 +1301,15 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\cm_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\pipes\binary_misc.dm" #include "code\game\objects\structures\pipes\pipes.dm" #include "code\game\objects\structures\pipes\trinary_misc.dm" diff --git a/config/example/config.txt b/config/example/config.txt index dcce464344..8e8bb2b754 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -132,6 +132,7 @@ FORUMURL https://forum.cm-ss13.com/ ## Wiki address WIKIURL https://cm-ss13.com/w +WIKIARTICLEURL https://cm-ss13.com/wiki ## Rules address RULESURL https://cm-ss13.com/viewtopic.php?f=57&t=5094 diff --git a/html/changelogs/AutoChangeLog-pr-4799.yml b/html/changelogs/AutoChangeLog-pr-4799.yml deleted file mode 100644 index 49ff3a1de2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-4799.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "private-tristan" -delete-after: True -changes: - - balance: "predators are no longer immune to molecular acid injected from spitter and boiler tailstabs" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4823.yml b/html/changelogs/AutoChangeLog-pr-4823.yml new file mode 100644 index 0000000000..75e0f58074 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4823.yml @@ -0,0 +1,4 @@ +author: "Drathek" +delete-after: True +changes: + - bugfix: "Fixed various job's entry messages having broken links to the wiki" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4825.yml b/html/changelogs/AutoChangeLog-pr-4825.yml new file mode 100644 index 0000000000..a63550514e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4825.yml @@ -0,0 +1,4 @@ +author: "Xander3359" +delete-after: True +changes: + - bugfix: "Fixes being able to create ghost tanks from a Broiler-T unit." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4830.yml b/html/changelogs/AutoChangeLog-pr-4830.yml new file mode 100644 index 0000000000..2eaaf3f208 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4830.yml @@ -0,0 +1,4 @@ +author: "fira" +delete-after: True +changes: + - admin: "Added better logging for orbital bombardment." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4834.yml b/html/changelogs/AutoChangeLog-pr-4834.yml new file mode 100644 index 0000000000..7778f38607 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4834.yml @@ -0,0 +1,4 @@ +author: "Alexguinea" +delete-after: True +changes: + - rscadd: "Added toners to the rec vendor" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4841.yml b/html/changelogs/AutoChangeLog-pr-4841.yml new file mode 100644 index 0000000000..d6f6b2fae8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4841.yml @@ -0,0 +1,4 @@ +author: "Releasethesea" +delete-after: True +changes: + - balance: "Makes it so that Pill packets fit in helmets" \ No newline at end of file diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index 1abcfaba81..2d89cade63 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -2,3 +2,49 @@ HeresKozmos: - rscadd: added flashlight, donk pocket box, interview table, folder, taperecorder, ink toner, extra lights and expanded the size of the CC's room. +2023-11-02: + Huffie56: + - refactor: Refactor gun cabinet code adding subtype for all the secure guncabinet. + - refactor: Refactor safe code adding subtype for cl and co safes also add a subtype + for armory honor guard closet . + cuberound: + - balance: LZ detector now works even when the DS is stationary + harryob: + - qol: you can now click drag from items in your storage to your hands + private-tristan: + - balance: predators are no longer immune to molecular acid injected from spitter + and boiler tailstabs +2023-11-03: + harryob: + - ui: the options button is now part of the statbrowser tabs proper +2023-11-04: + BeagleGaming1: + - rscadd: Added many new loadout items + - code_imp: Added a signal to items that triggers right after the mob finishes spawning + - code_imp: Added a signal to add additional behavior to storing items in shoes + Blundir: + - rscadd: added intel and foxtrot squad berets and headband + TheGamerdk: + - bugfix: Restores the MK1 AP mags in the CIC armory + fira: + - bugfix: M56D/M2C should now properly stop firing when they stop being used. + realforest2001: + - code_imp: Repathed sword weapons to a uniform /obj/item/weapon/sword + - balance: All sword-type weapons are now Large items instead of Normal sized, to + match machetes. + - rscadd: Added the KN5500 PDA for Working Joes. Sprites by Frans_Feiffer. + - rscadd: Changed the plain glass in Working Joe presets to Reinforced Glass. + sleepynecrons: + - imagedel: shrinks the type-19 SMG stick magazine to a more reasonable size +2023-11-05: + fira: + - bugfix: Fixed recyclers (including Whiskey Outposts') and added the possibility + to recycle crates with them. + - bugfix: Standardized "vend to table" functionality of vendors, enabling it to + work for Whiskey Outpost's Reqs. + - rscadd: Whiskey Outpost vendors now contain the same items as Almayer's. WO still + has spare specialist ammo on top of that. + - rscadd: Readded delivery chute, wrap and tagger to Whiskey Outpost Reqs, letting + you pack and send crates and items via disposals again. + - balance: Whiskey Outpost supply drops should now be more interesting and impactful. + - rscadd: Added missing Synth vendors on WO. diff --git a/html/statbrowser.js b/html/statbrowser.js index 83709e9e92..105270ad29 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -76,10 +76,21 @@ function createStatusTab(name) { B.textContent = name; B.className = "button"; //ORDERING ALPHABETICALLY - B.style.order = name.charCodeAt(0); - if (name == "Status" || name == "MC") { - B.style.order = name == "Status" ? 1 : 2; + + switch (name) { + case "Status": + B.style.order = 1; + break; + case "MC": + B.style.order = 2; + break; + case "Panel Options": + B.style.order = 999; + break; + default: + B.style.order = name.charCodeAt(0); } + //END ORDERING menu.appendChild(B); SendTabToByond(name); @@ -247,6 +258,7 @@ function tab_change(tab, force) { if (!force && tab == current_tab) return; if (document.getElementById(current_tab)) document.getElementById(current_tab).className = "button"; // disable active on last button + var oldTab = current_tab; current_tab = tab; set_byond_tab(tab); if (document.getElementById(tab)) @@ -270,6 +282,9 @@ function tab_change(tab, force) { draw_sdql2(); } else if (tab == turfname) { draw_listedturf(); + } else if (tab == "Panel Options") { + openOptionsMenu(); + tab_change(oldTab); } else { statcontentdiv.textContext = "Loading..."; } @@ -1036,21 +1051,7 @@ Byond.subscribeTo("remove_mc", remove_mc); Byond.subscribeTo("add_verb_list", add_verb_list); function createOptionsButton() { - if (document.getElementById("options")) { - return; - } - var button = document.createElement("BUTTON"); - button.onclick = function () { - openOptionsMenu(); - this.blur(); - }; - button.id = "options"; - button.textContent = "Options"; - button.className = "options"; - button.style.order = 999; // last please - button.style.marginLeft = "auto"; - button.style.marginRight = "2%"; - menu.appendChild(button); + addPermanentTab("Panel Options"); } function openOptionsMenu() { diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index dad985c1e1..19d73f120f 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index 50bcea0ad5..6bf64e7eff 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 1595402fef..1c2134ee3b 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/helmet_garb.dmi b/icons/obj/items/helmet_garb.dmi index 40a4552630..bbebf822c9 100644 Binary files a/icons/obj/items/helmet_garb.dmi and b/icons/obj/items/helmet_garb.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index 1f74fc09b9..076a93feb5 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ diff --git a/icons/obj/items/plush.dmi b/icons/obj/items/plush.dmi new file mode 100644 index 0000000000..8596fd69df Binary files /dev/null and b/icons/obj/items/plush.dmi differ diff --git a/icons/obj/items/synth/wj_pda.dmi b/icons/obj/items/synth/wj_pda.dmi new file mode 100644 index 0000000000..6bd7205e9a Binary files /dev/null and b/icons/obj/items/synth/wj_pda.dmi differ diff --git a/icons/obj/items/toy.dmi b/icons/obj/items/toy.dmi index e336d68dfd..4a40561475 100644 Binary files a/icons/obj/items/toy.dmi and b/icons/obj/items/toy.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi index 6f160bbbe7..5632ca3148 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi differ diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi index 3982564902..40e489df90 100644 Binary files a/icons/obj/items/weapons/weapons.dmi and b/icons/obj/items/weapons/weapons.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index e9b77c1ca9..21f2332b9a 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -135,15 +135,6 @@ "aaw" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/space_port) -"aax" = ( -/obj/structure/filingcabinet, -/obj/structure/sign/safety/hvac{ - pixel_x = -32 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/space_port) "aay" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor{ @@ -214,19 +205,6 @@ /obj/structure/cargo_container/grant/right, /turf/open/floor/plating, /area/bigredv2/outside/space_port) -"aaK" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/telecomm) -"aaL" = ( -/obj/structure/closet/firecloset, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/space_port) "aaM" = ( /obj/structure/machinery/vending/snack, /obj/structure/machinery/light{ @@ -292,12 +270,6 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating, /area/bigredv2/outside/space_port) -"aaV" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/telecomm) "aaW" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -307,10 +279,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/space_port) -"aaX" = ( -/obj/structure/closet/secure_closet/injection, -/turf/open/floor, -/area/bigredv2/outside/marshal_office) "aaY" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, @@ -734,12 +702,6 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves_north) -"acl" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/marshal_office) "acm" = ( /obj/item/tool/pickaxe, /turf/open/floor{ @@ -786,12 +748,6 @@ icon_state = "asteroidwarning" }, /area/bigred/ground/garage_workshop) -"acv" = ( -/obj/structure/filingcabinet/security, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/marshal_office) "acw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -1131,15 +1087,6 @@ icon_state = "dark" }, /area/bigredv2/outside/telecomm) -"adv" = ( -/obj/structure/surface/table, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/telecomm) "adw" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -1173,12 +1120,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"adC" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/marshal_office) "adD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -1292,14 +1233,6 @@ icon_state = "floor4" }, /area/bigredv2/outside/marshal_office) -"adU" = ( -/obj/structure/surface/table, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/paper/bigred/crazy, -/turf/open/floor, -/area/bigredv2/outside/marshal_office) "adW" = ( /turf/open/floor{ icon_state = "wood" @@ -1324,21 +1257,6 @@ "adZ" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/lambda/xenobiology) -"aea" = ( -/obj/structure/machinery/computer/telecomms/monitor{ - req_one_access_txt = "19;200" - }, -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "Solaris Ridge"; - phone_color = "yellow"; - phone_id = "Communications"; - pixel_x = -18 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/telecomm) "aeb" = ( /obj/item/device/radio/headset, /turf/open/floor{ @@ -1494,10 +1412,6 @@ "aev" = ( /turf/open/floor/plating, /area/bigredv2/caves/lambda/xenobiology) -"aew" = ( -/obj/structure/closet/crate/internals, -/turf/open/floor/plating, -/area/bigredv2/caves/lambda/xenobiology) "aex" = ( /obj/structure/closet/crate/freezer/rations, /turf/open/floor/plating, @@ -1681,13 +1595,6 @@ icon_state = "whiteyellowcorner" }, /area/bigredv2/caves/lambda/xenobiology) -"afa" = ( -/obj/structure/closet/secure_closet/chemical, -/turf/open/floor{ - dir = 5; - icon_state = "whiteyellow" - }, -/area/bigredv2/caves/lambda/xenobiology) "afb" = ( /obj/structure/machinery/computer/telecomms/traffic{ req_one_access_txt = "19;200" @@ -1753,16 +1660,6 @@ icon_state = "vault" }, /area/bigredv2/outside/marshal_office) -"afm" = ( -/obj/structure/closet/l3closet/security, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 8; - icon_state = "vault" - }, -/area/bigredv2/outside/marshal_office) "afo" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/revolver/cmb, @@ -2319,12 +2216,6 @@ icon_state = "wood" }, /area/bigredv2/outside/marshal_office) -"agP" = ( -/obj/structure/surface/rack, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/general_offices) "agQ" = ( /turf/open/floor{ dir = 1; @@ -2376,12 +2267,6 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/xenobiology) -"agY" = ( -/obj/structure/closet/secure_closet/CMO, -/turf/open/floor{ - icon_state = "whitegreenfull" - }, -/area/bigredv2/outside/medical) "agZ" = ( /obj/structure/surface/table, /obj/structure/machinery/light/small{ @@ -2955,18 +2840,6 @@ icon_state = "dark" }, /area/bigredv2/outside/marshal_office) -"aiG" = ( -/obj/structure/surface/table, -/obj/item/handcuffs, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Solaris Ridge"; - phone_color = "red"; - phone_id = "Marshal Office" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/marshal_office) "aiH" = ( /obj/structure/surface/table, /obj/structure/machinery/camera/autoname, @@ -3084,16 +2957,6 @@ icon_state = "bcircuit" }, /area/bigredv2/outside/marshal_office) -"aiY" = ( -/obj/structure/surface/table, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/device/defibrillator, -/turf/open/floor{ - icon_state = "whitegreenfull" - }, -/area/bigredv2/outside/medical) "aiZ" = ( /obj/structure/machinery/computer/cameras, /obj/structure/surface/table, @@ -3156,25 +3019,12 @@ }, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"ajk" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/bomb_supply, -/obj/effect/spawner/random/bomb_supply, -/turf/open/floor{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/bigredv2/outside/medical) "ajl" = ( /obj/structure/surface/table, /turf/open/floor{ icon_state = "wood" }, /area/bigredv2/outside/dorms) -"ajm" = ( -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/bigredv2/caves/lambda/breakroom) "ajn" = ( /obj/structure/platform/shiva{ dir = 1 @@ -3474,10 +3324,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/nw) -"aka" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/wood, -/area/bigredv2/caves/lambda/breakroom) "akc" = ( /obj/structure/window/framed/solaris, /turf/open/floor/plating, @@ -3691,17 +3537,6 @@ icon_state = "whitegreen" }, /area/bigredv2/caves/lambda/xenobiology) -"akJ" = ( -/obj/structure/surface/table, -/obj/item/device/analyzer/plant_analyzer, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 5; - icon_state = "whitegreen_v" - }, -/area/bigredv2/caves/lambda/xenobiology) "akK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -4027,12 +3862,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/plating, /area/bigredv2/caves/lambda/xenobiology) -"alL" = ( -/turf/open/floor/plating{ - dir = 9; - icon_state = "warnplate" - }, -/area/bigredv2/caves/lambda/xenobiology) "alM" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -4167,6 +3996,15 @@ icon_state = "redcorner" }, /area/bigredv2/outside/marshal_office) +"amf" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/telecomm) "amg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -4691,12 +4529,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"anE" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor{ - icon_state = "cult" - }, -/area/bigredv2/outside/marshal_office) "anF" = ( /obj/structure/machinery/light{ dir = 4 @@ -5935,13 +5767,6 @@ icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) -"arf" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/bigredv2/outside/medical) "arg" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -6059,14 +5884,6 @@ icon_state = "dark" }, /area/bigredv2/outside/general_offices) -"arz" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/outside/dorms) "arA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -6224,17 +6041,6 @@ icon_state = "white" }, /area/bigredv2/outside/medical) -"arW" = ( -/obj/structure/surface/table, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/pipes/vents/pump, -/turf/open/floor{ - dir = 5; - icon_state = "whitebluefull" - }, -/area/bigredv2/outside/medical) "arX" = ( /obj/structure/closet/secure_closet/medical1, /obj/structure/machinery/light{ @@ -6666,17 +6472,6 @@ icon_state = "elevatorshaft" }, /area/bigredv2/caves/lambda/breakroom) -"atf" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/rad, -/turf/open/floor{ - dir = 1; - icon_state = "elevatorshaft" - }, -/area/bigredv2/caves/lambda/breakroom) "atg" = ( /obj/structure/machinery/vending/snack{ icon_state = "snack-broken"; @@ -6969,18 +6764,6 @@ icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) -"atT" = ( -/obj/structure/surface/table, -/obj/item/tool/pen, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/tool/hand_labeler, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/bigredv2/outside/medical) "atU" = ( /obj/structure/window_frame/solaris, /turf/open/floor/plating, @@ -7116,13 +6899,6 @@ icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) -"aun" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigred/ground/garage_workshop) "auo" = ( /obj/structure/sign/safety/maint{ pixel_y = 32 @@ -7961,16 +7737,6 @@ icon_state = "purple" }, /area/bigredv2/caves/lambda/research) -"awB" = ( -/obj/structure/surface/table/holotable/wood, -/obj/item/reagent_container/food/drinks/coffee, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lambda Labs"; - phone_color = "blue"; - phone_id = "Administration" - }, -/turf/open/floor/carpet, -/area/bigredv2/caves/lambda/breakroom) "awC" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/carpet, @@ -8901,14 +8667,6 @@ icon_state = "whitepurple" }, /area/bigredv2/caves/lambda/research) -"azh" = ( -/obj/structure/surface/table, -/obj/item/clothing/glasses/science, -/turf/open/floor{ - dir = 1; - icon_state = "whitepurple" - }, -/area/bigredv2/caves/lambda/research) "azi" = ( /obj/structure/machinery/r_n_d/protolathe, /turf/open/floor{ @@ -9830,21 +9588,6 @@ icon_state = "white" }, /area/bigredv2/outside/medical) -"aBN" = ( -/obj/structure/surface/table, -/obj/item/device/healthanalyzer, -/obj/structure/pipes/vents/pump, -/obj/item/reagent_container/spray/cleaner, -/obj/structure/phone_base/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "green"; - phone_id = "Clinic"; - pixel_y = 24 - }, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/medical) "aBO" = ( /obj/structure/surface/table, /obj/structure/machinery/recharger, @@ -9852,12 +9595,6 @@ icon_state = "whitegreencorner" }, /area/bigredv2/outside/medical) -"aBP" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "whitegreencorner" - }, -/area/bigredv2/outside/medical) "aBQ" = ( /obj/structure/window/framed/solaris, /turf/open/floor/plating, @@ -10195,12 +9932,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) -"aCP" = ( -/obj/structure/closet/secure_closet/bar, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/bar) "aCQ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Restroom" @@ -10217,12 +9948,6 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/dorms) -"aCS" = ( -/obj/structure/closet/boxinggloves, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/dorms) "aCT" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ @@ -10722,15 +10447,6 @@ /obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/caves/eta/living) -"aEk" = ( -/obj/structure/surface/table/woodentable, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aEl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -10832,13 +10548,6 @@ icon_state = "whitegreen" }, /area/bigredv2/outside/medical) -"aEB" = ( -/obj/structure/surface/table, -/obj/structure/pipes/vents/pump, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/medical) "aEC" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor{ @@ -11032,14 +10741,6 @@ icon_state = "grass_impenetrable" }, /area/bigredv2/outside/admin_building) -"aFf" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/structure/machinery/light, -/turf/open/floor{ - dir = 10; - icon_state = "whitepurple" - }, -/area/bigredv2/caves/lambda/research) "aFg" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -11054,14 +10755,6 @@ icon_state = "whitepurple" }, /area/bigredv2/caves/lambda/research) -"aFi" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/structure/machinery/light/built, -/turf/open/floor{ - dir = 6; - icon_state = "whitepurple" - }, -/area/bigredv2/caves/lambda/research) "aFj" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -11085,20 +10778,6 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) -"aFl" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/technology_scanner, -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "Eta Labs"; - phone_id = "Observation"; - pixel_x = -18 - }, -/turf/open/floor{ - dir = 10; - icon_state = "purple" - }, -/area/bigredv2/caves/lambda/research) "aFm" = ( /turf/open/floor{ dir = 8; @@ -11410,13 +11089,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/library) -"aGd" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor{ - dir = 10; - icon_state = "warnwhite" - }, -/area/bigredv2/caves/lambda/virology) "aGe" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -11460,13 +11132,6 @@ icon_state = "purplecorner" }, /area/bigredv2/caves/lambda/research) -"aGj" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor{ - dir = 6; - icon_state = "warnwhite" - }, -/area/bigredv2/caves/lambda/virology) "aGk" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -11626,12 +11291,6 @@ icon_state = "whitegreenfull" }, /area/bigredv2/outside/medical) -"aGD" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/admin_building) "aGE" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -11696,12 +11355,6 @@ icon_state = "carpet10-8" }, /area/bigredv2/outside/library) -"aGP" = ( -/obj/structure/filingcabinet/medical, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "aGQ" = ( /obj/structure/machinery/light{ dir = 4 @@ -11742,13 +11395,6 @@ icon_state = "purple" }, /area/bigredv2/caves/lambda/research) -"aGX" = ( -/obj/structure/surface/table, -/obj/item/tool/weedkiller/D24, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "aGY" = ( /obj/structure/machinery/light{ dir = 4 @@ -11772,13 +11418,6 @@ icon_state = "whitegreen" }, /area/bigredv2/caves/lambda/virology) -"aHa" = ( -/obj/structure/surface/table, -/obj/item/storage/pill_bottle/spaceacillin, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "aHc" = ( /obj/structure/surface/table/reinforced, /turf/open/floor{ @@ -12153,12 +11792,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/virology) -"aIc" = ( -/obj/structure/closet/wardrobe/virology_white, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "aIg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12211,13 +11844,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/c) -"aIo" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table, -/turf/open/floor, -/area/bigredv2/outside/office_complex) "aIp" = ( /turf/open/mars{ icon_state = "mars_dirt_9" @@ -12832,12 +12458,6 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) -"aJT" = ( -/obj/structure/filingcabinet/medical, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/admin_building) "aJU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13241,20 +12861,6 @@ icon_state = "darkgreencorners2" }, /area/bigredv2/caves/lambda/virology) -"aKZ" = ( -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/window/reinforced/toughened, -/obj/structure/closet/crate/freezer, -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor{ - dir = 6; - icon_state = "darkgreen2" - }, -/area/bigredv2/caves/lambda/virology) "aLa" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-in" @@ -13304,12 +12910,6 @@ icon_state = "dark" }, /area/bigredv2/outside/office_complex) -"aLg" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/bigredv2/outside/office_complex) "aLh" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz1north" @@ -13326,13 +12926,6 @@ icon_state = "whiteyellowfull" }, /area/bigredv2/outside/office_complex) -"aLl" = ( -/obj/structure/filingcabinet, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor, -/area/bigredv2/outside/cargo) "aLn" = ( /obj/structure/surface/table, /obj/structure/machinery/light, @@ -13491,10 +13084,6 @@ "aLI" = ( /turf/open/floor/greengrid, /area/bigredv2/caves/lambda/research) -"aLJ" = ( -/obj/structure/filingcabinet, -/turf/open/floor, -/area/bigredv2/outside/engineering) "aLM" = ( /obj/structure/machinery/shower{ dir = 1 @@ -13832,17 +13421,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) -"aMG" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/surface/table, -/obj/item/tool/surgery/retractor, -/turf/open/floor{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/bigredv2/caves/eta/research) "aMH" = ( /obj/structure/machinery/light{ dir = 8 @@ -13963,12 +13541,6 @@ icon_state = "delivery" }, /area/bigredv2/caves/lambda/virology) -"aMZ" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "aNa" = ( /obj/structure/closet/l3closet/general, /turf/open/floor{ @@ -14180,22 +13752,6 @@ icon_state = "white" }, /area/bigredv2/outside/admin_building) -"aNE" = ( -/obj/structure/surface/table, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Solaris Ridge"; - phone_color = "blue"; - phone_id = "Administration" - }, -/turf/open/floor{ - dir = 4; - icon_state = "warnwhite" - }, -/area/bigredv2/outside/admin_building) "aNG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -14367,10 +13923,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aOc" = ( -/obj/structure/surface/table, -/turf/open/floor, -/area/bigredv2/outside/hydroponics) "aOd" = ( /obj/structure/bed/chair{ dir = 8 @@ -14605,11 +14157,6 @@ icon_state = "dark" }, /area/bigredv2/outside/admin_building) -"aOJ" = ( -/obj/structure/surface/table, -/obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/floor/plating, -/area/bigredv2/caves/eta/research) "aOK" = ( /turf/open/floor{ dir = 4; @@ -14646,18 +14193,6 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/storage) -"aOQ" = ( -/obj/structure/surface/table, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Eta Labs"; - phone_color = "Blue"; - phone_id = "Director" - }, -/turf/open/floor{ - dir = 6; - icon_state = "darkblue2" - }, -/area/bigredv2/caves/eta/research) "aOR" = ( /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor{ @@ -14776,17 +14311,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aPf" = ( -/obj/structure/surface/table, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Eta Labs"; - phone_id = "Workshop" - }, -/turf/open/floor{ - dir = 1; - icon_state = "darkred2" - }, -/area/bigredv2/caves/eta/research) "aPg" = ( /obj/structure/surface/table, /obj/item/XenoBio/Blood, @@ -15010,13 +14534,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/general_store) -"aPH" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 8; - icon_state = "darkred2" - }, -/area/bigredv2/caves/eta/research) "aPI" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -15062,18 +14579,6 @@ icon_state = "white" }, /area/bigredv2/outside/admin_building) -"aPO" = ( -/obj/structure/surface/table, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/item/handset, -/turf/open/floor{ - dir = 4; - icon_state = "warnwhite" - }, -/area/bigredv2/outside/admin_building) "aPP" = ( /turf/open/floor{ dir = 1; @@ -15132,13 +14637,6 @@ icon_state = "wood" }, /area/bigredv2/outside/bar) -"aPZ" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 8; - icon_state = "darkredcorners2" - }, -/area/bigredv2/caves/eta/xenobiology) "aQa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15296,12 +14794,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/e) -"aQv" = ( -/turf/open/floor{ - dir = 1; - icon_state = "podhatch" - }, -/area/bigredv2/caves/lambda/research) "aQw" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ @@ -16006,12 +15498,6 @@ icon_state = "whitegreen" }, /area/bigredv2/caves/lambda/virology) -"aSp" = ( -/turf/open/floor{ - dir = 9; - icon_state = "darkgreen2" - }, -/area/bigredv2/caves/lambda/virology) "aSq" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/vents/scrubber/on{ @@ -16310,12 +15796,6 @@ "aTa" = ( /turf/open/floor/plating, /area/bigredv2/outside/admin_building) -"aTb" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/admin_building) "aTc" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor{ @@ -16920,15 +16400,6 @@ icon_state = "darkgreen2" }, /area/bigredv2/caves/lambda/virology) -"aUJ" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor{ - dir = 6; - icon_state = "whitegreen" - }, -/area/bigredv2/caves/lambda/virology) "aUM" = ( /obj/structure/machinery/computer/operating, /turf/open/floor{ @@ -17007,14 +16478,6 @@ icon_state = "whitebluefull" }, /area/bigredv2/outside/general_store) -"aUY" = ( -/obj/structure/surface/table, -/obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor{ - dir = 5; - icon_state = "whitebluefull" - }, -/area/bigredv2/outside/general_store) "aUZ" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/flask/vacuumflask, @@ -17366,21 +16829,6 @@ icon_state = "darkblue2" }, /area/bigredv2/outside/admin_building) -"aVW" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/structure/phone_base/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "blue"; - phone_id = "Operations"; - pixel_y = 24 - }, -/turf/open/floor{ - dir = 1; - icon_state = "darkblue2" - }, -/area/bigredv2/outside/admin_building) "aVX" = ( /obj/structure/machinery/computer/cameras, /obj/structure/surface/table, @@ -17675,13 +17123,6 @@ icon_state = "warnwhite" }, /area/bigredv2/outside/virology) -"aWS" = ( -/obj/structure/surface/table, -/obj/item/reagent_container/glass/bottle/toxin, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/outside/virology) "aWT" = ( /obj/structure/bed, /turf/open/floor{ @@ -17966,13 +17407,6 @@ icon_state = "darkblue2" }, /area/bigredv2/outside/admin_building) -"aXQ" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 6; - icon_state = "darkblue2" - }, -/area/bigredv2/outside/admin_building) "aXS" = ( /obj/structure/machinery/vending/snack, /turf/open/floor, @@ -18085,14 +17519,6 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/admin_building) -"aYq" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/outside/admin_building) "aYr" = ( /obj/structure/toilet{ dir = 8 @@ -18164,10 +17590,6 @@ icon_state = "white" }, /area/bigredv2/outside/virology) -"aYB" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor/plating, -/area/bigredv2/outside/virology) "aYC" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -18370,13 +17792,6 @@ /obj/structure/closet/secure_closet/quartermaster, /turf/open/floor, /area/bigredv2/outside/cargo) -"aZo" = ( -/obj/structure/closet/secure_closet/cargotech{ - req_access = null; - req_one_access_txt = "21;101" - }, -/turf/open/floor, -/area/bigredv2/outside/cargo) "aZp" = ( /turf/open/floor{ dir = 9; @@ -18975,12 +18390,6 @@ icon_state = "carpet15-15" }, /area/bigredv2/outside/admin_building) -"bbn" = ( -/obj/structure/safe, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/admin_building) "bbo" = ( /obj/structure/bed/chair, /turf/open/floor, @@ -19109,16 +18518,6 @@ icon_state = "cult" }, /area/bigredv2/outside/chapel) -"bbE" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/surface/table/woodentable, -/obj/item/storage/bible, -/turf/open/floor{ - icon_state = "cult" - }, -/area/bigredv2/outside/chapel) "bbF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19155,6 +18554,16 @@ icon_state = "mars_dirt_14" }, /area/bigredv2/outside/w) +"bbL" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Solaris Ridge"; + phone_id = "Clinic Reception" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/medical) "bbM" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -20200,12 +19609,6 @@ icon_state = "dark" }, /area/bigredv2/outside/office_complex) -"bfe" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/office_complex) "bff" = ( /obj/structure/machinery/light{ dir = 1 @@ -20515,14 +19918,6 @@ icon_state = "bot" }, /area/bigredv2/outside/cargo) -"bfX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/trashcart, -/turf/open/floor{ - dir = 1; - icon_state = "bot" - }, -/area/bigredv2/outside/cargo) "bfY" = ( /obj/structure/largecrate/cow, /turf/open/floor{ @@ -20669,10 +20064,6 @@ icon_state = "bot" }, /area/bigredv2/outside/cargo) -"bgr" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor, -/area/bigredv2/outside/cargo) "bgs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -20972,14 +20363,6 @@ icon_state = "redcorner" }, /area/bigredv2/outside/office_complex) -"bhm" = ( -/obj/structure/surface/table, -/obj/item/trash/kepler, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" - }, -/area/bigredv2/outside/office_complex) "bhn" = ( /obj/effect/decal/cleanable/dirt, /obj/item/tool/lighter/random, @@ -21717,10 +21100,6 @@ /obj/structure/machinery/constructable_frame, /turf/open/floor, /area/bigredv2/outside/cargo) -"bkl" = ( -/obj/structure/filingcabinet, -/turf/open/floor, -/area/bigredv2/outside/cargo) "bkn" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor, @@ -22220,13 +21599,6 @@ /obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/engineering) -"bmw" = ( -/obj/structure/closet/secure_closet/engineering_chief, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor, -/area/bigredv2/outside/engineering) "bmx" = ( /obj/structure/bookcase/manuals/engineering, /turf/open/floor, @@ -22502,25 +21874,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor, /area/bigredv2/outside/engineering) -"bny" = ( -/obj/structure/window/reinforced/toughened{ - dir = 1; - icon_state = "fwindow"; - pixel_y = 12 - }, -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/surface/table/reinforced, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lambda Labs"; - phone_id = "Virology" - }, -/turf/open/floor{ - dir = 5; - icon_state = "darkgreen2" - }, -/area/bigredv2/caves/lambda/virology) "bnz" = ( /obj/structure/surface/table, /obj/item/tool/lighter/zippo, @@ -22831,16 +22184,6 @@ /obj/structure/machinery/pipedispenser, /turf/open/floor, /area/bigredv2/outside/filtration_plant) -"boY" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/obj/structure/phone_base/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "yellow"; - phone_id = "Filtration"; - pixel_y = 24 - }, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) "boZ" = ( /obj/effect/landmark/crap_item, /turf/open/floor, @@ -23343,18 +22686,6 @@ /obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/engineering) -"brn" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/technology_scanner, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/phone_base/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "yellow"; - phone_id = "Engineering"; - pixel_y = 24 - }, -/turf/open/floor, -/area/bigredv2/outside/engineering) "bro" = ( /obj/structure/machinery/camera/autoname, /turf/open/floor, @@ -23924,6 +23255,16 @@ icon_state = "mars_cave_16" }, /area/bigredv2/outside/s) +"bvr" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/surface/table/woodentable, +/obj/item/storage/bible, +/turf/open/floor{ + icon_state = "cult" + }, +/area/bigredv2/outside/chapel) "bvv" = ( /obj/structure/machinery/light{ dir = 1 @@ -24062,18 +23403,6 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/caves/eta/xenobiology) -"bwr" = ( -/obj/structure/machinery/light, -/obj/structure/surface/table, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Solaris Ridge"; - phone_color = "green"; - phone_id = "Virology Lab" - }, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/virology) "bww" = ( /turf/open/floor/plating, /area/bigredv2/caves/eta/storage) @@ -24155,18 +23484,6 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/storage) -"bwQ" = ( -/obj/structure/surface/table, -/obj/item/tool/screwdriver, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Eta Labs"; - phone_color = "yellow"; - phone_id = "Robotics" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/caves/eta/storage) "bwR" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor{ @@ -24372,15 +23689,6 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/storage) -"bxx" = ( -/obj/structure/closet/l3closet/scientist, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/caves/eta/research) "bxy" = ( /turf/open/floor{ dir = 8; @@ -25166,15 +24474,6 @@ icon_state = "darkblue2" }, /area/bigredv2/caves/eta/research) -"bzF" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/tech_supply, -/obj/item/handset, -/turf/open/floor{ - dir = 1; - icon_state = "darkblue2" - }, -/area/bigredv2/caves/eta/research) "bzG" = ( /obj/structure/surface/table, /obj/item/storage/fancy/vials/random, @@ -25183,13 +24482,6 @@ icon_state = "darkblue2" }, /area/bigredv2/caves/eta/research) -"bzH" = ( -/obj/structure/closet/secure_closet/RD, -/turf/open/floor{ - dir = 1; - icon_state = "darkblue2" - }, -/area/bigredv2/caves/eta/research) "bzI" = ( /obj/structure/machinery/computer/cameras, /obj/structure/surface/table, @@ -25440,14 +24732,6 @@ /obj/item/storage/box/wy_mre, /turf/open/floor/plating, /area/bigredv2/caves/eta/research) -"bAv" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "darkish" - }, -/area/bigredv2/caves/eta/storage) "bAw" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Eta Lab Server" @@ -26011,13 +25295,6 @@ icon_state = "darkgreen2" }, /area/bigredv2/caves/eta/xenobiology) -"bCj" = ( -/obj/structure/closet/l3closet/scientist, -/turf/open/floor{ - dir = 1; - icon_state = "darkgreen2" - }, -/area/bigredv2/caves/eta/xenobiology) "bCk" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor{ @@ -26566,13 +25843,6 @@ icon_state = "carpet10-8" }, /area/bigredv2/caves/eta/living) -"bDL" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/tool, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/caves/eta/living) "bDM" = ( /obj/structure/surface/table, /obj/structure/machinery/microwave, @@ -26840,13 +26110,6 @@ icon_state = "darkyellowcorners2" }, /area/bigredv2/caves/eta/living) -"bEB" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 9; - icon_state = "darkblue2" - }, -/area/bigredv2/caves/eta/research) "bEC" = ( /obj/structure/machinery/light, /obj/structure/closet/cabinet, @@ -27001,6 +26264,17 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/lz2_south_cas) +"bHh" = ( +/obj/structure/surface/table, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Eta Labs"; + phone_id = "Workshop" + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkred2" + }, +/area/bigredv2/caves/eta/research) "bII" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -27060,6 +26334,13 @@ icon_state = "dark" }, /area/bigredv2/outside/marshal_office) +"bOz" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/telecomm) "bPy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -27176,13 +26457,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/s) -"caN" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, -/area/bigredv2/outside/admin_building) "ccP" = ( /obj/structure/surface/table, /obj/effect/spawner/random/bomb_supply, @@ -27357,6 +26631,14 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/xenobiology) +"cvs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "cxi" = ( /obj/structure/machinery/light{ dir = 4 @@ -27451,15 +26733,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/cargo) -"cHI" = ( -/obj/structure/closet/crate, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/dorms) "cIq" = ( /obj/structure/machinery/light{ dir = 1 @@ -27493,6 +26766,19 @@ icon_state = "mars_cave_20" }, /area/bigredv2/caves_north) +"cKj" = ( +/obj/structure/closet/l3closet/virology, +/turf/open/floor/plating, +/area/bigredv2/outside/virology) +"cKB" = ( +/obj/structure/filingcabinet, +/obj/structure/sign/safety/hvac{ + pixel_x = -32 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/space_port) "cNH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -27533,6 +26819,17 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"cRc" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/rad, +/turf/open/floor{ + dir = 1; + icon_state = "elevatorshaft" + }, +/area/bigredv2/caves/lambda/breakroom) "cRP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, @@ -27591,27 +26888,12 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/lz2_west_cas) -"cZj" = ( -/obj/structure/filingcabinet, -/turf/open/floor/plating, -/area/bigredv2/caves/mining) "daf" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) -"daB" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lambda Labs"; - phone_id = "Xenobiology" - }, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurple" - }, -/area/bigredv2/caves/lambda/xenobiology) "dbi" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/outside/telecomm/lz2_cave) @@ -27646,6 +26928,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"diy" = ( +/obj/structure/surface/table, +/obj/item/tool/weedkiller/D24, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/virology) "dlr" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor, @@ -27654,6 +26943,13 @@ /obj/item/tool/pickaxe, /turf/open/mars, /area/bigredv2/outside/filtration_plant) +"dnn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/bigredv2/outside/medical) "dnV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -27661,6 +26957,13 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"dos" = ( +/obj/structure/surface/table, +/obj/structure/pipes/vents/pump, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/medical) "dot" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -27675,6 +26978,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"doK" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/glass/bottle/toxin, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/outside/virology) "dqy" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -27769,6 +27079,22 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"dwU" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 8; + icon_state = "darkredcorners2" + }, +/area/bigredv2/caves/eta/xenobiology) +"dxf" = ( +/obj/structure/closet/crate, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/dorms) "dxV" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_4" @@ -27830,11 +27156,6 @@ /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"dEf" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/light, -/turf/open/floor, -/area/bigred/ground/garage_workshop) "dEr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -27859,6 +27180,18 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"dFJ" = ( +/obj/structure/surface/table, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/item/handset, +/turf/open/floor{ + dir = 4; + icon_state = "warnwhite" + }, +/area/bigredv2/outside/admin_building) "dFR" = ( /obj/item/stack/sheet/wood{ pixel_y = -8 @@ -27903,6 +27236,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dIX" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa, +/turf/open/floor/plating, +/area/bigredv2/outside/cargo) "dJc" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -28073,6 +27411,13 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/eta) +"dYS" = ( +/obj/structure/closet/l3closet/virology, +/turf/open/floor{ + dir = 10; + icon_state = "warnwhite" + }, +/area/bigredv2/caves/lambda/virology) "dZO" = ( /obj/effect/decal/cleanable/blood{ dir = 8; @@ -28334,6 +27679,19 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/eta) +"eAV" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/phone_base/colony_net{ + phone_category = "Lambda Labs"; + phone_id = "Surgery"; + pixel_y = 24 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/caves/lambda/xenobiology) "eBn" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 3; @@ -28344,10 +27702,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) -"eDQ" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor, -/area/bigred/ground/garage_workshop) +"eDs" = ( +/obj/structure/surface/rack, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/general_offices) "eDS" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris/rock, @@ -28469,6 +27829,10 @@ /obj/structure/prop/server_equipment/broken, /turf/open/floor/greengrid, /area/bigredv2/caves/lambda/research) +"eQg" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor, +/area/bigred/ground/garage_workshop) "eRc" = ( /turf/open/floor{ dir = 6; @@ -28542,18 +27906,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/mars, /area/bigredv2/outside/filtration_plant) -"eWy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/moneybag, -/turf/open/floor/plating, -/area/bigredv2/caves/mining) -"eWG" = ( -/obj/structure/filingcabinet, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "eWP" = ( /obj/structure/surface/table, /obj/effect/spawner/random/bomb_supply, @@ -28582,14 +27934,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves_north) -"fcG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "fdr" = ( /turf/open/mars_cave{ icon_state = "mars_cave_10" @@ -28598,6 +27942,25 @@ "fdy" = ( /turf/open/floor, /area/bigredv2/caves/eta/living) +"fep" = ( +/obj/structure/window/reinforced/toughened{ + dir = 1; + icon_state = "fwindow"; + pixel_y = 12 + }, +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/surface/table/reinforced, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lambda Labs"; + phone_id = "Virology" + }, +/turf/open/floor{ + dir = 5; + icon_state = "darkgreen2" + }, +/area/bigredv2/caves/lambda/virology) "feN" = ( /turf/open/floor{ dir = 9; @@ -28628,6 +27991,20 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves_north) +"fim" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/technology_scanner, +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "Eta Labs"; + phone_id = "Observation"; + pixel_x = -18 + }, +/turf/open/floor{ + dir = 10; + icon_state = "purple" + }, +/area/bigredv2/caves/lambda/research) "fin" = ( /turf/open/floor/plating, /area/bigredv2/caves/eta/xenobiology) @@ -28755,6 +28132,22 @@ /obj/structure/surface/table, /turf/open/floor, /area/bigredv2/caves) +"fxb" = ( +/obj/structure/surface/table, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Solaris Ridge"; + phone_color = "blue"; + phone_id = "Administration" + }, +/turf/open/floor{ + dir = 4; + icon_state = "warnwhite" + }, +/area/bigredv2/outside/admin_building) "fxh" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -28787,18 +28180,12 @@ icon_state = "wood" }, /area/bigredv2/caves/eta/living) -"fyO" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "green"; - phone_id = "Clinic Labs"; - pixel_y = 24 - }, +"fAw" = ( +/obj/structure/surface/table, /turf/open/floor{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, -/area/bigredv2/outside/medical) +/area/bigredv2/outside/admin_building) "fBc" = ( /obj/structure/pipes/standard/tank/phoron, /turf/open/floor/plating, @@ -28812,6 +28199,10 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) +"fFp" = ( +/obj/structure/closet/secure_closet/injection, +/turf/open/floor, +/area/bigredv2/outside/marshal_office) "fFG" = ( /obj/structure/largecrate/random/barrel, /turf/open/mars_cave{ @@ -28894,19 +28285,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) -"fMZ" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/phone_base/colony_net{ - phone_category = "Lambda Labs"; - phone_id = "Surgery"; - pixel_y = 24 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/caves/lambda/xenobiology) "fOc" = ( /turf/open/mars_cave{ icon_state = "mars_cave_3" @@ -29015,6 +28393,13 @@ icon_state = "grass_impenetrable" }, /area/bigredv2/caves/eta/xenobiology) +"fXL" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table, +/turf/open/floor, +/area/bigredv2/outside/office_complex) "fYH" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/caves/mining) @@ -29231,6 +28616,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"gyK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/trashcart, +/turf/open/floor{ + dir = 1; + icon_state = "bot" + }, +/area/bigredv2/outside/cargo) "gyL" = ( /obj/item/ore{ pixel_x = 13; @@ -29249,6 +28642,13 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"gzF" = ( +/obj/structure/filingcabinet, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor, +/area/bigredv2/outside/cargo) "gzG" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -9; @@ -29270,26 +28670,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor, /area/bigredv2/outside/filtration_plant) -"gCC" = ( -/obj/structure/closet/secure_closet, -/obj/item/explosive/plastic{ - desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; - name = "Mining explosives" - }, -/obj/item/explosive/plastic{ - desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; - name = "Mining explosives" - }, -/obj/item/explosive/plastic{ - desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; - name = "Mining explosives" - }, -/obj/item/explosive/plastic{ - desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; - name = "Mining explosives" - }, -/turf/open/floor/plating, -/area/bigredv2/caves/mining) "gCE" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -29318,6 +28698,12 @@ icon_state = "mars_cave_4" }, /area/bigredv2/caves_virology) +"gNf" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/office_complex) "gNz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -29464,6 +28850,16 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"hfR" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/device/defibrillator, +/turf/open/floor{ + icon_state = "whitegreenfull" + }, +/area/bigredv2/outside/medical) "hgT" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -29562,20 +28958,25 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/filtration_plant) -"htp" = ( +"huR" = ( +/obj/structure/surface/table, +/turf/open/floor, +/area/bigredv2/outside/hydroponics) +"hvx" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, /obj/structure/phone_base/colony_net{ - do_not_disturb = 1; - dir = 4; - phone_category = "Lambda Labs"; - phone_color = "red"; - phone_id = "Secure Storage"; - pixel_x = -18 + phone_category = "Solaris Ridge"; + phone_color = "blue"; + phone_id = "Operations"; + pixel_y = 24 }, /turf/open/floor{ dir = 1; - icon_state = "elevatorshaft" + icon_state = "darkblue2" }, -/area/bigredv2/caves/lambda/breakroom) +/area/bigredv2/outside/admin_building) "hvQ" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -29731,6 +29132,12 @@ /obj/structure/sign/poster/safety, /turf/closed/wall/wood, /area/bigredv2/caves/mining) +"hMe" = ( +/obj/structure/closet/secure_closet/CMO, +/turf/open/floor{ + icon_state = "whitegreenfull" + }, +/area/bigredv2/outside/medical) "hNg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/crap_item, @@ -29739,6 +29146,20 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/research) +"hOo" = ( +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/window/reinforced/toughened, +/obj/structure/closet/crate/freezer, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor{ + dir = 6; + icon_state = "darkgreen2" + }, +/area/bigredv2/caves/lambda/virology) "hOx" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary, /turf/open/floor{ @@ -29799,6 +29220,10 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"hUK" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/bigredv2/caves/lambda/breakroom) "hWa" = ( /turf/open/floor{ icon_state = "dark" @@ -30087,14 +29512,6 @@ /obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/plating, /area/bigredv2/caves/lambda/xenobiology) -"iAy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/hefa_cult_decals/d96, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "iAF" = ( /turf/open/mars_cave{ icon_state = "mars_cave_11" @@ -30138,6 +29555,18 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"iFd" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "Solaris Ridge"; + phone_color = "green"; + phone_id = "Clinic Labs"; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/bigredv2/outside/medical) "iGK" = ( /turf/open/mars_cave, /area/bigredv2/caves_sw) @@ -30265,6 +29694,10 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"iXY" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plating, +/area/bigredv2/caves/mining) "iYR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -30377,11 +29810,6 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/general_store) -"jjt" = ( -/obj/structure/bed, -/obj/item/toy/farwadoll, -/turf/open/floor/plating, -/area/bigredv2/outside/cargo) "jkn" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, @@ -30400,6 +29828,16 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"jkM" = ( +/obj/effect/decal/cleanable/dirt{ + pixel_x = 17 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "jkO" = ( /obj/item/explosive/grenade/high_explosive/frag, /turf/open/mars_cave, @@ -30411,6 +29849,12 @@ /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"jnA" = ( +/turf/open/floor{ + dir = 1; + icon_state = "podhatch" + }, +/area/bigredv2/caves/lambda/research) "jnR" = ( /turf/open/floor{ dir = 9; @@ -30511,6 +29955,16 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) +"jxC" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 27 + }, +/obj/structure/closet/toolcloset, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "jzD" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ @@ -30616,14 +30070,6 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) -"jHS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor, -/area/bigred/ground/garage_workshop) "jIQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_19" @@ -30705,6 +30151,13 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"jPt" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 9; + icon_state = "darkblue2" + }, +/area/bigredv2/caves/eta/research) "jPV" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -1; @@ -30757,6 +30210,10 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"jSd" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/plating, +/area/bigredv2/caves/lambda/xenobiology) "jUc" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -30814,6 +30271,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"jWf" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/marshal_office) "jWj" = ( /obj/effect/decal/cleanable/blood, /turf/open/mars_cave{ @@ -31060,6 +30523,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"klP" = ( +/turf/open/floor/plating{ + dir = 9; + icon_state = "warnplate" + }, +/area/bigredv2/caves/lambda/xenobiology) "kmb" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A pipe."; @@ -31078,6 +30547,12 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) +"knl" = ( +/obj/structure/surface/table/woodentable, +/turf/open/floor{ + icon_state = "cult" + }, +/area/bigredv2/outside/marshal_office) "knN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31174,17 +30649,18 @@ icon_state = "darkredcorners2" }, /area/bigredv2/caves/eta/xenobiology) -"kyz" = ( -/obj/structure/phone_base/colony_net{ - dir = 4; +"kyg" = ( +/obj/structure/surface/table, +/obj/item/tool/screwdriver, +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Eta Labs"; - phone_id = "Observation"; - pixel_x = -18 + phone_color = "yellow"; + phone_id = "Robotics" }, /turf/open/floor{ icon_state = "dark" }, -/area/bigredv2/caves/eta/xenobiology) +/area/bigredv2/caves/eta/storage) "kBn" = ( /turf/closed/wall/solaris, /area/bigredv2/caves) @@ -31199,6 +30675,12 @@ /obj/structure/largecrate/supply/supplies/water, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"kBV" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/telecomm) "kCe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -31229,6 +30711,12 @@ icon_state = "darkgreencorners2" }, /area/bigredv2/caves/eta/research) +"kHH" = ( +/obj/structure/closet/wardrobe/virology_white, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/virology) "kHK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -31253,6 +30741,26 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) +"kKX" = ( +/obj/structure/closet/secure_closet, +/obj/item/explosive/plastic{ + desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; + name = "Mining explosives" + }, +/obj/item/explosive/plastic{ + desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; + name = "Mining explosives" + }, +/obj/item/explosive/plastic{ + desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; + name = "Mining explosives" + }, +/obj/item/explosive/plastic{ + desc = "A compact explosive charge for controlled demolitions. Looks to be made from C4"; + name = "Mining explosives" + }, +/turf/open/floor/plating, +/area/bigredv2/caves/mining) "kMs" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "Righty tighty, lefty loosey!"; @@ -31387,6 +30895,16 @@ "kYd" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/outside/e) +"kYR" = ( +/obj/structure/surface/table/holotable/wood, +/obj/item/reagent_container/food/drinks/coffee, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lambda Labs"; + phone_color = "blue"; + phone_id = "Administration" + }, +/turf/open/floor/carpet, +/area/bigredv2/caves/lambda/breakroom) "kZG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/bible/hefa, @@ -31584,6 +31102,11 @@ icon_state = "wood" }, /area/bigredv2/outside/dorms) +"lzl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/moneybag, +/turf/open/floor/plating, +/area/bigredv2/caves/mining) "lzI" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, @@ -31709,6 +31232,17 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"lPw" = ( +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "Eta Labs"; + phone_id = "Observation"; + pixel_x = -18 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/caves/eta/xenobiology) "lPL" = ( /obj/structure/platform/shiva{ dir = 4 @@ -31771,6 +31305,15 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"lST" = ( +/obj/structure/surface/table/woodentable, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "lUd" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -31803,6 +31346,12 @@ icon_state = "mars_cave_7" }, /area/bigredv2/caves_sw) +"lXX" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "grimy" + }, +/area/bigredv2/outside/office_complex) "lYi" = ( /obj/structure/ore_box, /turf/open/mars_cave{ @@ -31850,6 +31399,18 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/telecomm/lz2_cave) +"meK" = ( +/obj/structure/surface/table, +/obj/item/handcuffs, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Solaris Ridge"; + phone_color = "red"; + phone_id = "Marshal Office" + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/marshal_office) "meT" = ( /turf/open/mars, /area/bigredv2/outside/eta) @@ -31892,6 +31453,19 @@ }, /turf/open/floor, /area/bigred/ground/garage_workshop) +"mlt" = ( +/obj/structure/closet/l3closet/scientist, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/caves/eta/research) +"mlO" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor, +/area/bigredv2/outside/cargo) "mmg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip{ @@ -32051,6 +31625,12 @@ icon_state = "mars_cave_15" }, /area/bigredv2/outside/lz1_north_cas) +"mET" = ( +/obj/structure/closet/firecloset, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/space_port) "mFT" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/landmark/corpsespawner/russian, @@ -32244,6 +31824,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"ndp" = ( +/obj/structure/surface/table, +/obj/item/trash/kepler, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/bigredv2/outside/office_complex) "ndy" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -32389,6 +31977,20 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"nxm" = ( +/obj/structure/phone_base/colony_net{ + do_not_disturb = 1; + dir = 4; + phone_category = "Lambda Labs"; + phone_color = "red"; + phone_id = "Secure Storage"; + pixel_x = -18 + }, +/turf/open/floor{ + dir = 1; + icon_state = "elevatorshaft" + }, +/area/bigredv2/caves/lambda/breakroom) "nBb" = ( /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs{ @@ -32659,13 +32261,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/library) -"ocG" = ( -/obj/structure/bookcase/manuals/research_and_development, -/obj/item/storage/fancy/vials/random, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/caves/eta/living) "odw" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -32689,17 +32284,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"ofJ" = ( -/obj/structure/surface/table, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Eta Labs"; - phone_color = "red"; - phone_id = "Security" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/caves/eta/storage) "ofX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -32810,6 +32394,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"onJ" = ( +/obj/structure/closet/secure_closet/bar, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/bar) "onR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/broken, @@ -32875,6 +32465,12 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_se) +"otK" = ( +/obj/structure/closet/boxinggloves, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/dorms) "oud" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil/streak, @@ -32962,12 +32558,30 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_virology) +"oBC" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/marshal_office) "oEJ" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor, /area/bigredv2/outside/cargo) +"oGg" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Solaris Ridge"; + phone_color = "green"; + phone_id = "Virology Lab" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/virology) "oIc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; @@ -32994,6 +32608,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"oJM" = ( +/obj/structure/bookcase/manuals/research_and_development, +/obj/item/storage/fancy/vials/random, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/caves/eta/living) "oJO" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -8; @@ -33341,6 +32962,14 @@ /obj/structure/sign/safety/hazard, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) +"psc" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/outside/admin_building) "ptL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33378,6 +33007,10 @@ icon_state = "mars_dirt_13" }, /area/bigredv2/outside/filtration_plant) +"pvr" = ( +/obj/structure/filingcabinet, +/turf/open/floor, +/area/bigredv2/outside/cargo) "pxp" = ( /obj/structure/ore_box, /turf/open/floor/plating{ @@ -33428,6 +33061,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"pDX" = ( +/obj/structure/surface/table/woodentable, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "pGP" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -33478,6 +33117,13 @@ icon_state = "mars_cave_19" }, /area/bigredv2/caves/mining) +"pLx" = ( +/obj/structure/closet/secure_closet/RD, +/turf/open/floor{ + dir = 1; + icon_state = "darkblue2" + }, +/area/bigredv2/caves/eta/research) "pMm" = ( /turf/open/floor{ dir = 8; @@ -33552,6 +33198,11 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"pWm" = ( +/obj/structure/surface/table, +/obj/effect/decal/cleanable/blood/gibs/limb, +/turf/open/floor/plating, +/area/bigredv2/caves/eta/research) "pXm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33562,16 +33213,6 @@ icon_state = "redcorner" }, /area/bigredv2/outside/marshal_office) -"pXn" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 27 - }, -/obj/structure/closet/toolcloset, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "pXu" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -33644,12 +33285,25 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_north) +"qeE" = ( +/obj/structure/safe, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "qeK" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor, /area/bigredv2/outside/filtration_plant) +"qeL" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "qeX" = ( /obj/structure/largecrate, /obj/effect/decal/cleanable/dirt, @@ -33704,6 +33358,15 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves/mining) +"qhV" = ( +/obj/structure/surface/table, +/obj/item/device/radio{ + pixel_y = 8 + }, +/turf/open/mars_cave{ + icon_state = "mars_cave_3" + }, +/area/bigredv2/caves/mining) "qiA" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -33807,6 +33470,16 @@ "qtx" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/outside/space_port_lz2) +"qtB" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/obj/structure/phone_base/colony_net{ + phone_category = "Solaris Ridge"; + phone_color = "yellow"; + phone_id = "Filtration"; + pixel_y = 24 + }, +/turf/open/floor, +/area/bigredv2/outside/filtration_plant) "qux" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 6 @@ -33872,6 +33545,13 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"qCg" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tool, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/caves/eta/living) "qCK" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -34005,6 +33685,15 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves_lambda) +"qQV" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor{ + dir = 6; + icon_state = "whitegreen" + }, +/area/bigredv2/caves/lambda/virology) "qSj" = ( /obj/structure/cargo_container/hd/mid/alt, /turf/open/floor/plating, @@ -34197,6 +33886,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"rlw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/hefa_cult_decals/d96, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "rml" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor, @@ -34298,6 +33995,29 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"rvB" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/technology_scanner, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/obj/structure/phone_base/colony_net{ + phone_category = "Solaris Ridge"; + phone_color = "yellow"; + phone_id = "Engineering"; + pixel_y = 24 + }, +/turf/open/floor, +/area/bigredv2/outside/engineering) +"rvY" = ( +/obj/structure/surface/table, +/obj/item/device/analyzer/plant_analyzer, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whitegreen_v" + }, +/area/bigredv2/caves/lambda/xenobiology) "rxh" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -34309,6 +34029,21 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves_east) +"rye" = ( +/obj/structure/closet/secure_closet/chemical, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/bigredv2/caves/lambda/xenobiology) +"rzc" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/drinks/coffee, +/turf/open/floor{ + dir = 5; + icon_state = "whitebluefull" + }, +/area/bigredv2/outside/general_store) "rzO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -34379,6 +34114,13 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"rGk" = ( +/obj/structure/closet/l3closet/scientist, +/turf/open/floor{ + dir = 1; + icon_state = "darkgreen2" + }, +/area/bigredv2/caves/eta/xenobiology) "rGP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -34528,6 +34270,14 @@ }, /turf/open/floor/plating, /area/bigredv2/oob) +"rRo" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "darkish" + }, +/area/bigredv2/caves/eta/storage) "rRO" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ @@ -34775,33 +34525,6 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) -"sog" = ( -/obj/item/explosive/grenade/slug/baton{ - dir = 1; - pixel_y = -8 - }, -/obj/item/explosive/grenade/baton{ - dir = 4; - pixel_x = 9; - pixel_y = -8 - }, -/obj/structure/cable{ - icon_state = "4-10" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "sqc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; @@ -35048,6 +34771,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"sKz" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/structure/machinery/light, +/turf/open/floor{ + dir = 10; + icon_state = "whitepurple" + }, +/area/bigredv2/caves/lambda/research) "sLr" = ( /turf/open/mars_cave{ icon_state = "mars_cave_11" @@ -35059,6 +34790,39 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) +"sLO" = ( +/turf/open/floor{ + dir = 9; + icon_state = "darkgreen2" + }, +/area/bigredv2/caves/lambda/virology) +"sNo" = ( +/obj/item/explosive/grenade/slug/baton{ + dir = 1; + pixel_y = -8 + }, +/obj/item/explosive/grenade/baton{ + dir = 4; + pixel_x = 9; + pixel_y = -8 + }, +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-5" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/bigredv2/caves/mining) "sNQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_11" @@ -35082,6 +34846,17 @@ icon_state = "mars_cave_10" }, /area/bigredv2/caves_east) +"sOY" = ( +/obj/structure/surface/table, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Solaris Ridge"; + phone_color = "blue"; + phone_id = "Space Port" + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/space_port) "sPv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -35095,11 +34870,24 @@ icon_state = "mars_cave_23" }, /area/bigredv2/outside/lz1_telecomm_cas) +"sRK" = ( +/obj/structure/filingcabinet/medical, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "sSU" = ( /turf/open/mars_cave{ icon_state = "mars_cave_19" }, /area/bigredv2/outside/lz2_south_cas) +"sVh" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 8; + icon_state = "carpet15-15" + }, +/area/bigredv2/outside/admin_building) "sWa" = ( /obj/item/ore{ pixel_x = 12; @@ -35282,6 +35070,18 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"tjx" = ( +/obj/structure/surface/table, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Eta Labs"; + phone_color = "Blue"; + phone_id = "Director" + }, +/turf/open/floor{ + dir = 6; + icon_state = "darkblue2" + }, +/area/bigredv2/caves/eta/research) "tkN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -35321,6 +35121,21 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves_research) +"tnk" = ( +/obj/structure/machinery/computer/telecomms/monitor{ + req_one_access_txt = "19;200" + }, +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "Solaris Ridge"; + phone_color = "yellow"; + phone_id = "Communications"; + pixel_x = -18 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/telecomm) "tpR" = ( /obj/structure/bed/chair{ dir = 4; @@ -35597,6 +35412,14 @@ icon_state = "mars_cave_14" }, /area/bigredv2/caves_north) +"tLN" = ( +/obj/structure/surface/table, +/obj/item/clothing/glasses/science, +/turf/open/floor{ + dir = 1; + icon_state = "whitepurple" + }, +/area/bigredv2/caves/lambda/research) "tNz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" @@ -35684,6 +35507,14 @@ /obj/item/pizzabox, /turf/open/floor, /area/bigredv2/outside/engineering) +"tUm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor, +/area/bigred/ground/garage_workshop) "tUL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/hefa_cult_decals/d32, @@ -35730,6 +35561,14 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) +"uaI" = ( +/obj/structure/surface/table, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/paper/bigred/crazy, +/turf/open/floor, +/area/bigredv2/outside/marshal_office) "ubY" = ( /obj/structure/barricade/wooden, /turf/open/mars_cave{ @@ -35772,6 +35611,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"uhT" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/virology) "uij" = ( /turf/open/floor{ dir = 8; @@ -35815,6 +35660,18 @@ icon_state = "floor5" }, /area/bigredv2/oob) +"ukZ" = ( +/obj/structure/surface/table, +/obj/item/tool/pen, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/tool/hand_labeler, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/bigredv2/outside/medical) "ulk" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -35833,6 +35690,12 @@ /obj/item/device/flashlight/on, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"umh" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "whitegreencorner" + }, +/area/bigredv2/outside/medical) "umK" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -8; @@ -35968,6 +35831,17 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"uDP" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor{ + dir = 5; + icon_state = "whitebluefull" + }, +/area/bigredv2/outside/medical) "uDZ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -36040,6 +35914,17 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"uJr" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lambda Labs"; + phone_id = "Xenobiology" + }, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurple" + }, +/area/bigredv2/caves/lambda/xenobiology) "uJu" = ( /obj/item/robot_parts/robot_component/diagnosis_unit{ pixel_y = 15 @@ -36064,6 +35949,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"uNV" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/outside/dorms) "uNW" = ( /obj/effect/decal/cleanable/blood{ dir = 8; @@ -36236,6 +36129,11 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"vir" = ( +/obj/structure/closet/toolcloset, +/obj/structure/machinery/light, +/turf/open/floor, +/area/bigred/ground/garage_workshop) "vis" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -36452,16 +36350,6 @@ icon_state = "mars_cave_17" }, /area/bigredv2/caves_research) -"vBT" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Solaris Ridge"; - phone_id = "Clinic Reception" - }, -/turf/open/floor{ - icon_state = "white" - }, -/area/bigredv2/outside/medical) "vCd" = ( /obj/structure/surface/rack, /obj/item/weapon/twohanded/lungemine{ @@ -36490,6 +36378,17 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"vES" = ( +/obj/structure/surface/table, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Eta Labs"; + phone_color = "red"; + phone_id = "Security" + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/caves/eta/storage) "vEU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/mars{ @@ -36541,6 +36440,21 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_virology) +"vNP" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 8; + icon_state = "darkred2" + }, +/area/bigredv2/caves/eta/research) +"vOQ" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/structure/machinery/light/built, +/turf/open/floor{ + dir = 6; + icon_state = "whitepurple" + }, +/area/bigredv2/caves/lambda/research) "vPP" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 6 @@ -36570,6 +36484,17 @@ /obj/structure/sign/safety/high_voltage, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"vRD" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/surface/table, +/obj/item/tool/surgery/retractor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/caves/eta/research) "vRK" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -36666,6 +36591,13 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz1_north_cas) +"wcv" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigred/ground/garage_workshop) "wcw" = ( /turf/open/gm/river, /area/bigredv2/outside/filtration_plant) @@ -36810,17 +36742,6 @@ /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/mars, /area/bigredv2/outside/w) -"wry" = ( -/obj/structure/surface/table, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Solaris Ridge"; - phone_color = "blue"; - phone_id = "Space Port" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/space_port) "wrz" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -36834,6 +36755,13 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"wrV" = ( +/obj/structure/closet/l3closet/virology, +/turf/open/floor{ + dir = 6; + icon_state = "warnwhite" + }, +/area/bigredv2/caves/lambda/virology) "wtj" = ( /turf/open/floor/plating, /area/bigredv2/caves/mining) @@ -36894,6 +36822,15 @@ icon_state = "delivery" }, /area/bigredv2/caves/lambda/virology) +"wBe" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/bomb_supply, +/obj/effect/spawner/random/bomb_supply, +/turf/open/floor{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/bigredv2/outside/medical) "wBi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -37056,6 +36993,13 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/xenobiology) +"wPy" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor, +/area/bigredv2/outside/engineering) "wQa" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -37085,6 +37029,10 @@ }, /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/oob) +"wSG" = ( +/obj/structure/filingcabinet, +/turf/open/floor, +/area/bigredv2/outside/engineering) "wUo" = ( /obj/item/stack/sheet/wood{ pixel_y = -8 @@ -37174,6 +37122,21 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"xei" = ( +/obj/structure/surface/table, +/obj/item/device/healthanalyzer, +/obj/structure/pipes/vents/pump, +/obj/item/reagent_container/spray/cleaner, +/obj/structure/phone_base/colony_net{ + phone_category = "Solaris Ridge"; + phone_color = "green"; + phone_id = "Clinic"; + pixel_y = 24 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/medical) "xeN" = ( /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/mars_cave{ @@ -37254,6 +37217,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xjz" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/marshal_office) "xkq" = ( /turf/open/mars_cave{ icon_state = "mars_cave_3" @@ -37407,6 +37376,10 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xwz" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/wood, +/area/bigredv2/caves/lambda/breakroom) "xya" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -37477,6 +37450,12 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"xBO" = ( +/obj/structure/filingcabinet/medical, +/turf/open/floor{ + icon_state = "white" + }, +/area/bigredv2/outside/virology) "xBS" = ( /turf/open/mars_cave{ icon_state = "mars_cave_14" @@ -37565,6 +37544,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xMi" = ( +/obj/structure/closet/secure_closet/cargotech{ + req_access = null; + req_one_access_txt = "21;101" + }, +/turf/open/floor, +/area/bigredv2/outside/cargo) "xMr" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris/reinforced/hull, @@ -37579,6 +37565,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xMB" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 6; + icon_state = "darkblue2" + }, +/area/bigredv2/outside/admin_building) "xMT" = ( /obj/structure/closet, /obj/item/explosive/grenade/high_explosive/frag, @@ -37608,6 +37601,15 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/c) +"xPG" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tech_supply, +/obj/item/handset, +/turf/open/floor{ + dir = 1; + icon_state = "darkblue2" + }, +/area/bigredv2/caves/eta/research) "xQb" = ( /obj/structure/pipes/vents/pump/on, /obj/effect/decal/cleanable/dirt, @@ -37666,16 +37668,6 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"xWz" = ( -/obj/effect/decal/cleanable/dirt{ - pixel_x = 17 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/bigredv2/caves/mining) "xWH" = ( /obj/structure/barricade/wooden, /turf/open/mars_cave{ @@ -37833,15 +37825,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"yha" = ( +"ygo" = ( /obj/structure/surface/table, -/obj/item/device/radio{ - pixel_y = 8 - }, -/turf/open/mars_cave{ - icon_state = "mars_cave_3" +/obj/item/storage/pill_bottle/spaceacillin, +/turf/open/floor{ + icon_state = "white" }, -/area/bigredv2/caves/mining) +/area/bigredv2/outside/virology) "yhc" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_5" @@ -37863,6 +37853,16 @@ icon_state = "delivery" }, /area/bigredv2/outside/filtration_plant) +"yjg" = ( +/obj/structure/closet/l3closet/security, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "vault" + }, +/area/bigredv2/outside/marshal_office) "yjU" = ( /obj/item/weapon/broken_bottle, /turf/open/floor/plating{ @@ -39458,9 +39458,9 @@ aas aas acQ acY -aaK +bOz adH -aea +tnk aeB afb afI @@ -39680,7 +39680,7 @@ ade aeb aeC ade -aaV +kBV afv ahd ahd @@ -40759,7 +40759,7 @@ acA aas aas acQ -aaV +kBV adt adt adt @@ -41411,7 +41411,7 @@ aaf acJ acQ adf -adv +amf adI aef ade @@ -41858,7 +41858,7 @@ aao qsE qsE qlK -jHS +tUm qrZ qsE aao @@ -41895,20 +41895,20 @@ aFv aGr aHg aoD -aMZ +uhT aNc aoD -aGP +xBO aRE aSu arT -aGX +diy aVC aWd aWO aXu aoD -aIc +kHH aRE aoD aao @@ -42123,7 +42123,7 @@ aUM aNc aWe aNc -bwr +oGg aoD aYA aWe @@ -42336,13 +42336,13 @@ aQA aRG aSv arT -aHa +ygo aVD aWf aRG aNc aoD -aYB +cKj aZj aoD aao @@ -42642,7 +42642,7 @@ tfz kCe kCe kCe -iAy +rlw tUL rxh wBq @@ -42952,7 +42952,7 @@ vLd upE vLd vLd -dEf +vir qsE aao aao @@ -43083,7 +43083,7 @@ wBq ulk kSt uHQ -eWG +qeL jCg qwy xzi @@ -43169,7 +43169,7 @@ qsE vLd upE vLd -eDQ +eQg qsE aao aao @@ -43525,7 +43525,7 @@ wuC nkW kCe kCe -xWz +jkM pSa lSH yln @@ -43718,7 +43718,7 @@ qGg vxQ mtL pUi -eWy +lzl qOM hZl ust @@ -43808,7 +43808,7 @@ acJ aae aao qsE -aun +wcv uvz clB msS @@ -44148,7 +44148,7 @@ aao aao aao uHQ -gCC +kKX wtj duo wtj @@ -44509,7 +44509,7 @@ aNc aNc aNc asl -aWS +doK aNi asl aYC @@ -44582,7 +44582,7 @@ aao aao aao uHQ -cZj +iXY mIu fML eUs @@ -45038,7 +45038,7 @@ opz szw wCo uHQ -pXn +jxC rNc vzL pSa @@ -46319,7 +46319,7 @@ kvp wog eGf fYH -fcG +cvs dCA cAN yfs @@ -47469,13 +47469,13 @@ pXu pXu xbV aae -aax +cKB aaO aaP abe abn aby -wry +sOY abE aaw aca @@ -48337,7 +48337,7 @@ mDN pMv aao aae -aaL +mET aaO aaO aaO @@ -48554,7 +48554,7 @@ pXu iuu aao aae -aaL +mET aaO aaO abg @@ -48629,7 +48629,7 @@ aoH aoH aoH aoH -aUY +rzc aNo aNm aoH @@ -48935,7 +48935,7 @@ aao aao uHQ xwy -sog +sNo pZe mmg lBx @@ -49170,7 +49170,7 @@ aao aao aao kDs -yha +qhV rsv rsv rsv @@ -49309,7 +49309,7 @@ aZu aZO aZO atA -bkl +pvr aZO blg axL @@ -49504,7 +49504,7 @@ aoH aXH aXH asK -aZo +xMi aZu aZu aZu @@ -49526,7 +49526,7 @@ biK aZO aZO atA -bkl +pvr aZu aZu axL @@ -49721,7 +49721,7 @@ aoH aXH aXH asK -aZo +xMi aZM baB aZO @@ -49733,7 +49733,7 @@ aZu aZu beU bfC -bfX +gyK baF bgE bhe @@ -49743,7 +49743,7 @@ aZu aZu aZu asK -aLl +gzF aZu blh asK @@ -50152,7 +50152,7 @@ aOB aOB aNm aoH -jjt +dIX aXH asK aZn @@ -50333,7 +50333,7 @@ aqq are aim asy -ajk +wBe are auG alu @@ -50546,7 +50546,7 @@ aeI aeI ajy alu -fyO +iFd aqr aqr asz @@ -50981,7 +50981,7 @@ aeI aoP alu aqt -arf +dnn arP asB ato @@ -51202,7 +51202,7 @@ arg arQ arg aqu -atT +ukZ auI alu avZ @@ -51216,7 +51216,7 @@ aBd aBb amj aDF -arW +uDP aFz aGv aHq @@ -52260,7 +52260,7 @@ wXg wXg wcs acp -aaX +fFp adB adk adk @@ -52555,7 +52555,7 @@ atA beW aZu baz -bgr +mlO asK bYa aZu @@ -53166,7 +53166,7 @@ ayL azx aAv alu -aBN +xei aCF ari aEC @@ -53367,7 +53367,7 @@ anx afS akM alX -agY +hMe arl arl arl @@ -53389,7 +53389,7 @@ aDJ aDJ aDJ awN -aBP +umh alu aHD aBR @@ -53780,7 +53780,7 @@ acD vPZ acC adn -adC +oBC adN aen adN @@ -53803,7 +53803,7 @@ acp alX aqB arn -aiY +hfR asF arl amj @@ -53880,7 +53880,7 @@ ayr bor bmi axX -brn +rvB bmq trr bpl @@ -54235,7 +54235,7 @@ anx afS akM alX -aEB +dos aro arY asG @@ -54698,7 +54698,7 @@ aKm aHF aHF uRE -aGD +fAw aMf aPL aMf @@ -54931,9 +54931,9 @@ asT aYM aZB aZT -caN +sVh bbj -caN +sVh bcE bcN aYO @@ -55172,7 +55172,7 @@ bjA bjH blr axX -aLJ +wSG bmW bnx boa @@ -55389,7 +55389,7 @@ bjA bjH blr axX -bmw +wPy bmX bAo bmg @@ -55558,7 +55558,7 @@ aCK aDO aEH aFI -vBT +bbL amj amj alu @@ -55954,7 +55954,7 @@ aao acP asc acp -afm +yjg afS afS afS @@ -56176,7 +56176,7 @@ afS agD afS acp -aiG +meK afS afT afS @@ -56217,9 +56217,9 @@ aHF aHF aHF apD -aNE +fxb aOH -aPO +dFJ aQZ aof aSS @@ -57323,7 +57323,7 @@ bbm aJb bcN aof -aJT +sRK apC aHD aIn @@ -57827,7 +57827,7 @@ bzp ebZ aAp bAf -bAv +rRo bAN aCe bBb @@ -58181,7 +58181,7 @@ aof aVU aWE aXm -aXQ +xMB aof aYV aOM @@ -58273,7 +58273,7 @@ bCb qTC pvg aKi -aPZ +dwU aCe dyv dyv @@ -58395,7 +58395,7 @@ aof aSZ aTa aof -aVW +hvx aWF aof aof @@ -58404,11 +58404,11 @@ aYU aOM aZX aof -bbn +qeE bbZ bcP bdq -aJT +sRK apC aHD aIn @@ -58772,7 +58772,7 @@ aao acP asc acp -acl +xjz aes aeO adW @@ -58801,7 +58801,7 @@ atY jpT aty atB -cHI +dxf aty atB mhF @@ -58925,7 +58925,7 @@ aKi wPk qTC aKi -kyz +lPw aKi aKi aKi @@ -58989,7 +58989,7 @@ aao acP asc acq -acv +jWf adW aeP afs @@ -59650,7 +59650,7 @@ adS adS aiO ajg -adU +uaI akt acr alA @@ -59766,7 +59766,7 @@ kdr kdr kdr aAp -bwQ +kyg bxj bDi bDi @@ -59918,7 +59918,7 @@ aNP aOO aOO aof -aYq +psc aof aNL aUb @@ -60090,7 +60090,7 @@ acr adk amy ang -anE +knl aok adk acr @@ -60128,7 +60128,7 @@ aGG aPX aof aNQ -aTb +pDX aUg aof aNQ @@ -60222,7 +60222,7 @@ bBv bww bBN aCL -bCj +rGk aKi bCA bCG @@ -60385,7 +60385,7 @@ bne bkJ bkJ awM -boY +qtB bpo bpU bqv @@ -60430,7 +60430,7 @@ aBy bzp bzC aBQ -ofJ +vES aOP aOP aBE @@ -61287,7 +61287,7 @@ kdr aBv bwW bwW -bxx +mlt bwW aBA ufB @@ -61414,7 +61414,7 @@ amn aBo aBW amn -arz +uNV aEN aBk amn @@ -61720,7 +61720,7 @@ kdr kdr aBw bwX -aMG +vRD bxy bxI bxO @@ -62164,8 +62164,8 @@ aBw byT bzd aBv -bzF -bEB +xPG +jPt aOl bAF bAS @@ -62183,7 +62183,7 @@ xpl xpl kKB aDX -ocG +oJM kqS bDB kqS @@ -62281,7 +62281,7 @@ aws amn aBr alT -aCS +otK aDU alT aFT @@ -62384,7 +62384,7 @@ aBv bzG bzW bAp -aOQ +tjx bAS aBv bBj @@ -62598,7 +62598,7 @@ aBw byT bzf aBv -bzH +pLx bzX bxn bxn @@ -62754,7 +62754,7 @@ asv bfd wKf bgc -bfe +gNf bgI asv aHF @@ -63038,7 +63038,7 @@ aBv aBv aBv aBv -aPf +bHh xpl xpl bBQ @@ -63262,7 +63262,7 @@ bBR bBY bCn bCw -aPH +vNP bCI bCU pNa @@ -64139,7 +64139,7 @@ aDY aDY aRf bDA -bDL +qCg aDX bDU knN @@ -64987,7 +64987,7 @@ bzl ocp wXz bAa -aOJ +pWm bAu bAX aBv @@ -65107,7 +65107,7 @@ aEc aEc aFY aGJ -aCP +onJ aIv anJ aKz @@ -65359,7 +65359,7 @@ bfp asv bgi bgv -aLg +lXX bgg bgg asH @@ -66662,7 +66662,7 @@ asv bgm bgy bgS -bhm +ndp bhZ asv gSg @@ -67300,7 +67300,7 @@ aTq aTq asH baj -aIo +fXL bbC asv asv @@ -68790,7 +68790,7 @@ arD arD arD anT -aOc +huR aCo aCo aEZ @@ -69205,7 +69205,7 @@ aao aao aao akL -agP +eDs aoB apZ aoB @@ -70990,7 +70990,7 @@ atd nRT ban baR -bbE +bvr baR baR nRT @@ -71830,7 +71830,7 @@ arD aMk anW aDg -aEk +lST aui anW voz @@ -73985,13 +73985,13 @@ adZ aqX arE asn -htp +nxm amk -ajm +hUK aqc avM aqc -aka +xwz amk tQw tQw @@ -74641,7 +74641,7 @@ amW aqc auY auY -awB +kYR aqc amk aao @@ -74853,7 +74853,7 @@ adZ amk arG ara -atf +cRc amk aqc aqc @@ -75050,7 +75050,7 @@ aao aao aao adZ -fMZ +eAV agc agc agc @@ -75711,7 +75711,7 @@ aev anM adZ adZ -alL +klP amJ adZ anO @@ -75916,7 +75916,7 @@ tQw aao aao adZ -aew +jSd aeV aev adZ @@ -76388,7 +76388,7 @@ aAP aCs aAP aEm -aFf +sKz anI aao anI @@ -76598,7 +76598,7 @@ awF amk aao anI -azh +tLN aAj afz xWm @@ -77039,7 +77039,7 @@ afz afz xWm aEo -aFi +vOQ anI aao anI @@ -77436,7 +77436,7 @@ aao aao adZ adZ -afa +rye afG adZ agX @@ -77664,7 +77664,7 @@ adZ adZ aeQ ald -daB +uJr amO afy amO @@ -79615,7 +79615,7 @@ agc agc ajt adZ -akJ +rvY alj alg alg @@ -79643,7 +79643,7 @@ aAU anL aDp arN -aFl +fim anI anI anI @@ -80523,7 +80523,7 @@ aMs aLH aOo anL -aQv +jnA aRx anI aao @@ -81603,7 +81603,7 @@ aob aIW aJU aFV -aGd +dYS aob aao aao @@ -82037,7 +82037,7 @@ aob aDB aJW aKT -aGj +wrV aob aao aao @@ -82912,7 +82912,7 @@ aob aob aob aRz -aSp +sLO aTE aUF aVy @@ -83334,7 +83334,7 @@ aao aob aFr aGm -bny +fep aHW bQi aKc @@ -83555,7 +83555,7 @@ aHd aHX aJd aKd -aKZ +hOo aLa aMy aob @@ -83999,7 +83999,7 @@ aao aob aob aTJ -aUJ +qQV aob aob aao diff --git a/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm b/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm index c29681e40b..f3fa4dbcc6 100644 --- a/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm +++ b/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm @@ -134,7 +134,7 @@ /turf/open/mars, /area/bigredv2/caves/eta/xenobiology) "x" = ( -/obj/item/toy/farwadoll, +/obj/item/toy/plush/farwa, /turf/open/ice, /area/bigredv2/caves/eta/xenobiology) "y" = ( diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index c95caf2a9b..60af0805d2 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -16466,15 +16466,6 @@ }, /turf/open/floor/wood, /area/corsat/gamma/administration) -"aTJ" = ( -/obj/item/handset, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, -/area/corsat/gamma/biodome/complex) "aTK" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor{ @@ -25670,14 +25661,6 @@ icon_state = "spiralplate" }, /area/corsat/omega/offices) -"bug" = ( -/obj/structure/surface/table/almayer, -/obj/item/handset, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "bluegrey" - }, -/area/corsat/sigma/southeast/datalab) "buh" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -29326,14 +29309,6 @@ icon_state = "plate" }, /area/corsat/omega/hangar/security) -"bEt" = ( -/obj/structure/surface/table/reinforced, -/obj/item/handset, -/turf/open/floor/corsat{ - dir = 8; - icon_state = "red" - }, -/area/corsat/omega/hangar/security) "bEv" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -36393,13 +36368,6 @@ icon_state = "squares" }, /area/corsat/gamma/hangar/cargo) -"csM" = ( -/obj/structure/surface/table/almayer, -/obj/item/handset, -/turf/open/floor/corsat{ - icon_state = "bluegreycorner" - }, -/area/corsat/sigma/southeast/datalab) "cth" = ( /obj/effect/decal/cleanable/blood/xtracks, /turf/open/floor/corsat{ @@ -36493,6 +36461,13 @@ }, /turf/open/mars, /area/corsat/sigma/biodome) +"cwL" = ( +/obj/structure/surface/table/almayer, +/obj/item/handset, +/turf/open/floor/corsat{ + icon_state = "bluegreycorner" + }, +/area/corsat/sigma/southeast/datalab) "cxh" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/door/window/brigdoor/westleft{ @@ -37495,6 +37470,14 @@ icon_state = "whitetancorner" }, /area/corsat/sigma/dorms) +"drD" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/handset, +/turf/open/floor{ + dir = 8; + icon_state = "carpet15-15" + }, +/area/corsat/omega/offices) "drW" = ( /turf/open/floor/corsat{ dir = 8; @@ -37936,14 +37919,6 @@ icon_state = "whitebluefull" }, /area/corsat/gamma/residential/showers) -"dGy" = ( -/obj/structure/surface/rack, -/obj/item/toy/farwadoll, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "red" - }, -/area/corsat/omega/hangar/security) "dHa" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/corsat{ @@ -38367,14 +38342,6 @@ icon_state = "asteroidplating" }, /area/corsat/sigma/biodome/gunrange) -"dYh" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/handset, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, -/area/corsat/omega/offices) "dYk" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat{ @@ -39375,6 +39342,21 @@ icon_state = "green" }, /area/corsat/gamma/hallwaysouth) +"eJx" = ( +/obj/structure/machinery/camera/autoname{ + dir = 1; + network = list("sigma") + }, +/obj/structure/surface/table/almayer, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/item/handset, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/corsat/sigma/southeast/datalab) "eJz" = ( /obj/effect/landmark/corpsespawner/wysec, /obj/effect/decal/cleanable/blood/splatter, @@ -40520,6 +40502,14 @@ icon_state = "red" }, /area/corsat/omega/hallways) +"fBP" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handset, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "red" + }, +/area/corsat/omega/hangar/security) "fCi" = ( /obj/structure/surface/table, /obj/item/folder, @@ -41792,14 +41782,6 @@ icon_state = "squares" }, /area/corsat/theta/airlock/east/id) -"gwW" = ( -/obj/structure/surface/table/reinforced, -/obj/item/handset, -/turf/open/floor/corsat{ - dir = 10; - icon_state = "red" - }, -/area/corsat/omega/hangar/office) "gwY" = ( /obj/structure/machinery/disposal, /obj/structure/machinery/light, @@ -48244,14 +48226,6 @@ /obj/structure/window_frame/corsat, /turf/open/floor/plating, /area/corsat/gamma/biodome/complex) -"lnW" = ( -/obj/structure/surface/table/reinforced, -/obj/item/handset, -/turf/open/floor/corsat{ - dir = 4; - icon_state = "purplewhite" - }, -/area/corsat/gamma/sigmaremote) "lom" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/computer/secure_data{ @@ -48311,6 +48285,23 @@ icon_state = "squareswood" }, /area/corsat/gamma/rnr/arcade) +"lqU" = ( +/obj/structure/surface/table/almayer, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/item/ashtray/plastic{ + pixel_x = 4 + }, +/obj/item/handset{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/corsat/sigma/southeast/datalab) "lqX" = ( /obj/item/pamphlet/skill/powerloader, /turf/open/floor/corsat{ @@ -48816,13 +48807,6 @@ icon_state = "retrosquareslight" }, /area/corsat/sigma/south/complex) -"lIX" = ( -/obj/structure/surface/table/reinforced, -/obj/item/handset, -/turf/open/floor/corsat{ - icon_state = "purplewhite" - }, -/area/corsat/sigma/south/complex) "lIY" = ( /obj/structure/platform{ dir = 1 @@ -49666,6 +49650,14 @@ icon_state = "yellow" }, /area/corsat/theta/airlock/control) +"mod" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handset, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "purplewhite" + }, +/area/corsat/gamma/sigmaremote) "mop" = ( /obj/structure/surface/rack, /obj/item/tool/soap/deluxe, @@ -50050,6 +50042,15 @@ icon_state = "red" }, /area/corsat/gamma/hangar/cargo) +"mDR" = ( +/obj/item/handset, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor{ + dir = 8; + icon_state = "carpet15-15" + }, +/area/corsat/gamma/biodome/complex) "mEd" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -50366,6 +50367,14 @@ icon_state = "redcorner" }, /area/corsat/sigma/hangar/checkpoint) +"mPk" = ( +/obj/structure/surface/rack, +/obj/item/toy/plush/farwa, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "red" + }, +/area/corsat/omega/hangar/security) "mPS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -54488,21 +54497,6 @@ icon_state = "white" }, /area/corsat/gamma/residential/researcher) -"qaf" = ( -/obj/structure/machinery/camera/autoname{ - dir = 1; - network = list("sigma") - }, -/obj/structure/surface/table/almayer, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/item/handset, -/turf/open/floor/corsat{ - icon_state = "blue" - }, -/area/corsat/sigma/southeast/datalab) "qaj" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -61202,6 +61196,14 @@ icon_state = "retrosquares" }, /area/corsat/gamma/hallwaysouth) +"uVm" = ( +/obj/structure/surface/table/almayer, +/obj/item/handset, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "bluegrey" + }, +/area/corsat/sigma/southeast/datalab) "uVo" = ( /obj/structure/machinery/light{ dir = 8 @@ -62390,6 +62392,14 @@ icon_state = "red" }, /area/corsat/gamma/airlock/south) +"vNM" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handset, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "red" + }, +/area/corsat/omega/hangar/office) "vOh" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/camera/autoname{ @@ -64457,23 +64467,6 @@ icon_state = "purplewhite" }, /area/corsat/gamma/sigmaremote) -"xvB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/item/ashtray/plastic{ - pixel_x = 4 - }, -/obj/item/handset{ - pixel_x = -4; - pixel_y = 4 - }, -/turf/open/floor/corsat{ - icon_state = "blue" - }, -/area/corsat/sigma/southeast/datalab) "xvE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -64795,6 +64788,13 @@ icon_state = "whitetan" }, /area/corsat/gamma/residential/west) +"xJW" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handset, +/turf/open/floor/corsat{ + icon_state = "purplewhite" + }, +/area/corsat/sigma/south/complex) "xKr" = ( /turf/open/floor/corsat{ dir = 4; @@ -69410,7 +69410,7 @@ abF abF bke vrA -lnW +mod agS oEU qSG @@ -69510,7 +69510,7 @@ ncR bbQ mrQ rbo -aTJ +mDR aJC fdh aIX @@ -71759,7 +71759,7 @@ ahA djM brB uip -dYh +drD nsg djM aiL @@ -77460,7 +77460,7 @@ luj luj btB bEq -bEt +fBP aYQ luj dOw @@ -78695,7 +78695,7 @@ hay gSI gSI oIx -gwW +vNM aIv ylo ylo @@ -80399,7 +80399,7 @@ bEp aZb pyL aiB -dGy +mPk lWG lWG lWG @@ -113665,7 +113665,7 @@ ajX iqE lib aku -lIX +xJW akd anx sip @@ -119557,7 +119557,7 @@ txK wOX att aXz -bug +uVm aXh rgm auz @@ -119799,7 +119799,7 @@ aGP iZv cJW gjj -xvB +lqU att ixd buh @@ -121029,7 +121029,7 @@ att nkz aNr nLX -csM +cwL oPu auz ylo @@ -121269,7 +121269,7 @@ atl aGX txp dKv -qaf +eJx att att att diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 9473863bf8..c119fb60a3 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -9978,6 +9978,22 @@ icon_state = "cell_stripe" }, /area/shuttle/trijent_shuttle/omega) +"aEu" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/omega{ + pixel_y = 32; + shuttleId = "trijentshuttle22" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "sterile_white" + }, +/area/desert_dam/exterior/valley/valley_medical) "aEv" = ( /obj/structure/stairs{ dir = 1 @@ -14229,6 +14245,16 @@ /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) +"aRB" = ( +/obj/docking_port/stationary/trijent_elevator/occupied{ + id = "trijent_lz2"; + name = "Lz2 Elevator"; + airlock_area = /area/shuttle/trijent_shuttle/lz2; + elevator_network = "B"; + roundstart_template = /datum/map_template/shuttle/trijent_elevator/B + }, +/turf/open/gm/empty, +/area/shuttle/trijent_shuttle/lz2) "aRC" = ( /turf/open/floor{ dir = 8; @@ -20448,18 +20474,6 @@ icon_state = "blue" }, /area/desert_dam/interior/dam_interior/tech_storage) -"bmo" = ( -/obj/structure/safe, -/obj/item/weapon/katana/replica, -/obj/item/reagent_container/food/drinks/bottle/absinthe, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/desert_dam/interior/dam_interior/tech_storage) "bmp" = ( /obj/structure/surface/rack, /obj/structure/closet/fireaxecabinet{ @@ -23823,16 +23837,6 @@ icon_state = "darkyellowcorners2" }, /area/desert_dam/interior/dam_interior/smes_main) -"bxC" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/primary_tool_storage) "bxD" = ( /turf/open/floor{ dir = 8; @@ -47020,25 +47024,6 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_civilian) -"cWK" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/phoron{ - amount = 25 - }, -/obj/item/stack/sheet/plasteel{ - amount = 30; - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/storage/briefcase/inflatable, -/turf/open/floor/prison{ - dir = 4; - icon_state = "green" - }, -/area/desert_dam/interior/dam_interior/atmos_storage) "cWN" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -49531,22 +49516,6 @@ /obj/structure/window/framed/hangar/reinforced, /turf/open/floor/plating, /area/desert_dam/building/water_treatment_one/purification) -"dhL" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/desert_dam/building/medical/emergency_room) "dhT" = ( /obj/effect/decal/sand_overlay/sand2, /obj/effect/decal/cleanable/dirt, @@ -50746,14 +50715,6 @@ dir = 1 }, /area/desert_dam/exterior/river/riverside_central_south) -"dsl" = ( -/obj/structure/surface/table/woodentable, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/desert_dam/building/bar/bar) "dsA" = ( /turf/open/floor/prison{ dir = 8; @@ -50916,6 +50877,10 @@ icon_state = "cement1" }, /area/desert_dam/interior/dam_interior/central_tunnel) +"dtV" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood, +/area/desert_dam/building/administration/office) "dtX" = ( /obj/structure/platform_decoration, /turf/open/desert/dirt{ @@ -50928,6 +50893,13 @@ icon_state = "dirt2" }, /area/desert_dam/exterior/river/riverside_south) +"dua" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/desert_dam/building/medical/virology_wing) "duc" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 10 @@ -51534,12 +51506,6 @@ name = "reinforced metal wall" }, /area/desert_dam/building/water_treatment_one/breakroom) -"dye" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/desert_dam/interior/dam_interior/workshop) "dyi" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -54495,6 +54461,12 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) +"dMP" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor{ + icon_state = "whitepurplecorner" + }, +/area/desert_dam/building/medical/chemistry) "dMV" = ( /turf/closed/wall/r_wall/bunker{ name = "reinforced metal wall" @@ -58029,17 +58001,6 @@ icon_state = "bright_clean2" }, /area/desert_dam/building/dorms/restroom) -"dYU" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/item/storage/box/gloves{ - pixel_x = -5; - pixel_y = -5 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitered" - }, -/area/desert_dam/building/medical/surgery_room_one) "dYX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -58284,6 +58245,12 @@ icon_state = "bright_clean2" }, /area/desert_dam/building/dorms/restroom) +"eaN" = ( +/obj/structure/closet/l3closet/security, +/turf/open/floor/prison{ + icon_state = "floor_marked" + }, +/area/desert_dam/building/security/armory) "eaO" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -58934,13 +58901,6 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) -"edE" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/desert_dam/building/medical/virology_wing) "edJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Water Treatment Foyer" @@ -59494,17 +59454,13 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/valley_hydro) -"ejB" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/wood, -/area/desert_dam/building/administration/overseer_office) -"ejL" = ( -/obj/structure/filingcabinet, +"ejG" = ( +/obj/structure/surface/table, /turf/open/floor/prison{ - dir = 5; - icon_state = "red" + dir = 9; + icon_state = "darkyellow2" }, -/area/desert_dam/building/water_treatment_one/lobby) +/area/desert_dam/building/substation/northeast) "ejR" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -59575,12 +59531,28 @@ "eyL" = ( /turf/open/gm/empty, /area/shuttle/trijent_shuttle/engi) +"ezd" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/desert_dam/building/warehouse/loading) "eAe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 }, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) +"eBo" = ( +/obj/structure/closet/toolcloset, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, +/area/desert_dam/interior/dam_interior/workshop) "eBZ" = ( /obj/item/storage/fancy/vials/random, /obj/structure/surface/table/reinforced, @@ -59618,13 +59590,6 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) -"eJp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "bright_clean2" - }, -/area/desert_dam/building/warehouse/warehouse) "eKN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -59632,19 +59597,29 @@ icon_state = "cell_stripe" }, /area/desert_dam/interior/dam_interior/hanger) -"eLk" = ( -/obj/structure/closet/crate, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" +"eNo" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door/window/brigdoor/northleft{ + dir = 8 }, -/area/desert_dam/interior/lab_northeast/east_lab_excavation) +/turf/open/floor{ + icon_state = "dark2" + }, +/area/desert_dam/building/security/prison) "eNU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison{ icon_state = "whitepurple" }, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"eOH" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/cigarettes/kpack, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/prison{ + dir = 10 + }, +/area/desert_dam/interior/dam_interior/CE_office) "eRn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal10" @@ -59678,16 +59653,6 @@ icon_state = "green" }, /area/desert_dam/building/dorms/hallway_northwing) -"eXc" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet/toolcloset, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" - }, -/area/desert_dam/building/mining/workshop_foyer) "eXM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -59755,21 +59720,21 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"feh" = ( -/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/lz2{ - pixel_x = 32; - shuttleId = "trijentshuttle22" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/desert_dam/building/warehouse/loading) "feU" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/valley/valley_crashsite) +"ffh" = ( +/obj/structure/closet/crate/hydroponics/prespawned, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "vault" + }, +/area/desert_dam/building/hydroponics/hydroponics_storage) "fgo" = ( /obj/structure/platform/mineral/sandstone/runed{ dir = 1 @@ -59785,6 +59750,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) +"fhq" = ( +/obj/structure/surface/table, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/desert_dam/building/medical/virology_isolation) "fiW" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 @@ -59807,12 +59779,14 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) -"foO" = ( -/obj/structure/closet/athletic_mixed, +"fpn" = ( +/obj/structure/surface/table/woodentable, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "wood" + icon_state = "grimy" }, -/area/desert_dam/building/dorms/hallway_westwing) +/area/desert_dam/building/bar/bar) "fpu" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached9" @@ -59858,15 +59832,6 @@ icon_state = "wood" }, /area/desert_dam/building/dorms/hallway_westwing) -"ftR" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/desert_dam/interior/dam_interior/workshop) "fxs" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" @@ -59879,13 +59844,6 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/south_valley_dam) -"fyI" = ( -/obj/structure/surface/table, -/turf/open/floor/prison{ - dir = 1; - icon_state = "red" - }, -/area/desert_dam/building/water_treatment_one/lobby) "fyO" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ @@ -59893,6 +59851,21 @@ icon_state = "darkyellow2" }, /area/desert_dam/interior/dam_interior/garage) +"fzV" = ( +/obj/structure/closet/l3closet/security, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_marked" + }, +/area/desert_dam/building/security/armory) +"fAI" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + icon_state = "dark2" + }, +/area/desert_dam/building/administration/archives) "fBF" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -59908,6 +59881,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"fCP" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/interior/wood, +/area/desert_dam/building/security/detective) "fDh" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -59957,6 +59934,13 @@ icon_state = "bright_clean" }, /area/desert_dam/building/warehouse/loading) +"fIT" = ( +/obj/structure/closet, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitered" + }, +/area/desert_dam/building/medical/office2) "fNw" = ( /turf/open/desert/dirt{ dir = 4; @@ -59999,20 +59983,6 @@ icon_state = "sterile_white" }, /area/desert_dam/building/cafeteria/cafeteria) -"fTF" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "dark2" - }, -/area/desert_dam/building/administration/archives) -"fUu" = ( -/obj/structure/surface/table, -/obj/item/folder/yellow, -/obj/structure/machinery/light, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/desert_dam/building/substation/west) "fUO" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -60093,6 +60063,12 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/garage) +"ghU" = ( +/obj/structure/surface/table, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/lab_northeast/east_lab_workshop) "gls" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -60128,10 +60104,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) -"glU" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/wood, -/area/desert_dam/building/warehouse/breakroom) "gmZ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "warehouse_dam_3"; @@ -60170,13 +60142,6 @@ /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"gps" = ( -/obj/structure/closet/secure_closet/medical_doctor, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitered" - }, -/area/desert_dam/building/medical/office1) "gpZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/desert/rock/deep{ @@ -60230,6 +60195,16 @@ icon_state = "whiteyellow" }, /area/desert_dam/interior/dam_interior/garage) +"gxR" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/toolcloset, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" + }, +/area/desert_dam/building/mining/workshop_foyer) "gBV" = ( /obj/effect/landmark/crap_item, /obj/effect/decal/cleanable/dirt, @@ -60248,16 +60223,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) -"gDT" = ( -/obj/docking_port/stationary/trijent_elevator/occupied{ - id = "trijent_lz2"; - name = "Lz2 Elevator"; - airlock_area = /area/shuttle/trijent_shuttle/lz2; - elevator_network = "B"; - roundstart_template = /datum/map_template/shuttle/trijent_elevator/B +"gDS" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkred2" }, -/turf/open/gm/empty, -/area/shuttle/trijent_shuttle/lz2) +/area/desert_dam/interior/dam_interior/north_tunnel_entrance) "gEj" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -60265,12 +60237,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"gEp" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "whiteyellow" - }, -/area/desert_dam/interior/dam_interior/break_room) "gFr" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement_sunbleached{ @@ -60280,15 +60246,6 @@ "gGC" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/desert_dam/interior/caves/temple) -"gIQ" = ( -/obj/structure/surface/table, -/obj/item/clothing/head/welding, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/prison{ - dir = 8; - icon_state = "sterile_white" - }, -/area/desert_dam/building/hydroponics/hydroponics_breakroom) "gIS" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -60299,6 +60256,18 @@ icon_state = "rock4" }, /area/desert_dam/interior/caves/temple) +"gJe" = ( +/obj/structure/surface/table, +/obj/item/paper_bin, +/obj/item/tool/pen, +/turf/open/floor/prison, +/area/desert_dam/building/water_treatment_one/floodgate_control) +"gJE" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor{ + icon_state = "dark" + }, +/area/desert_dam/interior/dam_interior/office) "gKm" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached{ @@ -60333,6 +60302,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) +"gMv" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/desert_dam/building/medical/CMO) "gMN" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -60348,6 +60324,13 @@ icon_state = "wood" }, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"gNT" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/desert_dam/building/warehouse/warehouse) "gOE" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 6 @@ -60461,6 +60444,10 @@ icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/valley/south_valley_dam) +"hiw" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/desert_dam/building/warehouse/breakroom) "hiN" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -60522,12 +60509,6 @@ icon_state = "cement_sunbleached1" }, /area/desert_dam/exterior/valley/south_valley_dam) -"hsx" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison, -/area/desert_dam/building/water_treatment_one/control_room) "hvG" = ( /turf/open/desert/dirt{ dir = 4; @@ -60547,6 +60528,13 @@ icon_state = "cement_sunbleached13" }, /area/desert_dam/exterior/valley/valley_hydro) +"hyE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stool, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/desert_dam/building/warehouse/warehouse) "hyH" = ( /obj/structure/tunnel, /turf/open/desert/dirt, @@ -60600,12 +60588,24 @@ "hCf" = ( /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/south_valley_dam) +"hDO" = ( +/obj/structure/filingcabinet, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "whiteyellow" + }, +/area/desert_dam/interior/dam_interior/lobby) "hDT" = ( /obj/structure/flora/bush/desert/cactus{ icon_state = "cactus_4" }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) +"hEa" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/desert_dam/building/administration/office) "hEU" = ( /obj/effect/blocker/toxic_water/Group_1, /obj/structure/barricade/wooden{ @@ -60613,18 +60613,6 @@ }, /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/riverside_south) -"hGn" = ( -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/desert_dam/building/administration/overseer_office) -"hHz" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/interior/wood, -/area/desert_dam/building/security/marshals_office) -"hIy" = ( -/obj/structure/surface/table, -/turf/open/floor/prison, -/area/desert_dam/building/water_treatment_two/floodgate_control) "hIO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -60632,6 +60620,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"hLP" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" + }, +/area/desert_dam/interior/dam_interior/south_tunnel_entrance) "hMc" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached13" @@ -60727,11 +60722,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"ict" = ( -/obj/structure/surface/table/almayer, -/obj/item/spacecash/c10, -/turf/open/floor/wood, -/area/desert_dam/building/medical/break_room) "icM" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -60757,6 +60747,12 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/garage) +"igd" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, +/area/desert_dam/interior/dam_interior/workshop) "igf" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -60781,18 +60777,16 @@ "ioA" = ( /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/caves/temple) -"ioO" = ( -/obj/structure/surface/table/reinforced, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves{ - pixel_x = 6; - pixel_y = 10 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +"ipQ" = ( +/obj/docking_port/stationary/trijent_elevator/empty{ + id = "trijent_omega"; + name = "Omega Elevator"; + airlock_exit = "east"; + airlock_area = /area/shuttle/trijent_shuttle/omega; + elevator_network = "B" }, -/area/desert_dam/building/medical/treatment_room) +/turf/open/gm/empty, +/area/shuttle/trijent_shuttle/omega) "iqs" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/liquidfood, @@ -60859,6 +60853,13 @@ icon_state = "rock4" }, /area/desert_dam/interior/caves/temple) +"ivA" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkred2" + }, +/area/desert_dam/interior/dam_interior/north_tunnel_entrance) "ivQ" = ( /obj/structure/xenoautopsy/tank/broken, /turf/open/desert/rock/deep{ @@ -60908,13 +60909,10 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_wilderness) -"iHo" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - dir = 1; - icon_state = "darkred2" - }, -/area/desert_dam/building/administration/lobby) +"iHi" = ( +/obj/item/trash/semki, +/turf/open/floor/plating, +/area/desert_dam/interior/dam_interior/disposals) "iNg" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 2; @@ -60941,13 +60939,10 @@ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/valley/valley_hydro) -"iRs" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkpurple2" - }, -/area/desert_dam/interior/lab_northeast/east_lab_biology) +"iQG" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood, +/area/desert_dam/building/administration/overseer_office) "iRU" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -60957,6 +60952,13 @@ icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/valley/valley_civilian) +"iSj" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkpurple2" + }, +/area/desert_dam/interior/lab_northeast/east_lab_biology) "iTi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -60991,6 +60993,10 @@ dir = 10 }, /area/desert_dam/interior/dam_interior/hanger) +"iXA" = ( +/obj/structure/surface/table, +/turf/open/floor/prison, +/area/desert_dam/building/water_treatment_two/floodgate_control) "iYy" = ( /obj/structure/surface/table, /obj/item/device/lightreplacer, @@ -61020,10 +61026,49 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/telecomm/lz2_storage) +"jde" = ( +/obj/structure/surface/table, +/obj/item/ashtray/bronze{ + pixel_x = -7 + }, +/obj/item/clothing/mask/cigarette, +/obj/item/clothing/mask/cigarette{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor{ + dir = 9; + icon_state = "whiteyellow" + }, +/area/desert_dam/interior/dam_interior/garage) "jfA" = ( /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"jjq" = ( +/obj/structure/closet/bombclosetsecurity, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/desert_dam/building/security/staffroom) +"jkn" = ( +/obj/structure/closet/secure_closet/security, +/obj/item/clothing/suit/armor/vest/security, +/turf/open/floor/prison{ + dir = 10; + icon_state = "red" + }, +/area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"jlq" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/dam_interior/primary_tool_storage) "jlP" = ( /obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, @@ -61039,6 +61084,17 @@ icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/valley/valley_hydro) +"jqQ" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/item/storage/box/gloves{ + pixel_x = -5; + pixel_y = -5 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitered" + }, +/area/desert_dam/building/medical/surgery_room_one) "jrV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, @@ -61063,21 +61119,6 @@ icon_state = "bright_clean" }, /area/desert_dam/building/mining/workshop) -"juT" = ( -/obj/structure/surface/table, -/obj/item/ashtray/bronze{ - pixel_x = -7 - }, -/obj/item/clothing/mask/cigarette, -/obj/item/clothing/mask/cigarette{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor{ - dir = 9; - icon_state = "whiteyellow" - }, -/area/desert_dam/interior/dam_interior/garage) "jvZ" = ( /obj/structure/platform{ dir = 1 @@ -61105,20 +61146,15 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_crashsite) -"jyu" = ( -/obj/docking_port/stationary/trijent_elevator/occupied{ - id = "trijent_lz1"; - name = "Lz1 Elevator"; - elevator_network = "A"; - airlock_area = /area/shuttle/trijent_shuttle/lz1; - roundstart_template = /datum/map_template/shuttle/trijent_elevator/A +"jAA" = ( +/obj/structure/surface/table, +/obj/item/clothing/head/welding, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/prison{ + dir = 8; + icon_state = "sterile_white" }, -/turf/open/gm/empty, -/area/shuttle/trijent_shuttle/lz1) -"jAk" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/wood, -/area/desert_dam/building/administration/overseer_office) +/area/desert_dam/building/hydroponics/hydroponics_breakroom) "jAS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached{ @@ -61157,23 +61193,6 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/valley_telecoms) -"jMe" = ( -/obj/structure/bed/stool, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/smes_backup) -"jMG" = ( -/obj/docking_port/stationary/trijent_elevator/empty{ - id = "trijent_engineering"; - name = "Engineering Elevator"; - airlock_exit = "east"; - airlock_area = /area/shuttle/trijent_shuttle/engi; - elevator_network = "A" - }, -/turf/open/gm/empty, -/area/shuttle/trijent_shuttle/engi) "jMT" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -61192,22 +61211,6 @@ icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/valley/valley_hydro) -"jPl" = ( -/obj/structure/closet/l3closet/security, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_marked" - }, -/area/desert_dam/building/security/armory) -"jQS" = ( -/obj/structure/closet, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitered" - }, -/area/desert_dam/building/medical/office2) "jSS" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -61222,13 +61225,6 @@ icon_state = "floor_plate" }, /area/desert_dam/interior/dam_interior/hanger) -"jTZ" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 6; - icon_state = "red" - }, -/area/desert_dam/building/water_treatment_two/lobby) "jVa" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -61249,10 +61245,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) -"jWV" = ( -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/interior/wood/alt, -/area/desert_dam/building/security/detective) "jXv" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -61293,6 +61285,23 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_crashsite) +"khO" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean" + }, +/area/desert_dam/interior/dam_interior/primary_tool_storage) +"kin" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "dark2" + }, +/area/desert_dam/building/administration/archives) "kiy" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -61336,6 +61345,18 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/security/detective) +"ksy" = ( +/obj/structure/closet/secure_closet/injection, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/turf/open/floor/prison, +/area/desert_dam/building/security/execution_chamber) "ktJ" = ( /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/interior/caves/temple) @@ -61360,6 +61381,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) +"kDV" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/desert_dam/building/security/evidence) "kEq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -61384,17 +61411,32 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/garage) +"kGV" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door/window/brigdoor/northleft{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean2" + }, +/area/desert_dam/building/medical/lobby) +"kHO" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/item/storage/box/gloves{ + pixel_x = -5; + pixel_y = -5 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitered" + }, +/area/desert_dam/building/medical/surgery_room_two) "kIl" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached13" }, /area/desert_dam/exterior/valley/bar_valley_dam) -"kIB" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/desert_dam/building/water_treatment_one/equipment) "kIP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached, @@ -61475,6 +61517,13 @@ /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"laq" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + dir = 1; + icon_state = "darkred2" + }, +/area/desert_dam/building/administration/lobby) "lcj" = ( /turf/closed/wall/hangar{ name = "Elevator Shaft"; @@ -61539,6 +61588,18 @@ icon_state = "whitegreen" }, /area/desert_dam/building/medical/north_wing_hallway) +"lji" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/light, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/desert_dam/building/security/lobby) "ljO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/dam/van{ @@ -61585,17 +61646,17 @@ /obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"lsn" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "whiteyellow" - }, -/area/desert_dam/building/water_treatment_one/breakroom) "ltE" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) +"lua" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison, +/area/desert_dam/building/water_treatment_one/control_room) "lwh" = ( /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/engi{ pixel_x = -32 @@ -61629,12 +61690,16 @@ icon_state = "floor_marked" }, /area/desert_dam/building/cafeteria/loading) -"lDf" = ( -/obj/structure/surface/table, +"lAT" = ( +/obj/structure/closet/lasertag/blue, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/prison{ - dir = 10 + dir = 1; + icon_state = "blue" }, -/area/desert_dam/interior/lab_northeast/east_lab_RND) +/area/desert_dam/building/dorms/pool) "lDT" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, @@ -61729,6 +61794,14 @@ icon_state = "carpet15-15" }, /area/desert_dam/building/administration/office) +"lUN" = ( +/obj/structure/surface/table, +/obj/item/folder/yellow, +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/desert_dam/building/substation/west) "lUU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/dirt{ @@ -61773,6 +61846,16 @@ icon_state = "cement_sunbleached18" }, /area/desert_dam/exterior/valley/valley_labs) +"mej" = ( +/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/lz2{ + pixel_x = 32; + shuttleId = "trijentshuttle22" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/desert_dam/building/warehouse/loading) "meN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -61873,10 +61956,6 @@ icon_state = "multi_tiles" }, /area/desert_dam/interior/caves/temple) -"mvZ" = ( -/obj/item/trash/semki, -/turf/open/floor/plating, -/area/desert_dam/interior/dam_interior/disposals) "myx" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison{ @@ -61934,6 +62013,13 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) +"mEJ" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkred2" + }, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "mEV" = ( /obj/structure/machinery/light, /turf/open/desert/rock/deep/transition{ @@ -61961,20 +62047,6 @@ icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/telecomm/lz2_storage) -"mIc" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/door/window/brigdoor/westleft{ - name = "Security Desk" - }, -/obj/structure/machinery/door/window/eastright{ - name = "Security Desk" - }, -/obj/item/tool/stamp, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/prison{ - dir = 10 - }, -/area/desert_dam/interior/dam_interior/north_tunnel_entrance) "mKs" = ( /turf/closed/wall/rock/orange, /area/desert_dam/exterior/valley/valley_telecoms) @@ -62001,18 +62073,6 @@ icon_state = "sterile_white" }, /area/desert_dam/building/cafeteria/cafeteria) -"mOP" = ( -/obj/structure/closet/secure_closet/injection, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/turf/open/floor/prison, -/area/desert_dam/building/security/execution_chamber) "mOS" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement, @@ -62075,6 +62135,16 @@ "ncm" = ( /turf/open/desert/rock/deep, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) +"ndA" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/mineral/phoron{ + amount = 50 + }, +/turf/open/floor/plating{ + dir = 4; + icon_state = "warnplate" + }, +/area/desert_dam/building/substation/west) "ndP" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -62083,6 +62153,12 @@ }, /turf/open/desert/rock, /area/desert_dam/interior/caves/temple) +"nez" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, +/area/desert_dam/building/cafeteria/cafeteria) "ngo" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal10" @@ -62108,13 +62184,6 @@ icon_state = "dirt2" }, /area/desert_dam/exterior/valley/valley_crashsite) -"nkj" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/garage) "nlH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -62140,14 +62209,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) -"nnh" = ( -/obj/structure/filingcabinet/security, -/turf/open/floor/interior/wood, -/area/desert_dam/building/security/marshals_office) -"nor" = ( -/obj/structure/closet/secure_closet/medical_doctor, -/turf/open/floor/wood, -/area/desert_dam/building/medical/CMO) "nsf" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" @@ -62185,20 +62246,10 @@ /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) -"nAt" = ( -/obj/structure/surface/table, -/obj/item/paper_bin, -/obj/item/tool/pen, -/turf/open/floor/prison, -/area/desert_dam/building/water_treatment_one/floodgate_control) "nCi" = ( /obj/item/stack/medical/advanced/ointment/predator, /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/caves/temple) -"nDM" = ( -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/desert_dam/building/warehouse/breakroom) "nEM" = ( /turf/closed/wall/hangar{ name = "Elevator Shaft"; @@ -62217,6 +62268,13 @@ icon_state = "green" }, /area/desert_dam/building/dorms/hallway_northwing) +"nIG" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor{ + dir = 1; + icon_state = "darkred2" + }, +/area/desert_dam/building/administration/lobby) "nJZ" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -62236,6 +62294,12 @@ icon_state = "floor_marked" }, /area/desert_dam/building/cafeteria/loading) +"nRL" = ( +/obj/structure/closet/secure_closet/scientist, +/turf/open/floor{ + icon_state = "wood" + }, +/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "nRV" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -62266,7 +62330,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"nWT" = ( +"nWZ" = ( /obj/structure/closet/secure_closet/security, /obj/item/clothing/suit/armor/vest/security, /turf/open/floor/prison{ @@ -62345,21 +62409,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) -"ogQ" = ( -/obj/structure/surface/table, +"ogX" = ( +/obj/structure/closet/secure_closet/engineering_electrical, /obj/structure/machinery/light{ - dir = 8 + dir = 4 }, -/turf/open/floor/prison, -/area/desert_dam/building/hydroponics/hydroponics) -"ohM" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/kpack, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison{ - dir = 10 + dir = 5; + icon_state = "darkbrown2" }, -/area/desert_dam/interior/dam_interior/CE_office) +/area/desert_dam/interior/dam_interior/auxilary_tool_storage) "oit" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt{ @@ -62438,36 +62497,6 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"oyp" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/omega{ - pixel_y = 32; - shuttleId = "trijentshuttle22" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "sterile_white" - }, -/area/desert_dam/exterior/valley/valley_medical) -"oyr" = ( -/obj/structure/surface/table, -/obj/item/stack/sheet/metal{ - amount = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/smes_main) "ozu" = ( /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) @@ -62477,11 +62506,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) -"oAX" = ( -/obj/structure/surface/table/woodentable, -/obj/item/ammo_magazine/shotgun/slugs, -/turf/open/floor/interior/wood, -/area/desert_dam/interior/dam_interior/east_tunnel_entrance) "oBR" = ( /obj/structure/disposalpipe/segment, /turf/open/asphalt, @@ -62520,6 +62544,12 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"oJb" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + icon_state = "dark" + }, +/area/desert_dam/interior/dam_interior/office) "oJw" = ( /turf/open/desert/dirt{ dir = 8; @@ -62555,14 +62585,6 @@ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/valley/valley_hydro) -"oUk" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/desert_dam/building/substation/northwest) "oUr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/desert/dirt, @@ -62578,6 +62600,18 @@ icon_state = "wood" }, /area/desert_dam/building/dorms/hallway_northwing) +"oVH" = ( +/obj/structure/surface/table/reinforced, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 6; + pixel_y = 10 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/desert_dam/building/medical/treatment_room) "oXx" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt{ @@ -62603,6 +62637,13 @@ icon_state = "bright_clean" }, /area/desert_dam/exterior/telecomm/lz1_valley) +"oZM" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + dir = 6; + icon_state = "red" + }, +/area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "pac" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -62616,6 +62657,10 @@ /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"paT" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/interior/wood, +/area/desert_dam/building/security/marshals_office) "pba" = ( /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, @@ -62639,6 +62684,16 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/interior/caves/central_caves) +"pif" = ( +/obj/docking_port/stationary/trijent_elevator/empty{ + id = "trijent_engineering"; + name = "Engineering Elevator"; + airlock_exit = "east"; + airlock_area = /area/shuttle/trijent_shuttle/engi; + elevator_network = "A" + }, +/turf/open/gm/empty, +/area/shuttle/trijent_shuttle/engi) "pij" = ( /turf/open/desert/dirt{ dir = 6; @@ -62649,24 +62704,17 @@ /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) -"plo" = ( -/obj/structure/flora/grass/desert/lightgrass_1, -/turf/open/desert/dirt, -/area/desert_dam/exterior/telecomm/lz1_xenoflora) -"pmt" = ( +"pkl" = ( /obj/structure/closet/secure_closet/medical_doctor, /turf/open/floor/prison{ dir = 1; icon_state = "whitered" }, /area/desert_dam/building/medical/chemistry) -"pnx" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/garage) +"plo" = ( +/obj/structure/flora/grass/desert/lightgrass_1, +/turf/open/desert/dirt, +/area/desert_dam/exterior/telecomm/lz1_xenoflora) "poi" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/cleanable/dirt, @@ -62721,12 +62769,16 @@ icon_state = "darkyellow2" }, /area/desert_dam/building/mining/workshop) -"pwI" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - icon_state = "dark" +"pwW" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/area/desert_dam/interior/dam_interior/office) +/obj/structure/surface/table, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/desert_dam/building/medical/virology_wing) "pyP" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -62833,6 +62885,13 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) +"pKS" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/dam_interior/garage) "pLm" = ( /turf/open/desert/dirt{ dir = 5; @@ -62854,19 +62913,6 @@ icon_state = "cement_sunbleached3" }, /area/desert_dam/exterior/valley/valley_civilian) -"pPu" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkred2" - }, -/area/desert_dam/interior/dam_interior/north_tunnel_entrance) -"pRy" = ( -/obj/structure/closet/bombclosetsecurity, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/desert_dam/building/security/staffroom) "pSM" = ( /obj/effect/landmark/nightmare{ insert_tag = "purple-new-bridge" @@ -62911,19 +62957,6 @@ icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/valley/valley_crashsite) -"qaH" = ( -/obj/structure/closet/athletic_mixed, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/desert_dam/building/dorms/pool) "qbC" = ( /obj/structure/surface/table/woodentable, /turf/open/floor/wood, @@ -62935,29 +62968,32 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"qdy" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/desert_dam/building/administration/control_room) "qfI" = ( /obj/structure/flora/bush/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"qgK" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 4; - icon_state = "red" - }, -/area/desert_dam/interior/dam_interior/south_tunnel_entrance) -"qiG" = ( -/obj/structure/surface/table, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/desert_dam/building/medical/virology_isolation) "qjg" = ( /turf/open/desert/rock/deep/transition{ dir = 6 }, /area/desert_dam/interior/caves/temple) +"qkE" = ( +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/interior/wood/alt, +/area/desert_dam/building/security/detective) "qkJ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -63001,6 +63037,11 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_crashsite) +"qnO" = ( +/obj/structure/surface/table/woodentable, +/obj/item/ammo_magazine/shotgun/slugs, +/turf/open/floor/interior/wood, +/area/desert_dam/interior/dam_interior/east_tunnel_entrance) "qoJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/asphalt/cement_sunbleached{ @@ -63024,20 +63065,6 @@ icon_state = "cement_sunbleached13" }, /area/desert_dam/exterior/valley/valley_labs) -"quS" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/clothing/suit/armor/vest/security, -/turf/open/floor/prison{ - dir = 10; - icon_state = "red" - }, -/area/desert_dam/interior/lab_northeast/east_lab_west_entrance) -"qwO" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor{ - icon_state = "dark" - }, -/area/desert_dam/interior/dam_interior/office) "qwZ" = ( /obj/structure/bed/chair, /obj/effect/landmark/survivor_spawner, @@ -63085,6 +63112,10 @@ icon_state = "cement_sunbleached3" }, /area/desert_dam/exterior/valley/valley_crashsite) +"qCu" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/desert_dam/building/administration/overseer_office) "qCR" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt{ @@ -63097,17 +63128,6 @@ icon_state = "cement_sunbleached18" }, /area/desert_dam/exterior/valley/south_valley_dam) -"qEl" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean" - }, -/area/desert_dam/interior/dam_interior/primary_tool_storage) "qEJ" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/cleanable/dirt, @@ -63123,19 +63143,6 @@ /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) -"qHW" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "redcorner" - }, -/area/desert_dam/interior/dam_interior/south_tunnel_entrance) -"qIu" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - dir = 6; - icon_state = "red" - }, -/area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "qJI" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -63206,6 +63213,20 @@ icon_state = "cement_sunbleached18" }, /area/desert_dam/exterior/valley/south_valley_dam) +"qUv" = ( +/obj/structure/bed/stool, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/dam_interior/smes_backup) +"qUT" = ( +/obj/structure/closet/secure_closet/RD, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "qVN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -63226,6 +63247,19 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/control_room) +"ral" = ( +/obj/structure/closet/athletic_mixed, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/desert_dam/building/dorms/pool) "ray" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/desertdam/decals/road_edge{ @@ -63287,6 +63321,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/desert_dam/building/cafeteria/loading) +"rmj" = ( +/obj/structure/surface/table/almayer, +/obj/item/spacecash/c10, +/turf/open/floor/wood, +/area/desert_dam/building/medical/break_room) "rmo" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -63295,13 +63334,6 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/bar_valley_dam) -"rnV" = ( -/obj/structure/surface/table, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" - }, -/area/desert_dam/building/substation/northeast) "rob" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -63328,6 +63360,13 @@ icon_state = "bluecorner" }, /area/desert_dam/interior/dam_interior/tech_storage) +"rqX" = ( +/obj/structure/closet/crate, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/desert_dam/interior/lab_northeast/east_lab_excavation) "rtW" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt/cement_sunbleached{ @@ -63349,6 +63388,22 @@ }, /turf/open/desert/rock/deep, /area/desert_dam/interior/caves/temple) +"rxb" = ( +/obj/structure/closet/l3closet/virology, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/desert_dam/building/water_treatment_one/equipment) +"rxS" = ( +/obj/docking_port/stationary/trijent_elevator/occupied{ + id = "trijent_lz1"; + name = "Lz1 Elevator"; + elevator_network = "A"; + airlock_area = /area/shuttle/trijent_shuttle/lz1; + roundstart_template = /datum/map_template/shuttle/trijent_elevator/A + }, +/turf/open/gm/empty, +/area/shuttle/trijent_shuttle/lz1) "ryG" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ @@ -63380,16 +63435,6 @@ icon_state = "darkyellow2" }, /area/desert_dam/building/mining/workshop) -"rBL" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/door/window/brigdoor/northleft{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean2" - }, -/area/desert_dam/building/medical/lobby) "rBP" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 10 @@ -63460,18 +63505,15 @@ icon_state = "warning" }, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) -"rNO" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/machinery/light, +"rPh" = ( +/obj/structure/surface/table, +/obj/item/device/autopsy_scanner, +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 8; + icon_state = "sterile_white" }, -/area/desert_dam/building/security/lobby) +/area/desert_dam/building/medical/morgue) "rPp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -63491,6 +63533,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"rRt" = ( +/obj/structure/closet/athletic_mixed, +/turf/open/floor{ + icon_state = "wood" + }, +/area/desert_dam/building/dorms/hallway_westwing) "rTP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -63565,6 +63613,14 @@ icon_state = "whiteyellow" }, /area/desert_dam/interior/dam_interior/garage) +"sda" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/desert_dam/building/substation/northwest) "sdq" = ( /obj/structure/platform{ dir = 8 @@ -63591,15 +63647,6 @@ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/valley/south_valley_dam) -"shZ" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/tech_supply, -/obj/item/handset, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "sia" = ( /turf/open/desert/dirt{ icon_state = "desert_transition_corner1" @@ -63665,12 +63712,6 @@ icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/valley/valley_crashsite) -"srU" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "wood" - }, -/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "ssy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -63711,19 +63752,6 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_hydro) -"sBw" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/wood, -/area/desert_dam/building/administration/office) -"sCf" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/door/window/brigdoor/northleft{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "dark2" - }, -/area/desert_dam/building/security/prison) "sDf" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ @@ -63749,6 +63777,33 @@ /obj/structure/prop/dam/boulder/boulder3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"sIK" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "whiteyellow" + }, +/area/desert_dam/interior/dam_interior/break_room) +"sJY" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/dam_interior/garage) +"sKe" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door/window/brigdoor/westleft{ + name = "Security Desk" + }, +/obj/structure/machinery/door/window/eastright{ + name = "Security Desk" + }, +/obj/item/tool/stamp, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/prison{ + dir = 10 + }, +/area/desert_dam/interior/dam_interior/north_tunnel_entrance) "sLx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -63817,12 +63872,6 @@ "sUr" = ( /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) -"sVj" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/desert_dam/building/cafeteria/cafeteria) "sWS" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -63834,6 +63883,19 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) +"sXm" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tech_supply, +/obj/item/handset, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/desert_dam/interior/lab_northeast/east_lab_RND) +"sXn" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood, +/area/desert_dam/building/warehouse/breakroom) "sXM" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -63906,16 +63968,6 @@ }, /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/caves/temple) -"tfA" = ( -/obj/docking_port/stationary/trijent_elevator/empty{ - id = "trijent_omega"; - name = "Omega Elevator"; - airlock_exit = "east"; - airlock_area = /area/shuttle/trijent_shuttle/omega; - elevator_network = "B" - }, -/turf/open/gm/empty, -/area/shuttle/trijent_shuttle/omega) "thd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -63933,13 +63985,6 @@ /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz2_storage) -"tjz" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkred2" - }, -/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "tjX" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, @@ -63966,29 +64011,12 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"tos" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor{ - dir = 1; - icon_state = "darkred2" - }, -/area/desert_dam/building/administration/lobby) -"tpV" = ( -/obj/structure/machinery/light{ - dir = 1 - }, +"toU" = ( /obj/structure/surface/table, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/desert_dam/building/medical/virology_wing) -"trt" = ( -/obj/structure/closet/secure_closet/scientist, /turf/open/floor{ - icon_state = "wood" + icon_state = "whiteyellow" }, -/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +/area/desert_dam/building/water_treatment_one/breakroom) "trP" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt, @@ -64011,10 +64039,6 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/garage) -"tvi" = ( -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/desert_dam/building/administration/office) "tyc" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -64049,6 +64073,12 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"tCK" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "wood" + }, +/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "tEn" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -64087,6 +64117,14 @@ /obj/effect/decal/remains/human, /turf/open/desert/rock, /area/desert_dam/interior/caves/temple) +"tJG" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/briefcase, +/turf/open/floor{ + dir = 8; + icon_state = "carpet13-5" + }, +/area/desert_dam/building/administration/overseer_office) "tKQ" = ( /turf/open/desert/dirt{ icon_state = "rock1" @@ -64145,26 +64183,12 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/bar_valley_dam) -"tWm" = ( -/obj/item/trash/cheesie, -/turf/open/floor/interior/tatami, -/area/desert_dam/building/bar/bar) "tXS" = ( /turf/open/desert/dirt{ dir = 1; icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/south_valley_dam) -"tYH" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" - }, -/area/desert_dam/interior/dam_interior/auxilary_tool_storage) "tZQ" = ( /turf/closed/wall/r_wall, /area/desert_dam/exterior/rock) @@ -64172,6 +64196,15 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"ucS" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tech_supply, +/obj/effect/spawner/random/tech_supply, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/desert_dam/building/substation/southwest) "uez" = ( /turf/closed/wall/hangar{ name = "reinforced metal wall" @@ -64198,6 +64231,13 @@ "ufW" = ( /turf/closed/wall/mineral/sandstone/runed, /area/desert_dam/exterior/rock) +"ugJ" = ( +/obj/structure/surface/table, +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" + }, +/area/desert_dam/building/water_treatment_one/lobby) "uhf" = ( /turf/open/desert/desert_shore/desert_shore1{ dir = 1 @@ -64246,19 +64286,13 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) -"uqu" = ( -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/surface/table/reinforced, -/obj/item/paper_bin, -/obj/item/tool/pen/blue, -/obj/effect/decal/cleanable/dirt, +"umo" = ( +/obj/structure/filingcabinet, /turf/open/floor/prison{ - icon_state = "bright_clean2" + dir = 5; + icon_state = "red" }, -/area/desert_dam/building/administration/control_room) +/area/desert_dam/building/water_treatment_one/lobby) "uso" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -64311,6 +64345,18 @@ /obj/item/tool/pickaxe, /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) +"uDU" = ( +/obj/structure/safe, +/obj/item/weapon/sword/katana/replica, +/obj/item/reagent_container/food/drinks/bottle/absinthe, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/desert_dam/interior/dam_interior/tech_storage) "uFX" = ( /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_hydro) @@ -64337,13 +64383,6 @@ }, /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/caves/temple) -"uLl" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkred2" - }, -/area/desert_dam/interior/dam_interior/north_tunnel_entrance) "uLr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64411,12 +64450,12 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) -"uUB" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - icon_state = "dark2" +"uUW" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "redcorner" }, -/area/desert_dam/building/administration/archives) +/area/desert_dam/interior/dam_interior/south_tunnel_entrance) "uVm" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached{ @@ -64449,6 +64488,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"vdp" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/phoron{ + amount = 25 + }, +/obj/item/stack/sheet/plasteel{ + amount = 30; + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/item/storage/briefcase/inflatable, +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" + }, +/area/desert_dam/interior/dam_interior/atmos_storage) "vfr" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt{ @@ -64485,12 +64543,6 @@ /obj/structure/fence, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"vlZ" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/desert_dam/building/security/evidence) "vnf" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -64524,6 +64576,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"vqJ" = ( +/obj/structure/closet/secure_closet/medical_doctor, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitered" + }, +/area/desert_dam/building/medical/office1) "vqR" = ( /obj/structure/desertdam/decals/road_stop{ dir = 8; @@ -64542,6 +64601,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) +"vto" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/desert_dam/interior/dam_interior/primary_tool_storage) "vud" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt{ @@ -64559,23 +64625,12 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) -"vwv" = ( -/obj/structure/closet/secure_closet/RD, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "vxt" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor{ icon_state = "freezerfloor" }, /area/desert_dam/building/water_treatment_one/breakroom) -"vzd" = ( -/obj/structure/filingcabinet/security, -/turf/open/floor/interior/wood, -/area/desert_dam/building/security/detective) "vzj" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached18" @@ -64664,12 +64719,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"vLa" = ( -/obj/structure/closet/l3closet/security, -/turf/open/floor/prison{ - icon_state = "floor_marked" - }, -/area/desert_dam/building/security/armory) "vLd" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal11" @@ -64681,12 +64730,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/shuttle/plating, /area/desert_dam/interior/dam_interior/hanger) -"vLS" = ( -/obj/structure/surface/table, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/lab_northeast/east_lab_workshop) "vMp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -64712,6 +64755,12 @@ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_one) +"vSw" = ( +/obj/structure/surface/table, +/turf/open/floor/prison{ + dir = 10 + }, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "vSF" = ( /turf/open/desert/dirt{ dir = 8; @@ -64787,6 +64836,22 @@ icon_state = "desert_transition_corner1" }, /area/desert_dam/exterior/valley/bar_valley_dam) +"wiz" = ( +/obj/structure/machinery/power/apc{ + dir = 4; + pixel_x = 28; + start_charge = 0 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/desert_dam/building/medical/emergency_room) "wiF" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/prison{ @@ -64802,6 +64867,10 @@ icon_state = "darkyellow2" }, /area/desert_dam/interior/dam_interior/garage) +"wjd" = ( +/obj/item/trash/cheesie, +/turf/open/floor/interior/tatami, +/area/desert_dam/building/bar/bar) "wjC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64812,30 +64881,24 @@ icon_state = "floor_marked" }, /area/desert_dam/building/cafeteria/loading) -"wla" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tech_supply, -/obj/effect/spawner/random/tech_supply, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/desert_dam/building/substation/southwest) "woy" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/garage) -"wpS" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/item/storage/box/gloves{ - pixel_x = -5; - pixel_y = -5 +"wpN" = ( +/obj/structure/surface/table, +/obj/item/stack/sheet/metal{ + amount = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitered" + dir = 1; + icon_state = "darkyellow2" }, -/area/desert_dam/building/medical/surgery_room_two) +/area/desert_dam/interior/dam_interior/smes_main) "wpW" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, @@ -64883,26 +64946,6 @@ /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) -"wvL" = ( -/obj/structure/closet/lasertag/blue, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/desert_dam/building/dorms/pool) -"wxV" = ( -/obj/structure/closet/crate/hydroponics/prespawned, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "vault" - }, -/area/desert_dam/building/hydroponics/hydroponics_storage) "wya" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -64929,16 +64972,6 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel) -"wzC" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/mineral/phoron{ - amount = 50 - }, -/turf/open/floor/plating{ - dir = 4; - icon_state = "warnplate" - }, -/area/desert_dam/building/substation/west) "wAP" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" @@ -64986,13 +65019,6 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/south_valley_dam) -"wOY" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean" - }, -/area/desert_dam/building/warehouse/loading) "wPb" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -65042,13 +65068,10 @@ icon_state = "cement_sunbleached2" }, /area/desert_dam/exterior/valley/valley_hydro) -"wSB" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/desert_dam/interior/dam_interior/primary_tool_storage) +"wTz" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/wood, +/area/desert_dam/building/administration/overseer_office) "wTP" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/phoron{ @@ -65067,6 +65090,10 @@ dir = 10 }, /area/desert_dam/interior/dam_interior/atmos_storage) +"wWE" = ( +/obj/structure/closet/secure_closet/medical_doctor, +/turf/open/floor/wood, +/area/desert_dam/building/medical/CMO) "wYO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -65233,13 +65260,6 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_northwest) -"xrF" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/desert_dam/building/warehouse/warehouse) "xss" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -65280,12 +65300,13 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_telecoms) -"xwq" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor{ - icon_state = "whitepurplecorner" +"xxd" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 6; + icon_state = "red" }, -/area/desert_dam/building/medical/chemistry) +/area/desert_dam/building/water_treatment_two/lobby) "xxv" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -65301,13 +65322,6 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/telecomm/lz1_valley) -"xyt" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/desert_dam/building/medical/CMO) "xzc" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -65322,6 +65336,10 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/valley_medical) +"xBw" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/interior/wood, +/area/desert_dam/building/security/marshals_office) "xBM" = ( /turf/open/desert/rock/deep/transition{ dir = 5 @@ -65384,6 +65402,13 @@ icon_state = "bright_clean" }, /area/desert_dam/interior/dam_interior/garage) +"xKC" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison, +/area/desert_dam/building/hydroponics/hydroponics) "xLS" = ( /obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, @@ -65395,14 +65420,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_central_north) -"xNc" = ( -/obj/structure/filingcabinet, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 8; - icon_state = "whiteyellow" - }, -/area/desert_dam/interior/dam_interior/lobby) "xNB" = ( /obj/structure/machinery/floodlight/landing, /obj/structure/machinery/landinglight/ds1{ @@ -65426,14 +65443,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"xQX" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/briefcase, -/turf/open/floor{ - dir = 8; - icon_state = "carpet13-5" - }, -/area/desert_dam/building/administration/overseer_office) "xTH" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -65478,15 +65487,6 @@ dir = 8 }, /area/desert_dam/exterior/valley/valley_telecoms) -"yaK" = ( -/obj/structure/surface/table, -/obj/item/device/autopsy_scanner, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison{ - dir = 8; - icon_state = "sterile_white" - }, -/area/desert_dam/building/medical/morgue) "ybA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" @@ -67855,7 +67855,7 @@ cmm cte ctB cuA -fUu +lUN cgm cgm cgm @@ -68078,7 +68078,7 @@ dTs cgm cic cic -wzC +ndA cgm cku cml @@ -71041,7 +71041,7 @@ bzi bzi bMw bLW -dye +igd bLW bNZ bLW @@ -71523,8 +71523,8 @@ bVb bLU dTs arF -pnx -nkj +pKS +sJY ylT glz iCw @@ -71992,7 +71992,7 @@ bLU dTs dTs arF -juT +jde ixe scv scv @@ -72444,7 +72444,7 @@ bSg bJf bKp byo -ftR +eBo bLW bLW bLW @@ -73187,7 +73187,7 @@ aSU aVp bdz bjj -rNO +lji bnF bpi bqn @@ -73438,7 +73438,7 @@ bGE bIW bNE bNF -sCf +eNo bNF bNE bNF @@ -73662,7 +73662,7 @@ bqx bom bsm aWK -vlZ +kDV bpN bBb bDE @@ -73865,7 +73865,7 @@ bLW bXS bYy bYY -mvZ +iHi ccy cbe cbO @@ -74192,7 +74192,7 @@ dTs dTs dTs bvA -xrF +gNT cmS cnV cmS @@ -74789,7 +74789,7 @@ bzB bKr bEr bOR -qwO +gJE bQZ bRU bOR @@ -74821,9 +74821,9 @@ chG ceA ceA aVB -vzd +fCP aZL -jWV +qkE bjR aXM aVB @@ -74912,7 +74912,7 @@ cYG dbe ddL deW -eJp +hyE aNo aNK bvA @@ -75023,7 +75023,7 @@ bHS bKr bEp bRk -pwI +oJb bRX bRV bRk @@ -75523,7 +75523,7 @@ chG ceA bnv aVM -hHz +xBw aZM beo bjS @@ -75757,7 +75757,7 @@ chG ceA ceA aVM -nnh +paT aZM bes bkG @@ -77329,7 +77329,7 @@ fmP fmP fmP fmP -jyu +rxS lcj dTs dTs @@ -77748,7 +77748,7 @@ aOc aOc aRg aRE -oUk +sda bFq aTh aOc @@ -77762,7 +77762,7 @@ aWl aWl aex aYL -uqu +qdy bdE bdE aYv @@ -78353,7 +78353,7 @@ bHI bJI bJP bNw -jPl +fzV bSx bRF bYq @@ -78587,7 +78587,7 @@ bHJ bJI bJS bNw -vLa +eaN bSx bRF bRF @@ -78821,7 +78821,7 @@ bHK bJI bJS bNw -vLa +eaN bSx bRF bYr @@ -78970,7 +78970,7 @@ lcj lcj lcj blZ -bmo +uDU bmG bCU bnT @@ -79065,7 +79065,7 @@ bNw bZw bZw bZw -mOP +ksy bZJ bZJ bZw @@ -79159,7 +79159,7 @@ dTs dTs dTs aVm -tvi +hEa aWq aWq aWq @@ -79915,7 +79915,7 @@ bpB bqL brN blZ -tYH +ogX boB boB bxn @@ -80095,7 +80095,7 @@ dTs dTs dTs aVm -sBw +dtV aWq aWq aWq @@ -80187,7 +80187,7 @@ dCD dKl cbk cbW -gEp +sIK bTt mAZ bGn @@ -80216,7 +80216,7 @@ dTs dTs dTs aNH -pRy +jjq bvT byQ byQ @@ -80807,7 +80807,7 @@ brK bsE aZb aZP -iHo +laq dJN aZT bbi @@ -80876,7 +80876,7 @@ bRy bQe cCQ hmA -ohM +eOH cGA bRy bOY @@ -81041,7 +81041,7 @@ aYG bsL btJ aZP -tos +nIG dJP dJY bbj @@ -81210,7 +81210,7 @@ drO czv cPG boP -nDM +hiw buc cmG cnq @@ -81444,7 +81444,7 @@ drT cDc cPG boP -glU +sXn buc cmL cnu @@ -81472,7 +81472,7 @@ cZx cZx cZx cZx -feh +mej cZx cXa cXa @@ -81499,7 +81499,7 @@ dTs dTs dTs aVm -sBw +dtV aWq aWq aXs @@ -81701,7 +81701,7 @@ cIq cVU dfK cIq -wOY +ezd cIq dfK cZB @@ -81753,7 +81753,7 @@ buM buM bcq bdf -ejB +iQG bdC bdC beE @@ -81946,7 +81946,7 @@ rFi rFi rFi rFi -gDT +aRB nEM acu "} @@ -82011,10 +82011,10 @@ rTV dTs bkU bkU -pPu +ivA bmr bmr -uLl +gDS bnX bkU avt @@ -82225,7 +82225,7 @@ bAE bdZ duZ byp -xQX +tJG bdC bfy bdg @@ -82461,7 +82461,7 @@ dKc beH bfa bdC -jAk +wTz bdg bgg aoG @@ -82695,7 +82695,7 @@ bBl beI bdC bdC -hGn +qCu bdf bgg aoG @@ -82714,7 +82714,7 @@ asq bkU blC bmd -mIc +sKe bkU bUQ bkU @@ -83146,7 +83146,7 @@ aYs aYr aYr aZC -uUB +fAI aZY aZY aZY @@ -83851,7 +83851,7 @@ aZC aZZ bav aZY -fTF +kin aZC aYm bpz @@ -83906,11 +83906,11 @@ bDc cbl cbU bPx -wSB +vto ckL ciT cqI -qEl +khO ciT ckL cwT @@ -84085,7 +84085,7 @@ aZC baa baw aZY -fTF +kin aZC buZ brK @@ -84140,7 +84140,7 @@ bFQ cbl cbU bPx -wSB +vto bJm ciT ciT @@ -84181,7 +84181,7 @@ adw ahW aYh ccI -dsl +fpn ceM chK cmp @@ -84316,7 +84316,7 @@ aeM akt dTs aZC -uUB +fAI aZY aZY aZY @@ -84374,7 +84374,7 @@ bWc cbm cbU bGX -bxC +jlq ckL bHa ciT @@ -84550,7 +84550,7 @@ aeM dTs dTs aZC -uUB +fAI aZY aZY aZY @@ -84655,7 +84655,7 @@ cgy cij cxg cFN -tWm +wjd cij cxi cQT @@ -84784,7 +84784,7 @@ aeM aez akv aZC -uUB +fAI aZY aZY aZY @@ -85018,7 +85018,7 @@ aeM anE aez aZC -uUB +fAI bax baH baV @@ -86031,7 +86031,7 @@ aEa aEa aCI aCV -oAX +qnO aCJ aEa aDw @@ -87416,7 +87416,7 @@ bYA caF ctv bPv -xNc +hDO ckW bJq vhs @@ -87487,7 +87487,7 @@ cSr cSg cSr cSr -qHW +uUW cqn cOH cOH @@ -87716,11 +87716,11 @@ vzw vzw aHf cqn -nWT +nWZ cRV cRV cSs -qgK +hLP cSK dMV cOH @@ -88191,7 +88191,7 @@ dTs dTs dTs dMV -wla +ucS cRi cRi cRi @@ -88479,7 +88479,7 @@ dzb dWE dWE dWN -lsn +toU dyb dDZ dyb @@ -89991,7 +89991,7 @@ bEJ bFV bHm bIm -jMe +qUv dwW dwX bMn @@ -90207,7 +90207,7 @@ bib bib bod btc -oyr +wpN bqZ bqZ bsH @@ -90806,7 +90806,7 @@ kJP fCB hOK die -fyI +ugJ dqV dqV dqm @@ -90815,7 +90815,7 @@ dWa ecm dus doH -kIB +rxb dzg dzg bgq @@ -91023,7 +91023,7 @@ daK ddT dex dex -ogQ +xKC grQ dWj daK @@ -91040,7 +91040,7 @@ doi hxj dpA dqm -ejL +umo ebu dsO dqm @@ -91283,7 +91283,7 @@ dVI ect dqo dpB -kIB +rxb dzg dzg bgq @@ -92211,7 +92211,7 @@ dNS dpB dqo cgp -hsx +lua dqo dOe dVP @@ -93112,7 +93112,7 @@ dTs cPL cPL cTL -gIQ +jAA hOA cPL cPL @@ -93534,7 +93534,7 @@ vHQ vHQ vHQ vHQ -tfA +ipQ aDT dTs cft @@ -93827,7 +93827,7 @@ dNS dNS dNS dck -wxV +ffh dcW dcW dfe @@ -94609,7 +94609,7 @@ asA asB aet aeX -quS +jkn aow dTs dTs @@ -95402,7 +95402,7 @@ dTs dTs dTs aDT -oyp +aEu chY ceX caH @@ -98117,7 +98117,7 @@ arL atQ auj arL -vLS +ghU arJ ayK ayX @@ -98632,7 +98632,7 @@ eyL eyL eyL eyL -jMG +pif bfm dTs dTs @@ -98686,7 +98686,7 @@ ciu dnP ceY ciR -pmt +pkl ckB ckB ckB @@ -98831,7 +98831,7 @@ ayh axL ayx aCr -vwv +qUT auq auq azo @@ -99299,9 +99299,9 @@ dTs dTs dTs aCr -shZ +sXm ayV -lDf +vSw azo aCr dTs @@ -99583,7 +99583,7 @@ brh bDD bFb azJ -cWK +vdp bIC bDx dTs @@ -99868,7 +99868,7 @@ crE dQc csI cvO -rBL +kGV cxA lib ctQ @@ -100329,7 +100329,7 @@ clI clI dPa coR -xwq +dMP ckD crG dPU @@ -100408,7 +100408,7 @@ dFe dFe dwE dxe -nAt +gJe dWz dWG dWL @@ -101515,7 +101515,7 @@ dQM cBk cCj cDr -dhL +wiz cAK cGe cHa @@ -101756,7 +101756,7 @@ cHb cFn cCg cJB -ioO +oVH cLl cLR cJA @@ -102339,7 +102339,7 @@ avG axW gNq aye -srU +tCK avH ayL ayX @@ -102665,7 +102665,7 @@ ciU cjv cke ckP -yaK +rPh cZK jVr coT @@ -102804,7 +102804,7 @@ aCr aqC aqC avG -trt +nRL ayk ayv ayj @@ -103399,7 +103399,7 @@ cKy cJG cMQ cNE -qiG +fhq cOI cMP dTs @@ -103509,7 +103509,7 @@ avG axW ayi pFj -srU +tCK avH ayL ayX @@ -103614,7 +103614,7 @@ cvb cvW cwQ cxE -dYU +jqQ erB czH cAr @@ -104208,9 +104208,9 @@ aCr aqC aqC avG -srU +tCK aym -trt +nRL ayz avH ayS @@ -104784,7 +104784,7 @@ cvb cvb cwQ cxE -wpS +kHO czd czJ cAu @@ -106200,7 +106200,7 @@ dRy dRT cGB cHN -edE +dua cIT cIT cLo @@ -106418,7 +106418,7 @@ bZx dPI csR cue -nor +wWE cvi cwX cvi @@ -107110,7 +107110,7 @@ civ ciW cjG dOr -ict +rmj dOO cmF cjG @@ -107124,7 +107124,7 @@ cvk cwg cvi cvi -xyt +gMv czf czN cBx @@ -108134,7 +108134,7 @@ dym dXI dAD dBr -foO +rRt dFf dFf dFf @@ -108397,7 +108397,7 @@ acu afP ajQ akX -iRs +iSj alN aiI alI @@ -108531,7 +108531,7 @@ dTs dTs dTs czO -gps +vqJ cBC cCA cDz @@ -108749,7 +108749,7 @@ cdw cdw cdw aMz -rnV +ejG aNg aNw aMz @@ -108777,7 +108777,7 @@ cub cIV cIV cHL -tpV +pwW cMb cMb cMb @@ -109935,7 +109935,7 @@ dTs dTs dTs czP -jQS +fIT cBH cCE cDA @@ -111612,7 +111612,7 @@ daO fTk dqs dri -sVj +nez dcw dUt dzD @@ -111888,7 +111888,7 @@ dBy dBy dBy dIk -qaH +ral dJj ebo dZN @@ -112984,7 +112984,7 @@ bgo bhs bjw bkC -jTZ +xxd bgl bFF bTW @@ -113292,7 +113292,7 @@ dCg dBy dCg dIk -wvL +lAT dIr dCj dJG @@ -113563,7 +113563,7 @@ apn aqe apn aqQ -tjz +mEJ aqk asm asH @@ -114820,7 +114820,7 @@ dib dMq aoi asO -hIy +iXA aNS aNS aNU @@ -116821,7 +116821,7 @@ acu dTs dTs akk -eLk +rqX akK akK akK @@ -118891,7 +118891,7 @@ cWV xOb xec aVd -eXc +gxR bvw blc blc @@ -118939,7 +118939,7 @@ arq asw avo axy -qIu +oZM aas dTs dTs diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm index 1dd3650ad7..d0ebbc5039 100644 --- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm +++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm @@ -298,7 +298,7 @@ dir = 1; icon_state = "phoronrwindow" }, -/obj/item/weapon/katana{ +/obj/item/weapon/sword/katana{ color = "#b2ffff"; desc = "A finely made Japanese sword, with a well sharpened blade. It appears to have cobalt infused within the blade. There are Japanese engravings on the blade which say 'He who wields this sword becomes the next Titan.'."; name = "ancient katana"; @@ -548,10 +548,10 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 7 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -7 }, /turf/open/floor/sandstone/runed, diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm index 0157ac69c2..86d1bbbdb6 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm @@ -1171,13 +1171,6 @@ icon_state = "sterile_white" }, /area/desert_dam/building/bar/bar_restroom) -"vq" = ( -/obj/structure/sink, -/turf/open/floor/prison{ - dir = 8; - icon_state = "sterile_white" - }, -/area/desert_dam/building/bar/bar_restroom) "vy" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/plating, @@ -1350,6 +1343,25 @@ icon_state = "floor_plate" }, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) +"xI" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/obj/structure/prop/wooden_cross{ + pixel_y = 13 + }, +/obj/item/toy/plush/farwa, +/turf/open/mars{ + icon_state = "mars_dirt_5" + }, +/area/desert_dam/exterior/valley/bar_valley_dam) +"xJ" = ( +/obj/structure/sink, +/turf/open/floor/prison{ + dir = 8; + icon_state = "sterile_white" + }, +/area/desert_dam/building/bar/bar_restroom) "xN" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -2480,18 +2492,6 @@ icon_state = "mars_dirt_5" }, /area/desert_dam/exterior/valley/bar_valley_dam) -"PY" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/obj/structure/prop/wooden_cross{ - pixel_y = 13 - }, -/obj/item/toy/farwadoll, -/turf/open/mars{ - icon_state = "mars_dirt_5" - }, -/area/desert_dam/exterior/valley/bar_valley_dam) "Qc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3140,7 +3140,7 @@ xT xT xT VT -vq +xJ vn TR DE @@ -3456,7 +3456,7 @@ kf kf jC IU -PY +xI CI xT xT diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 9cd11760c2..30e6a6d7ba 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -15557,11 +15557,6 @@ icon_state = "blue" }, /area/prison/command/secretary_office) -"aRX" = ( -/obj/structure/surface/rack, -/obj/item/weapon/katana/replica, -/turf/open/floor/wood, -/area/prison/command/office) "aRY" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -17166,14 +17161,6 @@ icon_state = "darkredfull2" }, /area/prison/security/checkpoint/highsec/n) -"aWF" = ( -/obj/item/handset, -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/prison/cellblock/lowsec/nw) "aWG" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -18314,13 +18301,6 @@ }, /turf/open/floor/prison, /area/prison/kitchen) -"bag" = ( -/obj/item/handset, -/obj/structure/surface/table/reinforced, -/turf/open/floor{ - icon_state = "hydrofloor" - }, -/area/prison/hallway/central/west) "bah" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/blood, @@ -20843,13 +20823,6 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/vip) -"bhq" = ( -/obj/item/handset, -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - icon_state = "cell_stripe" - }, -/area/prison/cellblock/vip) "bhs" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23436,14 +23409,6 @@ icon_state = "cell_stripe" }, /area/prison/cellblock/vip) -"boR" = ( -/obj/item/handset, -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" - }, -/area/prison/cellblock/vip) "boT" = ( /obj/structure/surface/table/reinforced, /obj/item/tool/pen{ @@ -37319,11 +37284,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/prison/recreation/medsec) -"cgm" = ( -/obj/item/handset, -/obj/structure/surface/table/reinforced, -/turf/open/floor/prison, -/area/prison/recreation/medsec) "cgn" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -43204,6 +43164,11 @@ icon_state = "darkred2" }, /area/prison/security/monitoring/medsec/south) +"czR" = ( +/obj/structure/surface/rack, +/obj/item/weapon/sword/katana/replica, +/turf/open/floor/wood, +/area/prison/command/office) "czZ" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ density = 0; @@ -44008,6 +43973,13 @@ icon_state = "sterile_white" }, /area/prison/cellblock/lowsec/se) +"fpO" = ( +/obj/item/handset, +/obj/structure/surface/table/reinforced, +/turf/open/floor{ + icon_state = "hydrofloor" + }, +/area/prison/hallway/central/west) "fqG" = ( /obj/structure/machinery/light{ dir = 8 @@ -46785,6 +46757,13 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating, /area/prison/maintenance/staff_research) +"nMM" = ( +/obj/item/handset, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/prison/cellblock/vip) "nMW" = ( /obj/effect/decal/siding/wood_siding{ icon_state = "wood_siding6" @@ -47068,6 +47047,11 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/plating, /area/prison/residential/central) +"oBE" = ( +/obj/item/handset, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison, +/area/prison/recreation/medsec) "oBG" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/plating/plating_catwalk/prison, @@ -47553,6 +47537,14 @@ icon_state = "darkyellow2" }, /area/prison/telecomms) +"pWq" = ( +/obj/item/handset, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/prison/cellblock/lowsec/nw) "pXk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison{ @@ -48829,6 +48821,14 @@ icon_state = "green" }, /area/prison/monorail/west) +"uJE" = ( +/obj/item/handset, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/prison/cellblock/vip) "uKd" = ( /obj/structure/machinery/power/apc{ dir = 4; @@ -68095,14 +68095,14 @@ bby bdm bdk bgy -bhq +nMM bla bjy bdk bmc bnk bla -boR +uJE bgy bdk bdm @@ -69155,14 +69155,14 @@ bbz bdm bdk bgy -bhq +nMM bla bjy bdk bmc bnk bla -boR +uJE bgy bdk bdm @@ -70215,14 +70215,14 @@ bby bdm bdk bgy -bhq +nMM bla bjy bdk bmc bnk bla -boR +uJE bgy bdk bdm @@ -71275,14 +71275,14 @@ bby bdu bdk bgy -bhq +nMM bla bjy bdk bmc bnk bla -boR +uJE bgy bdk bdm @@ -74658,10 +74658,10 @@ aKy aKy aKy aSa -bag -bag -bag -bag +fpO +fpO +fpO +fpO lIs aWG tOU @@ -75562,7 +75562,7 @@ cbU cdv caa caa -cgm +oBE caa cae cbr @@ -76141,7 +76141,7 @@ eev hKn aNp aNp -aWF +pWq aNp aYD aPC @@ -77625,7 +77625,7 @@ aSw aTM aNp aNp -aWF +pWq aNp aYD aPC @@ -97972,7 +97972,7 @@ aMQ aMS aPV aMS -aRX +czR aLG acL aXt diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index fd4c360e7e..b0f5cc88d9 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -635,6 +635,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) +"arf" = ( +/obj/structure/closet/crate/medical, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) "arm" = ( /obj/structure/platform{ dir = 4 @@ -1227,6 +1233,17 @@ "aFZ" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) +"aGg" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "aGs" = ( /obj/structure/window/framed/prison/reinforced{ opacity = 1 @@ -1375,16 +1392,6 @@ icon_state = "platingdmg3" }, /area/fiorina/maintenance) -"aJK" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_container/food/snacks/meat/human, -/obj/item/reagent_container/food/snacks/meat/human, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/station/civres_blue) "aJU" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/organic/grass{ @@ -1543,12 +1550,6 @@ icon_state = "cell_stripe" }, /area/fiorina/oob) -"aOJ" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/lz/near_lzI) "aPd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 @@ -1596,6 +1597,11 @@ "aPH" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) +"aPU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight, +/turf/open/floor/plating/prison, +/area/fiorina/station/security/wardens) "aQB" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -1722,6 +1728,15 @@ "aSz" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/research_cells) +"aSK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/handset{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/security) "aSS" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, @@ -1796,17 +1811,6 @@ icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) -"aVD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/card/id/guest{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/card/id/guest, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "aVE" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/prison, @@ -2033,15 +2037,6 @@ icon_state = "greenblue" }, /area/fiorina/station/botany) -"bck" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/handset{ - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) "bcs" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ @@ -2499,13 +2494,6 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"bsd" = ( -/obj/structure/closet/basketball, -/obj/item/storage/pill_bottle/bicaridine/skillless, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) "bsm" = ( /obj/item/shard{ icon_state = "medium"; @@ -2628,10 +2616,6 @@ icon_state = "darkbrown2" }, /area/fiorina/maintenance) -"bxV" = ( -/obj/item/clothing/head/cmcap, -/turf/open/floor/wood, -/area/fiorina/station/chapel) "bxW" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -2655,14 +2639,6 @@ icon_state = "blue" }, /area/fiorina/station/power_ring) -"byr" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/fancy/vials/random, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "byt" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, @@ -2702,6 +2678,14 @@ "bzO" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/power_ring) +"bzU" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/stack/rods, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/station/chapel) "bAb" = ( /obj/structure/surface/rack, /obj/item/explosive/grenade/high_explosive/frag, @@ -3072,11 +3056,6 @@ icon_state = "cell_stripe" }, /area/fiorina/station/park) -"bLA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight, -/turf/open/floor/plating/prison, -/area/fiorina/station/security/wardens) "bMd" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ @@ -3488,16 +3467,6 @@ icon_state = "yellowfull" }, /area/fiorina/station/lowsec) -"cbx" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) "cbC" = ( /obj/structure/kitchenspike, /turf/open/floor/prison{ @@ -3921,6 +3890,18 @@ icon_state = "greenblue" }, /area/fiorina/station/botany) +"coZ" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) "cph" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c20, @@ -4069,6 +4050,24 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/civres) +"cui" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_container/syringe{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = 6; + pixel_y = 12 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/ice_lab) "cvf" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -4160,12 +4159,6 @@ icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) -"cxl" = ( -/obj/structure/filingcabinet/disk, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) "cxn" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ @@ -4227,13 +4220,6 @@ "cyV" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"czj" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "czC" = ( /obj/structure/bedsheetbin, /turf/open/floor/prison{ @@ -4342,18 +4328,6 @@ /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/wood, /area/fiorina/station/chapel) -"cDf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 - }, -/obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) "cDj" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -4521,6 +4495,18 @@ icon_state = "floor_plate" }, /area/fiorina/station/medbay) +"cIJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handset{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/storage/briefcase/inflatable, +/turf/open/floor/plating/prison, +/area/fiorina/station/security/wardens) "cJa" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ @@ -4588,6 +4574,13 @@ icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"cLt" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/bible/hefa{ + pixel_y = 3 + }, +/turf/open/floor/wood, +/area/fiorina/station/chapel) "cLu" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -4802,6 +4795,13 @@ }, /turf/open/floor/prison, /area/fiorina/station/lowsec) +"cVr" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "cVQ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -4919,12 +4919,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"cYP" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/storage/pill_bottle/dexalin/skillless, -/obj/effect/spawner/random/gun/special/midchance, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) "cYT" = ( /obj/vehicle/powerloader{ dir = 8 @@ -5835,6 +5829,14 @@ "dxS" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/servers) +"dyc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/handset, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/tumor/ice_lab) "dyd" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -5917,6 +5919,13 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/prison, /area/fiorina/station/park) +"dAp" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "dAA" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -6050,6 +6059,15 @@ icon_state = "yellowfull" }, /area/fiorina/station/lowsec) +"dDO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = 14 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "dDS" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" @@ -6262,6 +6280,11 @@ icon_state = "darkyellowfull2" }, /area/fiorina/station/telecomm/lz1_tram) +"dIT" = ( +/obj/structure/closet/crate/medical, +/obj/item/clothing/mask/cigarette/pipe, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "dJl" = ( /obj/item/device/flashlight/flare, /turf/open/floor/prison{ @@ -6473,6 +6496,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"dSn" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "dSw" = ( /obj/structure/bed{ icon_state = "abed" @@ -6927,6 +6954,11 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"eiw" = ( +/obj/structure/closet, +/obj/item/stack/cable_coil, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "eix" = ( /obj/structure/closet/bombcloset, /turf/open/floor/prison{ @@ -6934,6 +6966,18 @@ icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) +"eiQ" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) "ejk" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -6985,10 +7029,6 @@ icon_state = "yellow" }, /area/fiorina/station/disco) -"eki" = ( -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/fiorina/station/security/wardens) "ekH" = ( /obj/structure/bed/roller, /turf/open/floor/prison, @@ -7131,6 +7171,11 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"epn" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/drinks/cans/aspen, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "eps" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison, @@ -7598,6 +7643,12 @@ /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) +"eFX" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "eGg" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ @@ -7815,17 +7866,6 @@ }, /turf/open/space, /area/fiorina/oob) -"eOH" = ( -/obj/structure/filingcabinet, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) "eON" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -8308,18 +8348,19 @@ icon_state = "floor_plate" }, /area/fiorina/station/chapel) +"fdb" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "fde" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fdf" = ( -/obj/structure/closet, -/obj/item/stack/cable_coil, -/obj/item/storage/pill_bottle/peridaxon/skillless, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) "fdn" = ( /turf/open/floor/prison{ dir = 8; @@ -8548,6 +8589,12 @@ dir = 9 }, /area/fiorina/tumor/aux_engi) +"fkp" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/disco) "fkP" = ( /obj/structure/platform{ dir = 1 @@ -8609,6 +8656,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"fmD" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "fmL" = ( /obj/item/frame/toolbox_tiles, /turf/open/floor/prison{ @@ -8734,6 +8788,13 @@ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) +"fpN" = ( +/obj/structure/closet/basketball, +/obj/item/storage/pill_bottle/tramadol/skillless, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "fpY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/briefcase/inflatable, @@ -8756,13 +8817,6 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"fqZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) "frt" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison, @@ -9017,18 +9071,6 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"fAh" = ( -/obj/structure/closet/firecloset, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "fAs" = ( /obj/structure/bed{ icon_state = "abed" @@ -9113,6 +9155,12 @@ /obj/item/ammo_magazine/m56d, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"fBj" = ( +/obj/structure/closet, +/obj/item/stack/cable_coil, +/obj/item/storage/pill_bottle/peridaxon/skillless, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "fBp" = ( /obj/structure/closet/firecloset, /turf/open/floor/prison{ @@ -9137,11 +9185,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"fCZ" = ( -/obj/structure/closet/crate/medical, -/obj/item/clothing/mask/cigarette/pipe, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "fDI" = ( /obj/structure/barricade/handrail/type_b{ dir = 8; @@ -9159,6 +9202,23 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"fEM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/handset{ + pixel_x = 7; + pixel_y = -16 + }, +/obj/item/handset{ + pixel_x = -3; + pixel_y = 16 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "fEY" = ( /obj/structure/machinery/power/apc, /turf/open/floor{ @@ -9463,6 +9523,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"fMF" = ( +/obj/item/storage/bible/hefa{ + pixel_y = 3 + }, +/obj/structure/surface/table/woodentable, +/turf/open/floor/carpet, +/area/fiorina/station/civres_blue) "fMY" = ( /obj/structure/reagent_dispensers/watertank{ layer = 2.6 @@ -9499,12 +9566,6 @@ name = "astroturf" }, /area/fiorina/station/park) -"fOo" = ( -/obj/structure/closet/crate/medical, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "fOs" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ @@ -9867,18 +9928,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"gaZ" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) "gbi" = ( /obj/structure/inflatable/door, /turf/open/floor/prison{ @@ -10117,12 +10166,6 @@ icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) -"ghw" = ( -/obj/structure/bed/chair/dropship/pilot, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/fiorina/tumor/ship) "ghP" = ( /turf/open/floor/prison{ dir = 9; @@ -10953,6 +10996,13 @@ icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) +"gIk" = ( +/obj/item/frame/rack, +/obj/item/stack/medical/bruise_pack, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "gIB" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, @@ -11066,6 +11116,12 @@ }, /turf/open/floor/prison, /area/fiorina/station/botany) +"gNu" = ( +/obj/item/handset{ + pixel_y = 7 + }, +/turf/open/floor/plating/prison, +/area/fiorina/oob) "gNF" = ( /obj/structure/machinery/shower{ dir = 1; @@ -11110,15 +11166,6 @@ icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) -"gOJ" = ( -/obj/structure/closet/secure_closet/medical2{ - req_access_txt = "100" - }, -/obj/effect/spawner/random/pills, -/turf/open/floor/corsat{ - icon_state = "squares" - }, -/area/fiorina/station/medbay) "gPm" = ( /obj/item/ammo_casing{ icon_state = "casing_8" @@ -11258,6 +11305,14 @@ icon_state = "darkbrown2" }, /area/fiorina/station/park) +"gSJ" = ( +/obj/structure/closet/bombcloset, +/obj/effect/spawner/random/gun/rifle/midchance, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) "gSN" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "handblood" @@ -11397,10 +11452,6 @@ icon_state = "platingdmg1" }, /area/fiorina/station/chapel) -"gXu" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz2_maint) "gXD" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -11651,18 +11702,6 @@ "heO" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/civres_blue) -"hfc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/handset{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/briefcase/inflatable, -/turf/open/floor/plating/prison, -/area/fiorina/station/security/wardens) "hfd" = ( /obj/structure/platform{ dir = 1 @@ -11748,6 +11787,13 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) +"hhv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical/green, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) "hhy" = ( /turf/open/floor/prison{ dir = 9; @@ -11945,12 +11991,6 @@ icon_state = "kitchen" }, /area/fiorina/station/lowsec) -"hob" = ( -/obj/item/handset{ - pixel_y = 7 - }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) "hor" = ( /obj/structure/bed/chair{ dir = 1; @@ -11981,6 +12021,14 @@ icon_state = "darkbrown2" }, /area/fiorina/station/park) +"hoP" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/clothing/head/helmet/warden{ + pixel_x = 3; + pixel_y = 15 + }, +/turf/open/floor/carpet, +/area/fiorina/station/security/wardens) "hoY" = ( /obj/structure/surface/rack, /obj/item/frame/table/almayer, @@ -12139,6 +12187,11 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) +"htb" = ( +/obj/structure/closet/wardrobe/chaplain_black, +/obj/effect/spawner/random/goggles, +/turf/open/floor/prison/chapel_carpet, +/area/fiorina/station/chapel) "htc" = ( /obj/item/tool/wrench, /turf/open/floor/plating/prison, @@ -12249,6 +12302,15 @@ icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) +"hwx" = ( +/obj/structure/closet/crate/science{ + density = 0; + icon_state = "open_science"; + opened = 1 + }, +/obj/item/organ/eyes, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "hwE" = ( /obj/structure/tunnel/maint_tunnel, /turf/open/floor/prison{ @@ -12352,6 +12414,11 @@ icon_state = "bluefull" }, /area/fiorina/station/power_ring) +"hzz" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/storage/pill_bottle/kelotane/skillless, +/turf/open/floor/prison, +/area/fiorina/station/park) "hzG" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8; @@ -12416,23 +12483,6 @@ icon_state = "sterile_white" }, /area/fiorina/tumor/ice_lab) -"hBP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/handset{ - pixel_x = 7; - pixel_y = -16 - }, -/obj/item/handset{ - pixel_x = -3; - pixel_y = 16 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "hBX" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -12565,19 +12615,6 @@ icon_state = "greenfull" }, /area/fiorina/tumor/civres) -"hHc" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/candelabra{ - layer = 3.2; - pixel_x = 1; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/prison/chapel_carpet{ - dir = 1; - icon_state = "doubleside" - }, -/area/fiorina/station/chapel) "hHh" = ( /obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/prison{ @@ -12585,10 +12622,6 @@ icon_state = "darkyellowfull2" }, /area/fiorina/lz/near_lzI) -"hHq" = ( -/obj/structure/closet/cabinet, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) "hHv" = ( /obj/structure/platform{ dir = 1 @@ -12656,19 +12689,6 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"hKW" = ( -/obj/structure/closet/crate/science{ - density = 0; - icon_state = "open_science"; - opened = 1 - }, -/obj/item/organ/lungs, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "hLt" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light/double/blue{ @@ -12705,6 +12725,20 @@ /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison, /area/fiorina/station/disco) +"hLV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handset{ + pixel_x = -3; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "hLX" = ( /obj/structure/platform{ dir = 4 @@ -12848,6 +12882,19 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) +"hRR" = ( +/obj/structure/closet/crate/science{ + density = 0; + icon_state = "open_science"; + opened = 1 + }, +/obj/item/organ/lungs, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "hRV" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /obj/structure/window/reinforced{ @@ -12937,6 +12984,13 @@ icon_state = "darkpurple2" }, /area/fiorina/tumor/ice_lab) +"hTy" = ( +/obj/item/implanter/compressed, +/obj/structure/safe, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "hTG" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -12951,6 +13005,16 @@ /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"hUa" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 24 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "hUf" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison, @@ -13235,13 +13299,6 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"ieU" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/filingcabinet, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "ieW" = ( /obj/structure/machinery/computer3/server/rack, /obj/structure/barricade/handrail/type_b{ @@ -13337,6 +13394,14 @@ /obj/item/tool/wrench, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) +"ihY" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/weapon/gun/rifle/m16, +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "iif" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ @@ -13505,6 +13570,17 @@ icon_state = "greenfull" }, /area/fiorina/station/transit_hub) +"ioR" = ( +/obj/structure/filingcabinet, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/servers) "ipa" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2; @@ -13533,14 +13609,6 @@ /obj/item/fuelCell, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) -"iqB" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/clothing/head/helmet/warden{ - pixel_x = 3; - pixel_y = 15 - }, -/turf/open/floor/carpet, -/area/fiorina/station/security/wardens) "iqR" = ( /obj/structure/platform_decoration{ dir = 4 @@ -13666,13 +13734,6 @@ icon_state = "kitchen" }, /area/fiorina/station/power_ring) -"itt" = ( -/obj/item/frame/rack, -/obj/item/stack/medical/bruise_pack, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "itv" = ( /obj/item/toy/handcard/uno_reverse_yellow, /turf/open/floor/plating/prison, @@ -14074,6 +14135,18 @@ icon_state = "darkpurplefull2" }, /area/fiorina/tumor/ice_lab) +"iIN" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/item/tool/soap/syndie, +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/gun/special, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/tumor/civres) "iIS" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/plating/prison, @@ -14656,6 +14729,14 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/aux_engi) +"jaN" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/fancy/vials/random, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "jaR" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_x = 5; @@ -15125,13 +15206,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"jnr" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) +"jnq" = ( +/obj/item/clothing/head/cmcap, +/turf/open/floor/wood, +/area/fiorina/station/chapel) "jnO" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -15369,13 +15447,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"jtv" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "jtF" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -15439,13 +15510,6 @@ }, /turf/open/space, /area/fiorina/oob) -"jvB" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "jvE" = ( /obj/structure/inflatable, /turf/open/floor/prison{ @@ -15962,14 +16026,6 @@ icon_state = "platingdmg1" }, /area/fiorina/station/security) -"jLS" = ( -/obj/structure/closet/bombcloset, -/obj/effect/spawner/random/gun/rifle/midchance, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) "jMe" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ @@ -16022,6 +16078,16 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) +"jNr" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/explosive/grenade/incendiary/molotov, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "jNA" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison{ @@ -16564,22 +16630,6 @@ icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) -"kdk" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/handset{ - pixel_x = 6; - pixel_y = -15 - }, -/obj/item/handset{ - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "kdo" = ( /obj/structure/platform_decoration, /obj/structure/inflatable, @@ -17187,15 +17237,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"kwa" = ( -/obj/structure/closet/crate/science{ - density = 0; - icon_state = "open_science"; - opened = 1 - }, -/obj/item/organ/eyes, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "kwm" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ @@ -17502,6 +17543,13 @@ icon_state = "green" }, /area/fiorina/station/chapel) +"kEP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/card/id/guest, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "kEZ" = ( /obj/item/stack/tile/plasteel{ pixel_x = 12; @@ -17518,6 +17566,10 @@ icon_state = "darkredfull2" }, /area/fiorina/station/research_cells) +"kFq" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "kFH" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ @@ -17731,14 +17783,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/transit_hub) -"kLX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/handset, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) "kLY" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ @@ -17893,6 +17937,13 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) +"kRL" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/obj/effect/spawner/random/gun/smg, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "kRM" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison{ @@ -17957,12 +18008,6 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"kUr" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) "kUI" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -18317,6 +18362,14 @@ icon_state = "redfull" }, /area/fiorina/station/security) +"lhi" = ( +/obj/structure/closet/wardrobe/orange, +/obj/item/explosive/mine/pmc, +/obj/effect/spawner/random/gun/smg, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) "lhj" = ( /obj/structure/platform{ dir = 1 @@ -18357,6 +18410,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"liI" = ( +/obj/item/bedsheet/green, +/obj/structure/bed, +/obj/item/toy/plush/farwa, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "liT" = ( /turf/open/floor/prison{ dir = 1; @@ -18385,6 +18444,13 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"ljh" = ( +/obj/structure/closet/crate/medical, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) "ljA" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -18424,6 +18490,13 @@ icon_state = "stan_rightengine" }, /area/fiorina/oob) +"lkD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "lle" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ @@ -18909,6 +18982,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) +"lyo" = ( +/obj/structure/bed/chair/dropship/pilot, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/fiorina/tumor/ship) "lyF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/guestpass{ @@ -18983,6 +19062,12 @@ "lAh" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/ice_lab) +"lAm" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/lz/near_lzI) "lAv" = ( /obj/structure/sink{ pixel_y = 15 @@ -19055,13 +19140,6 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"lCD" = ( -/obj/structure/closet/basketball, -/obj/item/storage/pill_bottle/tramadol/skillless, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) "lCE" = ( /obj/structure/platform{ dir = 4 @@ -19702,18 +19780,6 @@ icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) -"lZL" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "mak" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -19885,20 +19951,6 @@ icon_state = "bluecorner" }, /area/fiorina/station/power_ring) -"mei" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/handset{ - pixel_x = -3; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) "mel" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ @@ -21010,6 +21062,18 @@ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) +"mNI" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "mNJ" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -21035,19 +21099,22 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"mOC" = ( -/obj/structure/closet/crate/medical, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "mOF" = ( /turf/open/floor/prison{ dir = 8; icon_state = "bluecorner" }, /area/fiorina/station/civres_blue) +"mOT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) "mOW" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 @@ -21264,13 +21331,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"mUV" = ( -/obj/structure/closet/basketball, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) "mVg" = ( /obj/structure/window{ dir = 8 @@ -21287,13 +21347,6 @@ icon_state = "floor_marked" }, /area/fiorina/lz/near_lzII) -"mWi" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) "mWx" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -21387,6 +21440,10 @@ icon_state = "blue" }, /area/fiorina/station/civres_blue) +"mYb" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) "mYo" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light/double/blue, @@ -21696,13 +21753,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) -"nhi" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) "nho" = ( /obj/structure/platform{ dir = 1 @@ -21781,20 +21831,6 @@ icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) -"njK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/handset{ - pixel_x = -3; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "njT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/taperecorder{ @@ -21805,6 +21841,13 @@ icon_state = "darkredfull2" }, /area/fiorina/station/lowsec) +"nkx" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/storage/pill_bottle/inaprovaline/skillless, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "nlw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -22072,6 +22115,13 @@ icon_state = "floor_plate" }, /area/fiorina/station/transit_hub) +"nuO" = ( +/obj/structure/closet/basketball, +/obj/item/storage/pill_bottle/bicaridine/skillless, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "nvz" = ( /obj/structure/flora/pottedplant/random, /turf/open/floor/prison{ @@ -22349,6 +22399,10 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"nCJ" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood, +/area/fiorina/station/security/wardens) "nCX" = ( /turf/open/organic/grass{ name = "astroturf" @@ -24180,6 +24234,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/civres_blue) +"oKb" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "oKl" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ @@ -24444,10 +24502,6 @@ }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) -"oVn" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) "oVC" = ( /turf/open/floor/prison{ dir = 6; @@ -24571,15 +24625,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"oZz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/eastright, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = 7; - pixel_y = 14 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) "oZR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -24706,11 +24751,6 @@ icon_state = "greenfull" }, /area/fiorina/tumor/civres) -"pcK" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/drinks/cans/aspen, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) "pdf" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -24935,6 +24975,11 @@ icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"pnj" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "pnv" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ @@ -25654,6 +25699,15 @@ icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) +"pJy" = ( +/obj/structure/closet/secure_closet/medical2{ + req_access_txt = "100" + }, +/obj/effect/spawner/random/pills, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/fiorina/station/medbay) "pJK" = ( /obj/structure/surface/rack, /obj/item/reagent_container/glass/bucket/mopbucket, @@ -25792,6 +25846,13 @@ /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison, /area/fiorina/station/security) +"pPi" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/book/manual/security_space_law, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/security) "pPG" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -25867,18 +25928,6 @@ /obj/item/weapon/wirerod, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"pSm" = ( -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 8 - }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = -8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "pSJ" = ( /turf/open/floor/wood, /area/fiorina/maintenance) @@ -25946,13 +25995,6 @@ icon_state = "kitchen" }, /area/fiorina/tumor/civres) -"pVR" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/bible/hefa{ - pixel_y = 3 - }, -/turf/open/floor/wood, -/area/fiorina/station/chapel) "pWm" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/beer_pack{ @@ -26096,6 +26138,13 @@ icon_state = "redfull" }, /area/fiorina/station/security) +"qbv" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/filingcabinet, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "qbD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -26209,17 +26258,6 @@ /obj/effect/spawner/random/pills/highchance, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"qeU" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "qeX" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 @@ -26264,6 +26302,13 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"qfR" = ( +/obj/item/handset{ + pixel_x = 9; + pixel_y = -10 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "qfU" = ( /turf/open/floor/prison{ dir = 4; @@ -26334,6 +26379,11 @@ /obj/item/trash/kepler, /turf/open/floor/prison, /area/fiorina/station/security) +"qhM" = ( +/obj/structure/surface/rack, +/obj/item/weapon/sword/katana, +/turf/open/floor/wood, +/area/fiorina/station/security/wardens) "qiq" = ( /obj/item/trash/cigbutt, /turf/open/floor/plating/prison, @@ -26637,12 +26687,6 @@ /obj/item/stack/cable_coil, /turf/open/floor/prison, /area/fiorina/station/disco) -"qqM" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "qqX" = ( /obj/item/disk, /turf/open/floor/prison{ @@ -27359,12 +27403,6 @@ icon_state = "blue" }, /area/fiorina/station/power_ring) -"qNm" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) "qNv" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -27485,6 +27523,12 @@ icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) +"qQg" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "qQl" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -27937,6 +27981,12 @@ icon_state = "greenfull" }, /area/fiorina/tumor/civres) +"rei" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) "rev" = ( /turf/open/floor/prison{ icon_state = "blue" @@ -27992,13 +28042,6 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"rfG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) "rfJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/mre_pack/meal4{ @@ -28106,18 +28149,6 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"rkb" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "rkr" = ( /turf/open/floor/prison{ dir = 5; @@ -28136,14 +28167,6 @@ /obj/structure/lattice, /turf/open/space, /area/fiorina/oob) -"rkQ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/stack/rods, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/chapel) "rkR" = ( /obj/item/clothing/glasses/science, /turf/open/space, @@ -28414,6 +28437,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"rur" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "ruv" = ( /turf/open/floor/prison{ dir = 8; @@ -28749,6 +28779,23 @@ icon_state = "damaged3" }, /area/fiorina/station/central_ring) +"rFs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/handset{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/item/handset{ + pixel_x = 9; + pixel_y = -10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/chapel_carpet{ @@ -29079,11 +29126,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"rON" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/storage/pill_bottle/kelotane/skillless, -/turf/open/floor/prison, -/area/fiorina/station/park) "rPh" = ( /turf/open/floor/prison{ icon_state = "darkpurplefull2" @@ -29146,11 +29188,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"rQd" = ( -/obj/structure/closet, -/obj/item/stack/cable_coil, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) "rQm" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -29527,13 +29564,6 @@ icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) -"sdg" = ( -/obj/item/implanter/compressed, -/obj/structure/safe, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "sdK" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -29623,13 +29653,6 @@ /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"sha" = ( -/obj/item/storage/bible/hefa{ - pixel_y = 3 - }, -/obj/structure/surface/table/woodentable, -/turf/open/floor/carpet, -/area/fiorina/station/civres_blue) "shq" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison{ @@ -29667,18 +29690,6 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"siR" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/item/tool/soap/syndie, -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random/gun/special, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) "sjc" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -29726,6 +29737,14 @@ name = "astroturf" }, /area/fiorina/station/park) +"skH" = ( +/obj/item/pamphlet/engineer, +/obj/structure/closet, +/obj/item/handcuffs, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/lowsec) "skM" = ( /obj/effect/landmark/nightmare{ insert_tag = "repairpanelslz" @@ -29849,6 +29868,12 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"sor" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) "sov" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -30145,24 +30170,6 @@ icon_state = "greenblue" }, /area/fiorina/station/botany) -"sBl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/bottle/spaceacillin{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_container/syringe{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/reagent_container/glass/bottle/spaceacillin{ - pixel_x = 6; - pixel_y = 12 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) "sBr" = ( /obj/item/reagent_container/food/drinks/coffee, /turf/open/floor/prison{ @@ -30294,16 +30301,6 @@ icon_state = "yellow" }, /area/fiorina/station/disco) -"sGu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/bottle/spaceacillin{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) "sGI" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/wood, @@ -30343,6 +30340,10 @@ icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"sIm" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz2_maint) "sII" = ( /obj/structure/bookcase{ icon_state = "book-5"; @@ -30621,19 +30622,18 @@ icon_state = "darkbrownfull2" }, /area/fiorina/station/park) -"sRH" = ( -/obj/item/pamphlet/engineer, -/obj/structure/closet, -/obj/item/handcuffs, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/lowsec) "sRV" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/security) +"sSk" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/servers) "sSJ" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison{ @@ -31301,11 +31301,6 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"tpt" = ( -/obj/structure/closet/wardrobe/chaplain_black, -/obj/effect/spawner/random/goggles, -/turf/open/floor/prison/chapel_carpet, -/area/fiorina/station/chapel) "tpO" = ( /obj/structure/machinery/microwave{ desc = "There's two of them."; @@ -31769,6 +31764,20 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/oob) +"tDo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handset{ + pixel_x = -3; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "tDB" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -31825,13 +31834,6 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"tER" = ( -/obj/item/handset{ - pixel_x = 9; - pixel_y = -10 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) "tFu" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, @@ -31882,6 +31884,12 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/fiberbush) +"tHi" = ( +/obj/structure/filingcabinet/disk, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) "tHl" = ( /obj/structure/inflatable, /turf/open/floor/plating/prison, @@ -32237,16 +32245,6 @@ icon_state = "platingdmg1" }, /area/fiorina/station/security) -"tQi" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 24 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) "tQm" = ( /obj/item/trash/boonie, /turf/open/floor/plating/prison, @@ -32392,16 +32390,6 @@ "tUs" = ( /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"tUA" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/explosive/grenade/incendiary/molotov, -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) "tUS" = ( /obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/plating/prison, @@ -33119,6 +33107,18 @@ icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) +"uuk" = ( +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 8 + }, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) "uuJ" = ( /obj/structure/holohoop{ dir = 8; @@ -33433,12 +33433,6 @@ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) -"uFc" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/disco) "uFh" = ( /turf/open/floor/prison{ dir = 10; @@ -33550,6 +33544,12 @@ icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"uIr" = ( +/obj/structure/closet/bombcloset, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "uIu" = ( /obj/item/storage/toolbox/electrical, /obj/structure/surface/rack, @@ -33871,6 +33871,23 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) +"uVa" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handset{ + pixel_y = -4 + }, +/obj/item/handset{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/tool/pen, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "uVn" = ( /turf/closed/shuttle/ert{ icon_state = "stan_inner_w_1" @@ -34076,6 +34093,22 @@ /obj/structure/curtain, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"vah" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handset{ + pixel_x = 6; + pixel_y = -15 + }, +/obj/item/handset{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "vaj" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ @@ -34107,12 +34140,18 @@ icon_state = "whitegreen" }, /area/fiorina/station/central_ring) -"vbl" = ( -/obj/structure/closet/bombcloset, +"vbf" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 10; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/maintenance) "vbn" = ( /obj/item/ammo_box/magazine/M16, /turf/open/floor/prison{ @@ -34316,6 +34355,17 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) +"vgu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/card/id/guest{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/card/id/guest, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "vgP" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -34371,11 +34421,6 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"vjl" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random/tool, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "vjq" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1" @@ -34411,13 +34456,6 @@ /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"vkh" = ( -/obj/structure/closet/cabinet, -/obj/effect/spawner/random/gun/special/midchance, -/obj/item/clothing/suit/armor/det_suit, -/obj/item/attachable/magnetic_harness, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) "vky" = ( /turf/open/floor/prison{ dir = 4; @@ -34505,23 +34543,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) -"vok" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/handset{ - pixel_x = -3; - pixel_y = 10 - }, -/obj/item/handset{ - pixel_x = 9; - pixel_y = -10 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "voq" = ( /obj/structure/machinery/computer/secure_data{ dir = 1 @@ -34635,13 +34656,6 @@ /obj/item/toy/crayon/green, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"vrM" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/item/book/manual/security_space_law, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) "vrN" = ( /obj/structure/monorail{ name = "launch track" @@ -34669,13 +34683,6 @@ icon_state = "floorscorched1" }, /area/fiorina/station/civres_blue) -"vsg" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "vsq" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ @@ -35252,11 +35259,16 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) -"vKP" = ( -/obj/structure/surface/rack, -/obj/item/weapon/katana, -/turf/open/floor/wood, -/area/fiorina/station/security/wardens) +"vKV" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_container/food/snacks/meat/human, +/obj/item/reagent_container/food/snacks/meat/human, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/station/civres_blue) "vLH" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/wood, @@ -36231,12 +36243,6 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"wul" = ( -/obj/item/bedsheet/green, -/obj/structure/bed, -/obj/item/toy/farwadoll, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "wuA" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/nailgun, @@ -36435,23 +36441,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"wAr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/handset{ - pixel_y = -4 - }, -/obj/item/handset{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/tool/pen, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "wAv" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, @@ -36685,13 +36674,6 @@ icon_state = "darkpurplefull2" }, /area/fiorina/lz/near_lzI) -"wHE" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/storage/pill_bottle/inaprovaline/skillless, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) "wHX" = ( /obj/item/tool/lighter/random, /turf/open/floor/prison{ @@ -36751,14 +36733,6 @@ icon_state = "redfull" }, /area/fiorina/station/security) -"wJw" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/weapon/gun/rifle/m16, -/obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) "wJJ" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison{ @@ -36937,6 +36911,12 @@ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) +"wOy" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/storage/pill_bottle/dexalin/skillless, +/obj/effect/spawner/random/gun/special/midchance, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "wOD" = ( /turf/open/floor/prison{ dir = 8; @@ -37164,6 +37144,18 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"wWf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 + }, +/obj/item/reagent_container/food/snacks/eat_bar, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/station/flight_deck) "wWs" = ( /turf/open/floor/greengrid, /area/fiorina/station/security) @@ -37460,6 +37452,16 @@ icon_state = "greenfull" }, /area/fiorina/station/transit_hub) +"xhY" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "xii" = ( /obj/structure/tunnel, /turf/open/organic/grass{ @@ -37578,6 +37580,13 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) +"xmt" = ( +/obj/structure/closet/basketball, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) "xmH" = ( /turf/open/floor/prison{ dir = 1; @@ -37734,13 +37743,6 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/civres) -"xpB" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "xqf" = ( /obj/structure/closet/bombcloset, /obj/item/clothing/suit/armor/bulletproof, @@ -37928,12 +37930,6 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/servers) -"xvH" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "xvI" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -37969,10 +37965,6 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"xwy" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "xwA" = ( /obj/item/ammo_casing{ icon_state = "casing_6_1" @@ -37987,13 +37979,6 @@ /obj/item/tool/weldingtool, /turf/open/floor/prison, /area/fiorina/station/civres_blue) -"xxd" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) "xxh" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison{ @@ -38097,14 +38082,6 @@ icon_state = "darkbrown2" }, /area/fiorina/station/park) -"xzW" = ( -/obj/structure/closet/wardrobe/orange, -/obj/item/explosive/mine/pmc, -/obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) "xAi" = ( /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison{ @@ -38351,6 +38328,13 @@ icon_state = "bright_clean_marked" }, /area/fiorina/station/medbay) +"xHH" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "xHV" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/civres) @@ -38464,6 +38448,13 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"xMe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "xMg" = ( /turf/open/floor/prison{ dir = 9; @@ -38505,13 +38496,6 @@ }, /turf/open/space, /area/fiorina/oob) -"xNf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/card/id/guest, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "xNg" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" @@ -38568,6 +38552,19 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) +"xPF" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/candelabra{ + layer = 3.2; + pixel_x = 1; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/prison/chapel_carpet{ + dir = 1; + icon_state = "doubleside" + }, +/area/fiorina/station/chapel) "xPG" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -38874,6 +38871,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"xZI" = ( +/obj/structure/closet/cabinet, +/obj/effect/spawner/random/gun/special/midchance, +/obj/item/clothing/suit/armor/det_suit, +/obj/item/attachable/magnetic_harness, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) "xZR" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -38949,10 +38953,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"ybY" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "ycd" = ( /turf/open/floor/prison{ icon_state = "darkbrownfull2" @@ -41055,7 +41055,7 @@ xwC xwC pqO oxA -ghw +lyo ouH fiU vYw @@ -42505,7 +42505,7 @@ dXG qty xHV xHV -siR +iIN omF lKd lLe @@ -44907,7 +44907,7 @@ aKW sJT aKW hjP -oVn +kFq rZP bQM baC @@ -46698,11 +46698,11 @@ agi agi agi jXz -eOH +ioR gks jXz hng -jnr +sSk jXz kPe xHV @@ -47589,7 +47589,7 @@ hDx xHV dIo iHn -fqZ +xMe hoY dIo qWB @@ -48212,7 +48212,7 @@ dXG dXG dIo fBP -gaZ +coZ dIo moJ hLt @@ -49129,11 +49129,11 @@ rGq jEG rZP rZP -qNm +sor myg aKW aKW -qNm +sor eev rZP rGq @@ -51436,7 +51436,7 @@ jVH lwG jlk jlk -mWi +kRL sVP hjP gCX @@ -51686,7 +51686,7 @@ jgu rxh ajK uGM -rON +hzz uGM qDy irB @@ -51768,7 +51768,7 @@ agi agi agi aWV -cxl +tHi cOq njx njx @@ -52097,7 +52097,7 @@ rGq rGq rGq ivM -nhi +lkD glG jUI uGM @@ -52303,7 +52303,7 @@ aKW jlk jlk rZP -wHE +nkx aKW rGq rGq @@ -52404,7 +52404,7 @@ agi agi agi aWV -cxl +tHi njx njx njx @@ -53306,7 +53306,7 @@ eQk xxD xxD xxD -hHq +mYb rja rja gma @@ -53764,7 +53764,7 @@ sJT sJT sJT eyM -vbl +uIr pER jlk jlk @@ -54779,7 +54779,7 @@ rja rja iCP xxD -vkh +xZI rja vVi rja @@ -57534,7 +57534,7 @@ xxD bMr bMr iRe -aJK +vKV rja qIZ gma @@ -57549,7 +57549,7 @@ iOt uAv bis bis -tpt +htb clP clP bEP @@ -58378,7 +58378,7 @@ bfZ bfZ gma vVi -sha +fMF pNj tDB rja @@ -58615,7 +58615,7 @@ lqq bis bis bis -hHc +xPF geL wNr cCF @@ -58688,7 +58688,7 @@ vwc aDl hhg dFE -tQi +hUa oTU mAg iKG @@ -59253,7 +59253,7 @@ clP clP jjW rgg -bxV +jnq hMf ycC ycC @@ -59409,7 +59409,7 @@ tgc lwK lwK wLI -kUr +qQg jnO dxg bzC @@ -59918,7 +59918,7 @@ joz lGm tlM rol -tER +qfR rol jiW nyo @@ -59977,7 +59977,7 @@ wKF cEl cEl clG -rfG +hhv twb twb kPz @@ -60097,7 +60097,7 @@ ycC ycC ycC bis -pcK +epn bis bis rFu @@ -61373,7 +61373,7 @@ rJK kHf rlC nOz -pVR +cLt nOz jBS fKm @@ -62097,8 +62097,8 @@ gyJ cME cME eLu -jvB -vsg +fdb +fmD twb twb twb @@ -62312,7 +62312,7 @@ ayX hxg goz tUr -fAh +vbf twb kPz kPz @@ -62448,7 +62448,7 @@ iKs gQh qwl ilX -rkQ +bzU xrs bUy joz @@ -63370,7 +63370,7 @@ afk afk iWq tPN -jtv +cVr cEl cEl dtc @@ -63582,7 +63582,7 @@ afk afk iWq tPN -jtv +cVr dKX gfo aXM @@ -63794,7 +63794,7 @@ afk afk iWq tPN -jtv +cVr cEl cEl lZC @@ -63908,7 +63908,7 @@ bow ioM hVI idE -xwy +dSn cRN ioM bis @@ -64103,7 +64103,7 @@ gkZ kcn kqz tEH -gOJ +pJy rQK uVD aif @@ -64330,7 +64330,7 @@ jEb pNV cwO ioM -hKW +hRR mEO mEO mEO @@ -64542,7 +64542,7 @@ aja ogr tkk ioM -kwa +hwx mEO mEO idE @@ -64819,7 +64819,7 @@ nqN nqN twb cME -wJw +ihY cME cME cME @@ -64846,17 +64846,17 @@ aWk aWk vZX nbb -gXu -gXu +sIm +sIm qkN vZX vZX aWk cEB jrk -rkb -czj -xxd +mNI +xHH +dAp twb kPz kPz @@ -64934,7 +64934,7 @@ qeX mEO hVI dVK -xpB +rur kqz fPZ idE @@ -64944,7 +64944,7 @@ tQB tQB aFZ iPM -fOo +arf bgb lXk kqz @@ -65059,7 +65059,7 @@ pRG vZX vZX wHq -gXu +sIm qkN vZX vZX @@ -65133,7 +65133,7 @@ kbO dFk ezJ xLi -kLX +dyc oHn ddL xjK @@ -65151,7 +65151,7 @@ kqz fPZ iPM hVI -mOC +ljh eCh oxT hVI @@ -65575,7 +65575,7 @@ kqz fPZ idE hVI -qqM +rei kqz kqz kqz @@ -65607,7 +65607,7 @@ opV mJy cwO tur -pSm +uuk hVI bEO bEO @@ -66277,8 +66277,8 @@ muO muO eLu eLu -fdf -rQd +fBj +eiw rOu twb oZy @@ -66442,7 +66442,7 @@ hVI vtG vtG vtG -qeU +aGg hVI tEH tEH @@ -66496,7 +66496,7 @@ liA nyS scZ ceC -itt +gIk aPF ceC fnB @@ -66963,7 +66963,7 @@ fnB fnB wxZ qeC -bLA +aPU xBT oyg xBT @@ -67370,7 +67370,7 @@ qms fnB nDT gIB -aVD +vgu dzo sRV tHs @@ -67598,7 +67598,7 @@ sRV fnB fnB cri -hfc +cIJ mie scU sFn @@ -67819,7 +67819,7 @@ plK uYR gRT vHU -eki +nCJ duM aPH kPz @@ -68122,7 +68122,7 @@ qfI fFU cqy fPZ -byr +jaN kqz kqz dla @@ -68192,7 +68192,7 @@ sHH vei uGY tBD -vrM +pPi fGp ceC fnB @@ -68395,7 +68395,7 @@ vei lcH wQT eLu -cYP +wOy qso hTr kqC @@ -68412,7 +68412,7 @@ fnB fnB fnB ceC -xNf +kEP sRV sRV sRV @@ -68465,7 +68465,7 @@ nGy rJO wMz rJO -vKP +qhM vXT kPz bQM @@ -68889,7 +68889,7 @@ cJW rTH bMh ewx -eki +nCJ vXT kPz bQM @@ -68983,8 +68983,8 @@ oBP aja lUp hVI -mei -oZz +hLV +dDO hVI hVI hVI @@ -69099,7 +69099,7 @@ rJO ipa rJO rJO -iqB +hoP rJO kmN vXT @@ -69258,7 +69258,7 @@ eGz isK xGt fHU -wAr +uVa fHU tHs sRV @@ -69275,7 +69275,7 @@ fnB hVG sRV sFf -sdg +hTy uGY pUS tHs @@ -69283,7 +69283,7 @@ tHs xGt wTz iTy -xvH +eFX uGY fnB fnB @@ -69470,7 +69470,7 @@ sHw uAG xGt cBT -hBP +fEM rBa ddO sRV @@ -70105,7 +70105,7 @@ buO isK xGt fHU -kdk +vah fHU tHs tHs @@ -70317,7 +70317,7 @@ ifI uAG xGt cBT -vok +rFs cBT tHs tHs @@ -72018,7 +72018,7 @@ kPz kPz dCM jbx -bck +aSK rbD oEt xGt @@ -72026,7 +72026,7 @@ wYE wYE wYE uGY -njK +tDo cHF uGY hxy @@ -73405,7 +73405,7 @@ mcT sCo csp csp -sBl +cui xjK xjK cKa @@ -74259,7 +74259,7 @@ xjK mvl jIZ wwr -sGu +mOT mvl bhR vJD @@ -75595,7 +75595,7 @@ vRA vRA kqC eaQ -tUA +jNr kqC pHu mcc @@ -75615,7 +75615,7 @@ fxP eag ibN vei -xzW +lhi duF hXc lAS @@ -76583,7 +76583,7 @@ vBP fQV erT uwk -bsd +nuO ikq vII dyM @@ -77112,7 +77112,7 @@ tlp mxQ xCa fgU -wul +liI mxQ qFg hvF @@ -77431,7 +77431,7 @@ eJQ jlH bUB uwk -lCD +fpN aaK dkj kNz @@ -78389,7 +78389,7 @@ ppb kfA kfA tUs -vjl +pnj mxQ oYM nVq @@ -79632,7 +79632,7 @@ kqC cCq pDV mxQ -fCZ +dIT nZQ sso mxQ @@ -79818,7 +79818,7 @@ lPV kDq ecM nSx -lZL +eiQ gCb ejO gqe @@ -80085,7 +80085,7 @@ hvF mxQ mxQ mxQ -ieU +qbv cNn oYM nVq @@ -80266,7 +80266,7 @@ jTJ jTJ jTJ mCT -sRH +skH ffZ tUs fgU @@ -81468,7 +81468,7 @@ jmG cKa cKa cKa -mUV +xmt roY roY roY @@ -81750,7 +81750,7 @@ ngr fKr fAV dxO -jLS +gSJ bzO bzO kfA @@ -82606,7 +82606,7 @@ oYM oYM dCb mxQ -cbx +xhY oYM oYM oYM @@ -83242,7 +83242,7 @@ hll oYM dCb mxQ -cbx +xhY oYM oYM oYM @@ -83639,7 +83639,7 @@ ozh mQZ mQZ izZ -uFc +fkp gWq waz bEX @@ -85708,7 +85708,7 @@ bce bce cAW cAW -hob +gNu pcu fiq nfF @@ -86198,7 +86198,7 @@ wDV wXf kwm cll -cDf +wWf wDV pOd pOd @@ -86802,7 +86802,7 @@ bQM bQM xDw yiD -aOJ +lAm jUp qHC qyk @@ -91689,7 +91689,7 @@ xeO mUA xeO gqZ -ybY +oKb xeO vUf hKI @@ -92113,7 +92113,7 @@ xeO xeO xeO dIp -ybY +oKb xeO wqM hKI diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm index 72b524015b..63fb17b8f8 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -234,6 +234,21 @@ name = "pool" }, /area/template_noop) +"ks" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/plush/therapy/blue{ + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = 10; + pixel_y = 4 + }, +/obj/item/clothing/head/bowlerhat{ + pixel_y = 16; + layer = 3.1 + }, +/turf/open/floor/wood, +/area/template_noop) "kA" = ( /obj/structure/platform{ dir = 1 @@ -335,6 +350,23 @@ "ni" = ( /turf/closed/wall/prison, /area/template_noop) +"nA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{ + pixel_x = 6; + pixel_y = 5; + layer = 3.1 + }, +/obj/item/toy/plush/farwa{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/trash/cigbutt{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/template_noop) "nC" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -399,6 +431,23 @@ icon_state = "darkbrown2" }, /area/template_noop) +"pM" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 + }, +/obj/item/toy/plush/barricade{ + pixel_x = -3; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) "ql" = ( /obj/item/trash/sosjerky{ pixel_x = -14; @@ -547,22 +596,6 @@ icon_state = "darkbrowncorners2" }, /area/template_noop) -"vd" = ( -/obj/structure/prop/souto_land/pole, -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 24 - }, -/obj/item/toy/plushie_cade{ - pixel_x = 1; - pixel_y = -9 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/template_noop) "vf" = ( /obj/structure/platform_decoration{ dir = 4 @@ -626,6 +659,22 @@ }, /turf/open/floor/wood, /area/template_noop) +"wl" = ( +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 + }, +/obj/item/toy/plush/barricade{ + pixel_x = 1; + pixel_y = -9 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) "wS" = ( /turf/open/floor/prison{ dir = 6; @@ -644,6 +693,28 @@ icon_state = "floor_plate" }, /area/template_noop) +"xr" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 + }, +/obj/item/toy/plush/barricade{ + pixel_x = 1; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) "xz" = ( /obj/structure/prop/souto_land/streamer{ dir = 9 @@ -723,23 +794,6 @@ icon_state = "darkbrown2" }, /area/template_noop) -"Bm" = ( -/obj/structure/prop/souto_land/pole{ - dir = 1 - }, -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 24 - }, -/obj/item/toy/plushie_cade{ - pixel_x = -3; - pixel_y = -9 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/template_noop) "Bv" = ( /obj/structure/prop/souto_land/streamer{ dir = 9 @@ -756,23 +810,6 @@ }, /turf/open/floor/wood, /area/template_noop) -"BY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{ - pixel_x = 6; - pixel_y = 5; - layer = 3.1 - }, -/obj/item/toy/farwadoll{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/trash/cigbutt{ - pixel_x = -6; - pixel_y = 11 - }, -/turf/open/floor/wood, -/area/template_noop) "Ci" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/beer_pack{ @@ -815,17 +852,17 @@ name = "pool" }, /area/template_noop) +"DW" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/storage/pill_bottle/kelotane/skillless, +/turf/open/floor/prison, +/area/template_noop) "Fj" = ( /obj/structure/platform_decoration{ dir = 8 }, /turf/open/floor/wood, /area/template_noop) -"Fl" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/storage/pill_bottle/kelotane/skillless, -/turf/open/floor/prison, -/area/template_noop) "Fo" = ( /turf/open/floor/prison{ dir = 4; @@ -844,21 +881,6 @@ icon_state = "darkbrown2" }, /area/template_noop) -"FD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/therapy_blue{ - pixel_y = 4 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = 10; - pixel_y = 4 - }, -/obj/item/clothing/head/bowlerhat{ - pixel_y = 16; - layer = 3.1 - }, -/turf/open/floor/wood, -/area/template_noop) "FN" = ( /obj/item/toy/crossbow{ pixel_x = 11; @@ -875,32 +897,6 @@ }, /turf/open/floor/plating/prison, /area/template_noop) -"Gp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = -7 - }, -/obj/item/trash/plate{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/trash/plate{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/trash/plate{ - pixel_x = 7 - }, -/obj/item/trash/plate{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/trash/plate{ - pixel_x = 7; - pixel_y = 9 - }, -/turf/open/floor/wood, -/area/template_noop) "Gu" = ( /obj/item/trash/crushed_cup{ pixel_y = -2; @@ -1116,6 +1112,30 @@ icon_state = "floor_plate" }, /area/template_noop) +"MQ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 + }, +/obj/item/toy/plush/barricade{ + pixel_x = -1; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) "MS" = ( /obj/structure/platform, /obj/structure/platform{ @@ -1256,28 +1276,6 @@ }, /turf/open/floor/wood, /area/template_noop) -"SW" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/souto_land/pole, -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 24 - }, -/obj/item/toy/plushie_cade{ - pixel_x = 1; - pixel_y = -9 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/template_noop) "Th" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ @@ -1435,30 +1433,6 @@ /obj/effect/landmark/corpsespawner/prisoner, /turf/open/floor/wood, /area/template_noop) -"XU" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/souto_land/pole{ - dir = 1 - }, -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 24 - }, -/obj/item/toy/plushie_cade{ - pixel_x = -1; - pixel_y = -9 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/template_noop) "XX" = ( /obj/structure/platform_decoration, /turf/open/floor/prison{ @@ -1480,6 +1454,32 @@ }, /turf/open/floor/wood, /area/template_noop) +"Yr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = -7 + }, +/obj/item/trash/plate{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/trash/plate{ + pixel_x = 7 + }, +/obj/item/trash/plate{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_x = 7; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/template_noop) "YB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/template_noop) @@ -1508,7 +1508,7 @@ (1,1,1) = {" Rs Qn -Fl +DW Qn rp fX @@ -1678,7 +1678,7 @@ ou ni ni Zr -FD +ks az Wh xQ @@ -1723,7 +1723,7 @@ Wh "} (10,1,1) = {" uw -SW +xr ng yx yx @@ -1739,7 +1739,7 @@ fL XM yx yx -vd +wl pB pH XM @@ -1747,7 +1747,7 @@ Jr "} (11,1,1) = {" DN -XU +MQ JR Fo Fo @@ -1763,7 +1763,7 @@ rU KM Fo Gu -Bm +pM yL LW Fo @@ -1809,7 +1809,7 @@ DT Wh cj Zr -BY +nA az cb Fy @@ -1886,7 +1886,7 @@ RW nf nf nf -Gp +Yr Bf "} (17,1,1) = {" diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index aaaaeb0c11..73bac53675 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -26844,7 +26844,7 @@ /area/ice_colony/underground/storage/highsec) "bCS" = ( /obj/structure/safe, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /obj/item/reagent_container/food/drinks/bottle/absinthe, /turf/open/floor{ dir = 1; @@ -27958,7 +27958,7 @@ /area/ice_colony/surface/bar/canteen) "bFZ" = ( /obj/structure/surface/table/reinforced, -/obj/item/toy/farwadoll, +/obj/item/toy/plush/farwa, /turf/open/floor{ icon_state = "darkblue2" }, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 7559e07353..701a660ddb 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -388,6 +388,15 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"akb" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/cargo) "akh" = ( /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, @@ -456,24 +465,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) -"amy" = ( -/obj/item/toy/farwadoll{ - desc = "A Farwa plush doll. Once soft and comforting now just really wet."; - name = "Soaked farwa plush doll" - }, -/turf/open/gm/river, -/area/lv522/atmos/sewer) -"amC" = ( -/obj/structure/bed/roller, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/lv522/indoors/a_block/admin) "amP" = ( /obj/structure/machinery/light{ dir = 8 @@ -507,6 +498,11 @@ icon_state = "cell_stripe" }, /area/lv522/atmos/way_in_command_centre) +"anc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/glasses/sunglasses, +/turf/open/floor/carpet, +/area/lv522/indoors/c_block/garage) "ann" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -807,6 +803,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"avX" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "awj" = ( /obj/item/stack/rods, /turf/open/floor/prison, @@ -1146,6 +1146,20 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) +"aGA" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_x = -7; + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/lv522/indoors/a_block/dorms) "aGE" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/buritto, @@ -1366,18 +1380,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"aNn" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Corporate"; - pixel_y = 26 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/corpo) "aNr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -1411,6 +1413,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"aOj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = -7; + pixel_y = 12 + }, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/garage) "aOP" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/dirt, @@ -1460,14 +1471,6 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/central_streets) -"aQe" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical) "aQs" = ( /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ @@ -2375,18 +2378,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) -"bny" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Garage"; - pixel_y = 26 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/reactor_garage) "bnz" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -2417,6 +2408,21 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"bof" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Chief Engineer Office"; + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + pixel_x = 3; + pixel_y = -1 + }, +/turf/open/floor/wood/ship, +/area/lv522/atmos/way_in_command_centre) "bou" = ( /obj/item/stack/tile/plasteel{ name = "ceiling tile"; @@ -2437,6 +2443,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"bpb" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/indoors/a_block/corpo) "bpD" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/corsat{ @@ -2558,6 +2571,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"bvU" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorm_north) "bwd" = ( /obj/item/toy/beach_ball/holoball{ pixel_x = 8; @@ -2709,6 +2726,15 @@ icon_state = "cell_stripe" }, /area/lv522/atmos/reactor_garage) +"bzw" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Dorms"; + pixel_y = 26 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "bzC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/cargo_intake) @@ -2799,6 +2825,22 @@ /obj/structure/cargo_container/grant/left, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) +"bBE" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Garage"; + pixel_x = -16 + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/garage) "bBF" = ( /obj/item/ammo_box/magazine/misc/mre, /obj/item/prop/colony/usedbandage{ @@ -2946,6 +2988,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"bFC" = ( +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/corpo/glass) "bFU" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -2968,32 +3021,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"bGN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/cargo) "bGT" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges) -"bGV" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/on{ - pixel_x = 4; - pixel_y = 14 - }, -/obj/item/device/binoculars, -/turf/open/floor/wood, -/area/lv522/indoors/a_block/executive) "bHa" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ req_access = list(7,23,27) @@ -3121,12 +3152,6 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) -"bJy" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/atmos/way_in_command_centre) "bJE" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_fuel"; @@ -3535,17 +3560,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"bTA" = ( -/obj/structure/surface/table/gamblingtable, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 3; - pixel_y = 13 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_y = 4 - }, -/turf/open/floor/carpet, -/area/lv522/indoors/c_block/casino) "bTF" = ( /obj/structure/machinery/blackbox_recorder, /obj/effect/decal/cleanable/cobweb, @@ -4129,6 +4143,17 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"cgF" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/clothing/under/suit_jacket/stowaway, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/strata{ + icon_state = "multi_tiles" + }, +/area/lv522/indoors/c_block/mining) "cgG" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper C-Block - Cargo Airlock" @@ -4147,6 +4172,16 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) +"chG" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security) "chR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -4414,6 +4449,29 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"cpE" = ( +/obj/structure/surface/table/almayer, +/obj/structure/phone_base/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Engineering"; + pixel_y = -6 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) +"cpG" = ( +/obj/structure/surface/table/almayer, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Colony Operations Centre"; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/admin) "cpJ" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -5487,16 +5545,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) -"cMq" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/mineral/diamond{ - amount = 2 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/atmos/cargo_intake) "cMv" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/machinery/light{ @@ -5901,6 +5949,22 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor) +"cVv" = ( +/obj/structure/surface/table/almayer, +/obj/item/grown/nettle/death{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/seeds/glowshroom, +/obj/item/seeds/glowshroom{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "cVy" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/corsat, @@ -6051,6 +6115,18 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"cYB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Garage"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/reactor_garage) "cYE" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -6356,29 +6432,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"ddo" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stack/sheet/metal{ - amount = 30 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/atmos/cargo_intake) -"ddq" = ( -/obj/structure/surface/rack, -/obj/item/device/analyzer, -/obj/item/stack/sheet/cardboard/full_stack, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/mining) "ddr" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/bottle/davenport{ @@ -6627,6 +6680,13 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_street) +"dht" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/atmos/cargo_intake) "dhH" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -6895,6 +6955,20 @@ icon_state = "plate" }, /area/lv522/indoors/c_block/mining) +"dmA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/adv/empty{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/reagent_container/hypospray/autoinjector/kelotane{ + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/garage) "dmE" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -7375,12 +7449,6 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) -"dwX" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/garage) "dxc" = ( /obj/structure/prop/invuln/overhead_pipe{ name = "overhead pipe"; @@ -7450,6 +7518,13 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical) +"dyQ" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/lv522/indoors/a_block/kitchen) "dyS" = ( /obj/item/stack/sheet/wood, /turf/open/auto_turf/sand_white/layer0, @@ -8439,10 +8514,6 @@ icon_state = "brown" }, /area/lv522/oob) -"dTs" = ( -/obj/structure/bed/roller, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "dTv" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/prison, @@ -8489,6 +8560,28 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"dUw" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "LZ1 Checkpoint"; + pixel_x = 4; + pixel_y = -5 + }, +/obj/item/tool/stamp/denied{ + pixel_x = -11; + pixel_y = 8 + }, +/obj/item/clothing/head/hardhat/white{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/landing_zone_1/ceiling) "dUD" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Ensign Robert 'Roach' Yangley" @@ -8558,6 +8651,14 @@ /obj/structure/closet/crate/trashcart, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"dWm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen/blue/clicky, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/casino) "dWn" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/plating_catwalk/prison, @@ -8594,6 +8695,17 @@ icon_state = "plate" }, /area/lv522/atmos/west_reactor) +"dWX" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Eastern Reactor Control"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor) "dWY" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "32" @@ -8780,20 +8892,6 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/bridge) -"eah" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; - icon_state = "pottedplant_21"; - layer = 3.1; - name = "synthethic potted plant"; - pixel_y = 14 - }, -/obj/item/prop/alien/hugger, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/lv522/indoors/a_block/dorms) "eam" = ( /obj/structure/blocker/forcefield/vehicles, /turf/open/floor/corsat{ @@ -8806,6 +8904,13 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/west) +"eaC" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "eaE" = ( /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) @@ -8836,20 +8941,6 @@ icon_state = "brown" }, /area/lv522/oob) -"ebR" = ( -/obj/structure/surface/table/almayer, -/obj/structure/phone_base/colony_net{ - dir = 1; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Engineering"; - pixel_y = -6 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "ecm" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/prison{ @@ -9654,10 +9745,6 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) -"erw" = ( -/obj/vehicle/train/cargo/trolley, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "erA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9923,6 +10010,16 @@ /obj/item/tool/wirecutters/clippers, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) +"exy" = ( +/obj/structure/surface/table/almayer, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "exB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -10114,6 +10211,11 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) +"eAT" = ( +/obj/structure/surface/table/almayer, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "eAX" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/fertilizer, @@ -10130,6 +10232,17 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/plating, /area/lv522/atmos/east_reactor) +"eBk" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/tool/pen/blue/clicky, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/a_block/hallway) "eBm" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ @@ -10386,13 +10499,10 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor/west) -"eHX" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/atmos/cargo_intake) +"eHY" = ( +/obj/structure/surface/table/gamblingtable, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/casino) "eIk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -10427,10 +10537,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"eJc" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "eJd" = ( /obj/structure/filingcabinet{ density = 0; @@ -10649,6 +10755,32 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/hydro) +"eNy" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Fitness"; + pixel_y = 26 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/lv522/indoors/a_block/fitness) +"eNR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Medical"; + pixel_x = 16 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical/glass) "eNT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10843,6 +10975,20 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) +"eSb" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/tool/pen/blue/clicky, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1/ceiling) "eSf" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -11141,6 +11287,15 @@ }, /turf/open/floor/prison, /area/lv522/atmos/outdoor) +"eYF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "eYM" = ( /turf/closed/wall/strata_outpost/reinforced, /area/lv522/landing_zone_1/tunnel) @@ -11197,23 +11352,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"eZW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "LZ1 Service Tunnel"; - pixel_y = 24 - }, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "eZY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -11233,6 +11371,19 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) +"fad" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/cargo) "faK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -11399,6 +11550,10 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/kitchen/glass) +"fej" = ( +/obj/structure/bed/roller, +/turf/open/floor/prison, +/area/lv522/atmos/cargo_intake) "feu" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -11476,20 +11631,6 @@ }, /turf/open/floor/prison, /area/lv522/landing_zone_2) -"ffO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - dir = 8; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Medical"; - pixel_x = 16 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical/glass) "fgf" = ( /obj/item/ammo_magazine/m2c{ current_rounds = 0; @@ -11921,6 +12062,20 @@ icon_state = "wood-broken4" }, /area/lv522/indoors/b_block/bar) +"fqe" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/blood, +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Entrance Office"; + pixel_y = 26 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "fqD" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -12211,25 +12366,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"fwT" = ( -/obj/item/tool/lighter/random{ - pixel_x = -4; - pixel_y = 13 - }, -/obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/trash/cigbutt{ - pixel_x = 4 - }, -/obj/item/paper/crumpled/bloody{ - pixel_x = -9 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "fwV" = ( /obj/structure/machinery/light{ dir = 1 @@ -12560,20 +12696,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) -"fDj" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/tool/pen/blue/clicky, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/landing_zone_1/ceiling) "fDn" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -12788,6 +12910,22 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/executive) +"fHE" = ( +/obj/structure/surface/table/almayer, +/obj/item/disk{ + desc = "a 2000 Russian crime film. It is a sequel to the 1997 film Brother."; + name = "brat 2 disk" + }, +/obj/structure/machinery/recharger{ + layer = 2.9; + pixel_x = 5; + pixel_y = -13 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "fHH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -12844,6 +12982,16 @@ icon_state = "marked" }, /area/lv522/atmos/west_reactor) +"fJd" = ( +/obj/item/storage/firstaid/o2, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan3" + }, +/area/lv522/indoors/a_block/medical/glass) "fJe" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -13381,6 +13529,14 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) +"fUk" = ( +/obj/structure/surface/table/almayer, +/obj/item/circuitboard/airlock, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/mining) "fUx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -13441,6 +13597,14 @@ "fWG" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) +"fWM" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "fWW" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1 @@ -13546,17 +13710,13 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"fYw" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/sandwich{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/clothing/glasses/meson, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"fYC" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/plasteel/large_stack, +/turf/open/floor/plating{ + icon_state = "platebot" }, -/area/lv522/indoors/c_block/mining) +/area/lv522/indoors/c_block/cargo) "fYD" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -13983,6 +14143,11 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"ggC" = ( +/obj/structure/surface/table/almayer, +/mob/living/simple_animal/mouse, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "ggH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -14107,6 +14272,10 @@ icon_state = "marked" }, /area/lv522/atmos/west_reactor) +"giL" = ( +/obj/vehicle/train/cargo/trolley, +/turf/open/floor/prison, +/area/lv522/atmos/cargo_intake) "giV" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/warning_stripes{ @@ -14305,14 +14474,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) -"gnl" = ( -/obj/structure/surface/table/almayer, -/obj/item/circuitboard/airlock, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/mining) "gnx" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -14512,16 +14673,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"grZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control/brbutton/alt{ - id = "Sec-Kitchen-Lockdown"; - name = "remote door-control"; - pixel_x = -4; - pixel_y = 2 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/security/glass) "gse" = ( /obj/structure/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, @@ -15081,6 +15232,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"gCz" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "gCE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/meat, @@ -15323,22 +15480,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"gHm" = ( +"gHj" = ( /obj/structure/surface/table/almayer, -/obj/item/seeds/bananaseed{ - pixel_x = -5; - pixel_y = 8 +/obj/item/trash/plate{ + pixel_y = 13 }, -/obj/item/seeds/berryseed, -/obj/structure/machinery/light{ - dir = 4 +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 20 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "darkbrownfull2" }, -/area/lv522/indoors/b_block/hydro) +/area/lv522/indoors/c_block/cargo) "gHz" = ( /turf/open/asphalt/cement{ icon_state = "cement2" @@ -16079,6 +16232,14 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_2/ceiling) +"gVD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical) "gWb" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/bottle/sake{ @@ -16562,6 +16723,14 @@ /obj/structure/platform_decoration, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"hcQ" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "hcV" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -16622,6 +16791,21 @@ }, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/n_rockies) +"hdC" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/tool/pen/blue/clicky, +/obj/item/device/flashlight/lamp{ + pixel_x = -9; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/cargo) "hdG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -17286,13 +17470,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) -"hoZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate{ - pixel_y = 8 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "hpe" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -17531,20 +17708,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"huX" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - dir = 1; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Kitchen"; - pixel_y = -6 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/lv522/indoors/a_block/kitchen) "hvh" = ( /obj/structure/platform, /turf/open/gm/river, @@ -17919,14 +18082,6 @@ icon_state = "brown" }, /area/lv522/atmos/command_centre) -"hBC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/autopsy_scanner, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical) "hBD" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat{ @@ -18624,21 +18779,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/atmos/cargo_intake) -"hPQ" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "LV522 Chances Claim"; - phone_id = "Chief Engineer Office"; - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/reagent_container/food/drinks/coffeecup/wy{ - pixel_x = 3; - pixel_y = -1 - }, -/turf/open/floor/wood/ship, -/area/lv522/atmos/way_in_command_centre) "hPT" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -19053,12 +19193,6 @@ icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) -"hYn" = ( -/obj/item/tool/pen/blue/clicky{ - pixel_x = 6 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "hYw" = ( /obj/structure/bed/sofa/south/grey/left{ pixel_y = 16 @@ -19427,6 +19561,18 @@ icon_state = "marked" }, /area/lv522/atmos/north_command_centre) +"ifv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/storage/firstaid/regular, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical/glass) "ifw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -19657,19 +19803,6 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"ike" = ( -/obj/item/prop/alien/hugger, -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Bar & Grill"; - pixel_x = -16 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/lv522/indoors/b_block/bar) "ikp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -19858,22 +19991,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"ipC" = ( -/obj/structure/toilet{ - pixel_y = 16 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "white_cyan2" - }, -/area/lv522/indoors/toilet) "ipH" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/mineral/gold{ @@ -19971,17 +20088,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"irH" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/reagent_container/food/drinks/drinkingglass{ - icon_state = "shotglass"; - pixel_x = 13; - pixel_y = 17 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/lv522/indoors/b_block/bar) "irR" = ( /obj/structure/platform_decoration{ dir = 4 @@ -20431,18 +20537,6 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo/glass) -"izp" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/glasses/meson, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "izr" = ( /obj/structure/platform/stair_cut, /obj/structure/stairs/perspective{ @@ -20650,6 +20744,15 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) +"iEN" = ( +/obj/item/reagent_container/food/drinks/drinkingglass{ + icon_state = "shotglass"; + pixel_x = 12; + pixel_y = 16 + }, +/obj/structure/surface/table/gamblingtable, +/turf/open/floor/carpet, +/area/lv522/indoors/c_block/casino) "iFe" = ( /obj/structure/closet/crate, /obj/item/weapon/classic_baton, @@ -21227,11 +21330,6 @@ icon_state = "marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) -"iPO" = ( -/obj/structure/surface/table/almayer, -/mob/living/simple_animal/mouse, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "iPR" = ( /turf/open/asphalt/cement{ icon_state = "cement3" @@ -21503,6 +21601,29 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"iVZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/tool/pen/blue/clicky, +/obj/item/device/flashlight/lamp{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control/brbutton/alt{ + id = "LZ1_Lockdown_Lo"; + name = "remote door-control"; + pixel_x = -7 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1/ceiling) "iWc" = ( /obj/structure/filtration/machine_64x96{ icon_state = "filtration_machine_A_1" @@ -22180,6 +22301,16 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"jih" = ( +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Cargo"; + pixel_x = -16 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/c_block/cargo) "jin" = ( /obj/structure/filtration/machine_96x96/indestructible{ icon_state = "sedimentation_A_1"; @@ -22658,22 +22789,6 @@ icon_state = "brown" }, /area/lv522/oob) -"joL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Garage"; - pixel_x = -16 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/garage) "joV" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/asphalt/cement{ @@ -23514,18 +23629,6 @@ }, /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) -"jEF" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Meeting Room"; - pixel_y = 26 - }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/east_reactor/south) "jEW" = ( /obj/structure/bed/chair{ dir = 1 @@ -24309,6 +24412,17 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"jUE" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/reagent_container/food/drinks/drinkingglass{ + icon_state = "shotglass"; + pixel_x = 13; + pixel_y = 17 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/lv522/indoors/b_block/bar) "jUI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -24352,6 +24466,18 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"jVm" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/bronze{ + icon_state = "ashtray_full_bl"; + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/toy/plush/farwa, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "jVq" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 @@ -24899,16 +25025,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) -"kfi" = ( -/obj/structure/surface/table/almayer, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "kfq" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -25653,6 +25769,22 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"kru" = ( +/obj/structure/surface/table/almayer, +/obj/item/seeds/bananaseed{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/seeds/berryseed, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "krw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/monkey_spawn, @@ -26152,14 +26284,6 @@ /obj/structure/cargo_container/grant/left, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) -"kBU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/pen/blue/clicky, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/casino) "kCf" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Sergeant James 'Four eyes' Brown" @@ -27216,14 +27340,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) -"kUP" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security) "kVa" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno{ @@ -27372,17 +27488,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) -"kXk" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/obj/item/clothing/under/suit_jacket/stowaway, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/strata{ - icon_state = "multi_tiles" - }, -/area/lv522/indoors/c_block/mining) "kXo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27833,6 +27938,20 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"lfI" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Kitchen"; + pixel_y = -6 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/lv522/indoors/a_block/kitchen) "lfS" = ( /turf/open/asphalt/cement{ icon_state = "cement2" @@ -28232,6 +28351,14 @@ icon_state = "brown" }, /area/lv522/atmos/filt) +"lol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/fancy/cigarettes/blackpack{ + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/lv522/indoors/a_block/executive) "lot" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29250,6 +29377,24 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) +"lIu" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/tool/lighter/random{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1/ceiling) "lIB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29585,6 +29730,22 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) +"lRn" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/hardhat/orange{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/item/tool/lighter/random{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1/ceiling) "lRx" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -29652,15 +29813,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) -"lSP" = ( -/obj/structure/surface/table/almayer, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "LV522 Chances Claim"; - phone_id = "Colony Operations Centre"; - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/a_block/admin) "lTd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -30064,19 +30216,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"mbw" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Dining"; - pixel_y = 26 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/kitchen/glass) "mbx" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer2, @@ -30774,6 +30913,16 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/west) +"mpo" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/mineral/diamond{ + amount = 2 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/atmos/cargo_intake) "mpr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -31009,16 +31158,6 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/floor/grass, /area/lv522/indoors/a_block/garden) -"mtM" = ( -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Cargo"; - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/c_block/cargo) "mua" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/atmos/filt) @@ -31029,28 +31168,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"muO" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/structure/phone_base/colony_net{ - dir = 1; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "LZ1 Checkpoint"; - pixel_x = 4; - pixel_y = -5 - }, -/obj/item/tool/stamp/denied{ - pixel_x = -11; - pixel_y = 8 - }, -/obj/item/clothing/head/hardhat/white{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/landing_zone_1/ceiling) "muP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -31529,24 +31646,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"mFm" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/tool/lighter/random{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/landing_zone_1/ceiling) "mFA" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -31769,6 +31868,13 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"mKC" = ( +/obj/item/toy/plush/farwa{ + desc = "A Farwa plush doll. Once soft and comforting now just really wet."; + name = "Soaked farwa plush doll" + }, +/turf/open/gm/river, +/area/lv522/atmos/sewer) "mKK" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -32243,6 +32349,17 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"mRg" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Sewer"; + pixel_y = 26 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/sewer) "mRh" = ( /obj/structure/window/framed/corsat, /turf/open/floor/corsat, @@ -32487,6 +32604,22 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"mWa" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/lv522/indoors/toilet) "mWc" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -32665,6 +32798,23 @@ "nax" = ( /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) +"naB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "LZ1 Service Tunnel"; + pixel_y = 24 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "naC" = ( /obj/structure/shuttle/engine/heater{ dir = 8; @@ -32904,18 +33054,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) -"nem" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Northern Dorms"; - pixel_y = 26 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/strata{ - icon_state = "blue1" - }, -/area/lv522/indoors/a_block/dorm_north) "nez" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -33016,6 +33154,11 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"ngb" = ( +/obj/structure/surface/table/gamblingtable, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/casino) "ngd" = ( /obj/item/tool/wrench, /obj/effect/decal/cleanable/dirt, @@ -33566,10 +33709,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/south) -"nqj" = ( -/obj/structure/surface/table/gamblingtable, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/casino) "nqo" = ( /obj/item/device/flashlight/lamp{ pixel_y = 13 @@ -33682,18 +33821,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) -"nrJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/storage/firstaid/regular, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical/glass) "nrL" = ( /obj/structure/surface/table/almayer{ dir = 8; @@ -34186,15 +34313,18 @@ /obj/item/tool/wrench, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"nDS" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Dorms"; - pixel_y = 26 +"nDZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = 2; + pixel_y = 4 }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) +/obj/item/tool/pen/blue/clicky, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/a_block/hallway) "nEd" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -34407,15 +34537,6 @@ "nJv" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/lone_buildings/engineering) -"nJO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/atmos/way_in_command_centre) "nJV" = ( /obj/structure/noticeboard, /turf/closed/wall/strata_outpost, @@ -34478,6 +34599,18 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"nKU" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/lv522/indoors/a_block/dorms/glass) "nKZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -34661,6 +34794,11 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) +"nNz" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/bucket, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/b_block/hydro) "nNA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -34889,6 +35027,18 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"nQX" = ( +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Security"; + pixel_x = -16 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security/glass) "nQY" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "53" @@ -34941,6 +35091,18 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/t_comm) +"nSk" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Corporate"; + pixel_y = 26 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/corpo) "nSm" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, @@ -35387,13 +35549,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"nZn" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/plasteel/large_stack, -/turf/open/floor/plating{ - icon_state = "platebot" - }, -/area/lv522/indoors/c_block/cargo) "nZv" = ( /obj/structure/machinery/conveyor{ dir = 4; @@ -35507,6 +35662,18 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) +"occ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/shovel/etool/folded, +/obj/item/tool/soap/deluxe{ + pixel_x = 4; + pixel_y = 13 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/corpo) "ocn" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -36355,17 +36522,6 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) -"osm" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Sewer"; - pixel_y = 26 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/atmos/sewer) "osN" = ( /turf/open/asphalt/cement{ icon_state = "cement4" @@ -36403,6 +36559,14 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/medical) +"otv" = ( +/obj/structure/surface/rack, +/obj/item/device/analyzer, +/obj/item/stack/sheet/cardboard/full_stack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/mining) "otx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -36555,6 +36719,20 @@ /obj/structure/platform, /turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) +"ovV" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; + icon_state = "pottedplant_21"; + layer = 3.1; + name = "synthethic potted plant"; + pixel_y = 14 + }, +/obj/item/prop/alien/hugger, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/lv522/indoors/a_block/dorms) "owe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -36682,6 +36860,18 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"oyR" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/surgical_tray/empty, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/lv522/outdoors/w_rockies) "oyY" = ( /obj/structure/largecrate, /obj/effect/landmark/lv624/fog_blocker/short, @@ -36723,12 +36913,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) -"ozJ" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/strata{ - icon_state = "blue1" - }, -/area/lv522/indoors/a_block/dorm_north) "ozQ" = ( /obj/structure/stairs/perspective{ dir = 9; @@ -36748,10 +36932,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"oAd" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorm_north) "oAp" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, @@ -36946,15 +37126,6 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/dorms) -"oFG" = ( -/obj/item/reagent_container/food/drinks/drinkingglass{ - icon_state = "shotglass"; - pixel_x = 12; - pixel_y = 16 - }, -/obj/structure/surface/table/gamblingtable, -/turf/open/floor/carpet, -/area/lv522/indoors/c_block/casino) "oFN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37067,18 +37238,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"oHR" = ( -/obj/structure/phone_base/colony_net{ - dir = 4; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Security"; - pixel_x = -16 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security/glass) "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -37218,17 +37377,6 @@ icon_state = "cell_stripe" }, /area/lv522/atmos/east_reactor/south) -"oKN" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Central Office"; - pixel_y = 26 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/command_centre) "oKP" = ( /obj/structure/machinery/autolathe, /obj/effect/decal/cleanable/dirt, @@ -37949,6 +38097,18 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/op_centre) +"oZd" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/glasses/meson, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "oZC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -38742,12 +38902,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) -"pqA" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/lv522/indoors/b_block/bar) "pqB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, @@ -38756,24 +38910,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"pqI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/soap{ - pixel_x = 5 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/stack/nanopaste{ - pixel_x = 8; - pixel_y = 15 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "cyan2" - }, -/area/lv522/indoors/a_block/medical) "pqQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -39316,24 +39452,6 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) -"pCb" = ( -/obj/structure/filingcabinet/seeds{ - density = 0; - pixel_x = -8; - pixel_y = 16 - }, -/obj/structure/filingcabinet/seeds{ - density = 0; - pixel_x = 7; - pixel_y = 16 - }, -/obj/structure/pipes/vents/pump, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/b_block/hydro) "pCg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -39558,6 +39676,18 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"pEZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/adv{ + pixel_y = 9 + }, +/obj/item/storage/firstaid/adv, +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical/glass) "pFw" = ( /obj/structure/cargo_container/horizontal/blue/middle, /obj/effect/landmark/lv624/fog_blocker/short, @@ -39721,14 +39851,6 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"pJd" = ( -/obj/effect/decal/cleanable/cobweb2, -/obj/structure/surface/table/almayer, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/b_block/hydro) "pJh" = ( /obj/structure/surface/table/almayer{ dir = 4; @@ -40315,6 +40437,15 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"pTJ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/on{ + pixel_x = 4; + pixel_y = 14 + }, +/obj/item/device/binoculars, +/turf/open/floor/wood, +/area/lv522/indoors/a_block/executive) "pTO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed{ @@ -40699,6 +40830,12 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"qaj" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/a_block/hallway) "qal" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/green, @@ -40877,6 +41014,35 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"qdg" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Dining"; + pixel_y = 26 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/kitchen/glass) +"qdA" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/stamp/denied{ + pixel_x = -11; + pixel_y = 8 + }, +/obj/item/card/id/silver/clearance_badge/cl{ + desc = "Wow sorry, didn't mean to drop that in front of you, it's real, btw."; + name = "certified powerloader operator card"; + pixel_x = 5; + registered_name = "John Forklift" + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/cargo) "qdO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -41256,6 +41422,19 @@ icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) +"qmF" = ( +/obj/item/prop/alien/hugger, +/obj/structure/phone_base/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Bar & Grill"; + pixel_x = -16 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/lv522/indoors/b_block/bar) "qmM" = ( /obj/structure/prop/invuln/fire{ pixel_x = -8; @@ -41586,6 +41765,12 @@ icon_state = "plate" }, /area/lv522/atmos/filt) +"qrU" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "qsd" = ( /obj/structure/pipes/standard/simple/visible{ dir = 10 @@ -41953,17 +42138,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"qyp" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Eastern Reactor Control"; - pixel_y = 26 - }, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/east_reactor) "qyG" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer0, @@ -42062,6 +42236,10 @@ "qzQ" = ( /turf/open/floor/prison, /area/lv522/indoors/b_block/bridge) +"qzT" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/lv522/indoors/b_block/hydro) "qzU" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -42386,18 +42564,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) -"qGh" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Fitness"; - pixel_y = 26 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/lv522/indoors/a_block/fitness) "qGq" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -42658,18 +42824,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) -"qLd" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/surgical_tray/empty, -/obj/structure/machinery/light/double{ - dir = 4; - pixel_y = -5 - }, -/turf/open/floor/strata{ - dir = 8; - icon_state = "white_cyan2" - }, -/area/lv522/outdoors/w_rockies) "qLk" = ( /obj/structure/closet/firecloset/full, /obj/effect/landmark/lv624/fog_blocker/short, @@ -43151,24 +43305,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"qSH" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"qSL" = ( +"qSA" = ( /obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/tool/pen/blue/clicky, -/obj/item/device/flashlight/lamp{ - pixel_x = -9; - pixel_y = 10 - }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "kitchen" }, -/area/lv522/indoors/c_block/cargo) +/area/lv522/indoors/b_block/bar) +"qSH" = ( +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "qSP" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "61" @@ -43419,6 +43564,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) +"qWi" = ( +/obj/structure/machinery/computer/operating, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan2" + }, +/area/lv522/indoors/a_block/medical) "qWt" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -43602,14 +43755,6 @@ }, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) -"qZh" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/egg_box, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/lv522/indoors/a_block/dorms) "qZu" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/asphalt/cement{ @@ -43996,6 +44141,16 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/a_block/dorm_north) +"rfc" = ( +/obj/structure/surface/table/almayer, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/lv522/indoors/c_block/mining) "rfe" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -44021,22 +44176,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/lv522/indoors/a_block/dorm_north) -"rfl" = ( -/obj/structure/surface/table/almayer, -/obj/item/grown/nettle/death{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/seeds/glowshroom, -/obj/item/seeds/glowshroom{ - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/b_block/hydro) "rfB" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 6; @@ -44048,27 +44187,16 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/east_central_street) -"rfK" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/stamp/denied{ - pixel_x = -11; - pixel_y = 8 - }, -/obj/item/card/id/silver/clearance_badge/cl{ - desc = "Wow sorry, didn't mean to drop that in front of you, it's real, btw."; - name = "certified powerloader operator card"; - pixel_x = 5; - registered_name = "John Forklift" - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/cargo) -"rfW" = ( +"rfC" = ( +/obj/item/tool/surgery/circular_saw, +/obj/item/tool/surgery/cautery, +/obj/item/tool/surgery/retractor, /obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/glasses/sunglasses, -/turf/open/floor/carpet, -/area/lv522/indoors/c_block/garage) +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical) "rge" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -44095,18 +44223,6 @@ /obj/structure/platform, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"rgW" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/bronze{ - icon_state = "ashtray_full_bl"; - pixel_x = -8; - pixel_y = 7 - }, -/obj/item/toy/farwadoll, -/turf/open/floor/strata{ - icon_state = "blue1" - }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) "rhh" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/decal/cleanable/dirt, @@ -44166,6 +44282,18 @@ icon_state = "102" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"ris" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/fire{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/storage/firstaid/fire, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical/glass) "riE" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "68" @@ -44200,20 +44328,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"rjl" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/effect/decal/cleanable/blood, -/obj/structure/phone_base/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Reactor Entrance Office"; - pixel_y = 26 - }, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/lv522/atmos/east_reactor/south) "rjn" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6; @@ -44264,13 +44378,6 @@ icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"rkd" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/lv522/indoors/a_block/kitchen) "rkR" = ( /obj/structure/barricade/deployable{ dir = 4 @@ -44470,6 +44577,19 @@ /obj/structure/largecrate/random/barrel, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"rob" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/cargo) "rod" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -44680,6 +44800,21 @@ /obj/item/toy/beach_ball, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) +"rsB" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stack/sheet/metal{ + amount = 30 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/atmos/cargo_intake) "rsF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -44795,20 +44930,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) -"ruW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/adv/empty{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/reagent_container/hypospray/autoinjector/kelotane{ - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/garage) "ruY" = ( /obj/structure/machinery/optable, /obj/structure/machinery/light{ @@ -44990,16 +45111,6 @@ "rxI" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/north_street) -"rxK" = ( -/obj/item/tool/surgery/circular_saw, -/obj/item/tool/surgery/cautery, -/obj/item/tool/surgery/retractor, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical) "rxT" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "East_Lock"; @@ -45233,6 +45344,18 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"rCH" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/off{ + layer = 3.1; + pixel_x = -5; + pixel_y = 14 + }, +/obj/item/tool/screwdriver, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2/ceiling) "rCI" = ( /obj/structure/prop/invuln/fire{ pixel_x = -6; @@ -45403,18 +45526,6 @@ /obj/item/trash/chips, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) -"rIa" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/farwadoll{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/toy/farwadoll, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/indoors/a_block/fitness/glass) "rIj" = ( /obj/structure/fence{ layer = 2.9 @@ -45457,6 +45568,13 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"rIE" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/coffee, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/lv522/indoors/a_block/dorms) "rIH" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -45533,11 +45651,6 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/north_street) -"rJH" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "rJI" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ @@ -46358,17 +46471,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) -"rYT" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen{ - pixel_x = -7 - }, -/obj/item/paper_bin{ - pixel_x = 7; - pixel_y = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/landing_zone_2/ceiling) "rZc" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -46802,14 +46904,6 @@ "sgT" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/indoors/a_block/corpo) -"sgV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/fancy/cigarettes/blackpack{ - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/lv522/indoors/a_block/executive) "sha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -47062,6 +47156,14 @@ icon_state = "kitchen" }, /area/lv522/indoors/b_block/bar) +"sli" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security) "slq" = ( /obj/structure/platform_decoration{ dir = 8 @@ -47072,17 +47174,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) -"slt" = ( -/obj/structure/surface/table/almayer, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "LV522 Chances Claim"; - phone_id = "Reactor Control"; - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/atmos/way_in_command_centre) "slD" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -47487,6 +47578,22 @@ icon_state = "browncorner" }, /area/lv522/atmos/west_reactor) +"ssp" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/weapon/pole/fancy_cane, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv522/indoors/a_block/corpo) +"ssH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/autopsy_scanner, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" + }, +/area/lv522/indoors/a_block/medical) "ssU" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "89" @@ -48016,14 +48123,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) -"sED" = ( -/obj/structure/barricade/wooden{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "sFb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -48755,6 +48854,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"sPX" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/b_block/bar) "sQb" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -49587,6 +49692,17 @@ icon_state = "49" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"thb" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security) "thc" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -49620,6 +49736,12 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/north_east_street) +"thw" = ( +/obj/item/tool/pen/blue/clicky{ + pixel_x = 6 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "thI" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -50012,16 +50134,6 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"toS" = ( -/obj/item/storage/firstaid/o2, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan3" - }, -/area/lv522/indoors/a_block/medical/glass) "toY" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "72" @@ -50364,6 +50476,17 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"tvv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/phone_base/colony_net{ + dir = 1; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Private Casino"; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/lv522/indoors/c_block/casino) "tvx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair, @@ -50462,6 +50585,18 @@ icon_state = "browncorner" }, /area/lv522/atmos/cargo_intake) +"txt" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Meeting Room"; + pixel_y = 26 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/east_reactor/south) "txK" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, @@ -50709,6 +50844,17 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"tCL" = ( +/obj/structure/surface/table/gamblingtable, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 3; + pixel_y = 13 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/lv522/indoors/c_block/casino) "tCN" = ( /turf/closed/wall/strata_ice/dirty, /area/lv522/outdoors/colony_streets/south_east_street) @@ -50744,14 +50890,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/fitness) -"tDu" = ( -/obj/structure/machinery/computer/operating, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata{ - dir = 4; - icon_state = "cyan2" - }, -/area/lv522/indoors/a_block/medical) "tDB" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -51077,6 +51215,16 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/bridge) +"tIW" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control/brbutton/alt{ + id = "Sec-Kitchen-Lockdown"; + name = "remote door-control"; + pixel_x = -4; + pixel_y = 2 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/security/glass) "tJa" = ( /obj/vehicle/train/cargo/trolley, /turf/open/auto_turf/shale/layer1, @@ -51232,6 +51380,22 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"tLA" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/phone_base/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Casino"; + pixel_x = 16 + }, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/casino) "tLE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -52437,14 +52601,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) -"uhF" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/weapon/pole/fancy_cane, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" - }, -/area/lv522/indoors/a_block/corpo) "uhP" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green, @@ -52504,13 +52660,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) -"uii" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" - }, -/area/lv522/indoors/a_block/corpo) "uiu" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, @@ -52847,11 +52996,6 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) -"upP" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/bucket, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/b_block/hydro) "upX" = ( /obj/structure/machinery/disposal, /obj/effect/landmark/lv624/fog_blocker/short, @@ -52939,6 +53083,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"urA" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/egg_box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/lv522/indoors/a_block/dorms) "urM" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 8 @@ -53003,22 +53155,6 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/corpo_fitness) -"utm" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/hardhat/orange{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/item/tool/lighter/random{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/landing_zone_1/ceiling) "utq" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/item/stack/sheet/metal, @@ -53057,17 +53193,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/way_in_command_centre) -"utR" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/pen/blue, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/corpo/glass) "uue" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -53241,18 +53366,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo) -"uxb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/fire{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/storage/firstaid/fire, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical/glass) "uxd" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/auto_turf/shale/layer1, @@ -53780,18 +53893,6 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) -"uHq" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/camera/autoname{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/lv522/indoors/a_block/dorms/glass) "uHE" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement{ @@ -54633,16 +54734,6 @@ "uVS" = ( /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/storage_blocks) -"uVU" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security) "uVZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -54754,6 +54845,10 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) +"uYu" = ( +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/carpet, +/area/lv522/indoors/b_block/bar) "uZc" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison{ @@ -54768,18 +54863,6 @@ icon_state = "brown" }, /area/lv522/atmos/west_reactor) -"uZC" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate{ - pixel_y = 13 - }, -/obj/item/reagent_container/food/snacks/toastedsandwich{ - pixel_y = 20 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/cargo) "uZO" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -54816,19 +54899,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"vaA" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/coffeecup/wy{ - pixel_x = -9; - pixel_y = 7 - }, -/obj/item/device/flashlight/lamp{ - pixel_x = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/cargo) "vaZ" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -10; @@ -54871,6 +54941,18 @@ /obj/structure/cargo_container/hd/mid/alt, /turf/open/floor/prison, /area/lv522/landing_zone_2) +"vbI" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Northern Dorms"; + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/lv522/indoors/a_block/dorm_north) "vbJ" = ( /obj/structure/window/reinforced{ dir = 4; @@ -54979,22 +55061,6 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_street) -"vdx" = ( -/obj/structure/surface/table/almayer, -/obj/item/disk{ - desc = "a 2000 Russian crime film. It is a sequel to the 1997 film Brother."; - name = "brat 2 disk" - }, -/obj/structure/machinery/recharger{ - layer = 2.9; - pixel_x = 5; - pixel_y = -13 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/landing_zone_2/ceiling) "vdH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -55589,22 +55655,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) -"voi" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/phone_base/colony_net{ - dir = 8; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Casino"; - pixel_x = 16 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/casino) "vou" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -55798,6 +55848,18 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"vri" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/plush/farwa{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/toy/plush/farwa, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/a_block/fitness/glass) "vrE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -56108,10 +56170,17 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"vxv" = ( -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/lv522/indoors/b_block/bar) +"vxr" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/snacks/sandwich{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/clothing/glasses/meson, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/c_block/mining) "vxD" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno{ @@ -56720,17 +56789,6 @@ /obj/structure/prop/ice_colony/ground_wire, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"vHU" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security) "vIb" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/gloves/boxing, @@ -57475,15 +57533,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) -"vUn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = -7; - pixel_y = 12 - }, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/garage) "vUx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -58445,6 +58494,17 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"wmJ" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/pen{ + pixel_x = -7 + }, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 8 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/landing_zone_2/ceiling) "wng" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -58551,11 +58611,6 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) -"wpd" = ( -/obj/structure/surface/table/gamblingtable, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/casino) "wpg" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /obj/structure/machinery/light{ @@ -58864,18 +58919,6 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor/west) -"wwn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/shovel/etool/folded, -/obj/item/tool/soap/deluxe{ - pixel_x = 4; - pixel_y = 13 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/corpo) "wwy" = ( /obj/structure/machinery/door/poddoor/almayer{ dir = 2; @@ -59025,20 +59068,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"wyE" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_x = -7; - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/lv522/indoors/a_block/dorms) "wyI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /obj/structure/pipes/standard/simple/hidden/green, @@ -59280,20 +59309,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"wDu" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/phone_base/colony_net{ - dir = 8; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Botany"; - pixel_x = 16 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/lv522/indoors/b_block/hydro) "wDy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -59447,15 +59462,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/way_in_command_centre) -"wGE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - pixel_y = 5 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/cargo) "wGG" = ( /obj/structure/surface/table/almayer{ dir = 8; @@ -59652,13 +59658,6 @@ "wLp" = ( /turf/closed/wall/mineral/bone_resin, /area/lv522/atmos/east_reactor/west) -"wLN" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/lv522/indoors/a_block/dorms) "wLU" = ( /obj/structure/machinery/light{ dir = 8 @@ -59757,12 +59756,6 @@ icon_state = "cement12" }, /area/lv522/outdoors/n_rockies) -"wOC" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/b_block/bar) "wOU" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ @@ -59895,6 +59888,17 @@ icon_state = "30" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"wRQ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "LV522 Chances Claim"; + phone_id = "Reactor Control"; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/atmos/way_in_command_centre) "wRZ" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -60214,6 +60218,24 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"wYX" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/soap{ + pixel_x = 5 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/nanopaste{ + pixel_x = 8; + pixel_y = 15 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan2" + }, +/area/lv522/indoors/a_block/medical) "wZl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -60551,17 +60573,6 @@ /obj/item/prop/colony/used_flare, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"xfS" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/phone_base/colony_net{ - dir = 1; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Private Casino"; - pixel_y = -6 - }, -/turf/open/floor/wood, -/area/lv522/indoors/c_block/casino) "xfW" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ @@ -61004,12 +61015,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/lone_buildings/chunk) -"xnG" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/a_block/hallway) "xnI" = ( /turf/open/floor/prison{ dir = 1; @@ -61513,6 +61518,12 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"xAr" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/garage) "xAw" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/lv522/indoors/a_block/bridges/op_centre) @@ -61615,6 +61626,17 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/east_central_street) +"xCp" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Reactor Central Office"; + pixel_y = 26 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/lv522/atmos/command_centre) "xCG" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -61883,6 +61905,20 @@ }, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"xHJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/phone_base/colony_net{ + dir = 8; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Botany"; + pixel_x = 16 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "xIr" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -62135,10 +62171,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"xNo" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison, -/area/lv522/indoors/b_block/hydro) "xNt" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -62335,18 +62367,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/ship, /area/lv522/atmos/way_in_command_centre) -"xQw" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/tool/pen/blue/clicky, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/a_block/hallway) "xQZ" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" @@ -62485,6 +62505,24 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"xSz" = ( +/obj/structure/filingcabinet/seeds{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/seeds{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/structure/pipes/vents/pump, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/indoors/b_block/hydro) "xSA" = ( /obj/structure/machinery/light{ dir = 1 @@ -62884,17 +62922,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) -"yae" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/tool/pen/blue/clicky, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/a_block/hallway) "yaf" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe/plasmacutter, @@ -63157,6 +63184,17 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"yen" = ( +/obj/structure/bed/roller, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/lv522/indoors/a_block/admin) "yeD" = ( /obj/item/ammo_magazine/pistol/m1911{ current_rounds = 0; @@ -63197,6 +63235,25 @@ icon_state = "squares" }, /area/lv522/atmos/north_command_centre) +"yfk" = ( +/obj/item/tool/lighter/random{ + pixel_x = -4; + pixel_y = 13 + }, +/obj/structure/surface/table/almayer, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/trash/cigbutt{ + pixel_x = 4 + }, +/obj/item/paper/crumpled/bloody{ + pixel_x = -9 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "yfu" = ( /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) @@ -63296,18 +63353,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) -"yhy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/adv{ - pixel_y = 9 - }, -/obj/item/storage/firstaid/adv, -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata{ - dir = 4; - icon_state = "white_cyan1" - }, -/area/lv522/indoors/a_block/medical/glass) "yhz" = ( /obj/structure/window_frame/corsat, /obj/effect/spawner/gibspawner/xeno, @@ -63484,18 +63529,6 @@ icon_state = "whitegreenfull" }, /area/lv522/oob) -"yjP" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/radio/off{ - layer = 3.1; - pixel_x = -5; - pixel_y = 14 - }, -/obj/item/tool/screwdriver, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/landing_zone_2/ceiling) "yjT" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -63533,16 +63566,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"ykn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/lv522/indoors/c_block/mining) "ykL" = ( /turf/open/floor/prison{ dir = 4; @@ -63563,29 +63586,6 @@ "ykT" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) -"ykU" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/tool/pen/blue/clicky, -/obj/item/device/flashlight/lamp{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door_control/brbutton/alt{ - id = "LZ1_Lockdown_Lo"; - name = "remote door-control"; - pixel_x = -7 - }, -/obj/effect/landmark/lv624/fog_blocker/short, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/lv522/landing_zone_1/ceiling) "yld" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -67101,7 +67101,7 @@ bIJ bIJ fXS dsq -eHX +dht bIJ bIJ sLZ @@ -67325,7 +67325,7 @@ uWO uWO aTA bIJ -cMq +mpo nZF nZF nZF @@ -67353,7 +67353,7 @@ rWS rWS pUc qrj -qLd +oyR qUD rkR rkR @@ -67552,7 +67552,7 @@ uWO uWO cpy bIJ -ddo +rsB eaE eaE eaE @@ -69922,7 +69922,7 @@ yiM yiM fCU kvq -izp +oZd qWf icy wdj @@ -70377,8 +70377,8 @@ yiM fXx nJv xVd -kfi -ebR +exy +cpE jkL xzj pWW @@ -70962,7 +70962,7 @@ hzM eaE cFv fsQ -dTs +fej eaE eaE gbH @@ -72210,7 +72210,7 @@ max max rFw aFf -mFm +lIu nnv vbu vbu @@ -72226,7 +72226,7 @@ lBl veq gej tFx -ykU +iVZ rzz nEq tUB @@ -72242,7 +72242,7 @@ yhU yhU ggS tFx -eZW +naB pET fxZ fxZ @@ -72402,7 +72402,7 @@ ruS ruS cLx pMd -eah +ovV trj tUM uOs @@ -72680,7 +72680,7 @@ ien jZD saL ymc -muO +dUw yhU tfl tKS @@ -72862,7 +72862,7 @@ fjP uOs uOs lsD -wyE +aGA nLm ien vXc @@ -72893,7 +72893,7 @@ rFw tFx tFx nuU -fDj +eSb opt tFx tFx @@ -73078,7 +73078,7 @@ nLm pTj drM vKA -uHq +nKU hJp yjW jTS @@ -73107,7 +73107,7 @@ mBF ydU bSD nqY -pqA +qSA gKY eEv rdc @@ -73138,7 +73138,7 @@ fDF tKS mvP yhU -utm +lRn tFx cpy cpy @@ -73732,7 +73732,7 @@ clY clY oNQ nLm -qZh +urA eJm hDE kPV @@ -73914,7 +73914,7 @@ tfP tfP tfP eaE -erw +giL eaE eaE eaE @@ -73940,7 +73940,7 @@ qNM oiZ rod kvJ -rIa +vri seJ xtb myP @@ -74017,7 +74017,7 @@ hnA oqJ xuB wZH -wOC +sPX mBF fnA fnA @@ -74141,7 +74141,7 @@ tfP tfP eaE eaE -erw +giL bex eaE eaE @@ -74368,7 +74368,7 @@ tfP tfP eaE eaE -erw +giL fFA gzu eaE @@ -74451,7 +74451,7 @@ ulL ulL lAj wRd -wLN +rIE nLm qQM vXc @@ -74898,7 +74898,7 @@ trj nLm nLm nLm -nDS +bzw uMM uOs fjP @@ -75598,7 +75598,7 @@ fXx rMF vVs xYn -vxv +uYu xci wuQ wDy @@ -75788,7 +75788,7 @@ mns gWL sPk mZK -rJH +eAT hGX sLQ nLm @@ -76059,7 +76059,7 @@ hMI pCg nAa pZV -ike +qmF wDy mMI mBF @@ -76259,7 +76259,7 @@ nLm kDH trj aSE -hoZ +eaC pUd nLm enD @@ -76512,7 +76512,7 @@ bIF xQj pCg lpq -irH +jUE wDy wDy nia @@ -77366,7 +77366,7 @@ xWL lfe lbg dmm -hYn +thw vWl fjP guB @@ -77853,7 +77853,7 @@ qWX sPk dnM wDZ -rJH +eAT mum rGE rHu @@ -77884,7 +77884,7 @@ tSL tSL gkg kzT -xNo +qzT xNR gkg rLg @@ -78254,7 +78254,7 @@ rbb jZo rwK hzk -qGh +eNy uEC jXc xtb @@ -79914,7 +79914,7 @@ xNR wnM kzT hsh -upP +nNz eKL qNl kzT @@ -80012,7 +80012,7 @@ otQ xho tiQ xce -oKN +xCp xdF iKC hCv @@ -80146,7 +80146,7 @@ mCA qYG wyy phu -wDu +xHJ cKi phu phu @@ -80607,7 +80607,7 @@ tSL roN srM tSL -pJd +hcQ kui cIe qNQ @@ -80818,7 +80818,7 @@ vXc rOP tSL tSL -pCb +xSz wyy lUv dOz @@ -81166,7 +81166,7 @@ saC saC uAm iAv -bny +cYB gbo bBJ iuC @@ -81273,11 +81273,11 @@ cys rMF tSL tSL -gHm +kru vZm qqW mjC -rfl +cVv wXq tSL tSL @@ -81875,7 +81875,7 @@ oUq oAY lDk uFA -bJy +qrU oUq oUq oUq @@ -82103,7 +82103,7 @@ lbo kXY kXY lDk -bJy +qrU oUq oUq fjr @@ -82330,7 +82330,7 @@ kXY nFc rqE kXY -slt +wRQ oUq oUq oUq @@ -82799,7 +82799,7 @@ beB beB beB beB -utR +bFC saS vnX vMM @@ -83270,7 +83270,7 @@ sjy mhn sDY kTm -oHR +nQX ort wdi wdi @@ -83323,7 +83323,7 @@ tnM wHU woq qsC -iPO +ggC jmG uKS ild @@ -83485,7 +83485,7 @@ rhF nTx jNv wrC -wwn +occ wTu htN wrC @@ -83774,7 +83774,7 @@ ldC nbn kaV izz -fwT +yfk ild jwM qsr @@ -84209,7 +84209,7 @@ jzu vXc uWD xkO -ipC +mWa waD qJN vXc @@ -84637,12 +84637,12 @@ azl mnU xhu sjy -vHU +thb uVj kHU iYO wtK -uVU +chG pgt sjy ohL @@ -84857,7 +84857,7 @@ urY sjy aUb aPN -grZ +tIW sjy lhK azl @@ -84879,7 +84879,7 @@ lxL xGf xiG lVp -mbw +qdg yca xXo lNs @@ -85277,8 +85277,8 @@ mkh iTI oUq oUq -nJO -bJy +eYF +qrU dio kkR lbI @@ -85522,10 +85522,10 @@ wrC sNU toZ tFk -uhF +ssp jyx wrC -aNn +nSk mYo wcO sgT @@ -85810,8 +85810,8 @@ swf jmG jmG jmG -bGN -uZC +fad +gHj jmG xMl qIJ @@ -85820,7 +85820,7 @@ jmG wkp qIJ iup -qSL +hdC wZy jmz uTh @@ -85874,7 +85874,7 @@ eso vWI hzc aAI -ykn +rfc vpe uEE eBu @@ -86038,9 +86038,9 @@ uPn jmG cZb khN -vaA +rob jmG -wGE +akb jBR srm jmG @@ -86104,7 +86104,7 @@ jas oeT sKx vpe -ykn +rfc jas cpy cpy @@ -86186,7 +86186,7 @@ nMX gvk sSv raH -hPQ +bof sMA oMo oUq @@ -86273,7 +86273,7 @@ srm jmG kkP wly -rfK +qdA jmG jmG kie @@ -86430,7 +86430,7 @@ wrC sOe nzt rAX -uii +bpb uuW uiS mvR @@ -86541,7 +86541,7 @@ nax nax fki jas -ddq +otv eso eso eso @@ -87412,7 +87412,7 @@ wiE yhi vNi nNA -mtM +jih rqA gXc yhi @@ -88035,7 +88035,7 @@ ocw sjy sjy sjy -kUP +sli xxs uDb xtO @@ -88093,7 +88093,7 @@ xPK yhi yhi saz -eJc +avX qot yhi spM @@ -88439,7 +88439,7 @@ mPY qJE qJE xQc -rjl +fqe gyB aox yiu @@ -88518,7 +88518,7 @@ mRf qcA fpl qcw -huX +lfI kqb kqb dCJ @@ -88992,7 +88992,7 @@ wGh gij mHv nlW -nqj +eHY ozn xMO vcH @@ -89200,7 +89200,7 @@ fpl qcA eXd fpl -rkd +dyQ kqb dCJ rnB @@ -89698,7 +89698,7 @@ jwM ild ild vBd -nZn +fYC jmG fEY fWG @@ -90184,7 +90184,7 @@ vsk phq phq jas -kXk +cgF phq jas nQu @@ -90292,7 +90292,7 @@ pZo qSH uRb xjF -bGV +pTJ eHy vSU xjF @@ -90301,7 +90301,7 @@ xCN xPW wgW jRT -sgV +lol ryO xFp sYk @@ -90353,7 +90353,7 @@ cKf wNp vdH jLD -voi +tLA fOe gFs pDU @@ -90804,7 +90804,7 @@ vNk vNk vdZ urd -xfS +tvv vdZ vNk mdr @@ -91089,7 +91089,7 @@ vbV ozw jas nHT -fYw +vxr aGy eJd ptU @@ -91180,7 +91180,7 @@ fSf cZH jDN mqx -amy +mKC hvh eZF lfj @@ -91484,7 +91484,7 @@ igT vJD tGh pBK -oFG +iEN pTZ tGh vNk @@ -91627,7 +91627,7 @@ oyK ayX vKP bjd -osm +mRg pqQ bjd fSf @@ -91937,7 +91937,7 @@ rnB igT vJD tGo -bTA +tCL vmG pTZ cbW @@ -92097,7 +92097,7 @@ alI alI alI wDj -rgW +jVm eJR kbH iHD @@ -92397,7 +92397,7 @@ xez veT dzB uQr -wpd +ngb hMT hFG mfS @@ -92502,7 +92502,7 @@ lXC lXC hOy tiQ -qyp +dWX jcl jcl bCd @@ -93097,7 +93097,7 @@ qjO jOF oiR pLs -sED +fWM ylo mkm uwT @@ -93510,7 +93510,7 @@ mTx jmi sbJ tTK -pqI +wYX lPa rar tTK @@ -93959,7 +93959,7 @@ pej ubw oml tTK -aQe +gVD nwZ vyH tTK @@ -93990,7 +93990,7 @@ wNp wNp rIx vNk -kBU +dWm ozn sYM vNk @@ -94421,7 +94421,7 @@ eFK ici otY rex -yhy +pEZ jab dCJ tTD @@ -94648,7 +94648,7 @@ kaD kaD eYh cMQ -nrJ +ifv jab dCJ rnB @@ -94796,7 +94796,7 @@ nbj sZq tiQ tiQ -jEF +txt ayX ayX ayX @@ -94875,7 +94875,7 @@ dBo dBb iad haq -uxb +ris jab dCJ tTD @@ -94952,7 +94952,7 @@ uUm eso wJq wNX -gnl +fUk jas cpy cpy @@ -95989,7 +95989,7 @@ lOk mqv fYZ btb -amC +yen hWD way jgV @@ -96689,7 +96689,7 @@ kFx qPu nWI wfh -toS +fJd oRG jJi jab @@ -96869,7 +96869,7 @@ xCT niT dRL dRL -ozJ +gCz xCT xCT qMd @@ -96915,7 +96915,7 @@ gGa gVr klz hMR -ffO +eNR smF hMR pBl @@ -96953,7 +96953,7 @@ xvB xWO ppD xkO -ipC +mWa waD ujy uwT @@ -97096,7 +97096,7 @@ xCT nuo dRL npA -oAd +bvU xCT tMp qjr @@ -97318,7 +97318,7 @@ ouv uSJ sLl dRL -nem +vbI fzE yfP rJf @@ -97595,7 +97595,7 @@ dQh qzD vzZ tTK -tDu +qWi bDn idt iWz @@ -98079,7 +98079,7 @@ ekR wsz tjh bhD -joL +bBE wbE xRw uaI @@ -98289,7 +98289,7 @@ tTD rnB igT cUG -ruW +dmA wgR tum pRH @@ -98734,7 +98734,7 @@ lhP gbR oLG oLG -rxK +rfC tTK dCJ rnB @@ -98760,7 +98760,7 @@ uaI vBN arq anv -vUn +aOj tID rzR uaI @@ -98942,7 +98942,7 @@ jMr xFw wWV lCh -lSP +cpG lUR mwh gdO @@ -98961,7 +98961,7 @@ tTK rRr vyH vyH -hBC +ssH tTK dCJ rnB @@ -98991,7 +98991,7 @@ cIA uKw dKd oaq -dwX +xAr cUG hMz uwT @@ -99693,7 +99693,7 @@ rRy feu aTw sGQ -yjP +rCH oQW snX snX @@ -100143,7 +100143,7 @@ uwT ewf vpp tlR -rYT +wmJ piD rZL lHH @@ -100320,7 +100320,7 @@ dsQ pej uIa gdO -xnG +qaj tby uEP gdO @@ -100351,7 +100351,7 @@ xCY xjO inA gDL -rfW +anc inA xjO hMz @@ -100542,12 +100542,12 @@ sha puJ onT gdO -xQw -xnG +nDZ +qaj uyB lmp gdO -yae +eBk gxs gdO gdO @@ -100598,7 +100598,7 @@ ewf snX snX pWx -vdx +fHE dkJ lVA fOX diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 80da4a7381..f82c57d41e 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -589,16 +589,6 @@ icon_state = "wood-broken3" }, /area/lv624/ground/caves/north_central_caves) -"ada" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/shovel, -/obj/item/stack/sheet/wood{ - amount = 16 - }, -/turf/open/shuttle{ - icon_state = "floor4" - }, -/area/lv624/lazarus/crashed_ship_containers) "adc" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -705,31 +695,6 @@ icon_state = "vault" }, /area/lv624/ground/barrens/north_east_barrens/ceiling) -"adD" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/mineral/diamond{ - amount = 2 - }, -/turf/open/floor{ - dir = 8; - icon_state = "vault" - }, -/area/lv624/ground/barrens/north_east_barrens/ceiling) -"adE" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stack/sheet/metal{ - amount = 30 - }, -/turf/open/floor{ - dir = 8; - icon_state = "vault" - }, -/area/lv624/ground/barrens/north_east_barrens/ceiling) "adF" = ( /obj/structure/surface/rack, /obj/item/tool/shovel, @@ -791,16 +756,6 @@ /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"adR" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/mineral/tritium{ - pixel_x = -4 - }, -/turf/open/floor{ - dir = 8; - icon_state = "vault" - }, -/area/lv624/ground/barrens/north_east_barrens/ceiling) "adS" = ( /obj/structure/xenoautopsy/tank/hugger, /turf/open/shuttle{ @@ -1351,20 +1306,6 @@ /obj/item/explosive/grenade/high_explosive, /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) -"agu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/explosive/grenade/high_explosive/stick, -/obj/item/explosive/grenade/high_explosive/stick{ - pixel_x = 6 - }, -/obj/item/explosive/grenade/high_explosive/stick{ - pixel_x = -6 - }, -/turf/open/floor{ - dir = 8; - icon_state = "vault" - }, -/area/lv624/ground/barrens/north_east_barrens/ceiling) "agv" = ( /turf/open/floor/plating{ dir = 4; @@ -1652,13 +1593,6 @@ icon_state = "warnplate" }, /area/lv624/ground/barrens/east_barrens/ceiling) -"aij" = ( -/obj/structure/filingcabinet, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/lv624/ground/barrens/east_barrens/ceiling) "aik" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -2758,22 +2692,6 @@ icon_state = "whitebluefull" }, /area/lv624/lazarus/medbay) -"aos" = ( -/obj/structure/surface/table, -/obj/item/stack/medical/bruise_pack{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/surgical, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/storage/belt/medical/full, -/turf/open/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/lv624/lazarus/medbay) "aou" = ( /turf/open/floor{ icon_state = "whitebluecorner" @@ -3067,16 +2985,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"aqA" = ( -/obj/structure/closet/wardrobe, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/lv624/lazarus/medbay) "aqF" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, @@ -3155,6 +3063,22 @@ icon_state = "whitebluecorner" }, /area/lv624/lazarus/medbay) +"arh" = ( +/obj/structure/surface/table, +/obj/structure/mirror{ + icon_state = "mirror_broke"; + pixel_x = 30 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + frequency = 1469; + name = "General Listening Channel"; + pixel_y = 30 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/lv624/lazarus/toilet) "ari" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/closed/wall/strata_ice/jungle, @@ -3510,13 +3434,6 @@ icon_state = "platebotc" }, /area/lv624/lazarus/quartstorage/outdoors) -"ath" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) "ati" = ( /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) @@ -3636,16 +3553,6 @@ }, /turf/open/floor/plating, /area/lv624/lazarus/research) -"atP" = ( -/obj/structure/surface/table, -/obj/item/alien_embryo{ - pixel_y = 4 - }, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) "atQ" = ( /obj/structure/lamarr{ density = 0; @@ -3747,17 +3654,6 @@ }, /turf/open/floor/wood, /area/lv624/ground/jungle/west_jungle/ceiling) -"auj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/surgical_tray, -/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{ - icon_state = "whitebluefull" - }, -/area/lv624/lazarus/medbay) "aul" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/beachcorner2/south_east, @@ -3887,13 +3783,6 @@ icon_state = "barber" }, /area/lv624/lazarus/fitness) -"auH" = ( -/obj/structure/closet/crate/secure/hydrosec, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "auI" = ( /obj/structure/cargo_container/wy/left, /turf/open/floor/plating{ @@ -4010,31 +3899,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) -"avk" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/mask/yautja_flavor{ - anchored = 1; - unacidable = 0 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "avm" = ( /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) @@ -4162,26 +4026,10 @@ "avH" = ( /turf/closed/wall, /area/lv624/lazarus/robotics) -"avJ" = ( -/obj/structure/surface/table, -/obj/item/tool/crowbar, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) "avK" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/east, /area/lv624/ground/river/west_river) -"avL" = ( -/obj/structure/closet/lasertag/blue, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "avM" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ @@ -4503,10 +4351,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor, /area/lv624/lazarus/research) -"awO" = ( -/obj/structure/filingcabinet/medical, -/turf/open/floor, -/area/lv624/lazarus/fitness) "awP" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -4676,16 +4520,6 @@ /obj/item/weapon/harpoon, /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) -"axz" = ( -/obj/structure/closet/athletic_mixed, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "axA" = ( /obj/item/stool, /turf/open/floor/plating{ @@ -4746,30 +4580,6 @@ icon_state = "whitepurple" }, /area/lv624/lazarus/research) -"axJ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_id = "Research Dome"; - pixel_y = 24 - }, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) -"axL" = ( -/obj/structure/surface/table, -/obj/item/book/manual/research_and_development, -/obj/item/cell/hyper, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) "axN" = ( /obj/item/storage/firstaid/regular, /obj/structure/surface/rack, @@ -5024,14 +4834,6 @@ icon_state = "white" }, /area/lv624/lazarus/research) -"ayL" = ( -/obj/item/clothing/suit/redtag, -/obj/structure/closet/athletic_mixed, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "ayM" = ( /obj/structure/surface/table, /obj/item/folder, @@ -5044,17 +4846,6 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) -"ayO" = ( -/obj/item/weapon/baseballbat/metal, -/obj/item/weapon/baseballbat/metal{ - pixel_x = 5 - }, -/obj/structure/surface/rack, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "ayP" = ( /turf/closed/wall/r_wall, /area/lv624/lazarus/main_hall) @@ -5097,10 +4888,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/robotics) -"ayX" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/greengrid, -/area/lv624/lazarus/secure_storage) "ayY" = ( /obj/item/device/multitool, /obj/structure/extinguisher_cabinet{ @@ -5332,13 +5119,6 @@ }, /turf/open/floor/plating, /area/lv624/lazarus/robotics) -"azL" = ( -/obj/structure/closet/cabinet, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "azM" = ( /obj/structure/closet/secure_closet/hydroponics, /turf/open/floor{ @@ -5353,16 +5133,6 @@ icon_state = "bluecorner" }, /area/lv624/lazarus/sleep_male) -"azO" = ( -/obj/structure/closet{ - density = 0; - icon_state = "open"; - opened = 1 - }, -/turf/open/floor{ - icon_state = "bluecorner" - }, -/area/lv624/lazarus/sleep_male) "azP" = ( /turf/closed/wall, /area/lv624/lazarus/sleep_male) @@ -5742,15 +5512,6 @@ icon_state = "purple" }, /area/lv624/lazarus/sleep_female) -"aBe" = ( -/obj/structure/surface/table, -/obj/item/handset, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - dir = 9; - icon_state = "purple" - }, -/area/lv624/lazarus/sleep_female) "aBf" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -5820,15 +5581,6 @@ }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) -"aBp" = ( -/obj/structure/prop/mech/tesla_energy_relay{ - layer = 2.5 - }, -/obj/structure/largecrate/random, -/turf/open/floor/plating{ - icon_state = "platebot" - }, -/area/lv624/lazarus/robotics) "aBq" = ( /obj/structure/largecrate, /obj/structure/prop/mech/repair_droid{ @@ -5868,13 +5620,6 @@ icon_state = "platebot" }, /area/lv624/lazarus/robotics) -"aBv" = ( -/obj/structure/surface/table, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/lv624/lazarus/research) "aBx" = ( /obj/effect/landmark/hunter_secondary, /turf/open/gm/dirt, @@ -6220,15 +5965,6 @@ icon_state = "purple" }, /area/lv624/lazarus/sleep_female) -"aCB" = ( -/obj/structure/bed, -/obj/item/bedsheet/purple, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor{ - dir = 9; - icon_state = "purple" - }, -/area/lv624/lazarus/sleep_female) "aCC" = ( /obj/item/reagent_container/food/drinks/flask/barflask, /obj/item/device/radio/intercom{ @@ -6337,25 +6073,6 @@ "aCX" = ( /turf/open/floor/grass, /area/lv624/lazarus/main_hall) -"aCY" = ( -/obj/structure/closet{ - density = 0; - icon_state = "open"; - opened = 1 - }, -/obj/item/device/flashlight, -/obj/item/device/radio/intercom{ - freerange = 1; - frequency = 1469; - name = "General Listening Channel"; - pixel_x = -30 - }, -/obj/item/clothing/under/colonist, -/turf/open/floor{ - dir = 9; - icon_state = "purple" - }, -/area/lv624/lazarus/sleep_female) "aCZ" = ( /obj/structure/surface/table, /obj/item/weapon/gun/pistol/holdout, @@ -6428,13 +6145,6 @@ icon_state = "bluecorner" }, /area/lv624/lazarus/sleep_male) -"aDr" = ( -/obj/structure/surface/table, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/plating{ - icon_state = "platebot" - }, -/area/lv624/lazarus/robotics) "aDs" = ( /obj/structure/bed/roller, /obj/structure/machinery/light, @@ -7409,14 +7119,6 @@ icon_state = "freezerfloor" }, /area/lv624/lazarus/toilet) -"aGK" = ( -/obj/structure/surface/table, -/obj/structure/prop/mech/drill, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - icon_state = "vault" - }, -/area/lv624/lazarus/robotics) "aGN" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/pipes/standard/simple/hidden/cyan, @@ -8067,23 +7769,6 @@ icon_state = "whiteyellow" }, /area/lv624/lazarus/main_hall) -"aJC" = ( -/obj/item/handset{ - desc = "A model of an ancient Earth communication device."; - force = 8 - }, -/obj/structure/surface/rack, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/open/floor{ - icon_state = "wood" - }, -/area/lv624/lazarus/main_hall) "aJD" = ( /obj/structure/window/reinforced{ dir = 1 @@ -8628,28 +8313,6 @@ icon_state = "red" }, /area/lv624/lazarus/security) -"aMc" = ( -/obj/structure/closet, -/turf/open/floor{ - icon_state = "bluecorner" - }, -/area/lv624/lazarus/sleep_male) -"aMd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp{ - pixel_x = 6; - pixel_y = 14 - }, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lazarus Landing"; - phone_color = "red"; - phone_id = "Marshal Office" - }, -/turf/open/floor{ - dir = 8; - icon_state = "redcorner" - }, -/area/lv624/lazarus/security) "aMe" = ( /obj/structure/machinery/vending/cola, /turf/open/floor{ @@ -8925,10 +8588,6 @@ /obj/structure/flora/jungle/cart_wreck, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) -"aNE" = ( -/obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/grass2, -/area/lv624/lazarus/yggdrasil) "aNF" = ( /obj/structure/flora/jungle/treeblocker, /obj/structure/machinery/colony_floodlight, @@ -9261,13 +8920,6 @@ icon_state = "bar" }, /area/lv624/lazarus/canteen) -"aOP" = ( -/obj/structure/surface/table, -/obj/item/trash/plate, -/turf/open/floor{ - icon_state = "bar" - }, -/area/lv624/lazarus/canteen) "aOQ" = ( /obj/structure/surface/table, /obj/item/trash/candy, @@ -9299,18 +8951,6 @@ /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) -"aPe" = ( -/obj/structure/surface/table, -/obj/structure/machinery/door/window/westright{ - layer = 2.9 - }, -/obj/item/paper_bin, -/obj/item/tool/pen, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" - }, -/area/lv624/lazarus/quart) "aPf" = ( /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, @@ -9368,22 +9008,6 @@ icon_state = "red" }, /area/lv624/lazarus/security) -"aPs" = ( -/obj/structure/surface/table, -/obj/structure/mirror{ - icon_state = "mirror_broke"; - pixel_x = 30 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - frequency = 1469; - name = "General Listening Channel"; - pixel_y = 30 - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/lv624/lazarus/toilet) "aPt" = ( /turf/closed/wall/r_wall, /area/lv624/lazarus/comms) @@ -10150,12 +9774,6 @@ icon_state = "wood" }, /area/lv624/lazarus/hop) -"aSz" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "vault" - }, -/area/lv624/lazarus/robotics) "aSA" = ( /turf/open/floor{ icon_state = "wood" @@ -10496,15 +10114,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/engineering) -"aTP" = ( -/obj/structure/machinery/power/terminal{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor{ - icon_state = "platebot" - }, -/area/lv624/lazarus/engineering) "aTR" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -10664,14 +10273,6 @@ icon_state = "dark" }, /area/lv624/lazarus/engineering) -"aUv" = ( -/obj/item/device/flashlight, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor{ - dir = 4; - icon_state = "red" - }, -/area/lv624/lazarus/security) "aUx" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -10903,12 +10504,6 @@ }, /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) -"aVo" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/lv624/lazarus/hop) "aVp" = ( /obj/structure/bed/chair/office/light, /turf/open/floor{ @@ -11025,10 +10620,6 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) -"aVL" = ( -/obj/structure/surface/table, -/turf/open/floor/plating, -/area/lv624/ground/barrens/central_barrens) "aVM" = ( /obj/structure/surface/table/woodentable, /obj/item/device/taperecorder, @@ -11088,11 +10679,6 @@ /obj/item/tool/crowbar, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) -"aVY" = ( -/obj/structure/surface/rack, -/obj/item/ore/silver, -/turf/open/floor/greengrid, -/area/lv624/lazarus/secure_storage) "aVZ" = ( /obj/structure/surface/rack, /obj/item/ore/diamond, @@ -11396,16 +10982,6 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) -"aWR" = ( -/obj/structure/safe{ - spawnkey = 0 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/cell/high, -/turf/open/floor/greengrid, -/area/lv624/lazarus/secure_storage) "aWT" = ( /obj/structure/surface/rack, /obj/item/device/aicard, @@ -11545,19 +11121,6 @@ icon_state = "dark" }, /area/lv624/lazarus/engineering) -"aXt" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_color = "yellow"; - phone_id = "Engineering"; - pixel_y = 24 - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/lazarus/engineering) "aXu" = ( /obj/structure/machinery/light{ dir = 1 @@ -11858,18 +11421,6 @@ icon_state = "red" }, /area/lv624/lazarus/security) -"aYJ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/trash/chips, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lazarus Landing"; - phone_color = "blue"; - phone_id = "Director's Office" - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/lv624/lazarus/hop) "aYM" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/med_data/laptop, @@ -11983,20 +11534,6 @@ icon_state = "dark" }, /area/lv624/lazarus/engineering) -"aZg" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/light/small, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/lv624/lazarus/captain) -"aZh" = ( -/obj/structure/surface/table, -/turf/open/floor{ - dir = 9; - icon_state = "brown" - }, -/area/lv624/lazarus/comms) "aZi" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/chem_dispenser/soda/beer{ @@ -12007,15 +11544,6 @@ icon_state = "grimy" }, /area/lv624/lazarus/captain) -"aZj" = ( -/obj/structure/closet/cabinet, -/obj/item/reagent_container/food/snacks/syndicake{ - layer = 2.6 - }, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/lv624/lazarus/captain) "aZn" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/tool/candle, @@ -12034,13 +11562,6 @@ icon_state = "grimy" }, /area/lv624/lazarus/captain) -"aZp" = ( -/obj/structure/surface/table/woodentable/poor, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/lv624/ground/jungle/west_jungle/ceiling) "aZs" = ( /obj/structure/closet/secure_closet/bar, /turf/open/floor{ @@ -12065,25 +11586,6 @@ icon_state = "dark" }, /area/lv624/lazarus/engineering) -"aZy" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/lazarus/engineering) -"aZz" = ( -/obj/structure/filingcabinet/security{ - desc = "A large cabinet with hard copy security records."; - name = "Security Records" - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "redcorner" - }, -/area/lv624/lazarus/security) "aZA" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -12123,12 +11625,6 @@ icon_state = "freezerfloor" }, /area/lv624/lazarus/kitchen) -"aZE" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - icon_state = "grimy" - }, -/area/lv624/lazarus/hop) "aZF" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -12136,12 +11632,6 @@ icon_state = "grimy" }, /area/lv624/lazarus/hop) -"aZG" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/lazarus/engineering) "aZI" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor{ @@ -12324,27 +11814,22 @@ "bhr" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_east_jungle) -"bhL" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" - }, -/area/lv624/ground/caves/sand_temple) "bit" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"bjn" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_color = "yellow"; + phone_id = "Communications"; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 9; + icon_state = "brown" + }, +/area/lv624/lazarus/comms) "bkG" = ( /turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) @@ -12362,6 +11847,11 @@ icon_state = "floor4" }, /area/lv624/lazarus/crashed_ship_containers) +"blF" = ( +/obj/structure/surface/rack, +/obj/item/ore/silver, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "bnz" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -12407,6 +11897,10 @@ /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"bsh" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "bsR" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) @@ -12580,6 +12074,13 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, /area/lv624/ground/river/west_river) +"bGk" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/light/small, +/turf/open/floor{ + icon_state = "grimy" + }, +/area/lv624/lazarus/captain) "bGV" = ( /obj/structure/machinery/iv_drip, /turf/open/floor{ @@ -12587,6 +12088,13 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/medbay) +"bIH" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor{ + dir = 8; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) "bIO" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 @@ -12598,6 +12106,10 @@ /obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) +"bJK" = ( +/obj/structure/filingcabinet/medical, +/turf/open/floor, +/area/lv624/lazarus/fitness) "bLs" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -12613,20 +12125,6 @@ /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_barrens) -"bNW" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "bOg" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 @@ -12818,6 +12316,16 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"clE" = ( +/obj/structure/closet/athletic_mixed, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "cmf" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, @@ -12898,6 +12406,20 @@ icon_state = "desert_dug" }, /area/lv624/ground/barrens/west_barrens) +"cyf" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "cys" = ( /obj/structure/foamed_metal, /turf/open/gm/dirtgrassborder/south, @@ -12922,6 +12444,13 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"cBc" = ( +/obj/structure/closet/lasertag/blue, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "cBG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp{ @@ -12968,6 +12497,15 @@ }, /turf/open/gm/dirt, /area/lv624/ground/jungle/north_west_jungle) +"cDR" = ( +/obj/structure/surface/table, +/obj/item/handset, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 9; + icon_state = "purple" + }, +/area/lv624/lazarus/sleep_female) "cEh" = ( /obj/structure/flora/bush/ausbushes/pointybush, /turf/open/gm/grass/grass1, @@ -12984,6 +12522,22 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"cGo" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/lv624/ground/jungle/west_jungle/ceiling) +"cHA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/adv, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) "cIL" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -12998,16 +12552,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) -"cJw" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/lv624/lazarus/corporate_dome) "cJA" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, @@ -13055,6 +12599,15 @@ "cPV" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) +"cQI" = ( +/obj/structure/closet/cabinet, +/obj/item/reagent_container/food/snacks/syndicake{ + layer = 2.6 + }, +/turf/open/floor{ + icon_state = "grimy" + }, +/area/lv624/lazarus/captain) "cQJ" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -13101,6 +12654,23 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) +"cWW" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv624/ground/caves/sand_temple) "cXd" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/flora/jungle/vines/heavy, @@ -13144,6 +12714,17 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"det" = ( +/obj/structure/surface/table, +/obj/effect/landmark/crap_item, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 9; + icon_state = "green" + }, +/area/lv624/lazarus/hydroponics) "deU" = ( /obj/item/circuitboard/airlock{ pixel_x = 12 @@ -13166,6 +12747,16 @@ /obj/effect/landmark/corpsespawner/scientist, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) +"dgi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/shovel, +/obj/item/stack/sheet/wood{ + amount = 16 + }, +/turf/open/shuttle{ + icon_state = "floor4" + }, +/area/lv624/lazarus/crashed_ship_containers) "dhp" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, @@ -13249,30 +12840,10 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) -"drm" = ( -/obj/structure/closet/crate, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40/extended, -/obj/item/ammo_magazine/rifle/mar40/extended, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/ground/barrens/north_east_barrens/ceiling) "dsi" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) -"dsz" = ( -/obj/structure/closet/crate/hydroponics/prespawned, -/turf/open/floor{ - dir = 9; - icon_state = "green" - }, -/area/lv624/lazarus/hydroponics) "dvf" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, @@ -13416,16 +12987,15 @@ "dKg" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) -"dLd" = ( -/obj/structure/bookcase, -/obj/item/book/manual/research_and_development, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/book/manual/security_space_law, -/turf/open/floor{ - dir = 5; - icon_state = "whiteblue" +"dKC" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_color = "red"; + phone_id = "Secure Storage"; + pixel_y = 24 }, -/area/lv624/lazarus/corporate_dome) +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "dLn" = ( /obj/effect/acid_hole, /turf/closed/wall/r_wall, @@ -13439,6 +13009,19 @@ "dLY" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) +"dMD" = ( +/obj/structure/filingcabinet/security{ + desc = "A large cabinet with hard copy security records."; + name = "Security Records" + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "redcorner" + }, +/area/lv624/lazarus/security) "dMF" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -13479,11 +13062,24 @@ icon_state = "wood-broken" }, /area/lv624/ground/caves/north_central_caves) +"dOK" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/engineering) "dOQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/queen_spawn, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"dSW" = ( +/obj/structure/surface/table/holotable, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "dTm" = ( /turf/open/gm/dirt{ icon_state = "desert1" @@ -13553,6 +13149,15 @@ icon_state = "bot" }, /area/lv624/lazarus/landing_zones/lz1) +"ebg" = ( +/obj/structure/bed, +/obj/item/bedsheet/purple, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor{ + dir = 9; + icon_state = "purple" + }, +/area/lv624/lazarus/sleep_female) "ebS" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/east, @@ -13648,10 +13253,39 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"eng" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp{ + pixel_x = 6; + pixel_y = 14 + }, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lazarus Landing"; + phone_color = "red"; + phone_id = "Marshal Office" + }, +/turf/open/floor{ + dir = 8; + icon_state = "redcorner" + }, +/area/lv624/lazarus/security) "eny" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"enC" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_color = "yellow"; + phone_id = "Engineering"; + pixel_y = 24 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/engineering) "eoo" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -13801,6 +13435,12 @@ "eER" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) +"eFt" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "whiteblue" + }, +/area/lv624/lazarus/medbay) "eFS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -13845,12 +13485,6 @@ /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) -"eLx" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/shuttle{ - icon_state = "floor4" - }, -/area/lv624/lazarus/crashed_ship_containers) "eNK" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_east_jungle) @@ -13908,13 +13542,13 @@ icon_state = "cult" }, /area/lv624/ground/caves/south_west_caves) -"eYh" = ( -/obj/structure/surface/rack, -/turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" +"eXO" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plating{ + dir = 1; + icon_state = "warnplate" }, -/area/lv624/lazarus/quart) +/area/lv624/ground/barrens/east_barrens/ceiling) "eYD" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /obj/effect/landmark/lv624/fog_blocker, @@ -14072,6 +13706,16 @@ icon_state = "asteroidwarning" }, /area/lv624/ground/colony/telecomm/sw_lz2) +"frQ" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/lv624/lazarus/corporate_dome) "fsa" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -14091,6 +13735,22 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"ftO" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + icon_state = "grimy" + }, +/area/lv624/lazarus/hop) +"fuj" = ( +/obj/structure/safe{ + spawnkey = 0 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/cell/high, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "fur" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) @@ -14258,6 +13918,23 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) +"fKm" = ( +/obj/item/handset{ + desc = "A model of an ancient Earth communication device."; + force = 8 + }, +/obj/structure/surface/rack, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor{ + icon_state = "wood" + }, +/area/lv624/lazarus/main_hall) "fMl" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -14274,6 +13951,10 @@ icon_state = "floor4" }, /area/lv624/lazarus/crashed_ship_containers) +"fNO" = ( +/obj/vehicle/train/cargo/trolley, +/turf/open/floor, +/area/lv624/ground/barrens/containers) "fPi" = ( /turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) @@ -14302,6 +13983,16 @@ "fTM" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) +"fUg" = ( +/obj/structure/closet{ + density = 0; + icon_state = "open"; + opened = 1 + }, +/turf/open/floor{ + icon_state = "bluecorner" + }, +/area/lv624/lazarus/sleep_male) "fXr" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -14479,6 +14170,14 @@ "gxd" = ( /turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) +"gxO" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/quartstorage) "gyP" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_west_jungle) @@ -14586,22 +14285,6 @@ "gRx" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) -"gTu" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 16 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 16 - }, -/turf/open/floor{ - dir = 9; - icon_state = "whiteblue" - }, -/area/lv624/lazarus/corporate_dome) "gTv" = ( /obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/light_2, @@ -14613,6 +14296,14 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"gUp" = ( +/obj/item/device/flashlight, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor{ + dir = 4; + icon_state = "red" + }, +/area/lv624/lazarus/security) "gUq" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) @@ -14738,10 +14429,6 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) -"hhU" = ( -/obj/vehicle/train/cargo/trolley, -/turf/open/floor, -/area/lv624/ground/barrens/containers) "hjl" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/east, @@ -14985,14 +14672,6 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/river, /area/lv624/ground/river/central_river) -"hXt" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_id = "Lakeside Bar"; - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/lv624/ground/caves/north_central_caves) "hZg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -15042,27 +14721,20 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) -"idz" = ( -/obj/item/weapon/claymore/mercsword{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" +"icF" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_y = 8 }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 +/obj/item/folder/yellow{ + pixel_y = 4 }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" +/obj/item/folder/red, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellow" }, -/area/lv624/ground/caves/sand_temple) +/area/lv624/lazarus/corporate_dome) "ieH" = ( /obj/item/stack/sheet/wood{ amount = 2 @@ -15120,6 +14792,18 @@ "ioC" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/east_jungle) +"ipW" = ( +/obj/structure/surface/table, +/obj/structure/machinery/door/window/westright{ + layer = 2.9 + }, +/obj/item/paper_bin, +/obj/item/tool/pen, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv624/lazarus/quart) "isF" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, @@ -15312,6 +14996,12 @@ /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"iRc" = ( +/turf/open/floor{ + dir = 8; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) "iSa" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/floor/strata{ @@ -15416,6 +15106,25 @@ icon_state = "vault" }, /area/lv624/lazarus/quartstorage) +"jkQ" = ( +/obj/item/storage/firstaid/adv/empty, +/obj/structure/machinery/door_control{ + id = "secure_outer_blast"; + name = "Secure Outer Doors"; + pixel_x = 25; + pixel_y = -5 + }, +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_color = "blue"; + phone_id = "Corporate Office"; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) "jlh" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, @@ -15519,6 +15228,10 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"jzv" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/grass/grass2, +/area/lv624/lazarus/yggdrasil) "jzZ" = ( /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, @@ -15594,6 +15307,34 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_central_jungle) +"jKT" = ( +/obj/item/weapon/sword{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + unacidable = 0 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "jLc" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/beachcorner/north_east, @@ -15662,15 +15403,6 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz2) -"jQW" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/stack/sheet/mineral/sandstone{ - amount = 50 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "jRm" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/north_nexus_road) @@ -15749,6 +15481,14 @@ icon_state = "whiteyellow" }, /area/lv624/lazarus/corporate_dome) +"jZr" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_id = "Cargo"; + pixel_y = 24 + }, +/turf/open/floor/vault, +/area/lv624/lazarus/quartstorage) "jZL" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, @@ -15820,6 +15560,12 @@ /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"kpd" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor{ + icon_state = "grimy" + }, +/area/lv624/lazarus/hop) "kqx" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/flora/jungle/vines/light_3, @@ -15900,17 +15646,6 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"kzd" = ( -/obj/structure/surface/table, -/obj/effect/landmark/crap_item, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - dir = 9; - icon_state = "green" - }, -/area/lv624/lazarus/hydroponics) "kzu" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/grass/grass1, @@ -15923,6 +15658,13 @@ /obj/structure/cargo_container/lockmart/right, /turf/open/floor, /area/lv624/ground/barrens/containers) +"kzZ" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/lv624/lazarus/robotics) "kAg" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, @@ -15992,6 +15734,31 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) +"kOX" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + unacidable = 0 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "kPL" = ( /obj/structure/fence, /turf/open/floor{ @@ -16104,13 +15871,6 @@ /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) -"kZS" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/lv624/lazarus/corporate_dome) "laY" = ( /obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, @@ -16275,6 +16035,13 @@ /obj/effect/decal/cleanable/blood/gibs/robot/down, /turf/open/gm/dirt, /area/lv624/ground/jungle/north_west_jungle) +"lDe" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/lv624/lazarus/research) "lDh" = ( /obj/item/clothing/suit/armor/yautja_flavor, /turf/open/floor/strata{ @@ -16293,6 +16060,15 @@ /obj/structure/machinery/light, /turf/open/floor/greengrid, /area/lv624/lazarus/corporate_dome) +"lGa" = ( +/obj/structure/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + icon_state = "platebot" + }, +/area/lv624/lazarus/engineering) "lGo" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/machinery/door_control{ @@ -16382,6 +16158,13 @@ icon_state = "whitebluecorner" }, /area/lv624/lazarus/corporate_dome) +"lNH" = ( +/obj/structure/closet/crate/secure/hydrosec, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "lPJ" = ( /turf/open/gm/dirtgrassborder{ icon_state = "desert" @@ -16390,6 +16173,17 @@ "lQC" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/east_barrens) +"lQG" = ( +/obj/item/weapon/baseballbat/metal, +/obj/item/weapon/baseballbat/metal{ + pixel_x = 5 + }, +/obj/structure/surface/rack, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "lRd" = ( /obj/item/stack/sheet/wood{ amount = 2 @@ -16492,6 +16286,22 @@ "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) +"mey" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) "meP" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -16520,6 +16330,13 @@ icon_state = "dark" }, /area/lv624/lazarus/corporate_dome) +"mhn" = ( +/obj/structure/surface/table, +/obj/item/trash/plate, +/turf/open/floor{ + icon_state = "bar" + }, +/area/lv624/lazarus/canteen) "mhZ" = ( /turf/open/shuttle{ icon_state = "floor6" @@ -16536,12 +16353,6 @@ icon_state = "desert3" }, /area/lv624/ground/river/east_river) -"mjB" = ( -/turf/open/floor{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/lv624/lazarus/corporate_dome) "mjY" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -16884,6 +16695,16 @@ "nbw" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/north_east_barrens) +"ncd" = ( +/obj/structure/surface/table, +/obj/item/alien_embryo{ + pixel_y = 4 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "ncq" = ( /obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/r_wall, @@ -17004,14 +16825,6 @@ icon_state = "desert3" }, /area/lv624/ground/barrens/west_barrens) -"nrP" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_id = "Cargo"; - pixel_y = 24 - }, -/turf/open/floor/vault, -/area/lv624/lazarus/quartstorage) "nsk" = ( /turf/open/gm/dirt, /area/lv624/ground/river/west_river) @@ -17176,6 +16989,16 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"nFn" = ( +/obj/structure/closet/wardrobe, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 8; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/medbay) "nHj" = ( /obj/item/tool/extinguisher, /turf/open/floor{ @@ -17257,6 +17080,22 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"nLy" = ( +/obj/structure/surface/table, +/obj/item/stack/medical/bruise_pack{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/mask/surgical, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/storage/belt/medical/full, +/turf/open/floor{ + dir = 1; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/medbay) "nLH" = ( /obj/structure/prop/tower, /turf/open/floor{ @@ -17488,6 +17327,13 @@ /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) +"ofx" = ( +/obj/structure/surface/rack, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowfull" + }, +/area/lv624/lazarus/quart) "ogM" = ( /turf/open/gm/dirt, /area/lv624/ground/river/east_river) @@ -17638,6 +17484,28 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"oBT" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/stack/sheet/mineral/sandstone{ + amount = 50 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"oBW" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lazarus Landing"; + phone_id = "Medbay" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/medbay) "oDY" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 @@ -17732,27 +17600,24 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/west_nexus_road) -"oMZ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, -/turf/open/gm/dirt, -/area/lv624/ground/caves/west_caves) -"oNJ" = ( -/obj/structure/safe{ - spawnkey = 0 +"oLB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/explosive/grenade/high_explosive/stick, +/obj/item/explosive/grenade/high_explosive/stick{ + pixel_x = 6 }, -/obj/item/coin/diamond, -/obj/item/m_gift, -/obj/structure/machinery/light{ - dir = 1 +/obj/item/explosive/grenade/high_explosive/stick{ + pixel_x = -6 }, -/obj/item/clothing/head/helmet/marine/veteran/pmc, -/obj/item/clothing/under/marine/veteran/pmc, -/obj/item/storage/fancy/cigar, /turf/open/floor{ - dir = 5; - icon_state = "whiteyellow" + dir = 8; + icon_state = "vault" }, -/area/lv624/lazarus/corporate_dome) +/area/lv624/ground/barrens/north_east_barrens/ceiling) +"oMZ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "oOd" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, @@ -17900,6 +17765,13 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/south_nexus_road) +"pbS" = ( +/obj/structure/filingcabinet, +/turf/open/floor{ + dir = 10; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) "pca" = ( /obj/effect/landmark/nightmare{ insert_tag = "nexuscenter" @@ -17968,6 +17840,12 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"pkV" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "vault" + }, +/area/lv624/lazarus/robotics) "plf" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, @@ -18052,6 +17930,14 @@ "puo" = ( /turf/open/floor/greengrid, /area/lv624/lazarus/corporate_dome) +"pwl" = ( +/obj/item/clothing/suit/redtag, +/obj/structure/closet/athletic_mixed, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "pwq" = ( /turf/open/floor{ icon_state = "white" @@ -18072,6 +17958,16 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"pxX" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/mineral/tritium{ + pixel_x = -4 + }, +/turf/open/floor{ + dir = 8; + icon_state = "vault" + }, +/area/lv624/ground/barrens/north_east_barrens/ceiling) "pyG" = ( /turf/open/floor{ icon_state = "whiteyellowcorner" @@ -18081,19 +17977,6 @@ /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) -"pzt" = ( -/obj/structure/surface/table, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/phone_base/colony_net/rotary{ - phone_category = "Lazarus Landing"; - phone_id = "Medbay" - }, -/turf/open/floor{ - icon_state = "white" - }, -/area/lv624/lazarus/medbay) "pBk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/grass/grass1, @@ -18246,25 +18129,27 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) -"pRe" = ( -/obj/item/storage/firstaid/adv/empty, -/obj/structure/machinery/door_control{ - id = "secure_outer_blast"; - name = "Secure Outer Doors"; - pixel_x = 25; - pixel_y = -5 +"pRf" = ( +/obj/item/weapon/sword{ + pixel_x = 6; + pixel_y = 7 }, -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_color = "blue"; - phone_id = "Corporate Office"; - pixel_y = 24 +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" }, -/turf/open/floor{ - dir = 5; - icon_state = "whiteyellow" +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 }, -/area/lv624/lazarus/corporate_dome) +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "pRh" = ( /turf/open/floor/plating{ dir = 5; @@ -18299,12 +18184,6 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/west_nexus_road) -"pTk" = ( -/obj/item/bedsheet/medical, -/turf/open/floor{ - icon_state = "white" - }, -/area/lv624/lazarus/medbay) "pUm" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/east_caves) @@ -18312,6 +18191,12 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) +"pXW" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/engineering) "pYp" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/grass/grass1, @@ -18361,6 +18246,13 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"qeM" = ( +/obj/structure/closet/crate/hydroponics/prespawned, +/turf/open/floor{ + dir = 9; + icon_state = "green" + }, +/area/lv624/lazarus/hydroponics) "qeW" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) @@ -18380,12 +18272,33 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz2) +"qfP" = ( +/obj/structure/surface/rack, +/turf/open/floor{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/lv624/lazarus/fitness) "qgA" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_east_jungle) "qjf" = ( /turf/open/floor, /area/lv624/ground/barrens/containers) +"qjo" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_id = "Research Dome"; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "qjt" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/grass/grass1, @@ -18412,6 +18325,15 @@ "qqJ" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) +"qrz" = ( +/obj/structure/surface/table, +/obj/item/tool/crowbar, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "qsM" = ( /obj/structure/platform/mineral/sandstone/runed{ dir = 1 @@ -18457,20 +18379,19 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_nexus_road) -"qxo" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/white{ - pixel_y = 8 - }, -/obj/item/folder/yellow{ - pixel_y = 4 - }, -/obj/item/folder/red, +"qwV" = ( +/obj/structure/closet/crate, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40/extended, +/obj/item/ammo_magazine/rifle/mar40/extended, /turf/open/floor{ - dir = 4; - icon_state = "whiteyellow" + icon_state = "dark" }, -/area/lv624/lazarus/corporate_dome) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "qxZ" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/stack/sheet/metal{ @@ -18587,12 +18508,6 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt, /area/lv624/ground/jungle/north_west_jungle) -"qJg" = ( -/obj/structure/surface/table, -/turf/open/floor{ - icon_state = "whiteblue" - }, -/area/lv624/lazarus/medbay) "qJq" = ( /obj/structure/machinery/body_scanconsole, /turf/open/floor{ @@ -18772,6 +18687,18 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"rht" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/trash/chips, +/obj/structure/phone_base/colony_net/rotary{ + phone_category = "Lazarus Landing"; + phone_color = "blue"; + phone_id = "Director's Office" + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/lv624/lazarus/hop) "rit" = ( /turf/open/gm/coast/south, /area/lv624/ground/river/central_river) @@ -19032,6 +18959,10 @@ "rSy" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/east_jungle) +"rTs" = ( +/obj/structure/surface/table, +/turf/open/floor/plating, +/area/lv624/ground/barrens/central_barrens) "rTG" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/light_3, @@ -19041,18 +18972,13 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) -"rVH" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_color = "yellow"; - phone_id = "Communications"; - pixel_y = 24 - }, +"rWf" = ( +/obj/structure/closet/cabinet, /turf/open/floor{ - dir = 9; - icon_state = "brown" + dir = 4; + icon_state = "whitepurplecorner" }, -/area/lv624/lazarus/comms) +/area/lv624/lazarus/fitness) "rWW" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/river, @@ -19068,14 +18994,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"rZL" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, -/turf/open/floor{ - icon_state = "dark" - }, -/area/lv624/lazarus/quartstorage) "sau" = ( /obj/effect/landmark/crap_item, /obj/structure/flora/jungle/vines/light_1, @@ -19166,6 +19084,30 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/barrens/east_barrens) +"spY" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "sqj" = ( /turf/open/gm/river, /area/lv624/ground/river/central_river) @@ -19401,6 +19343,14 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/central_river) +"sUb" = ( +/obj/structure/surface/table, +/obj/structure/prop/mech/drill, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + icon_state = "vault" + }, +/area/lv624/lazarus/robotics) "sUc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/gm/grass/grass1, @@ -19459,6 +19409,12 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"sZq" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/shuttle{ + icon_state = "floor4" + }, +/area/lv624/lazarus/crashed_ship_containers) "taa" = ( /obj/structure/barricade/wooden, /obj/structure/flora/jungle/vines/light_3, @@ -19529,34 +19485,6 @@ /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/north, /area/lv624/ground/river/west_river) -"thn" = ( -/obj/item/weapon/claymore/mercsword{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor{ - anchored = 1; - unacidable = 0 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "thS" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -19951,6 +19879,13 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"ufy" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "ufG" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -20011,6 +19946,16 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"ukf" = ( +/obj/structure/surface/table, +/obj/item/book/manual/research_and_development, +/obj/item/cell/hyper, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 5; + icon_state = "whitepurple" + }, +/area/lv624/lazarus/research) "ukh" = ( /obj/item/ammo_casing/bullet{ icon_state = "cartridge_6_1" @@ -20047,15 +19992,6 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple) -"ulp" = ( -/obj/structure/phone_base/colony_net{ - phone_category = "Lazarus Landing"; - phone_color = "red"; - phone_id = "Secure Storage"; - pixel_y = 24 - }, -/turf/open/floor/greengrid, -/area/lv624/lazarus/secure_storage) "umb" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane, /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -20105,6 +20041,21 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) +"uuA" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stack/sheet/metal{ + amount = 30 + }, +/turf/open/floor{ + dir = 8; + icon_state = "vault" + }, +/area/lv624/ground/barrens/north_east_barrens/ceiling) "uuV" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirtgrassborder/south, @@ -20343,13 +20294,6 @@ icon_state = "warningcorner" }, /area/lv624/lazarus/landing_zones/lz1) -"uZz" = ( -/obj/structure/surface/table/holotable, -/turf/open/floor{ - dir = 5; - icon_state = "whitepurple" - }, -/area/lv624/lazarus/research) "vam" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/grass/grass1, @@ -20453,6 +20397,25 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"vnn" = ( +/obj/structure/closet{ + density = 0; + icon_state = "open"; + opened = 1 + }, +/obj/item/device/flashlight, +/obj/item/device/radio/intercom{ + freerange = 1; + frequency = 1469; + name = "General Listening Channel"; + pixel_x = -30 + }, +/obj/item/clothing/under/colonist, +/turf/open/floor{ + dir = 9; + icon_state = "purple" + }, +/area/lv624/lazarus/sleep_female) "vno" = ( /obj/item/ammo_casing/bullet{ icon_state = "cartridge_9_1" @@ -20508,6 +20471,12 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"vvY" = ( +/obj/item/bedsheet/medical, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/medbay) "vxa" = ( /obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ @@ -20632,6 +20601,14 @@ "vPV" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_jungle) +"vRL" = ( +/obj/structure/phone_base/colony_net{ + phone_category = "Lazarus Landing"; + phone_id = "Lakeside Bar"; + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/lv624/ground/caves/north_central_caves) "vSG" = ( /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass1, @@ -20664,6 +20641,15 @@ icon_state = "vault" }, /area/lv624/lazarus/quartstorage) +"vVT" = ( +/obj/structure/prop/mech/tesla_energy_relay{ + layer = 2.5 + }, +/obj/structure/largecrate/random, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/lv624/lazarus/robotics) "vWs" = ( /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, @@ -20814,30 +20800,6 @@ icon_state = "wood-broken6" }, /area/lv624/ground/caves/north_central_caves) -"woM" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "wpw" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) @@ -20887,6 +20849,23 @@ icon_state = "asteroidplating" }, /area/lv624/ground/caves/north_central_caves) +"wxl" = ( +/obj/structure/safe{ + spawnkey = 0 + }, +/obj/item/coin/diamond, +/obj/item/m_gift, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/clothing/head/helmet/marine/veteran/pmc, +/obj/item/clothing/under/marine/veteran/pmc, +/obj/item/storage/fancy/cigar, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) "wxP" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) @@ -20959,6 +20938,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"wJW" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/mineral/diamond{ + amount = 2 + }, +/turf/open/floor{ + dir = 8; + icon_state = "vault" + }, +/area/lv624/ground/barrens/north_east_barrens/ceiling) "wKv" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -21252,13 +21241,6 @@ "xpR" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/north_east_caves) -"xqV" = ( -/obj/structure/surface/rack, -/turf/open/floor{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/lv624/lazarus/fitness) "xrI" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ @@ -21355,6 +21337,17 @@ "xDw" = ( /turf/closed/wall/r_wall/unmeltable, /area/lv624/ground/colony/telecomm/cargo) +"xDP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/surgical_tray, +/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{ + icon_state = "whitebluefull" + }, +/area/lv624/lazarus/medbay) "xDR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/gm/grass/grass1, @@ -21368,6 +21361,13 @@ icon_state = "bar" }, /area/lv624/lazarus/canteen) +"xFT" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 9; + icon_state = "brown" + }, +/area/lv624/lazarus/comms) "xGd" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -21442,6 +21442,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) +"xTr" = ( +/obj/structure/bookcase, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/security_space_law, +/turf/open/floor{ + dir = 5; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) "xTM" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirt, @@ -21465,6 +21475,12 @@ "xVN" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/south_central_jungle) +"xXk" = ( +/obj/structure/closet, +/turf/open/floor{ + icon_state = "bluecorner" + }, +/area/lv624/lazarus/sleep_male) "xXB" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/grass/grass1, @@ -21553,15 +21569,6 @@ /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) -"yiT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/adv{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/firstaid/adv, -/turf/open/floor/greengrid, -/area/lv624/lazarus/corporate_dome) "yjh" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, @@ -21581,13 +21588,6 @@ "yle" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/south_nexus_road) -"ylI" = ( -/obj/structure/filingcabinet, -/turf/open/floor{ - dir = 10; - icon_state = "whiteyellow" - }, -/area/lv624/lazarus/corporate_dome) "ylL" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -27229,7 +27229,7 @@ aqS aFm auf auf -aZp +cGo aFm aAl omu @@ -28643,8 +28643,8 @@ aTf aTf aTf aTf -ayX -aWR +bsh +fuj aUj aTf aTf @@ -29782,7 +29782,7 @@ aTf aUj aUQ aUQ -aVY +blF aUQ aWU aUQ @@ -30236,7 +30236,7 @@ aXh aTf aTf aTf -ulp +dKC aUQ aWa aUQ @@ -32737,7 +32737,7 @@ kWH kWH xgE oyT -cJw +frQ bzD xgE efp @@ -32937,11 +32937,11 @@ axe aCZ ayg avH -aSz +pkV axi axj avH -aBp +vVT aBR aCk ado @@ -33639,14 +33639,14 @@ aDv aDv xgE vvE -kZS +bIH qTM nIs xgE epG nrb wKv -mjB +iRc mBN xgE mwB @@ -34781,7 +34781,7 @@ laY xEt xgE xgE -gTu +mey hhv mVn paJ @@ -35215,11 +35215,11 @@ psh ado axe axf -aDr +kzZ avH aze azI -aGK +sUb avH aHc axf @@ -35245,7 +35245,7 @@ gnx tWw xeq xgE -yiT +cHA pnl xgE cPV @@ -35463,7 +35463,7 @@ wMk qGK xEt xgE -dLd +xTr uGM gnx joz @@ -35701,7 +35701,7 @@ pox tWw anJ cen -ylI +pbS oYx wMk wMk @@ -36147,7 +36147,7 @@ xEt bbU mfI xgE -oNJ +wxl cLD ocG rMR @@ -36376,7 +36376,7 @@ wMk laY xgE xgE -pRe +jkQ cOz ybQ gnx @@ -36606,7 +36606,7 @@ xEt xgE xgE jYM -qxo +icF xfP paJ xkU @@ -37942,7 +37942,7 @@ psh oBi bnE atn -atP +ncd aum azS atU @@ -37950,7 +37950,7 @@ avD awk auX atU -aBv +lDe ayp axF asU @@ -38445,7 +38445,7 @@ aQn aQn aQn aTg -rVH +bjn aQn aQn aON @@ -38843,9 +38843,9 @@ oSJ anF anF apx -pTk +vvY nYZ -aqA +nFn txL tIg nSg @@ -38853,8 +38853,8 @@ opP udP udP asU -ath -ath +ufy +ufy aum auV atU @@ -39066,7 +39066,7 @@ tyG tyG tyG anS -aos +nLy aoE pOW anF @@ -39361,7 +39361,7 @@ aQn aQn aQn aQn -aZh +xFT aPT kxI kxI @@ -39766,7 +39766,7 @@ udP udP udP atn -ath +ufy aum auX asT @@ -39774,7 +39774,7 @@ aum atp aum asT -axJ +qjo aum aFV asU @@ -39837,7 +39837,7 @@ aaa aac abm abk -hXt +vRL abZ avm aEI @@ -40222,7 +40222,7 @@ udP udP udP asU -uZz +dSW aum auY asT @@ -40230,8 +40230,8 @@ aAR awq atq asT -axL -ath +ukf +ufy ryJ asU aJr @@ -40454,7 +40454,7 @@ atO atO atO asT -avJ +qrz awr auX asT @@ -40671,7 +40671,7 @@ pwq pwq aoI hZg -qJg +eFt nSg opP udP @@ -40890,14 +40890,14 @@ tyG tyG tyG anS -auj +xDP aoL anF anF apx pwq aou -pzt +oBW aqQ atV nSg @@ -40956,7 +40956,7 @@ tem aVd aTM aTq -aZG +dOK aSX aZI aXJ @@ -41140,7 +41140,7 @@ jHN jHN adp awu -awO +bJK adp aJr uTe @@ -41170,7 +41170,7 @@ aKF aLe aLe aMS -aNE +jzv aNG aPh aPS @@ -41769,7 +41769,7 @@ agf ajW agi ajW -aVL +rTs agF agT ahh @@ -41822,13 +41822,13 @@ adp auz atX avu -avL +cBc atX awR atX axN auz -xqV +qfP azi atY aLv @@ -42275,7 +42275,7 @@ udP udP udP atw -axz +clE atX atX avN @@ -42503,7 +42503,7 @@ udP udP atw atw -ayL +pwl atX atX atX @@ -42547,7 +42547,7 @@ aJz aJz aSL aTs -aTP +lGa aUt aSX aVF @@ -42742,7 +42742,7 @@ atX atX atX atX -azL +rWf adp mKf mKf @@ -42782,7 +42782,7 @@ aVG aTM aWG aSX -aXt +enC aWi aYc aVB @@ -42950,7 +42950,7 @@ aoA aoA aoA eBN -dsz +qeM arp anT xPk @@ -43239,7 +43239,7 @@ aTq aWI aSX aXw -aZy +pXW aYd aWz kxI @@ -44099,7 +44099,7 @@ jRm ppR oqO adp -auH +lNH atX atX atX @@ -44108,7 +44108,7 @@ awT atX axS ayz -ayO +lQG auz adp oUy @@ -44996,7 +44996,7 @@ tyG anT aoC aoR -kzd +det aoA aoA aoA @@ -45724,7 +45724,7 @@ aGH aDy azt aJh -aJC +fKm aKv azt aLl @@ -45947,7 +45947,7 @@ aEE aFl aFP aDy -aPs +arh aHb aDy aHp @@ -45962,11 +45962,11 @@ aNc aOD aNc aLl -aZj +cQI aRA aSs aSQ -aZg +bGk aQx oUy oaL @@ -46413,7 +46413,7 @@ aKv aKL aLl aMa -aUv +gUp aNO aXL aPq @@ -46766,7 +46766,7 @@ oeN adC adM adM -adR +pxX oeN pDt pDt @@ -46853,7 +46853,7 @@ aBA aAU aCt aCT -aMc +xXk azP aOF aFo @@ -46881,7 +46881,7 @@ aQM aQM aQM aUB -aZE +ftO aQM aXV oUy @@ -46991,7 +46991,7 @@ pDt pDt pDt oeN -adD +wJW adM adM adT @@ -47096,7 +47096,7 @@ azt azt azt aKQ -aMd +eng aZw aNQ aOI @@ -47109,7 +47109,7 @@ aZB aSA aTY aUD -aVo +kpd aQM aQM oUy @@ -47219,7 +47219,7 @@ pDt pDt pDt oeN -adE +uuA adM adM aei @@ -47333,7 +47333,7 @@ aLl aQK aYD aYG -aYJ +rht aTB aQM aUE @@ -47530,7 +47530,7 @@ oUy oUy oUy azq -azO +fUg aAx aAX aBA @@ -47556,7 +47556,7 @@ aMe aKQ aNS aOK -aZz +dMD aLl akh aRI @@ -47677,8 +47677,8 @@ pDt oeN adF adN -agu -drm +oLB +qwV oeN pDt pDt @@ -48371,7 +48371,7 @@ xNK xNK xNK qjf -hhU +fNO qjf qjf qjf @@ -48599,7 +48599,7 @@ xNK xNK qjf qjf -hhU +fNO qjf qjf qjf @@ -48827,7 +48827,7 @@ xNK xNK qjf qjf -hhU +fNO qjf qjf qjf @@ -49262,7 +49262,7 @@ acw acU acT kRr -ada +dgi add yfH nUC @@ -49530,7 +49530,7 @@ lQC lQC lQC bZX -aij +eXO aiF aiQ bZX @@ -49715,7 +49715,7 @@ acf acf ecy acw -eLx +sZq gcI acV tlQ @@ -49816,7 +49816,7 @@ aBa aBD aBD aCz -aCY +vnn aDx aDY aEU @@ -50277,7 +50277,7 @@ azR aDY aEW aFx -aPe +ipW aGr aGO aHj @@ -50727,14 +50727,14 @@ azw aBd aBE aBE -aCB +ebg aDa aDA aEa aEY aFy aFv -eYh +ofx aFv aRj aDY @@ -50952,7 +50952,7 @@ fjM fjM azU azy -aBe +cDR aBC aBC azR @@ -52118,7 +52118,7 @@ aMl aOQ aPC xFf -aOP +mhn aRX aNo aNo @@ -54295,13 +54295,13 @@ dkN ufW ufW aAd -avk +kOX wmj boe boe boe qAc -thn +jKT qsM ufW fvt @@ -54600,7 +54600,7 @@ lyS lyS lyS asN -nrP +jZr ati ati asN @@ -55663,13 +55663,13 @@ ahv aeg aeg qAc -woM +spY rYA yhd dxy agX hNq -idz +pRf afq ufW qPO @@ -55955,7 +55955,7 @@ ati atE rGB ati -rZL +gxO ati tJb ati @@ -58168,7 +58168,7 @@ agm whU ahv afS -bNW +cyf agX agX agX @@ -59320,7 +59320,7 @@ boe boe boe boe -bhL +cWW afS ahv ahv @@ -60220,7 +60220,7 @@ whU whU ahv ahv -jQW +oBT agX nEo hcN diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index 27e4f42b61..a8748f8f94 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -82,6 +82,33 @@ /obj/item/tool/pickaxe/plasmacutter, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) +"cq" = ( +/obj/item/weapon/sword{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "dr" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -113,25 +140,6 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple/powered) -"dB" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/item/stack/sheet/animalhide/xeno{ - color = "#524e4e"; - desc = "An old hide from a fearsome creature."; - name = "hunter hide" - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "dE" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -235,6 +243,24 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"eG" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/item/weapon/sword/machete{ + desc = "This machete seems not standard issue, indeed it seems to be an ancient military design. Smells like the jungle."; + name = "\improper Dutch's Machete" + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "eM" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -280,6 +306,33 @@ "fl" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) +"fw" = ( +/obj/item/weapon/sword{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "fD" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -315,6 +368,33 @@ /obj/structure/prop/brazier/torch, /turf/closed/wall/rock/brown, /area/lv624/ground/caves/sand_temple) +"gb" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "gk" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -386,26 +466,6 @@ "hi" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) -"hu" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/weapon/yautja/knife{ - color = "#FFE55C"; - name = "sacred ceremonial dagger"; - pixel_x = -10 - }, -/obj/item/weapon/yautja/knife{ - color = "#FFE55C"; - name = "sacred ceremonial dagger" - }, -/obj/item/weapon/yautja/knife{ - color = "#FFE55C"; - name = "sacred ceremonial dagger"; - pixel_x = 9 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "hA" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -464,32 +524,24 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"iN" = ( -/obj/item/weapon/claymore/mercsword{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 +"iD" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" +/obj/item/stack/sheet/animalhide/xeno{ + color = "#524e4e"; + desc = "An old hide from a fearsome creature."; + name = "hunter hide" }, +/turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "iW" = ( /obj/structure/barricade/handrail/strata{ @@ -502,16 +554,6 @@ icon_state = "grass1" }, /area/lv624/ground/barrens/south_eastern_barrens) -"ja" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/restraints, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "kb" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/sandstone/runed, @@ -867,33 +909,6 @@ /obj/structure/platform/mineral/sandstone/runed, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"uy" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "uE" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) @@ -968,6 +983,18 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"wm" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/XenoItem/AntiAcid{ + pixel_x = -6 + }, +/obj/item/XenoItem/AntiAcid{ + pixel_x = 4 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "wx" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -977,6 +1004,13 @@ /obj/structure/platform/mineral/sandstone/runed, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) +"wR" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/stack/yautja_rope, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple/powered) "wS" = ( /obj/structure/showcase{ desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; @@ -1121,33 +1155,6 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"BI" = ( -/obj/item/weapon/claymore/mercsword{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "Cr" = ( /obj/effect/decal/cleanable/blood{ basecolor = "#20d450"; @@ -1178,33 +1185,6 @@ }, /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) -"DH" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "DX" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -1216,24 +1196,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"Eq" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/item/weapon/claymore/mercsword/machete{ - desc = "This machete seems not standard issue, indeed it seems to be an ancient military design. Smells like the jungle."; - name = "\improper Dutch's Machete" - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "EJ" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1276,6 +1238,33 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"GK" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "GO" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -1435,18 +1424,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"Lg" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/XenoItem/AntiAcid{ - pixel_x = -6 - }, -/obj/item/XenoItem/AntiAcid{ - pixel_x = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "LF" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -1538,6 +1515,26 @@ icon_state = "desert_dug" }, /area/lv624/ground/barrens/south_eastern_barrens) +"MT" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/weapon/yautja/knife{ + color = "#FFE55C"; + name = "sacred ceremonial dagger"; + pixel_x = -10 + }, +/obj/item/weapon/yautja/knife{ + color = "#FFE55C"; + name = "sacred ceremonial dagger" + }, +/obj/item/weapon/yautja/knife{ + color = "#FFE55C"; + name = "sacred ceremonial dagger"; + pixel_x = 9 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "Nt" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -1665,6 +1662,22 @@ }, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) +"QH" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/stack/sheet/mineral/sandstone{ + amount = 50 + }, +/obj/item/stack/sheet/mineral/sandstone{ + amount = 50; + pixel_y = 7 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/lv624/ground/caves/sand_temple/powered) "QL" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -1705,13 +1718,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"Sm" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/stack/yautja_rope, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple/powered) "SF" = ( /obj/effect/decal/remains/xeno, /obj/structure/stairs/perspective{ @@ -1735,22 +1741,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"SW" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/stack/sheet/mineral/sandstone{ - amount = 50 - }, -/obj/item/stack/sheet/mineral/sandstone{ - amount = 50; - pixel_y = 7 - }, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/lv624/ground/caves/sand_temple/powered) "TY" = ( /obj/structure/machinery/optable, /turf/open/floor/strata{ @@ -1792,6 +1782,16 @@ "Vu" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) +"VU" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/restraints, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "Wl" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -2579,13 +2579,13 @@ GT OC OC zZ -DH +gb vN mv mv mv zZ -iN +cq vN OC GO @@ -2831,13 +2831,13 @@ GT OC OC zZ -uy +GK vN mv mv mv zZ -BI +fw vN OC mB @@ -3302,7 +3302,7 @@ Rx mv mv mv -Eq +eG OC GT Ai @@ -3386,7 +3386,7 @@ mv mv mv mv -dB +iD oi GT GT @@ -3587,7 +3587,7 @@ oi UX pb pb -Sm +wR OC qz mv @@ -3596,7 +3596,7 @@ OC MD mv mv -Lg +wm OC GT GT @@ -3668,7 +3668,7 @@ ZX ZX GT OC -SW +QH aO bP dA @@ -3719,7 +3719,7 @@ fE Hq rU OC -ja +VU TY Wl nN @@ -3758,7 +3758,7 @@ OC OC OC OC -hu +MT OC OC FS diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index f375b61213..1badb8a8e4 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -27,20 +27,6 @@ /obj/structure/platform_decoration/mineral/sandstone/runed, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) -"aI" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "aN" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -74,6 +60,20 @@ "ci" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) +"cS" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "de" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) @@ -258,10 +258,6 @@ "hi" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) -"hu" = ( -/obj/item/weapon/claymore/mercsword, -/turf/open/gm/coast/beachcorner2/north_west, -/area/lv624/ground/caves/sand_temple) "hA" = ( /turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/caves/sand_temple) @@ -343,12 +339,6 @@ "lm" = ( /turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) -"lt" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "lI" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -462,6 +452,27 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) +"nr" = ( +/obj/item/weapon/sword{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "nL" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 @@ -645,6 +656,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"tu" = ( +/obj/item/weapon/sword, +/turf/open/gm/coast/beachcorner2/north_west, +/area/lv624/ground/caves/sand_temple) "tE" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -669,30 +684,6 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple) -"uy" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "uE" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) @@ -772,20 +763,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"wk" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "wt" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1001,27 +978,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"BI" = ( -/obj/item/weapon/claymore/mercsword{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "Ci" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 @@ -1078,30 +1034,6 @@ }, /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) -"DH" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/claymore/mercsword{ - layer = 3.1; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/lv624/ground/caves/sand_temple) "DZ" = ( /obj/effect/landmark/lv624/fog_blocker, /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -1268,6 +1200,26 @@ /obj/item/stool, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"Hr" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"Hy" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "HJ" = ( /obj/structure/showcase{ color = "#95948B"; @@ -1441,6 +1393,30 @@ "KL" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) +"KS" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "Lg" = ( /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) @@ -1691,6 +1667,30 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple) +"Sy" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/lv624/ground/caves/sand_temple) "SK" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 @@ -2549,7 +2549,7 @@ ai dA dA Dl -DH +Sy vN mv mv @@ -2596,7 +2596,7 @@ rA mv mv wU -hu +tu ci vY eY @@ -2801,13 +2801,13 @@ GT xO xO zZ -uy +KS qf Ai ax ci ky -BI +nr wR dA mB @@ -3260,7 +3260,7 @@ ZX ZX GT OC -wk +cS Ai UX Ai @@ -3482,7 +3482,7 @@ Ai ax MB mv -aI +Hr OC GT GT @@ -3599,7 +3599,7 @@ OC as XV Ai -lt +Hy OC qz mv diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index 2700593a2a..f37a7b1954 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -107,6 +107,26 @@ icon_state = "emerald" }, /area/lv624/lazarus/crashed_ship) +"cl" = ( +/obj/structure/phone_base/clf_net{ + phone_category = "CR-116"; + phone_id = "Cargo Bay"; + pixel_y = 32 + }, +/turf/open/floor{ + dir = 8; + icon_state = "damaged3" + }, +/area/lv624/lazarus/crashed_ship) +"cD" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/spawner/random/toolbox, +/obj/item/toy/deck/uno{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/lv624/lazarus/crashed_ship) "dt" = ( /obj/structure/barricade/metal/wired{ dir = 4; @@ -116,6 +136,19 @@ icon_state = "platingdmg3" }, /area/lv624/lazarus/crashed_ship) +"dK" = ( +/obj/structure/bed, +/obj/item/bedsheet/green, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/obj/item/toy/plush/farwa, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/lv624/lazarus/crashed_ship) "dN" = ( /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) @@ -160,17 +193,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"fA" = ( -/obj/structure/phone_base/clf_net{ - phone_category = "CR-116"; - phone_id = "Armoury"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/lv624/lazarus/crashed_ship) "fX" = ( /obj/item/stool, /obj/effect/landmark/survivor_spawner/lv624_crashed_clf, @@ -378,6 +400,17 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"ko" = ( +/obj/structure/phone_base/clf_net{ + phone_category = "CR-116"; + phone_id = "Armoury"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/lv624/lazarus/crashed_ship) "kp" = ( /obj/item/stack/rods, /obj/structure/girder, @@ -453,12 +486,6 @@ "lr" = ( /turf/open/floor/plating/plating_catwalk, /area/lv624/lazarus/crashed_ship) -"lv" = ( -/obj/item/stack/rods, -/turf/open/floor{ - icon_state = "platingdmg1" - }, -/area/lv624/lazarus/crashed_ship) "lC" = ( /obj/item/ammo_magazine/sniper/svd, /turf/open/floor/plating, @@ -543,19 +570,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"ox" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 - }, -/obj/item/toy/farwadoll, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/lv624/lazarus/crashed_ship) "oI" = ( /obj/item/stack/rods, /obj/effect/landmark/corpsespawner/clf, @@ -661,18 +675,6 @@ icon_state = "green" }, /area/lv624/lazarus/crashed_ship) -"sI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/obj/structure/phone_base/clf_net/rotary{ - phone_category = "CR-116"; - phone_color = "yellow"; - phone_id = "Engineering" - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/lv624/lazarus/crashed_ship) "sO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -886,6 +888,14 @@ icon_state = "green" }, /area/lv624/lazarus/crashed_ship) +"xV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "emerald" + }, +/area/lv624/lazarus/crashed_ship) "xX" = ( /obj/structure/machinery/light/small{ dir = 1; @@ -1005,6 +1015,15 @@ }, /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) +"AS" = ( +/obj/structure/surface/table/almayer, +/obj/item/tank/oxygen/red, +/obj/item/storage/bag/trash, +/obj/item/tool/screwdriver, +/turf/open/floor{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/crashed_ship) "AT" = ( /obj/structure/barricade/plasteel/wired{ icon_state = "plasteel_2" @@ -1054,15 +1073,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/lv624/lazarus/crashed_ship) -"Cs" = ( -/obj/structure/surface/table/almayer, -/obj/item/tank/oxygen/red, -/obj/item/storage/bag/trash, -/obj/item/tool/screwdriver, -/turf/open/floor{ - icon_state = "platingdmg1" - }, -/area/lv624/lazarus/crashed_ship) "Ct" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 8; @@ -1243,14 +1253,23 @@ icon_state = "emerald" }, /area/lv624/lazarus/crashed_ship) -"GO" = ( -/obj/structure/surface/table/woodentable, +"GE" = ( +/obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/obj/item/toy/deck/uno{ - pixel_x = -3; - pixel_y = 4 +/obj/structure/phone_base/clf_net/rotary{ + phone_category = "CR-116"; + phone_color = "yellow"; + phone_id = "Engineering" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/lv624/lazarus/crashed_ship) +"GN" = ( +/obj/item/stack/rods, +/turf/open/floor{ + icon_state = "platingdmg1" }, -/turf/open/floor/wood, /area/lv624/lazarus/crashed_ship) "GQ" = ( /obj/effect/landmark/corpsespawner/engineer, @@ -1266,20 +1285,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"GY" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/obj/item/weapon/gun/pistol/heavy, -/obj/item/ammo_magazine/pistol/heavy, -/obj/item/ammo_magazine/pistol/heavy, -/obj/item/ammo_magazine/pistol/heavy, -/obj/item/ammo_magazine/pistol/heavy, -/obj/item/clothing/accessory/storage/webbing, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/lv624/lazarus/crashed_ship) "Hg" = ( /obj/structure/cargo_container/arious/rightmid, /turf/open/floor{ @@ -1409,6 +1414,20 @@ icon_state = "platingdmg3" }, /area/lv624/lazarus/crashed_ship) +"Lx" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/obj/item/weapon/gun/pistol/heavy, +/obj/item/ammo_magazine/pistol/heavy, +/obj/item/ammo_magazine/pistol/heavy, +/obj/item/ammo_magazine/pistol/heavy, +/obj/item/ammo_magazine/pistol/heavy, +/obj/item/clothing/accessory/storage/webbing, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/lv624/lazarus/crashed_ship) "LD" = ( /obj/item/stack/rods, /turf/open/floor/plating{ @@ -1546,6 +1565,19 @@ icon_state = "emeraldcorner" }, /area/lv624/lazarus/crashed_ship) +"Om" = ( +/obj/structure/machinery/body_scanconsole, +/obj/structure/phone_base/clf_net{ + phone_category = "CR-116"; + phone_color = "green"; + phone_id = "Medical Bay"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "emerald" + }, +/area/lv624/lazarus/crashed_ship) "Op" = ( /obj/structure/surface/rack, /obj/item/storage/backpack/general_belt{ @@ -1655,19 +1687,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"Qj" = ( -/obj/structure/machinery/body_scanconsole, -/obj/structure/phone_base/clf_net{ - phone_category = "CR-116"; - phone_color = "green"; - phone_id = "Medical Bay"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/lv624/lazarus/crashed_ship) "Qp" = ( /obj/item/stack/rods, /turf/open/gm/dirt, @@ -1951,14 +1970,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/crashed_ship) -"Xa" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/lv624/lazarus/crashed_ship) "Xm" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -1986,17 +1997,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/crashed_ship) -"XM" = ( -/obj/structure/phone_base/clf_net{ - phone_category = "CR-116"; - phone_id = "Cargo Bay"; - pixel_y = 32 - }, -/turf/open/floor{ - dir = 8; - icon_state = "damaged3" - }, -/area/lv624/lazarus/crashed_ship) "XX" = ( /turf/closed/shuttle/ert{ icon_state = "stan8" @@ -2479,9 +2479,9 @@ xh wV lr gQ -sI +GE Xq -Qj +Om lr lr Yz @@ -2528,7 +2528,7 @@ lr DY HR Xq -Xa +xV Ud lr ch @@ -2565,7 +2565,7 @@ te UV Ro Sy -Cs +AS ok dN Bc @@ -2948,7 +2948,7 @@ wx LG ln Bg -GO +cD uX Xq Mz @@ -2956,7 +2956,7 @@ ag gD QQ Xq -XM +cl dN dN Bc @@ -2998,7 +2998,7 @@ Ar Ar Ar Xq -fA +ko OL fe jr @@ -3181,7 +3181,7 @@ vo lr RS Xq -ox +dK Dv sH IG @@ -3193,7 +3193,7 @@ jr Xq ou dN -lv +GN Qf Hg dN @@ -3371,7 +3371,7 @@ Ab Ab Ab Ns -GY +Lx IP Xq Nw diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 2b39ff6c17..a376e1173d 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -118,14 +118,6 @@ dir = 8 }, /area/varadero/interior/hall_N) -"afi" = ( -/obj/structure/machinery/light, -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "afx" = ( /obj/structure/machinery/light{ dir = 4 @@ -254,15 +246,31 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"akd" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/machinery/firealarm{ - pixel_y = 24 +"aiY" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 }, -/turf/open/floor{ - icon_state = "freezerfloor" +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 }, -/area/varadero/interior/cargo) +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/toy/plush/farwa, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "akf" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/oil, @@ -294,6 +302,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) +"akJ" = ( +/obj/structure/surface/table/woodentable, +/turf/open/floor/carpet, +/area/varadero/interior/library) "akO" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/shiva{ @@ -309,23 +321,6 @@ icon_state = "red" }, /area/varadero/interior/medical) -"alh" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "alD" = ( /obj/structure/filtration/coagulation_arm{ indestructible = 1; @@ -400,6 +395,18 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"anE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) "aoi" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor{ @@ -605,10 +612,13 @@ "avD" = ( /turf/closed/wall/huntership, /area/varadero/interior_protected/vessel) -"avI" = ( -/obj/structure/closet/crate, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +"avF" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/technical_storage) "avX" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4; @@ -912,6 +922,13 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) +"aDv" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "aDF" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -921,23 +938,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"aDQ" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - layer = 3.1; - pixel_x = 8; - pixel_y = 21 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - layer = 3.2; - pixel_x = 8; - pixel_y = 10 - }, -/turf/open/floor/wood, -/area/varadero/interior/administration) "aDZ" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor{ @@ -1078,18 +1078,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"aHs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras/wooden_tv{ - desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; - dir = 4; - name = "Television set"; - network = null; - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/varadero/interior/research) "aHu" = ( /turf/open/gm/dirt{ icon_state = "desert3" @@ -1138,6 +1126,23 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"aIu" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "aJc" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -1245,6 +1250,23 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"aKA" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + layer = 3.1; + pixel_x = 8; + pixel_y = 21 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + layer = 3.2; + pixel_x = 8; + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/varadero/interior/administration) "aKJ" = ( /obj/item/tool/warning_cone, /obj/structure/prop/invuln/lattice_prop{ @@ -1328,14 +1350,6 @@ /obj/structure/window/framed/colony/reinforced/hull, /turf/open/floor/plating/icefloor, /area/varadero/interior/dock_control) -"aQu" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/shiva{ - icon_state = "snow_mat" - }, -/area/varadero/interior/security) "aQG" = ( /turf/open/floor/shiva{ dir = 9; @@ -1570,6 +1584,12 @@ /obj/structure/largecrate/supply/medicine/iv, /turf/open/shuttle/elevator/grating, /area/varadero/interior/records) +"aXC" = ( +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "aYg" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -1687,13 +1707,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"baN" = ( -/obj/structure/closet/crate/secure, -/obj/item/trash/wy_chips_pepper, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "bbt" = ( /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand_white/layer1, @@ -1757,35 +1770,6 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"ben" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/strata_decals/grime/grime3{ - dir = 4 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) -"bez" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/closet/crate, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) "beE" = ( /obj/item/device/taperecorder, /obj/structure/surface/table/reinforced/prison, @@ -1796,16 +1780,6 @@ "beK" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/exterior/lz2_near) -"beM" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/filingcabinet/security, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "red" - }, -/area/varadero/interior/security) "bfg" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -1900,19 +1874,6 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) -"biF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt, -/obj/item/trash/cigbutt{ - pixel_y = 8 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "biS" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8; @@ -1925,6 +1886,16 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"bjd" = ( +/obj/item/weapon/gun/smg/nailgun{ + pixel_y = 3 + }, +/obj/structure/surface/rack, +/turf/open/floor/shiva{ + dir = 5; + icon_state = "purple" + }, +/area/varadero/interior/research) "bjf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1949,12 +1920,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"bjP" = ( -/obj/structure/filingcabinet, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/records) "bko" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -2245,17 +2210,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"bxc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/attachable/bayonet/co2{ - pixel_y = 7 - }, -/obj/effect/spawner/random/powercell, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "bxx" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/plating/icefloor{ @@ -2976,6 +2930,10 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"bUm" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "bUK" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -2992,17 +2950,6 @@ default_name = "shallow ocean" }, /area/varadero/exterior/monsoon) -"bUR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard{ - pixel_x = -3; - pixel_y = 4 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "bUZ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/auto_turf/sand_white/layer1, @@ -3138,6 +3085,13 @@ default_name = "shallow ocean" }, /area/varadero/exterior/pontoon_beach) +"caV" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "cba" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor{ @@ -3383,6 +3337,26 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"cio" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/strata_decals/grime/grime3{ + dir = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "cit" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -3421,15 +3395,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"cjU" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/closet/secure_closet/scientist, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purple" +"cka" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras/wooden_tv{ + desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; + dir = 4; + name = "Television set"; + network = null; + pixel_x = -3; + pixel_y = 6 }, +/turf/open/floor/wood, /area/varadero/interior/research) "ckx" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -3620,6 +3596,17 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/eastbeach) +"cpy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "cpA" = ( /obj/structure/morgue, /turf/open/floor/shiva{ @@ -3660,18 +3647,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"cqB" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purple" - }, -/area/varadero/interior/research) "cqC" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, @@ -3794,6 +3769,20 @@ icon_state = "red" }, /area/varadero/interior/security) +"cvI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper/janitor{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/tool/pen/blue{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "cvW" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/structure/prop/invuln/lattice_prop{ @@ -3949,6 +3938,13 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"cCO" = ( +/obj/structure/closet/jcloset, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/laundry) "cDc" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -3966,15 +3962,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"cDr" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access_txt = "100" - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "wred" - }, -/area/varadero/interior/medical) "cEm" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4; @@ -4303,6 +4290,28 @@ icon_state = "green" }, /area/varadero/interior/court) +"cMw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"cMQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "cNb" = ( /obj/structure/surface/table, /obj/item/device/binoculars, @@ -4877,12 +4886,6 @@ icon_state = "floor3" }, /area/varadero/interior/records) -"dhQ" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist, -/obj/item/weapon/katana, -/turf/open/floor/carpet, -/area/varadero/interior/chapel) "dhV" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/gm/river{ @@ -4980,13 +4983,6 @@ icon_state = "wood" }, /area/varadero/interior/library) -"djH" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt, -/turf/open/floor/wood, -/area/varadero/interior/administration) "djP" = ( /obj/structure/bed/chair, /turf/open/floor/interior/plastic, @@ -5055,6 +5051,13 @@ /obj/structure/prop/rock/brown_degree, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) +"dmq" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "dmN" = ( /turf/closed/wall/r_wall/elevator{ dir = 5 @@ -5175,14 +5178,6 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"dpO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/evidencebag, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "red" - }, -/area/varadero/interior/security) "dpW" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/exterior/comms4) @@ -5228,23 +5223,6 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"dsz" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "dsC" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -5494,12 +5472,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"dGh" = ( -/obj/structure/closet/crate/hydroponics/prespawned, -/turf/open/floor/shiva{ - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "dGr" = ( /turf/closed/shuttle{ dir = 1; @@ -5777,6 +5749,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"dQV" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/varadero/interior/hall_SE) "dRs" = ( /turf/open/gm/river{ name = "shallow ocean"; @@ -5802,6 +5781,17 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) +"dSo" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "dSs" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ @@ -5900,13 +5890,16 @@ icon_state = "wood" }, /area/varadero/interior/library) -"dWl" = ( -/obj/structure/filingcabinet, +"dWu" = ( +/obj/structure/surface/rack, +/obj/item/broken_device{ + desc = "A timeless piece of technology from another era, of spacemen who once plunged into the 12th Bay and beyond." + }, /turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" + dir = 4; + icon_state = "purple" }, -/area/varadero/interior/electrical) +/area/varadero/interior/research) "dWE" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ @@ -5976,18 +5969,6 @@ /obj/item/book/manual/hydroponics_beekeeping, /turf/open/floor/carpet, /area/varadero/interior/library) -"dYq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/co2_cartridge{ - pixel_x = 13; - pixel_y = 7 - }, -/obj/effect/spawner/random/bomb_supply, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "dYy" = ( /obj/structure/machinery/light{ dir = 4 @@ -6009,6 +5990,21 @@ /obj/structure/machinery/light, /turf/open/floor/carpet, /area/varadero/interior/library) +"dYZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/brigdoor/westleft, +/obj/item/tool/pen/blue{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/pill_bottle/bicaridine{ + pixel_x = -5; + pixel_y = 11 + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "dZT" = ( /obj/structure/bed/chair{ dir = 1 @@ -6048,25 +6044,6 @@ /obj/item/packageWrap, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"eaN" = ( -/obj/structure/closet/crate/ammo/alt, -/obj/item/ammo_magazine/rifle/m4ra{ - pixel_x = 5 - }, -/obj/item/ammo_magazine/rifle/m4ra{ - pixel_y = -5; - pixel_x = -8 - }, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/ammo_magazine/rifle{ - pixel_x = -7 - }, -/turf/open/shuttle/elevator/grating, -/area/varadero/interior/hall_N) "eaQ" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor{ @@ -6357,13 +6334,14 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"ekg" = ( -/obj/structure/closet/secure_closet/engineering_personal, +"ekp" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/sling, +/obj/structure/machinery/light, /turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" + icon_state = "floor3" }, -/area/varadero/interior/comms3) +/area/varadero/interior/medical) "ekE" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8; @@ -6578,14 +6556,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"esz" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/shotgun, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" - }, -/area/varadero/interior/medical) "esA" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -7190,34 +7160,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"eKW" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, -/obj/item/toy/farwadoll, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "snow_mat" - }, -/area/varadero/interior/security) -"eLE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/brigdoor/westleft, -/obj/item/tool/stamp{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/tool/pen/blue{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "eLZ" = ( /obj/structure/prop/ice_colony/dense/planter_box/hydro{ density = 0 @@ -7479,6 +7421,17 @@ icon_state = "bluefull" }, /area/varadero/interior/maintenance) +"eUr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/surgery{ + pixel_x = 2; + pixel_y = 7 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "eUv" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -7988,21 +7941,6 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"fiB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/brigdoor/westleft, -/obj/item/tool/pen/blue{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/pill_bottle/bicaridine{ - pixel_x = -5; - pixel_y = 11 - }, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "fjg" = ( /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/swcaves) @@ -8040,12 +7978,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) -"fjK" = ( -/obj/structure/closet/crate/secure, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "fjM" = ( /obj/structure/machinery/conveyor, /obj/structure/pipes/standard/simple/hidden/green{ @@ -8148,6 +8080,25 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"fnF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/brigdoor/westleft, +/obj/item/tool/stamp{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/tool/pen/blue{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "fnX" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 @@ -8415,6 +8366,12 @@ }, /turf/closed/wall/rock/brown, /area/varadero/exterior/eastbeach) +"fyi" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist, +/obj/item/weapon/sword/katana, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "fys" = ( /obj/structure/barricade/handrail/wire{ layer = 3.01 @@ -8509,28 +8466,6 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"fDn" = ( -/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/toy/farwadoll, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "fDB" = ( /obj/structure/machinery/light{ dir = 4 @@ -8625,6 +8560,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"fFu" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "blue" + }, +/area/varadero/interior/administration) "fFw" = ( /obj/item/stack/sheet/wood, /turf/open/gm/dirt, @@ -8851,13 +8793,6 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"fMP" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/hall_SE) "fNm" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8; @@ -9038,15 +8973,6 @@ /obj/structure/machinery/light/small, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior/caves/north_research) -"fUC" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/caves/east) "fUF" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 @@ -9247,6 +9173,18 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"fYV" = ( +/obj/structure/surface/rack, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) +"fZd" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "fZe" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/access/dormatory, /turf/open/floor/shiva{ @@ -9404,10 +9342,6 @@ }, /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) -"gdN" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor/carpet, -/area/varadero/interior/library) "gdO" = ( /obj/item/stack/tile/plasteel{ layer = 2.89; @@ -9688,18 +9622,11 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) -"gkk" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/cigar{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigar/tarbacks{ - pixel_x = -3; - pixel_y = 10 - }, +"gkb" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/storage/large_holster/ceremonial_sword/full, /turf/open/floor/wood, -/area/varadero/interior/research) +/area/varadero/interior/security) "gkw" = ( /obj/structure/machinery/power/apc{ dir = 1 @@ -9758,13 +9685,6 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"gmE" = ( -/obj/structure/closet/jcloset, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/varadero/interior/laundry) "gmK" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva{ @@ -10019,6 +9939,24 @@ icon_state = "yellowfull" }, /area/varadero/interior/disposals) +"gwt" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/shiva{ + dir = 5; + icon_state = "red" + }, +/area/varadero/interior/security) "gwB" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/shiva{ @@ -10047,14 +9985,13 @@ icon_state = "red" }, /area/varadero/interior/security) -"gwW" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/sling, -/obj/structure/machinery/light, +"gwO" = ( +/obj/structure/filingcabinet, /turf/open/floor/shiva{ - icon_state = "floor3" + dir = 10; + icon_state = "red" }, -/area/varadero/interior/medical) +/area/varadero/interior/security) "gxi" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -10158,23 +10095,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"gBp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/screwdriver{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/tool/plantspray/pests/old/phosmet{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/weapon/wirerod{ - pixel_x = 8 - }, -/turf/open/floor/shiva{ - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "gBM" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -10306,19 +10226,6 @@ /obj/structure/prop/rock/brown, /turf/open/gm/dirt, /area/varadero/interior_protected/caves) -"gES" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "gFt" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva{ @@ -10433,21 +10340,6 @@ /obj/item/tool/lighter, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"gLZ" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "gMi" = ( /obj/structure/barricade/handrail/wire{ layer = 3.5 @@ -10556,6 +10448,17 @@ }, /turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) +"gPY" = ( +/obj/structure/surface/table, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "gPZ" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -10712,6 +10615,25 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"gWu" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/tools/full, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/varadero/interior/medical) +"gWA" = ( +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/research) "gWL" = ( /obj/structure/surface/table, /obj/structure/machinery/faxmachine, @@ -10783,25 +10705,6 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) -"gZI" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/item/reagent_container/food/drinks/flask/vacuumflask{ - pixel_x = 9; - pixel_y = 25 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "haq" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -10846,13 +10749,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/technical_storage) -"haV" = ( -/obj/structure/closet/crate/secure, -/obj/item/trash/kepler, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "haX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green, @@ -10975,15 +10871,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"hfD" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/varadero/interior/research) "hfR" = ( /turf/open/floor/prison/chapel_carpet{ dir = 1; @@ -11125,12 +11012,6 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) -"hlp" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) "hlw" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/landmark/survivor_spawner, @@ -11271,6 +11152,23 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"hrc" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "hre" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) @@ -11344,33 +11242,12 @@ /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) -"hty" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/storage/large_holster/ceremonial_sword/full, -/turf/open/floor/wood, -/area/varadero/interior/security) "htP" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"htU" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = -7; - pixel_y = 13 - }, -/turf/open/floor/wood, -/area/varadero/interior/records) "huf" = ( /obj/structure/machinery/light{ dir = 4 @@ -11670,14 +11547,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) -"hFA" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/shiva{ - icon_state = "purple" - }, -/area/varadero/interior/research) "hFE" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Underground Maintenance"; @@ -11778,6 +11647,13 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"hJx" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "hJB" = ( /obj/structure/blocker/fog, /turf/closed/wall/r_wall/unmeltable, @@ -11804,17 +11680,6 @@ "hKK" = ( /turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) -"hLt" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/varadero/interior/maintenance/north) "hLE" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -11842,6 +11707,13 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"hLI" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt, +/turf/open/floor/wood, +/area/varadero/interior/administration) "hLQ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/shiva{ @@ -12410,16 +12282,6 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"ifx" = ( -/obj/item/weapon/gun/smg/nailgun{ - pixel_y = 3 - }, -/obj/structure/surface/rack, -/turf/open/floor/shiva{ - dir = 5; - icon_state = "purple" - }, -/area/varadero/interior/research) "ifB" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -12532,6 +12394,13 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/eastbeach) +"iir" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/kepler, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "iiX" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/secure{ @@ -12613,12 +12482,6 @@ "imz" = ( /turf/closed/wall/r_wall/elevator/gears, /area/varadero/interior/records) -"imZ" = ( -/obj/structure/surface/table, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) "inj" = ( /obj/structure/bed/chair{ dir = 4 @@ -12845,12 +12708,6 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) -"ivg" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/medical) "ivo" = ( /obj/structure/airlock_assembly, /turf/open/gm/dirt, @@ -12893,36 +12750,6 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/wood, /area/varadero/interior/court) -"iwo" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.1; - pixel_x = -5; - pixel_y = 17 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.1; - pixel_x = -10; - pixel_y = 16 - }, -/obj/item/storage/pill_bottle/kelotane/skillless{ - pixel_x = -5 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "iwT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, @@ -13146,13 +12973,6 @@ }, /turf/open/floor/prison/chapel_carpet, /area/varadero/interior/chapel) -"iDS" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "redfull" - }, -/area/varadero/interior/hall_SE) "iEe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13400,6 +13220,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) +"iMc" = ( +/obj/structure/surface/rack, +/obj/item/clipboard, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "purple" + }, +/area/varadero/interior/research) "iMp" = ( /obj/structure/machinery/light{ dir = 1 @@ -13844,13 +13672,6 @@ icon_state = "blue" }, /area/varadero/interior/maintenance) -"jai" = ( -/obj/structure/filingcabinet/security, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "red" - }, -/area/varadero/interior/security) "jaF" = ( /turf/open/gm/coast/east, /area/varadero/exterior/pontoon_beach) @@ -13989,6 +13810,10 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) +"jff" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/wood, +/area/varadero/interior/records) "jfn" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -14037,6 +13862,17 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"jgw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/beaker/ethanol{ + desc = "The beaker stares at you lecherously. Its contents... irresistible."; + pixel_y = 7 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "jgL" = ( /turf/open/floor{ dir = 6; @@ -14341,6 +14177,19 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz2_near) +"jqr" = ( +/obj/item/reagent_container/food/snacks/wrapped/barcardine{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/structure/surface/table, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "jqu" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva, @@ -14509,18 +14358,6 @@ "juW" = ( /turf/closed/wall/r_wall, /area/varadero/interior/comms3) -"jvc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/implanter{ - pixel_x = 10 - }, -/obj/item/ashtray/bronze{ - icon_state = "ashtray_half_br" - }, -/obj/item/weapon/gun/lever_action/r4t, -/obj/item/ammo_magazine/handful/lever_action, -/turf/open/floor/carpet, -/area/varadero/interior/research) "jvh" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -14588,6 +14425,14 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"jzq" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "jzB" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -14757,6 +14602,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"jFh" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/wy_chips_pepper, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "jFt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/wood/normal{ @@ -14993,6 +14845,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"jNb" = ( +/obj/structure/surface/table, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "jNn" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt, @@ -15183,6 +15041,16 @@ "jSX" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/pontoon_beach) +"jTi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/administration) "jTj" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_2" @@ -15203,6 +15071,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/hall_SE) +"jUB" = ( +/obj/structure/surface/table/woodentable, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "jUM" = ( /obj/structure/urinal{ pixel_y = 32 @@ -15768,17 +15640,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/pontoon_beach) -"kpF" = ( -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/varadero/interior/research) "kpN" = ( /obj/structure/machinery/light{ dir = 1 @@ -16256,13 +16117,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"kDO" = ( -/obj/structure/closet/crate, -/obj/item/trash/chunk, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "kEB" = ( /obj/structure/prop/invuln/static_corpse/afric_zimmer{ desc = "A card lays in his lap. 'Happy birthday, Steve. Here's to another fruitful year!'"; @@ -16690,6 +16544,15 @@ default_name = "shallow ocean" }, /area/varadero/interior_protected/caves) +"kSF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "kSN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -16822,6 +16685,13 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"kXA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/evidencebag, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "kXP" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ @@ -17163,13 +17033,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/monsoon) -"liE" = ( -/obj/structure/closet/crate/secure/weapon, -/turf/open/floor/shiva{ - dir = 9; - icon_state = "red" - }, -/area/varadero/interior/security) "liM" = ( /obj/structure/pipes/binary/passive_gate, /turf/open/gm/river/desert/deep{ @@ -17754,6 +17617,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"lDr" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/filingcabinet/security, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "red" + }, +/area/varadero/interior/security) "lDz" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat{ @@ -18005,27 +17878,6 @@ /obj/effect/spawner/random/attachment, /turf/open/floor/carpet, /area/varadero/interior/administration) -"lJo" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/surface/rack, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "wred" - }, -/area/varadero/interior/medical) -"lKI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/beaker/ethanol{ - desc = "The beaker stares at you lecherously. Its contents... irresistible."; - pixel_y = 7 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "lKS" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -18044,6 +17896,16 @@ icon_state = "floor3" }, /area/varadero/interior/medical) +"lLe" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/closet/secure_closet/scientist, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purple" + }, +/area/varadero/interior/research) "lLq" = ( /turf/open/floor/shiva{ dir = 8; @@ -18469,12 +18331,6 @@ "lYr" = ( /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"lYA" = ( -/obj/structure/closet/secure_closet/medical2, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "lYD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/wood, @@ -18569,6 +18425,22 @@ icon_state = "red" }, /area/varadero/interior/administration) +"mbf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/pwine{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -6; + pixel_y = 13 + }, +/obj/item/reagent_container/glass/rag{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/varadero/interior/research) "mbt" = ( /obj/structure/bed/chair{ dir = 8; @@ -18719,23 +18591,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/maintenance/south) -"mee" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/brigdoor/westleft{ - name = "Security Desk" - }, -/obj/structure/machinery/door/window/eastright{ - name = "Security Desk" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = -6; - pixel_y = 2 - }, -/turf/open/floor/plating, -/area/varadero/interior/administration) "mey" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/cameras/wooden_tv{ @@ -18778,6 +18633,22 @@ /obj/structure/barricade/wooden, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"mhm" = ( +/obj/item/ammo_magazine/smg/nailgun, +/obj/structure/surface/rack, +/obj/item/ammo_magazine/smg/nailgun{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/ammo_magazine/smg/nailgun{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "purple" + }, +/area/varadero/interior/research) "mio" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -18847,17 +18718,6 @@ icon_state = "floor3" }, /area/varadero/interior/administration) -"mkc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/cell_charger, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "purple" - }, -/area/varadero/interior/research) "mke" = ( /obj/structure/window/reinforced{ dir = 4; @@ -18908,6 +18768,12 @@ /obj/vehicle/powerloader/ft, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"mlR" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "mlT" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -19190,6 +19056,30 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"muF" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/hall_SE) +"muY" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/trash/cigbutt/ucigbutt, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = 11 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/administration) "mve" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19653,6 +19543,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"mJw" = ( +/obj/structure/closet/secure_closet/medical3{ + req_access_txt = "100" + }, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "wred" + }, +/area/varadero/interior/medical) "mJH" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/sand_white/layer1, @@ -19853,12 +19753,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"mQh" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) "mQC" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -20053,9 +19947,6 @@ default_name = "shallow ocean" }, /area/varadero/exterior/pool) -"mXi" = ( -/turf/open/shuttle/elevator, -/area/varadero/interior/records) "mXs" = ( /obj/structure/machinery/light{ dir = 4 @@ -20301,6 +20192,12 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"nex" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "neD" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -20545,15 +20442,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"nmN" = ( -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/surface/table, -/turf/open/floor/shiva{ - icon_state = "snow_mat" - }, -/area/varadero/interior/security) "nmQ" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -20696,6 +20584,22 @@ "nti" = ( /turf/closed/wall/r_wall, /area/varadero/exterior/lz2_near) +"nto" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -7; + pixel_y = 13 + }, +/turf/open/floor/wood, +/area/varadero/interior/records) "ntw" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -20739,6 +20643,15 @@ "nwq" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) +"nwV" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "wred" + }, +/area/varadero/interior/medical) "nxl" = ( /obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/plating/icefloor{ @@ -20800,16 +20713,12 @@ icon_state = "asteroidfloor" }, /area/varadero/interior/comms1) +"nAq" = ( +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "nBc" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/lz2_near) -"nBj" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/technical_storage) "nBl" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -20894,6 +20803,17 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"nEp" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/obj/structure/closet/firecloset, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "nEE" = ( /obj/structure/prop/server_equipment/laptop/on{ pixel_x = -5 @@ -20993,6 +20913,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/comms3) +"nHk" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "nHy" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8; @@ -21138,6 +21064,16 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"nMT" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/surface/rack, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "wred" + }, +/area/varadero/interior/medical) "nNe" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -21445,6 +21381,13 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"nTX" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/shiva{ + dir = 9; + icon_state = "red" + }, +/area/varadero/interior/hall_N) "nUf" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva{ @@ -21513,6 +21456,12 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) +"nWs" = ( +/obj/structure/filingcabinet, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/records) "nWS" = ( /obj/item/stack/tile/plasteel{ pixel_x = 8; @@ -21791,6 +21740,18 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"ofI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/co2_cartridge{ + pixel_x = 13; + pixel_y = 7 + }, +/obj/effect/spawner/random/bomb_supply, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "ofJ" = ( /obj/structure/shuttle/engine/router{ dir = 4; @@ -21940,12 +21901,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"okB" = ( -/obj/structure/surface/rack, -/turf/open/floor/shiva{ - icon_state = "purple" - }, -/area/varadero/interior/research) "okI" = ( /obj/structure/surface/rack, /obj/item/implantpad, @@ -22479,13 +22434,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"oCy" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "red" - }, -/area/varadero/interior/security) "oCN" = ( /obj/structure/machinery/computer/cameras{ dir = 4 @@ -22551,6 +22499,36 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"oEc" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.1; + pixel_x = -5; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.1; + pixel_x = -10; + pixel_y = 16 + }, +/obj/item/storage/pill_bottle/kelotane/skillless{ + pixel_x = -5 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "oET" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/maintenance/security) @@ -22661,13 +22639,6 @@ /obj/item/device/flashlight/slime, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"oKi" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood, -/area/varadero/interior/beach_bar) "oKo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -22759,10 +22730,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"oMg" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/wood, -/area/varadero/interior/beach_bar) "oMl" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -22812,12 +22779,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"oPr" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "oPQ" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -22856,18 +22817,6 @@ /obj/structure/prop/invuln/lattice_prop, /turf/open/gm/coast/north, /area/varadero/exterior/pool) -"oRK" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/hall_SE) "oSe" = ( /obj/structure/surface/table, /obj/item/stack/sheet/metal/med_large_stack, @@ -22887,18 +22836,6 @@ /obj/item/tool/crowbar/red, /turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) -"oTJ" = ( -/obj/structure/machinery/alarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/taperecorder, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "blue" - }, -/area/varadero/interior/administration) "oTX" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1; @@ -23066,17 +23003,6 @@ /obj/structure/prop/server_equipment/laptop/on, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"oXE" = ( -/obj/structure/surface/table, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/mess) "oXZ" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -23094,6 +23020,10 @@ icon_state = "red" }, /area/varadero/interior/medical) +"oYE" = ( +/obj/structure/closet/crate, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "oZw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -23283,6 +23213,15 @@ default_name = "shallow ocean" }, /area/varadero/exterior/pool) +"peu" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "peA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23303,6 +23242,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"pfD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/cell_charger, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "purple" + }, +/area/varadero/interior/research) "pfL" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -23331,13 +23281,6 @@ }, /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastbeach) -"phd" = ( -/obj/structure/filingcabinet, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" - }, -/area/varadero/interior/security) "phk" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/dirt, @@ -23465,14 +23408,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) -"plc" = ( -/obj/structure/surface/rack, -/obj/item/clipboard, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purple" - }, -/area/varadero/interior/research) "pll" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -23530,23 +23465,6 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"pmy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/trash/cigbutt/ucigbutt, -/obj/item/trash/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = 11 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "bluefull" - }, -/area/varadero/interior/administration) "pmM" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -23676,13 +23594,6 @@ icon_state = "green" }, /area/varadero/interior/court) -"pqH" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "pqO" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -23884,19 +23795,6 @@ dir = 1 }, /area/varadero/interior/cargo) -"pyk" = ( -/obj/item/reagent_container/food/snacks/wrapped/barcardine{ - pixel_y = 7 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/structure/surface/table, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/north) "pyz" = ( /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/plating/icefloor{ @@ -24069,17 +23967,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"pDF" = ( -/obj/structure/machinery/storm_siren{ - dir = 4; - pixel_x = -3 - }, -/obj/structure/closet/firecloset, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/exterior/lz1_near) "pDW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor{ @@ -24090,6 +23977,14 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"pEv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/evidencebag, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "red" + }, +/area/varadero/interior/security) "pEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24117,6 +24012,15 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"pFS" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) "pGc" = ( /obj/structure/window/framed/colony/reinforced, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -24151,6 +24055,21 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"pGU" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "pIe" = ( /obj/item/stack/sheet/wood, /turf/open/floor/plating/icefloor{ @@ -24244,13 +24163,6 @@ icon_state = "wood" }, /area/varadero/interior/library) -"pJZ" = ( -/obj/structure/surface/table, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" - }, -/area/varadero/interior/administration) "pKg" = ( /obj/item/book/manual/nuclear, /turf/open/floor/carpet, @@ -24294,12 +24206,6 @@ icon_state = "red" }, /area/varadero/interior/administration) -"pMe" = ( -/turf/open/floor/shiva{ - dir = 4; - icon_state = "multi_tiles" - }, -/area/varadero/interior/morgue) "pMG" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ @@ -24519,6 +24425,14 @@ /obj/structure/inflatable/door, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"pSy" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/ammo_box/magazine/shotgun/buckshot, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "blue" + }, +/area/varadero/interior/administration) "pSD" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -24554,6 +24468,25 @@ /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/wood, /area/varadero/interior/maintenance/north) +"pTs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/circuitboard/computer/crew{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/storage/box/trackimp{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/paper/crumpled{ + pixel_x = 6; + pixel_y = 18 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "pTI" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/river/ocean{ @@ -24635,16 +24568,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) -"pVF" = ( -/obj/structure/surface/rack, -/obj/item/broken_device{ - desc = "A timeless piece of technology from another era, of spacemen who once plunged into the 12th Bay and beyond." - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purple" - }, -/area/varadero/interior/research) "pVN" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -24746,6 +24669,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) +"pYJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/implanter{ + pixel_x = 10 + }, +/obj/item/ashtray/bronze{ + icon_state = "ashtray_half_br" + }, +/obj/item/weapon/gun/lever_action/r4t, +/obj/item/ammo_magazine/handful/lever_action, +/turf/open/floor/carpet, +/area/varadero/interior/research) "pYK" = ( /turf/open/gm/dirt{ icon_state = "desert1" @@ -25719,13 +25654,6 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"qDw" = ( -/obj/structure/filingcabinet, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "red" - }, -/area/varadero/interior/security) "qDR" = ( /obj/item/device/flashlight, /turf/open/floor/shiva, @@ -26001,20 +25929,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"qNI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper/janitor{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/tool/pen/blue{ - pixel_x = 6; - pixel_y = -4 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) "qNP" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -26072,6 +25986,14 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) +"qPd" = ( +/obj/structure/machinery/light, +/obj/structure/closet/l3closet/scientist, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "qPk" = ( /obj/structure/machinery/light{ dir = 8 @@ -26278,12 +26200,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"qUj" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "qUK" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -26304,16 +26220,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/eastbeach) -"qVl" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) "qVp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -26445,6 +26351,25 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"rau" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/reagent_container/food/drinks/flask/vacuumflask{ + pixel_x = 9; + pixel_y = 25 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "raW" = ( /turf/closed/wall, /area/varadero/interior_protected/caves/central) @@ -27155,33 +27080,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"ruq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/surgery{ - pixel_x = 2; - pixel_y = 7 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) -"ruZ" = ( -/obj/item/ammo_magazine/smg/nailgun, -/obj/structure/surface/rack, -/obj/item/ammo_magazine/smg/nailgun{ - pixel_x = -6; - pixel_y = -1 - }, -/obj/item/ammo_magazine/smg/nailgun{ - pixel_x = 6; - pixel_y = 1 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purple" - }, -/area/varadero/interior/research) "rvD" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/monsoon) @@ -27396,6 +27294,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"rEO" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/shotgun, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "red" + }, +/area/varadero/interior/medical) "rFv" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/gibs, @@ -27781,26 +27687,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"rSI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "rSX" = ( /obj/structure/window/reinforced{ dir = 4; @@ -27883,15 +27769,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz2_near) -"rUw" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "purple" - }, -/area/varadero/interior/research) "rUI" = ( /obj/structure/closet/crate/construction, /obj/item/reagent_container/food/snacks/wrapped/chunk, @@ -28085,6 +27962,16 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"sba" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/item/trash/crushed_cup, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "sbX" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -28112,6 +27999,28 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"sdq" = ( +/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/toy/plush/farwa, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "sdy" = ( /turf/open/floor/shiva{ dir = 4; @@ -28347,6 +28256,23 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) +"slj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/screwdriver{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/tool/plantspray/pests/old/phosmet{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/weapon/wirerod{ + pixel_x = 8 + }, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "slw" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/floor/plating/icefloor{ @@ -28495,6 +28421,18 @@ icon_state = "green" }, /area/varadero/interior/court) +"sqG" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purple" + }, +/area/varadero/interior/research) "sre" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -28519,14 +28457,6 @@ dir = 4 }, /area/varadero/interior/hall_N) -"srX" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/tools/full, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "redfull" - }, -/area/varadero/interior/medical) "srY" = ( /obj/structure/sign/safety/airlock{ pixel_x = 8 @@ -28634,6 +28564,13 @@ icon_state = "blue" }, /area/varadero/interior/maintenance) +"suN" = ( +/obj/structure/surface/table, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "blue" + }, +/area/varadero/interior/administration) "suY" = ( /obj/structure/barricade/handrail/wire{ dir = 8 @@ -28675,6 +28612,13 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"swa" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "red" + }, +/area/varadero/interior/security) "swf" = ( /obj/structure/bed/chair{ dir = 4 @@ -28712,6 +28656,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"swS" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "swV" = ( /obj/structure/closet/crate/construction, /turf/open/auto_turf/sand_white/layer1, @@ -28850,6 +28800,15 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"sAf" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/closet/radiation, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) "sAR" = ( /obj/item/tool/wet_sign, /turf/open/floor/shiva{ @@ -29022,6 +28981,16 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"sFa" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "sFc" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/barcardine, @@ -29178,13 +29147,6 @@ icon_state = "floor3" }, /area/varadero/interior/mess) -"sJB" = ( -/obj/structure/filingcabinet/security, -/turf/open/floor/shiva{ - dir = 9; - icon_state = "red" - }, -/area/varadero/interior/hall_N) "sJF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29289,6 +29251,18 @@ /obj/item/prop/magazine/dirty, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"sMS" = ( +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/taperecorder, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "blue" + }, +/area/varadero/interior/administration) "sNa" = ( /obj/structure/window/reinforced/tinted, /turf/open/floor{ @@ -29515,6 +29489,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/oob) +"sUm" = ( +/obj/structure/closet/crate/secure/weapon, +/turf/open/floor/shiva{ + dir = 9; + icon_state = "red" + }, +/area/varadero/interior/security) "sUp" = ( /obj/item/toy/beach_ball, /turf/open/gm/dirt, @@ -30072,24 +30053,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/cargo) -"tnA" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "tnD" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/reagent_container/food/drinks/bottle/absinthe, @@ -30124,6 +30087,23 @@ /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz2_near) +"tpp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/brigdoor/westleft{ + name = "Security Desk" + }, +/obj/structure/machinery/door/window/eastright{ + name = "Security Desk" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/varadero/interior/administration) "tpB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/autopsy_scanner{ @@ -30321,6 +30301,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"tve" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/attachable/bayonet/co2{ + pixel_y = 7 + }, +/obj/effect/spawner/random/powercell, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "tvv" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -30503,14 +30494,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) -"tFX" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/item/ammo_box/magazine/shotgun/buckshot, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "blue" - }, -/area/varadero/interior/administration) "tGl" = ( /turf/open/floor/shiva{ dir = 5; @@ -30533,6 +30516,13 @@ }, /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/pontoon_beach) +"tGA" = ( +/obj/structure/filingcabinet, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "red" + }, +/area/varadero/interior/security) "tGV" = ( /turf/closed/wall/r_wall/elevator{ dir = 1 @@ -30572,6 +30562,13 @@ }, /turf/open/floor/plating, /area/varadero/interior/hall_N) +"tJN" = ( +/obj/structure/closet/crate, +/obj/item/trash/chunk, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "tJT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -30603,6 +30600,15 @@ icon_state = "white" }, /area/varadero/interior/toilets) +"tKE" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "purple" + }, +/area/varadero/interior/research) "tKI" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -30675,30 +30681,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/pontoon_beach) -"tNE" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/strata_decals/grime/grime3{ - dir = 4 - }, -/obj/item/tool/pen/clicky{ - pixel_x = 7; - pixel_y = 3 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "tNT" = ( /obj/effect/spawner/random/tool, /turf/open/floor/carpet, @@ -30737,16 +30719,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/oob) -"tOK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera{ - pixel_y = 5 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "bluefull" - }, -/area/varadero/interior/administration) "tOV" = ( /obj/item/tool/warning_cone, /turf/open/auto_turf/sand_white/layer1, @@ -31163,15 +31135,6 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"ucv" = ( -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/obj/structure/closet/radiation, -/turf/open/floor/shiva{ - icon_state = "purple" - }, -/area/varadero/interior/research) "ucL" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river{ @@ -31179,13 +31142,6 @@ default_name = "shallow ocean" }, /area/varadero/exterior/monsoon) -"udg" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "udp" = ( /obj/structure/prop/rock/brown, /turf/open/gm/dirt, @@ -31440,24 +31396,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"unw" = ( -/obj/structure/machinery/alarm{ - pixel_y = 24 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/turf/open/floor/wood, -/area/varadero/interior/security) "unH" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 @@ -31493,6 +31431,24 @@ icon_state = "asteroidplating" }, /area/varadero/interior/caves/east) +"uoN" = ( +/obj/structure/machinery/alarm{ + pixel_y = 24 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/varadero/interior/security) "uoO" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ @@ -31548,6 +31504,22 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"upY" = ( +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/morgue) "uqw" = ( /obj/structure/surface/rack, /obj/item/reagent_container/blood/OMinus, @@ -31568,10 +31540,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/maintenance) -"uqU" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor/wood, -/area/varadero/interior/beach_bar) "uqW" = ( /obj/structure/prop/rock/brown, /turf/open/gm/dirt, @@ -31788,6 +31756,17 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"uzN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "uAt" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -31833,6 +31812,15 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"uDg" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/item/toy/plush/farwa, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "uDw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -31930,6 +31918,15 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) +"uGi" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/surface/table, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "uGs" = ( /obj/structure/machinery/power/terminal{ dir = 8 @@ -32049,10 +32046,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"uMu" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/wood, -/area/varadero/interior/records) "uMx" = ( /obj/structure/dispenser, /turf/open/floor/shiva{ @@ -32073,31 +32066,6 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"uMN" = ( -/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/toy/farwadoll, -/obj/structure/machinery/light, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) "uMQ" = ( /obj/item/ammo_casing/shell{ icon_state = "cartridge_1_1" @@ -33027,6 +32995,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/hall_SE) +"vqt" = ( +/turf/open/floor/shiva{ + dir = 4; + icon_state = "multi_tiles" + }, +/area/varadero/interior/morgue) "vqw" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -33159,24 +33133,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"vtR" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/turf/open/floor/shiva{ - dir = 5; - icon_state = "red" - }, -/area/varadero/interior/security) "vus" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -33634,6 +33590,18 @@ icon_state = "asteroidplating" }, /area/varadero/interior/oob) +"vFf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigar{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/storage/fancy/cigar/tarbacks{ + pixel_x = -3; + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/varadero/interior/research) "vFl" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, @@ -33720,22 +33688,6 @@ }, /turf/open/floor/plating/icefloor, /area/varadero/interior/maintenance/north) -"vKD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/pen/blue/clicky, -/obj/item/tool/pen/sleepypen{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/tool/lighter/zippo/fluff{ - pixel_x = 7; - pixel_y = 2 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "bluefull" - }, -/area/varadero/interior/administration) "vLc" = ( /obj/item/reagent_container/glass/bucket{ pixel_x = -11; @@ -34049,22 +34001,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"vTl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/pwine{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -6; - pixel_y = 13 - }, -/obj/item/reagent_container/glass/rag{ - pixel_x = -3; - pixel_y = 4 - }, -/turf/open/floor/carpet, -/area/varadero/interior/research) "vUx" = ( /obj/structure/girder/displaced, /obj/structure/prop/invuln/overhead_pipe, @@ -34208,6 +34144,22 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"vYF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen/blue/clicky, +/obj/item/tool/pen/sleepypen{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/tool/lighter/zippo/fluff{ + pixel_x = 7; + pixel_y = 2 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/administration) "vYQ" = ( /obj/structure/window/reinforced{ dir = 4; @@ -34379,6 +34331,24 @@ icon_state = "doubleside" }, /area/varadero/interior/chapel) +"wcG" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "wdb" = ( /obj/structure/machinery/computer/cameras/wooden_tv{ dir = 4; @@ -34398,6 +34368,19 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"wdg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt, +/obj/item/trash/cigbutt{ + pixel_y = 8 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "wdh" = ( /obj/structure/machinery/computer/operating{ density = 0 @@ -34436,13 +34419,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/shuttle/elevator, /area/varadero/interior/records) -"wdX" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "blue" - }, -/area/varadero/interior/administration) "weG" = ( /obj/structure/catwalk, /turf/open/gm/river/desert/deep{ @@ -34610,6 +34586,26 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) +"wjh" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "wjB" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -34760,6 +34756,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"wmX" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/strata_decals/grime/grime3{ + dir = 4 + }, +/obj/item/tool/pen/clicky{ + pixel_x = 7; + pixel_y = 3 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "wng" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -34778,16 +34798,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/varadero/interior/maintenance/north) -"wnw" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/trash/crushed_cup, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "wnA" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_y = 21; @@ -35065,12 +35075,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/hall_SE) -"wvK" = ( -/obj/structure/closet/crate/freezer, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/varadero/interior/cargo) "wwd" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -35118,21 +35122,6 @@ icon_state = "white" }, /area/varadero/interior/laundry) -"wxD" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "wyE" = ( /obj/item/storage/belt/marine/quackers, /turf/open/gm/river{ @@ -35147,6 +35136,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) +"wAE" = ( +/obj/structure/filingcabinet, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/electrical) "wBc" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, @@ -35188,6 +35184,16 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"wCx" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cdeathalarm_kit{ + pixel_x = -8; + pixel_y = 1 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "wCE" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -35544,13 +35550,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) -"wOS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/evidencebag, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/security) "wPl" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8; @@ -35745,22 +35744,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"wVA" = ( -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/varadero/interior/morgue) "wVD" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -35783,6 +35766,12 @@ }, /turf/closed/wall/r_wall, /area/varadero/interior/hall_N) +"wVT" = ( +/obj/structure/closet/crate/freezer, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) "wWd" = ( /obj/structure/largecrate/random, /turf/open/shuttle/elevator, @@ -36219,25 +36208,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"xpw" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/circuitboard/computer/crew{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/storage/box/trackimp{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/paper/crumpled{ - pixel_x = 6; - pixel_y = 18 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "xpL" = ( /obj/structure/machinery/camera/autoname/lz_camera, /obj/structure/machinery/landinglight/ds1/spoke{ @@ -36573,6 +36543,12 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/research, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"xyU" = ( +/obj/structure/closet/crate/secure, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "xza" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer1, @@ -36663,6 +36639,12 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"xBX" = ( +/obj/structure/closet/crate/hydroponics/prespawned, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "xCn" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) @@ -36674,16 +36656,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/research) -"xCJ" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access_txt = "100" - }, -/obj/structure/machinery/light, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "wred" - }, -/area/varadero/interior/medical) "xCM" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor{ @@ -37093,6 +37065,14 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"xQe" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) "xQJ" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/clothing/mask/cigarette/cigar, @@ -37174,17 +37154,6 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"xUs" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/obj/structure/machinery/storm_siren{ - pixel_y = 5 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "xUu" = ( /obj/structure/surface/table/woodentable, /obj/item/weapon/shield/riot, @@ -37288,6 +37257,25 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"xXp" = ( +/obj/structure/closet/crate/ammo/alt, +/obj/item/ammo_magazine/rifle/m4ra{ + pixel_x = 5 + }, +/obj/item/ammo_magazine/rifle/m4ra{ + pixel_y = -5; + pixel_x = -8 + }, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/ammo_magazine/rifle{ + pixel_x = -7 + }, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/hall_N) "xXr" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/gibs/xeno/body, @@ -37428,6 +37416,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"ybL" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "ybY" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -37447,6 +37450,13 @@ /obj/structure/machinery/door/window/westleft, /turf/open/floor/interior/plastic, /area/varadero/interior/security) +"ycE" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "red" + }, +/area/varadero/interior/security) "ycY" = ( /obj/item/trash/ceramic_plate{ pixel_x = -8; @@ -37746,16 +37756,6 @@ icon_state = "desert0" }, /area/varadero/exterior/eastbeach) -"ykE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/cdeathalarm_kit{ - pixel_x = -8; - pixel_y = 1 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) "ykM" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -39712,7 +39712,7 @@ efw awu fay uuN -cqB +sqG hBX fay eqe @@ -40075,9 +40075,9 @@ efw qMY efw dkr -rUw +tKE hfX -hFA +xQe dkr qMD hDA @@ -40247,9 +40247,9 @@ efw efw kYN yks -aHs +cka fla -gkk +vFf eGP nPE yks @@ -40793,7 +40793,7 @@ vdq efw efw aoE -vTl +mbf ovC ovC ovC @@ -40983,7 +40983,7 @@ rbU aCz wIr ezI -biF +wdg yba pVl xDf @@ -41159,7 +41159,7 @@ cbv yks vNG rbU -jvc +pYJ nCV ovC fay @@ -41177,7 +41177,7 @@ dQl rWJ ltW qQF -okB +fYV fay ebr ebr @@ -41353,9 +41353,9 @@ qQF rWJ hyQ ltW -lKI +jgw rWJ -bxc +tve ltW ltW qQF @@ -41521,7 +41521,7 @@ qMY efw nKr yks -kpF +gWA xxO rFD ncC @@ -41537,7 +41537,7 @@ dzN ltW iFy rWJ -dYq +ofI ltW ltW lRU @@ -41712,14 +41712,14 @@ yks iYb ltW kCy -bUR +cpy qQF ltW yji ltW dQl ltW -ruq +eUr rWJ ltW sKL @@ -41881,7 +41881,7 @@ pea qul yks yks -xUs +uzN sQn vSd sQn @@ -41894,7 +41894,7 @@ bZg giq izs izs -hfD +kSF clv ltW rWJ @@ -42225,7 +42225,7 @@ ifB efw efw qMY -qUj +fZd yks yks qul @@ -42269,7 +42269,7 @@ dQl hDA hDA icn -afi +qPd fay ebr vYW @@ -42444,7 +42444,7 @@ rQV nuQ lKS sCK -cjU +lLe nLw fay rex @@ -42619,7 +42619,7 @@ efw qMY kYN yks -mkc +pfD ltW ltW ltW @@ -42809,7 +42809,7 @@ vSY izs dmS ltW -ucv +sAf fay rex hDA @@ -42983,13 +42983,13 @@ qDh vvh qlj aoE -ifx -ruZ +bjd +mhm aJW gun aWA -pVF -plc +dWu +iMc xAK ckz fay @@ -43473,7 +43473,7 @@ tQT rMM wjB ykc -akd +pFS eBL vjA pfR @@ -43673,9 +43673,9 @@ uQK oLM mIL xOx -haV +iir oke -baN +jFh wGl ykc pkG @@ -43846,7 +43846,7 @@ fcg uXZ foF oJB -wnw +sba bWq hHK oke @@ -44020,8 +44020,8 @@ arC wjB uXZ cHS -wvK -wvK +wVT +wVT eBL mzT xIA @@ -44040,7 +44040,7 @@ oke oRx hsF rLW -fjK +xyU keN lSg lSg @@ -44213,7 +44213,7 @@ oJB cPI bMG fXX -kDO +tJN nPK xuN wJu @@ -44403,7 +44403,7 @@ iZx xVC wGl oke -fjK +xyU wGl ykc fuF @@ -46427,9 +46427,9 @@ saq rsM maN faq -qNI +cvI dNW -ykE +wCx lxT mOO qcN @@ -46437,7 +46437,7 @@ tJT xLN qcN rsh -lJo +nMT qcN lUe aQc @@ -46445,7 +46445,7 @@ bft ykw ani irw -xpw +pTs hJO syM ykw @@ -46618,7 +46618,7 @@ qcN vhb kFT qcN -cDr +nwV aLl qcN qqA @@ -46811,7 +46811,7 @@ tsX wkC fAO haT -gBp +slj bIt gze qWC @@ -46989,13 +46989,13 @@ qqA aQc qqA ykw -pqH +dmq sDo cXQ haT wLR ykw -nBj +avF qDR iRw pjH @@ -47171,11 +47171,11 @@ vMU aQc qqA ykw -udg +hJx haT hwN haT -dGh +xBX pQp lXc vgA @@ -47322,7 +47322,7 @@ bLB joN jZE mfa -dhQ +fyi krM uEE xWU @@ -47336,11 +47336,11 @@ qDv maN wFX xkj -gES -eLE +cMQ +fnF paB bkG -fiB +dYZ gfr nxW tGr @@ -47353,7 +47353,7 @@ qqA aQc qqA ykw -tnA +wcG woj uyK lkI @@ -47655,7 +47655,7 @@ rjo gPG lYr gLV -avI +oYE huF huF huF @@ -47826,7 +47826,7 @@ lYr hCw pbp loQ -pDF +nEp wMw wMw qNE @@ -48064,7 +48064,7 @@ uUW maN wFX dLN -oPr +mlR rLC aoo fyH @@ -48257,7 +48257,7 @@ cTr tjF qcN jNS -xCJ +mJw qcN lUe aQc @@ -48775,7 +48775,7 @@ weG hyr hyr epQ -wVA +upY mRL iQl fyZ @@ -49503,7 +49503,7 @@ weG hyr leU sKC -pMe +vqt cOK rmZ eYG @@ -49516,7 +49516,7 @@ hvO bih rHv nxW -ivg +swS sdS tYg sdS @@ -49525,7 +49525,7 @@ wQd sWp dBB maN -uMN +aiY qcN oHo qqA @@ -49715,11 +49715,11 @@ aQc xgG qzd eQz -vKD +vYF ixd xgW -tFX -oTJ +pSy +sMS qvo pWm bNC @@ -49728,7 +49728,7 @@ xgG qvo qvo cNA -mee +tpp qvo xgG oyx @@ -50079,7 +50079,7 @@ aQc xgG tbQ jMr -pmy +muY rzM rzM oiM @@ -50253,7 +50253,7 @@ qcN qcN sgy peA -qVl +sFa qcN yil qqA @@ -50282,7 +50282,7 @@ iKa tvv pRP sBX -gmE +cCO nfv nfv aFh @@ -50471,7 +50471,7 @@ qjd uNq mey wSx -bez +cMw cto cto iFb @@ -50799,7 +50799,7 @@ jnA jKz prh wVa -esz +rEO qcN qqA qqA @@ -50973,7 +50973,7 @@ mos rHv nnw nxW -lYA +aXC gjw wdh lEM @@ -50981,7 +50981,7 @@ rNo qcN maN rsM -gwW +ekp qcN yil qqA @@ -50991,7 +50991,7 @@ smO rQY rzM vPe -tOK +jTi jMr wbB qvo @@ -51163,7 +51163,7 @@ xVA nxW mVN doa -srX +gWu qcN dmR yil @@ -51174,7 +51174,7 @@ jOR wIH gkL xkb -wdX +fFu xxZ qvo gFW @@ -52053,7 +52053,7 @@ hyr pGJ nio lkH -eaN +xXp lYF srW pGJ @@ -52089,7 +52089,7 @@ aQc qqA xgG duw -aDQ +aKA mcN aAg xgG @@ -52404,7 +52404,7 @@ bJI bJI bJI aMC -hLt +dSo egV bTf cKK @@ -52586,7 +52586,7 @@ bJI rgf asx aMC -hLt +dSo kUj ixw rmV @@ -52639,7 +52639,7 @@ iAX lIU tXE xgG -pJZ +suN qOn wbB qvo @@ -52768,7 +52768,7 @@ bVX eOa asx aMC -hLt +dSo rmo qfC xbm @@ -52795,7 +52795,7 @@ oMs yjp lDk oKN -sJB +nTX xRF yil yil @@ -52818,7 +52818,7 @@ dkl qvo opW nOz -djH +hLI vRI oxi rVI @@ -53192,7 +53192,7 @@ xgG vUM sJZ tEJ -fMP +muF pKs chs chs @@ -53736,7 +53736,7 @@ xne tQy rMN lMD -oRK +anE tEJ bZI bkM @@ -54093,7 +54093,7 @@ xNR iLd iTP jZG -tNE +wmX vYQ lgb fEI @@ -54272,7 +54272,7 @@ tcq jyw xya ydx -fDn +sdq wpX qQt jNT @@ -54454,7 +54454,7 @@ pbt pbt iLD xNR -rSI +wjh vNu cdL oWs @@ -54639,7 +54639,7 @@ xNR trC yhy sJq -iwo +oEc tMY dKm xxo @@ -54785,7 +54785,7 @@ aJP ogj akk xUu -gdN +akJ lWf jzZ mRq @@ -54992,7 +54992,7 @@ qqA iLD nRy qlW -oXE +gPY uYF hen sJx @@ -55003,7 +55003,7 @@ ydx bAE kIg nmC -ben +cio agi hDk aZb @@ -55182,7 +55182,7 @@ nBD qvQ uXX xNR -gZI +rau vNu vNu iAc @@ -55546,7 +55546,7 @@ jCr aAj cGd xNR -gLZ +ybL vNu pRs ssZ @@ -55731,7 +55731,7 @@ xNR pYx sQs rSX -alh +aIu owY klP ryG @@ -56015,7 +56015,7 @@ eDY tNy ctE gYh -oKi +aDv opd iEe diK @@ -56051,7 +56051,7 @@ cwE bgE jEZ cjf -pyk +jqr vEM bgE pGs @@ -56382,7 +56382,7 @@ rHE psk gyE anA -uqU +jUB ipi oLZ eDY @@ -57005,9 +57005,9 @@ krP wVf kof cHf -phd +tGA cHf -qDw +gwO wVf pBS viK @@ -57024,10 +57024,10 @@ rRq usB pYn qTz -bjP -bjP +nWs +nWs sre -bjP +nWs pYn iIt xFE @@ -57291,7 +57291,7 @@ ctE hFM fQh gLw -oMg +bUm mhf eQm oLZ @@ -57368,7 +57368,7 @@ pJn krP wVf vyX -dpO +pEv xOo iIL qDs @@ -57396,7 +57396,7 @@ pYn wic pqj ydI -uMu +jff uLY pEE tEJ @@ -57588,7 +57588,7 @@ hrI pXG bkM vAR -iDS +dQV bkM cto etv @@ -57696,7 +57696,7 @@ oGv oGv oDU szp -ekg +caV noC ktN qSj @@ -57721,7 +57721,7 @@ tBm wqb kBZ wVf -unw +uoN idw idw idw @@ -57757,7 +57757,7 @@ pYn pYn kgw vHs -htU +nto pqj ydI pYn @@ -57923,7 +57923,7 @@ fjx xhs abl wVf -liE +sUm jZw xMq vnU @@ -58060,7 +58060,7 @@ oGv oGv rkH szp -ekg +caV eFJ eFJ xzr @@ -58096,7 +58096,7 @@ pJn krP qhZ gwG -wOS +kXA wrv cNh eOu @@ -58459,7 +58459,7 @@ xsi pJn krP wVf -vtR +gwt hzm xOo hzm @@ -58617,7 +58617,7 @@ pZl qId cud kOS -dWl +wAE wOO kBZ kBZ @@ -58984,7 +58984,7 @@ loh rsB poE tlT -hlp +nHk kBZ kBZ kBZ @@ -59034,7 +59034,7 @@ oef jgY kWB kWB -mXi +nAq rmf kWB ltA @@ -59166,7 +59166,7 @@ kCA jaL poE tlT -mQh +nex kBZ kBZ ryD @@ -59361,7 +59361,7 @@ ryD wVf wVf pIC -hty +gkb wVf wVf wVf @@ -59386,7 +59386,7 @@ tUd wVf rmL qsh -oCy +ycE wVf cur syb @@ -59740,8 +59740,8 @@ eyt wVf mca hzm -beM -jai +lDr +swa wVf xWj pJn @@ -59886,7 +59886,7 @@ fFx kCA tlT mYd -imZ +jNb jPe rKL tOd @@ -59936,7 +59936,7 @@ xOo wVf wpM vpV -nmN +uGi wVf xJZ viK @@ -60482,7 +60482,7 @@ lxy qhZ bUg vpV -eKW +uDg obS ryD wXs @@ -60845,7 +60845,7 @@ jVK iPI fLn jhv -aQu +jzq ocr wVf ybt @@ -61890,10 +61890,10 @@ xSZ qEt biS vVH -dsz +hrc enu iQS -wxD +pGU vVH kBZ kBZ @@ -62075,7 +62075,7 @@ vVH won vSu iQS -wxD +pGU vVH kBZ kBZ @@ -64833,7 +64833,7 @@ ouy ouy uon kvz -fUC +peu ouy ouy tXu diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index d1aa245ce2..a652580158 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1636,18 +1636,6 @@ icon_state = "outerhull_dir" }, /area/space) -"afo" = ( -/obj/structure/safe, -/obj/item/moneybag, -/obj/item/clothing/glasses/monocle, -/obj/item/weapon/telebaton, -/obj/item/book/codebook, -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "afq" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -2661,6 +2649,14 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) +"aiQ" = ( +/obj/structure/machinery/faxmachine, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "aiR" = ( /obj/structure/stairs{ dir = 8; @@ -2755,14 +2751,6 @@ "ajl" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/upper_medical) -"ajm" = ( -/obj/structure/closet/secure_closet/securecom, -/obj/item/storage/box/kit/honorguard, -/obj/item/storage/box/kit/honorguard, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ajp" = ( /obj/structure/surface/table/almayer, /obj/structure/dropship_equipment/fuel/cooling_system{ @@ -3702,15 +3690,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"amE" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/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{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "amF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -3933,63 +3912,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) -"anp" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anq" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/closet/secure_closet/guncabinet/red, -/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, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anr" = ( -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "ans" = ( /turf/open/floor/almayer{ dir = 8; @@ -5608,22 +5530,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"asu" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "asv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light{ @@ -6041,15 +5947,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"atx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "aty" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -6649,15 +6546,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/command/cic) -"auR" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "auS" = ( /obj/item/tool/warning_cone, /obj/item/tool/warning_cone, @@ -7992,18 +7880,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"azp" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "azq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -10230,14 +10106,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aIn" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/command/computerlab) "aIo" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -10369,24 +10237,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aIV" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "aIX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -10615,32 +10465,6 @@ /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) -"aJP" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/structure/surface/table/almayer, -/obj/structure/phone_base/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office Second Line"; - pixel_x = -5; - pixel_y = 3 - }, -/obj/structure/phone_base/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office"; - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "aJU" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -13729,6 +13553,20 @@ /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 = "S" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "aZB" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -15399,18 +15237,6 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"bhM" = ( -/obj/structure/safe, -/obj/item/coin/platinum, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/clothing/accessory/storage/holster, -/obj/item/weapon/gun/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/clothing/suit/armor/bulletproof, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "bhT" = ( /obj/structure/cargo_container/lockmart/mid{ layer = 3.1; @@ -16729,6 +16555,17 @@ icon_state = "plate" }, /area/almayer/living/offices) +"bpu" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "bpv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -18532,15 +18369,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower_engineering) -"byY" = ( -/obj/structure/bed, -/obj/item/toy/farwadoll{ - pixel_x = 5 - }, -/obj/item/clothing/under/redpyjamas, -/obj/item/bedsheet/orange, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "bzg" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -23412,25 +23240,6 @@ icon_state = "blue" }, /area/almayer/squads/charlie_delta_shared) -"bUo" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "bUp" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -26013,6 +25822,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"cgW" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/photo_album{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/folder/black{ + pixel_y = -3; + pixel_x = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "chf" = ( /obj/structure/window/reinforced{ dir = 4; @@ -27907,6 +27730,13 @@ allow_construction = 0 }, /area/almayer/hallways/port_hallway) +"cyN" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "cyU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -28347,15 +28177,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"cHe" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/command/securestorage) "cHl" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -28469,22 +28290,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"cJq" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_x = 8 - }, -/obj/structure/phone_base/rotary{ - name = "Reporter Telephone"; - phone_category = "Almayer"; - phone_id = "Reporter"; - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "cJu" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -28718,6 +28523,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) +"cNK" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "cNX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28820,16 +28634,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"cQO" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/computerlab) "cRb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29572,18 +29376,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"dgm" = ( -/obj/structure/phone_base{ - name = "Brig Offices Telephone"; - phone_category = "Almayer"; - phone_id = "Brig Main Offices"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "dgx" = ( /turf/open/floor/almayer{ dir = 8; @@ -29601,6 +29393,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"dha" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "dhQ" = ( /obj/structure/sign/safety/terminal{ pixel_x = -17 @@ -29966,6 +29763,12 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"dnW" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "dnX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29995,6 +29798,32 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dok" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/obj/structure/surface/table/almayer, +/obj/structure/phone_base/rotary{ + name = "Telephone"; + phone_category = "Almayer"; + phone_id = "Auxiliary Support Office Second Line"; + pixel_x = -5; + pixel_y = 3 + }, +/obj/structure/phone_base/rotary{ + name = "Telephone"; + phone_category = "Almayer"; + phone_id = "Auxiliary Support Office"; + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "doJ" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -31481,30 +31310,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"dTO" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/phone_base/rotary/no_dnd{ - name = "Charlie Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Charlie Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "dTZ" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_side" @@ -31524,6 +31329,25 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"dUG" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "SEA Office Shutters"; + name = "SEA Office Shutters"; + pixel_y = 12 + }, +/obj/item/ashtray/plastic{ + pixel_x = 8; + pixel_y = -4 + }, +/obj/structure/phone_base/rotary{ + name = "Senior Enlisted Advisor Office Telephone"; + phone_category = "Almayer"; + phone_id = "Senior Enlisted Advisor's Office"; + pixel_x = -3 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/sea_office) "dUI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Port Viewing Room" @@ -31671,6 +31495,13 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"dXo" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/taperecorder, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "dXr" = ( /obj/structure/bed/chair{ dir = 8; @@ -31985,27 +31816,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"edW" = ( -/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/phone_base/rotary/no_dnd{ - name = "Alpha Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Alpha Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "eed" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -32260,28 +32070,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"eii" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/phone_base/rotary{ - name = "Researcher Office Telephone"; - phone_category = "Almayer"; - phone_id = "Research"; - pixel_y = 6 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/reagent_container/glass/beaker/large{ - pixel_x = -6 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32791,6 +32579,15 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"erC" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa{ + pixel_x = 5 + }, +/obj/item/clothing/under/redpyjamas, +/obj/item/bedsheet/orange, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "erG" = ( /obj/structure/disposalpipe/junction{ dir = 2; @@ -33951,6 +33748,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"eSK" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -34011,6 +33814,12 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) +"eUk" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "eUn" = ( /obj/structure/machinery/chem_master, /turf/open/floor/almayer{ @@ -34218,15 +34027,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"eYN" = ( -/obj/structure/phone_base/rotary{ - name = "CL Office Telephone"; - phone_category = "Almayer"; - phone_id = "CL Office" - }, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/almayer/command/corporateliason) "eYQ" = ( /obj/structure/closet/fireaxecabinet{ pixel_x = -32 @@ -34384,6 +34184,27 @@ icon_state = "dark_sterile" }, /area/almayer/medical/upper_medical) +"fbP" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/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{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "fbY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -35029,29 +34850,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"frJ" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -35098,27 +34896,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"fsx" = ( -/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/phone_base/rotary/no_dnd{ - name = "Delta Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Delta Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "fsz" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -35201,14 +34978,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"ftE" = ( -/obj/structure/machinery/faxmachine, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "fut" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35286,30 +35055,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"fvs" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/prop/helmetgarb/flair_io{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/item/prop/magazine/boots/n160{ - pixel_x = -6; - pixel_y = -5 - }, -/obj/structure/phone_base/rotary{ - name = "Flight Deck Telephone"; - phone_category = "Almayer"; - phone_id = "Flight Deck"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) "fvu" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -35440,6 +35185,28 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) +"fyv" = ( +/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/phone_base/rotary/no_dnd{ + name = "Bravo Overwatch Telephone"; + phone_category = "Command"; + phone_id = "Bravo Overwatch" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -36032,6 +35799,10 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"fLa" = ( +/obj/structure/safe/co_office, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "fLg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/wrapped/barcardine{ @@ -36259,6 +36030,16 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"fQx" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "fQF" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -36457,6 +36238,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fXE" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -36736,19 +36530,6 @@ icon_state = "silvercorner" }, /area/almayer/hallways/repair_bay) -"gdJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/phone_base{ - dir = 4; - name = "Port Railgun Control Telephone"; - phone_category = "Command"; - phone_id = "Port Railgun Control"; - pixel_x = -26 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/shipboard/port_missiles) "gdS" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -37088,16 +36869,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"gka" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "gks" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -37346,10 +37117,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"grz" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/command/computerlab) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -37517,6 +37284,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"gvL" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/command/computerlab) "gvU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -37739,20 +37510,6 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) -"gyI" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/photo_album{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/folder/black{ - pixel_y = -3; - pixel_x = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "gyN" = ( /obj/structure/machinery/prop{ desc = "It's a server box..."; @@ -37808,13 +37565,6 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"gzv" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/command/computerlab) "gzw" = ( /obj/structure/closet/hydrant{ pixel_x = 30 @@ -38148,6 +37898,12 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) +"gHw" = ( +/obj/structure/closet/secure_closet/securecom, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38429,6 +38185,15 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"gNj" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/securestorage) "gNp" = ( /turf/open/floor/almayer{ dir = 9; @@ -38556,6 +38321,18 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"gQV" = ( +/obj/structure/phone_base/no_dnd{ + name = "Requisition Telephone"; + phone_category = "Almayer"; + phone_id = "Requisition"; + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/squads/req) "gRd" = ( /obj/structure/platform, /obj/structure/target{ @@ -39004,22 +38781,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hbI" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "hbZ" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -39366,6 +39127,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) +"hhc" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/securestorage) "hhe" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_y = 32 @@ -40064,6 +39830,13 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) +"hzb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "hzc" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/notunnel) @@ -40248,6 +40021,27 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"hCs" = ( +/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/phone_base/rotary/no_dnd{ + name = "Delta Overwatch Telephone"; + phone_category = "Command"; + phone_id = "Delta Overwatch" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "hCt" = ( /obj/structure/sign/safety/terminal{ pixel_x = 15; @@ -40468,14 +40262,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"hIr" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "hII" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -41329,6 +41115,16 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"icn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "icp" = ( /turf/open/floor/almayer{ dir = 8; @@ -41896,6 +41692,27 @@ icon_state = "orangefull" }, /area/almayer/squads/alpha_bravo_shared) +"ipI" = ( +/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/phone_base/rotary/no_dnd{ + name = "Alpha Overwatch Telephone"; + phone_category = "Command"; + phone_id = "Alpha Overwatch" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "ipK" = ( /obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ @@ -42133,6 +41950,17 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"iuj" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt, +/obj/structure/phone_base/rotary/no_dnd{ + name = "Brig Cells Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Cells"; + pixel_x = 15 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "iun" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, @@ -42452,6 +42280,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"iAc" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "iAw" = ( /obj/item/tool/warning_cone{ pixel_x = -12 @@ -42571,6 +42408,15 @@ icon_state = "green" }, /area/almayer/living/offices) +"iCN" = ( +/obj/structure/sign/safety/ammunition{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "iDd" = ( /obj/structure/machinery/door/poddoor/railing{ id = "vehicle_elevator_railing_aux" @@ -42629,6 +42475,10 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) +"iEM" = ( +/obj/structure/safe/cl_office, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "iFc" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -42731,6 +42581,15 @@ "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) +"iHe" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "iHF" = ( /obj/structure/largecrate/random, /obj/item/reagent_container/food/snacks/cheesecakeslice{ @@ -42934,24 +42793,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"iLJ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 1 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/phone_base{ - dir = 1; - name = "Brig Warden's Office Telephone"; - phone_category = "Offices"; - phone_id = "Brig Warden's Office"; - pixel_x = -16 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) "iLO" = ( /turf/open/floor/almayer{ dir = 4; @@ -42986,6 +42827,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"iNt" = ( +/obj/structure/phone_base/rotary{ + name = "CL Office Telephone"; + phone_category = "Almayer"; + phone_id = "CL Office" + }, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/carpet, +/area/almayer/command/corporateliason) "iNZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -43424,15 +43274,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"iWZ" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "iXb" = ( /obj/structure/bed/chair/comfy/delta{ dir = 8 @@ -43884,6 +43725,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"jfd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "jfm" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -44259,25 +44108,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"jlj" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - pixel_x = -8 - }, -/obj/item/toy/farwadoll{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - icon_state = "therapyred"; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_x = 7; - pixel_y = -1; - throwforce = 15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/briefing) +"jkX" = ( +/obj/structure/bed/chair/wood/normal, +/obj/item/bedsheet/brown, +/obj/item/toy/plush/farwa, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/cells) "jlA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -44289,6 +44125,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"jlD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "jlG" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -44442,31 +44288,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) -"jod" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/item/clipboard{ - base_pixel_x = 20; - pixel_x = 5 - }, -/obj/item/paper{ - pixel_x = 5 - }, -/obj/item/tool/pen{ - pixel_x = 5 - }, -/obj/structure/surface/table/reinforced/black, -/obj/structure/phone_base/rotary{ - name = "CIC Reception Telephone"; - phone_category = "Command"; - phone_id = "CIC Reception"; - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/command/cic) "jox" = ( /obj/structure/machinery/brig_cell/cell_3{ pixel_x = -32 @@ -44513,6 +44334,40 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) +"jpy" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/yellow{ + layer = 3.2 + }, +/obj/item/bedsheet/yellow{ + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plush/barricade, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "jpJ" = ( /obj/structure/bed/chair{ dir = 8 @@ -44822,11 +44677,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"jzy" = ( -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/command/computerlab) "jzD" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -44938,6 +44788,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"jCB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -30 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -45166,23 +45030,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) -"jJr" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, -/obj/item/folder/red, -/obj/structure/phone_base/rotary{ - name = "Brig CMP's Office Telephone"; - phone_category = "Offices"; - phone_id = "Brig CMP's Office"; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) "jJs" = ( /turf/open/floor/almayer{ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"jJT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "jKh" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -45801,6 +45662,25 @@ icon_state = "test_floor5" }, /area/almayer/command/computerlab) +"jVG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/phone_base{ + name = "CMO Office Telephone"; + phone_category = "Offices"; + phone_id = "CMO Office"; + pixel_y = 29 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = 23; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/upper_medical) "jWh" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/port) @@ -46047,6 +45927,32 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) +"kaQ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/faxmachine/uscm/command{ + department = "AI Core"; + pixel_y = 8 + }, +/obj/structure/phone_base/rotary{ + name = "AI Core Telephone"; + phone_category = "ARES"; + phone_color = "blue"; + phone_id = "AI Core"; + pixel_x = 8; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"kaS" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "kbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -46105,6 +46011,19 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"kcd" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "kcl" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -46364,40 +46283,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/surgery) -"kjV" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/obj/item/toy/plushie_cade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46662,14 +46547,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"kqn" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "kqt" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -46828,26 +46705,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/evidence_storage) -"ktn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/brig/armory) "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -47521,6 +47378,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"kIX" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "kJi" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -47966,6 +47833,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"kRL" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item{ + pixel_x = -8 + }, +/obj/item/toy/plush/therapy/red{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_x = 7; + pixel_y = -1; + throwforce = 15 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/prop/magazine/dirty/torn, @@ -48022,28 +47907,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"kTc" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "kTq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -48600,6 +48463,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"les" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "let" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -48666,19 +48539,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) -"lgS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/phone_base{ - dir = 8; - name = "Medical Telephone"; - phone_category = "Almayer"; - phone_id = "Medical Lower"; - pixel_x = 16 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green" - }, -/area/almayer/medical/lockerroom) "lgX" = ( /obj/structure/sign/safety/storage{ pixel_y = 32 @@ -48920,6 +48780,52 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"llV" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -8; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) +"llY" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/prop/helmetgarb/flair_io{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/prop/magazine/boots/n160{ + pixel_x = -6; + pixel_y = -5 + }, +/obj/structure/phone_base/rotary{ + name = "Flight Deck Telephone"; + phone_category = "Almayer"; + phone_id = "Flight Deck"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/repair_bay) "lmk" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -49319,31 +49225,14 @@ }, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) -"ltP" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -6; - pixel_y = 28 - }, -/obj/structure/machinery/firealarm{ - pixel_x = 8; - pixel_y = 28 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/phone_base/rotary{ - name = "Intelligence Center Telephone"; - phone_category = "Almayer"; - phone_id = "Intelligence Center Telephone" - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - pixel_x = -17 +"ltU" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "silverfull" + icon_state = "plate" }, -/area/almayer/command/securestorage) +/area/almayer/command/combat_correspondent) "ltX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -49656,6 +49545,30 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"lAi" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/overwatch/almayer{ + dir = 8; + layer = 3.2; + pixel_x = -17; + pixel_y = -17 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/phone_base/rotary/no_dnd{ + name = "Charlie Overwatch Telephone"; + phone_category = "Command"; + phone_id = "Charlie Overwatch" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "lAl" = ( /turf/open/floor/almayer{ dir = 4; @@ -49816,14 +49729,6 @@ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) -"lDf" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "lDg" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddernorthwest"; @@ -50490,6 +50395,47 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"lQA" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "CIC Lockdown"; + name = "CIC Lockdown"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/obj/structure/machinery/door_control{ + id = "Hangar Lockdown"; + name = "Hangar Lockdown"; + pixel_x = -7; + pixel_y = 2; + req_access_txt = "1" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/obj/structure/machinery/door_control{ + id = "bot_armory"; + name = "Armory Lockdown"; + pixel_x = -7; + pixel_y = -5; + req_one_access_txt = "1;4" + }, +/obj/structure/phone_base/rotary/no_dnd{ + name = "Combat Information Center Telephone"; + phone_category = "Command"; + phone_id = "Combat Information Center"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/machinery/door/window/westright{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) "lQG" = ( /obj/structure/machinery/computer/tech_control, /turf/open/floor/plating/plating_catwalk, @@ -50516,23 +50462,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"lRa" = ( -/obj/structure/closet/secure_closet, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/storage/box/tapes, -/obj/item/clothing/head/fedora, -/obj/item/clothing/suit/storage/marine/light/reporter, -/obj/item/clothing/head/helmet/marine/reporter, -/obj/item/clothing/head/cmcap/reporter, -/obj/item/device/flashlight, -/obj/item/device/toner, -/obj/item/device/toner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "lRs" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -50838,25 +50767,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) -"mbI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "SEA Office Shutters"; - name = "SEA Office Shutters"; - pixel_y = 12 - }, -/obj/item/ashtray/plastic{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/structure/phone_base/rotary{ - name = "Senior Enlisted Advisor Office Telephone"; - phone_category = "Almayer"; - phone_id = "Senior Enlisted Advisor's Office"; - pixel_x = -3 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/sea_office) "mce" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -50938,6 +50848,16 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"meE" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/phone_base/rotary{ + name = "Captain's Office"; + phone_category = "Offices"; + phone_id = "Captain's Office"; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "meJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -50984,6 +50904,52 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"mft" = ( +/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; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/structure/bed/chair/comfy/charlie, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "mfI" = ( /obj/structure/ladder{ height = 1; @@ -51121,6 +51087,16 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"miX" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "mji" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51425,6 +51401,15 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/squads/req) +"mqa" = ( +/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, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -51639,16 +51624,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"mtX" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "mub" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -51848,6 +51823,13 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) +"mzx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "mzz" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -51883,16 +51865,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mAr" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "mAT" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; @@ -52250,19 +52222,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"mJb" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "mJe" = ( /obj/structure/sign/safety/conference_room{ pixel_x = -17; @@ -52506,22 +52465,10 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"mMk" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) -"mMU" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silvercorner" - }, -/area/almayer/command/computerlab) "mMV" = ( /obj/structure/pipes/vents/scrubber, /obj/item/device/radio/intercom{ @@ -53425,6 +53372,24 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) +"nhf" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/structure/phone_base{ + name = "Kitchen Telephone"; + phone_category = "Almayer"; + phone_id = "Kitchen"; + pixel_x = -8; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "nhi" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -53481,12 +53446,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"nib" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "nig" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -53568,24 +53527,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"niZ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/faxmachine/uscm/command{ - department = "AI Core"; - pixel_y = 8 - }, -/obj/structure/phone_base/rotary{ - name = "AI Core Telephone"; - phone_category = "ARES"; - phone_color = "blue"; - phone_id = "AI Core"; - pixel_x = 8; - pixel_y = -8 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "nja" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -53849,6 +53790,14 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"noH" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/computerlab) "noV" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -54486,26 +54435,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"nDd" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "nDo" = ( /obj/structure/closet/l3closet/general, /obj/structure/window/reinforced{ @@ -54847,43 +54776,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"nKQ" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown"; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/surface/table/reinforced/almayer_B{ - climbable = 0; - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/phone_base/rotary{ - name = "AI Reception Telephone"; - phone_category = "ARES"; - phone_color = "blue"; - phone_id = "AI Reception" - }, -/obj/structure/machinery/door_control{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown"; - pixel_x = 10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "nLa" = ( /obj/structure/bed/chair{ dir = 4 @@ -54952,18 +54844,6 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"nLT" = ( -/obj/structure/phone_base/no_dnd{ - name = "Requisition Telephone"; - phone_category = "Almayer"; - phone_id = "Requisition"; - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/squads/req) "nLZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55357,15 +55237,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"nUF" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "nVe" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/bridge{ @@ -55794,13 +55665,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) -"oeJ" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/command/computerlab) "oeL" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -56171,22 +56035,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"omu" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -56317,6 +56165,23 @@ "opD" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) +"opI" = ( +/obj/structure/closet/secure_closet, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/storage/box/tapes, +/obj/item/clothing/head/fedora, +/obj/item/clothing/suit/storage/marine/light/reporter, +/obj/item/clothing/head/helmet/marine/reporter, +/obj/item/clothing/head/cmcap/reporter, +/obj/item/device/flashlight, +/obj/item/device/toner, +/obj/item/device/toner, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "opJ" = ( /obj/docking_port/stationary/emergency_response/external/port4, /turf/open/space/basic, @@ -56693,6 +56558,13 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) +"ovY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "owg" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -57263,6 +57135,28 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"oKa" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/phone_base/rotary{ + name = "Researcher Office Telephone"; + phone_category = "Almayer"; + phone_id = "Research"; + pixel_y = 6 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -6 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "oKb" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -57430,14 +57324,6 @@ icon_state = "mono" }, /area/almayer/engineering/ce_room) -"oNf" = ( -/obj/item/stack/folding_barricade/three, -/obj/item/stack/folding_barricade/three, -/obj/structure/closet/secure_closet/guncabinet/red, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "oNj" = ( /obj/structure/sign/prop1{ pixel_x = -32; @@ -57593,28 +57479,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"oRi" = ( -/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/phone_base/rotary/no_dnd{ - name = "Bravo Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Bravo Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "oRj" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -58267,6 +58131,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"phj" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -58354,24 +58227,6 @@ icon_state = "redfull" }, /area/almayer/squads/alpha_bravo_shared) -"plb" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/structure/phone_base{ - name = "Kitchen Telephone"; - phone_category = "Almayer"; - phone_id = "Kitchen"; - pixel_x = -8; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "plE" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -59243,16 +59098,6 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) -"pGQ" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = 29 - }, -/obj/structure/filingcabinet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "pGT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -59266,6 +59111,31 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"pHC" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -6; + pixel_y = 28 + }, +/obj/structure/machinery/firealarm{ + pixel_x = 8; + pixel_y = 28 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/phone_base/rotary{ + name = "Intelligence Center Telephone"; + phone_category = "Almayer"; + phone_id = "Intelligence Center Telephone" + }, +/obj/structure/machinery/computer/cameras/almayer/vehicle{ + dir = 4; + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/securestorage) "pHG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59899,24 +59769,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"pVx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "pVA" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_x = 2; @@ -59971,11 +59823,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engineering_workshop) -"pWp" = ( -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/command/securestorage) "pWr" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -60304,20 +60151,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"qcn" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/phone_base{ - dir = 4; - name = "Starboard Railgun Control Telephone"; - phone_category = "Command"; - phone_id = "Starboard Railgun Control"; - pixel_x = -26 - }, -/obj/item/device/binoculars, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/shipboard/starboard_missiles) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -60776,14 +60609,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"qlX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "qmk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61049,27 +60874,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"qqr" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qqu" = ( /turf/open/floor/almayer{ dir = 1; @@ -61815,21 +61619,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"qJf" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qJj" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -62082,6 +61871,26 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"qMS" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/command/computerlab) +"qNa" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/phone_base{ + dir = 4; + name = "Port Railgun Control Telephone"; + phone_category = "Command"; + phone_id = "Port Railgun Control"; + pixel_x = -26 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/shipboard/port_missiles) "qNd" = ( /obj/structure/machinery/cryopod, /obj/structure/machinery/light{ @@ -63157,6 +62966,18 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/living/gym) +"rkB" = ( +/obj/structure/phone_base{ + name = "Brig Offices Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Main Offices"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) "rkK" = ( /turf/open/floor/almayer{ dir = 4; @@ -63386,13 +63207,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"rpM" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "rpW" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -63481,47 +63295,6 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"rrI" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "CIC Lockdown"; - name = "CIC Lockdown"; - pixel_x = -7; - pixel_y = 9; - req_access_txt = "1" - }, -/obj/structure/machinery/door_control{ - id = "Hangar Lockdown"; - name = "Hangar Lockdown"; - pixel_x = -7; - pixel_y = 2; - req_access_txt = "1" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/obj/structure/machinery/door_control{ - id = "bot_armory"; - name = "Armory Lockdown"; - pixel_x = -7; - pixel_y = -5; - req_one_access_txt = "1;4" - }, -/obj/structure/phone_base/rotary/no_dnd{ - name = "Combat Information Center Telephone"; - phone_category = "Command"; - phone_id = "Combat Information Center"; - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/machinery/door/window/westright{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "rrK" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -64299,6 +64072,19 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"rHM" = ( +/obj/structure/phone_base{ + dir = 8; + name = "RO Office Telephone"; + phone_category = "Offices"; + phone_id = "RO Office"; + pixel_x = 16 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/squads/req) "rHN" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/plating/plating_catwalk, @@ -64908,25 +64694,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) -"rYd" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/phone_base{ - name = "CMO Office Telephone"; - phone_category = "Offices"; - phone_id = "CMO Office"; - pixel_y = 29 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 23; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/upper_medical) "rYi" = ( /obj/structure/bed/chair, /obj/structure/machinery/power/apc/almayer{ @@ -65818,18 +65585,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ssW" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ssX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -65846,16 +65601,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"sth" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/phone_base/rotary{ - name = "Captain's Office"; - phone_category = "Offices"; - phone_id = "Captain's Office"; - pixel_y = 6 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "sti" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/balaclavas, @@ -65938,6 +65683,63 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"svK" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/yellow{ + layer = 3.2 + }, +/obj/item/bedsheet/yellow{ + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plush/barricade, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"swc" = ( +/obj/structure/machinery/firealarm{ + pixel_x = 6; + pixel_y = 28 + }, +/obj/structure/bed/chair/office/dark{ + dir = 4; + layer = 3.25 + }, +/obj/structure/phone_base{ + name = "CE Office Telephone"; + phone_category = "Offices"; + phone_id = "CE Office"; + pixel_x = -8; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/ce_room) "swn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -66638,28 +66440,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"sLW" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 6; - pixel_x = 6 - }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = -8; - pixel_y = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "sMs" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -66765,27 +66545,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"sOZ" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "sPc" = ( /obj/structure/machinery/light{ dir = 1 @@ -67066,17 +66825,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"sVS" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt, -/obj/structure/phone_base/rotary/no_dnd{ - name = "Brig Cells Telephone"; - phone_category = "Almayer"; - phone_id = "Brig Cells"; - pixel_x = 15 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -67197,23 +66945,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"sYB" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "sYC" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -67619,19 +67350,16 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) -"tgd" = ( -/obj/structure/phone_base{ - dir = 8; - name = "RO Office Telephone"; - phone_category = "Offices"; - phone_id = "RO Office"; - pixel_x = 16 +"tgf" = ( +/obj/structure/machinery/light{ + dir = 8 }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + dir = 8; + icon_state = "silver" }, -/area/almayer/squads/req) +/area/almayer/command/computerlab) "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67817,12 +67545,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/tankerbunks) -"tjU" = ( -/obj/structure/bed/chair/wood/normal, -/obj/item/bedsheet/brown, -/obj/item/toy/farwadoll, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) "tki" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -68346,6 +68068,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"tuk" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/ares_console{ + pixel_x = 9 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "tuo" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/sign/safety/hvac_old{ @@ -68365,13 +68096,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"tuX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "tuZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -69197,6 +68921,31 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"tNZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/item/clipboard{ + base_pixel_x = 20; + pixel_x = 5 + }, +/obj/item/paper{ + pixel_x = 5 + }, +/obj/item/tool/pen{ + pixel_x = 5 + }, +/obj/structure/surface/table/reinforced/black, +/obj/structure/phone_base/rotary{ + name = "CIC Reception Telephone"; + phone_category = "Command"; + phone_id = "CIC Reception"; + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/cic) "tOd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -69628,15 +69377,6 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"tZa" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/ares_console{ - pixel_x = 9 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "plating" - }, -/area/almayer/command/airoom) "tZc" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -69986,6 +69726,14 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"ugj" = ( +/obj/item/stack/folding_barricade/three, +/obj/item/stack/folding_barricade/three, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "ugs" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law{ @@ -70119,6 +69867,19 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"ujv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/phone_base{ + dir = 8; + name = "Medical Telephone"; + phone_category = "Almayer"; + phone_id = "Medical Lower"; + pixel_x = 16 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/lockerroom) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -70287,6 +70048,11 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"umV" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/computerlab) "umY" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -70487,6 +70253,12 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"uri" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -70973,49 +70745,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) -"uzP" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/toy/farwadoll{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - icon_state = "therapyred"; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_y = 15; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.1; - pixel_x = -1; - pixel_y = 22 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "uzU" = ( /obj/structure/disposalpipe/segment, /obj/structure/surface/table/almayer, @@ -71136,6 +70865,12 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"uBM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "uBN" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -71236,6 +70971,43 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"uDQ" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/surface/table/reinforced/almayer_B{ + climbable = 0; + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/phone_base/rotary{ + name = "AI Reception Telephone"; + phone_category = "ARES"; + phone_color = "blue"; + phone_id = "AI Reception" + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + pixel_x = 10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "uDW" = ( /obj/structure/machinery/cm_vending/clothing/tl/delta{ density = 0; @@ -71722,6 +71494,12 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"uPq" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "uPr" = ( /turf/open/floor/almayer{ dir = 5; @@ -72192,6 +71970,13 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) +"uZE" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "uZH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -72205,19 +71990,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) -"uZY" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -72489,6 +72261,17 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"vfS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "vgk" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/camera/autoname/almayer{ @@ -73227,19 +73010,24 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vsI" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"vsG" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 1 }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/obj/structure/phone_base{ + dir = 1; + name = "Brig Warden's Office Telephone"; + phone_category = "Offices"; + phone_id = "Brig Warden's Office"; + pixel_x = -16 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "vsJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -73796,6 +73584,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) +"vEf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "vEj" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -74222,6 +74018,16 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"vMR" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "vND" = ( /obj/structure/bed/chair{ dir = 8; @@ -74345,6 +74151,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"vPV" = ( +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "vQe" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -75452,23 +75265,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"wke" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/phone_base{ - dir = 8; - name = "OT Telephone"; - phone_category = "Almayer"; - phone_id = "Ordnance Tech"; - pixel_x = 14 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/engineering_workshop/hangar) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75669,6 +75465,48 @@ /obj/structure/window/framed/almayer/white/hull, /turf/open/floor/plating, /area/almayer/command/airoom) +"wnn" = ( +/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; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/living/port_emb) "wnL" = ( /obj/item/stack/tile/carpet{ amount = 12 @@ -75786,6 +75624,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/stern_hallway) +"wqr" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 29 + }, +/obj/structure/filingcabinet, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "wqu" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -76109,27 +75957,6 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) -"wxJ" = ( -/obj/structure/machinery/firealarm{ - pixel_x = 6; - pixel_y = 28 - }, -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/obj/structure/phone_base{ - name = "CE Office Telephone"; - phone_category = "Offices"; - phone_id = "CE Office"; - pixel_x = -8; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/ce_room) "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -76419,6 +76246,20 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wEt" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/phone_base{ + dir = 4; + name = "Starboard Railgun Control Telephone"; + phone_category = "Command"; + phone_id = "Starboard Railgun Control"; + pixel_x = -26 + }, +/obj/item/device/binoculars, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/shipboard/starboard_missiles) "wEI" = ( /obj/structure/surface/table/reinforced/black, /obj/item/tool/pen, @@ -76974,6 +76815,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"wRy" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -77188,25 +77042,6 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) -"wVw" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "wVy" = ( /obj/structure/window/reinforced{ dir = 8 @@ -78135,28 +77970,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"xoS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/brig/armory) "xpd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -78201,6 +78014,12 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"xpC" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "xpI" = ( /obj/structure/stairs{ dir = 4 @@ -78755,6 +78574,23 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"xAn" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/phone_base{ + dir = 8; + name = "OT Telephone"; + phone_category = "Almayer"; + phone_id = "Ordnance Tech"; + pixel_x = 14 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/engineering_workshop/hangar) "xAt" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 8 @@ -79744,6 +79580,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"xUV" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "xVc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -80100,6 +79944,22 @@ /obj/structure/machinery/computer/secure_data, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"ycy" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 8 + }, +/obj/structure/phone_base/rotary{ + name = "Reporter Telephone"; + phone_category = "Almayer"; + phone_id = "Reporter"; + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "ycV" = ( /obj/structure/curtain/red, /turf/open/floor/plating/plating_catwalk, @@ -80306,6 +80166,18 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ygj" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, +/obj/item/folder/red, +/obj/structure/phone_base/rotary{ + name = "Brig CMP's Office Telephone"; + phone_category = "Offices"; + phone_id = "Brig CMP's Office"; + pixel_x = 15 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "ygs" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" @@ -88105,7 +87977,7 @@ aTg pdG vAG dOL -jJr +ygj hwS wly wIC @@ -90531,7 +90403,7 @@ vBm vBm vBm vBm -dgm +rkB mLJ fkn gaJ @@ -91365,7 +91237,7 @@ eZH ohJ thL thL -tjU +jkX liZ rUk jVa @@ -91556,13 +91428,13 @@ gaJ gaJ tRA lMc -sVS +iuj cMl oeB rkL ldu eRL -iLJ +vsG vBm qJZ ohJ @@ -91947,9 +91819,9 @@ pCi rPC rwS lrq -kTc +miX uqo -wVw +bpu cqn gTx eRL @@ -92150,9 +92022,9 @@ ahE rPC nfI lrq -omu +mzx uqo -sYB +jfd cqn ldu eRL @@ -92353,9 +92225,9 @@ ahE rPC heV lrq -frJ +aZA uqo -ktn +vfS cqn nBb mdS @@ -92556,9 +92428,9 @@ ahE wcn nBc lrq -vsI +icn uqo -xoS +jCB lrq mAT lrq @@ -92759,7 +92631,7 @@ pCi wcn wcn lrq -mAr +ovY uqo fsT jnA @@ -92962,7 +92834,7 @@ pCi oCL wcn lrq -uZY +jlD uqo uqo uqo @@ -93165,7 +93037,7 @@ pCi rPC aou lrq -mAr +ovY uqo uvy tfO @@ -93880,7 +93752,7 @@ dqd uNL hJp kcp -aJP +dok bTS bTS lxo @@ -96404,7 +96276,7 @@ aaa aaa aad aeE -qcn +wEt ayq cfE cfE @@ -96452,7 +96324,7 @@ btD rVN rVN vly -gdJ +qNa pun ajZ aaa @@ -97321,7 +97193,7 @@ aaa nXP ndx uNL -nDd +wRy soS sgy nsu @@ -97524,9 +97396,9 @@ aaa nXP hJp uNL -gka +dnW bwQ -oNf +ugj uNL aNw kXJ @@ -99066,9 +98938,9 @@ wVW wVW wVW swH -oRi +fyv wVW -dTO +lAi sEM wVW wVW @@ -99267,13 +99139,13 @@ apo fHh wVW lZs -edW +ipI sni ayz dAX aQg vpV -fsx +hCs aGp wVW aDv @@ -100878,7 +100750,7 @@ agj eYC agc fNb -sth +meE agc agc hvH @@ -100894,7 +100766,7 @@ wVW rOC soX azX -rrI +lQA aCb aDv aEC @@ -101496,9 +101368,9 @@ agj aic aov wVW -atx +uri qEk -ajm +gHw wVW arP alX @@ -101510,7 +101382,7 @@ hkG wVW fvB qEk -auR +eSK wVW aKn aKz @@ -101699,7 +101571,7 @@ agj aic aov wVW -atx +uri qEk ato wVW @@ -101713,7 +101585,7 @@ aEB wVW fvB qEk -auR +eSK wVW aKn aKz @@ -101787,7 +101659,7 @@ nXP mNf hJp uNL -fvs +llY xSI uZQ aoH @@ -101902,7 +101774,7 @@ agj aic aov wVW -ssW +jJT qEk hrm wVW @@ -101916,7 +101788,7 @@ aEC wVW dNZ qEk -mtX +vPV wVW aKn aKz @@ -102094,7 +101966,7 @@ cnX lIh agj mXj -afo +fLa lue ahw aiG @@ -102105,7 +101977,7 @@ agj aic aoA wVW -atx +uri jvX ato wVW @@ -102119,7 +101991,7 @@ aED wVW ryR jvX -auR +eSK wVW aKn aKy @@ -102722,7 +102594,7 @@ aCj ayK aAd aAP -jod +tNZ ayu aCj bYY @@ -106483,7 +106355,7 @@ qyD omo blZ bqN -lgS +ujv bqN bwR gfW @@ -107712,7 +107584,7 @@ mWw apT apA arC -wke +xAn cSN asy atw @@ -108803,7 +108675,7 @@ dtM akU ajC sqf -anp +vMR wjz fnA jZY @@ -109006,7 +108878,7 @@ dtM aii ajC sqf -sOZ +iCN oNJ eDo eDo @@ -109209,7 +109081,7 @@ dtM ajt aik sqf -anq +fbP awn xsz jTj @@ -109412,17 +109284,17 @@ dtM aii ajC sqf -anr +les awn tEi -asu -hbI +kIX +fQx sqf ajl vtx ajl ajl -rYd +jVG fbB cyU bho @@ -111454,7 +111326,7 @@ lMv dVu eSo qmD -eii +oKa lJv aCt kXw @@ -112385,7 +112257,7 @@ vzP bJt hjB bJt -plb +nhf bDs gSk bDs @@ -112484,7 +112356,7 @@ bqy bYj eUR bsd -eYN +iNt bYj xne cNH @@ -114311,7 +114183,7 @@ rne rne fAo awE -bhM +iEM wQv bBi awE @@ -114718,7 +114590,7 @@ rne wft awE hpf -byY +erC igp awE hoX @@ -115989,7 +115861,7 @@ wNl nGh fPp lqN -kjV +jpy nsY xCN pOB @@ -116002,7 +115874,7 @@ aLJ eBg dAO cEG -eBg +svK dYX tBF lBz @@ -116643,7 +116515,7 @@ bJz bdg wLV wLV -wLV +mft wLV wLV wNT @@ -116656,7 +116528,7 @@ uVh nsY kzK lFh -uzP +wnn pVA mzV pML @@ -116808,7 +116680,7 @@ aLf tRc qEW bdd -jlj +kRL mLb wmz vpt @@ -118560,8 +118432,8 @@ avK aqU aCZ dgg -cQO -gzv +tgf +cyN aHq sDC ajt @@ -119368,7 +119240,7 @@ mLE tmK avK aug -nKQ +uDQ aqU lyE rsO @@ -119970,18 +119842,18 @@ uLu anC aiC ioU -ltP +pHC qPE xqD -pWp -jzy -aIn -jzy -jzy +hhc +umV +noH +umV +umV aHq cnE liJ -mMU +qMS cbn aHq uLu @@ -120173,7 +120045,7 @@ aSz anG aiC ioU -cHe +gNj wTd cmK lFm @@ -120994,7 +120866,7 @@ oeM eed oeM eed -grz +gvL aRi aGN qrv @@ -121197,7 +121069,7 @@ fXx kXf huO iLO -oeJ +uZE xNv iLO bUa @@ -121495,7 +121367,7 @@ bdj bri bLX bdl -nLT +gQV bNP bmD bNP @@ -123033,9 +122905,9 @@ alG anG apf oIB -sLW -cJq -gyI +llV +ycy +cgW oIB sFR vuv @@ -123236,9 +123108,9 @@ alG aYD uPI oIB -mJb -hIr -ftE +fXE +kaS +aiQ oIB sFR vuv @@ -123439,9 +123311,9 @@ sUF anG apd oIB -pGQ +wqr bZw -kqn +xUV oIB sFR hPo @@ -123536,7 +123408,7 @@ bZr bKA dyx eYr -bUo +kcd uys cbz cbU @@ -123643,8 +123515,8 @@ aYD aTS qgK tEB -nib -rpM +uBM +dXo oIB lBR nVu @@ -123739,7 +123611,7 @@ bmD bKA dyx hGN -pVx +xpC uys ttM iEb @@ -123846,8 +123718,8 @@ anG mPX oIB wKF -tuX -lDf +hzb +ltU oIB fbx cFA @@ -124048,9 +123920,9 @@ aSC aZH iAB oIB -iWZ -qlX -nUF +phj +vEf +cNK oIB fbx cxo @@ -124251,8 +124123,8 @@ rFY ctC gPF oIB -lRa -mMk +opI +dha pxj oIB fbx @@ -124942,7 +124814,7 @@ sou bAX bdl wIr -tgd +rHM jAB iYt bMa @@ -125965,7 +125837,7 @@ qlz xYf skn bQX -mbI +dUG cLl qlz tez @@ -126273,8 +126145,8 @@ auu aoT aFm xBe -aIV -qqr +eUk +iHe arH xBe alG @@ -126681,7 +126553,7 @@ anO nFX atv auV -amE +mqa xBe alG aDZ @@ -126884,7 +126756,7 @@ atc nFX atv auV -amE +mqa xBe alG aYj @@ -127288,8 +127160,8 @@ atq aDr aFu xBe -azp -qJf +uPq +iAc anV xBe alG @@ -128691,7 +128563,7 @@ bNM iEr owg eNi -wxJ +swc eJX sAC wYY @@ -138493,7 +138365,7 @@ lmz daz cwS ffE -tZa +tuk wpw ffE ffE @@ -139720,7 +139592,7 @@ wyv pTt gAe rCi -niZ +kaQ mUz our rna 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 eb4f5fdb60..36c8e9abe7 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -166,6 +166,11 @@ }, /turf/open/floor/wood, /area/whiskey_outpost/inside/cic) +"aC" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/whiskey_outpost/inside/cic) "aE" = ( /obj/structure/bed, /obj/item/bedsheet/hop, @@ -868,6 +873,13 @@ "dl" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/inside/hospital) +"dp" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "dr" = ( /obj/structure/window/reinforced{ dir = 4; @@ -2021,6 +2033,13 @@ /obj/structure/surface/rack, /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_south) +"hr" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/disposal/deliveryChute{ + dir = 1 + }, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "hs" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_north) @@ -3058,8 +3077,10 @@ }, /area/whiskey_outpost/inside/supply) "kE" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/plating_catwalk/prison, +/obj/structure/machinery/computer/cryopod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/whiskey_outpost/inside/supply) "kG" = ( /obj/structure/bed/chair{ @@ -4260,6 +4281,10 @@ /obj/effect/landmark/start/whiskey/pilot, /turf/open/gm/dirt, /area/whiskey_outpost/outside/mortar_pit) +"pg" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "pj" = ( /obj/effect/landmark/start/whiskey/engineer, /turf/open/gm/dirtgrassborder/north, @@ -4415,7 +4440,7 @@ "pO" = ( /obj/structure/bed, /obj/item/bedsheet/orange, -/obj/item/toy/farwadoll{ +/obj/item/toy/plush/farwa{ pixel_x = 5 }, /obj/item/clothing/under/redpyjamas, @@ -5151,7 +5176,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/engineering) "sh" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/wo, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/wo, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -5223,6 +5248,10 @@ /obj/structure/sign/ROsign, /turf/closed/wall/r_wall, /area/whiskey_outpost) +"sw" = ( +/obj/effect/decal/warning_stripes, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "sx" = ( /obj/structure/machinery/cm_vending/clothing/dress, /turf/open/floor/prison{ @@ -5251,7 +5280,7 @@ }, /area/whiskey_outpost/inside/living) "sJ" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/wo, +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/wo, /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "sK" = ( @@ -5356,9 +5385,8 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "th" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) @@ -5729,12 +5757,13 @@ dir = 4; id = "trash" }, -/obj/structure/machinery/recycler{ - recycle_dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/light/small, +/obj/structure/machinery/recycler/whiskey{ + recycle_dir = 8 + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -6274,6 +6303,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/machinery/light/small, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -6337,7 +6367,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -6403,6 +6432,14 @@ "wK" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_south) +"wL" = ( +/obj/structure/surface/rack, +/obj/item/device/destTagger, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "wM" = ( /obj/structure/machinery/line_nexter{ dir = 1; @@ -6533,10 +6570,17 @@ }, /area/whiskey_outpost/inside/cic) "xk" = ( -/obj/structure/machinery/light, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/surface/rack, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 1 }, +/obj/item/device/destTagger, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "xl" = ( /obj/item/ammo_casing{ @@ -6788,6 +6832,7 @@ /area/whiskey_outpost/inside/hospital) "yj" = ( /obj/effect/landmark/start/whiskey/cargo, +/obj/structure/disposalpipe/segment, /turf/open/floor/prison{ dir = 8; icon_state = "darkyellowcorners2" @@ -6867,10 +6912,6 @@ dir = 4; health = 80 }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -6926,6 +6967,9 @@ health = 80 }, /obj/item/tool/hand_labeler, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/prison{ dir = 8; icon_state = "darkyellow2" @@ -7860,6 +7904,13 @@ icon_state = "floor_plate" }, /area/whiskey_outpost/inside/bunker/bunker/front) +"Cd" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/closed/wall/r_wall/unmeltable, +/area/whiskey_outpost/inside/supply) "Ce" = ( /turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_north) @@ -8361,6 +8412,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) +"DW" = ( +/obj/structure/machinery/door/window/northleft, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/whiskey_outpost/inside/engineering) "DX" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river, @@ -8576,6 +8634,10 @@ icon_state = "grass_impenetrable" }, /area/whiskey_outpost/outside/north/northwest) +"EL" = ( +/obj/structure/machinery/cm_vending/gear/synth, +/turf/open/floor/plating/plating_catwalk, +/area/whiskey_outpost/inside/cic) "EN" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor{ @@ -9834,7 +9896,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/bunker/front) "Kc" = ( -/obj/structure/machinery/cm_vending/sorted/attachments, +/obj/structure/machinery/cm_vending/sorted/attachments/wo, /turf/open/floor/plating, /area/whiskey_outpost/inside/supply) "Kd" = ( @@ -9880,6 +9942,18 @@ /obj/structure/sign/poster, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/engineering) +"Ks" = ( +/obj/structure/closet/secure_closet/cargotech, +/obj/item/clothing/accessory/storage/webbing, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/whiskey_outpost/inside/supply) "Kt" = ( /obj/structure/fence, /turf/open/gm/dirt, @@ -10779,6 +10853,20 @@ icon_state = "white" }, /area/whiskey_outpost/inside/hospital/triage) +"OI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/whiskey_outpost) "OK" = ( /turf/closed/wall/strata_ice/jungle, /area/whiskey_outpost/outside/south/far) @@ -11823,7 +11911,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "TD" = ( -/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/sword/machete, /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" @@ -12234,6 +12322,16 @@ icon_state = "blue" }, /area/whiskey_outpost/inside/cic) +"Vr" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/item/device/destTagger, +/obj/item/packageWrap, +/obj/item/packageWrap, +/turf/open/floor/prison, +/area/whiskey_outpost/inside/supply) "Vt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -12565,6 +12663,10 @@ icon_state = "asteroidwarning" }, /area/whiskey_outpost/outside/north) +"WK" = ( +/obj/structure/machinery/cm_vending/own_points/experimental_tools, +/turf/open/floor/plating/plating_catwalk, +/area/whiskey_outpost/inside/cic) "WL" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /obj/structure/disposalpipe/segment{ @@ -12805,6 +12907,13 @@ /obj/effect/spawner/random/tool, /turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) +"XO" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/whiskey_outpost/inside/supply) "XP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19252,9 +19361,9 @@ mT mT mT mT -mT -mT -mT +ak +ak +ak mT mT mT @@ -19455,7 +19564,7 @@ mT mT mT ak -ak +WK ak ak ak @@ -19655,9 +19764,9 @@ mT mT mT mT -mT ak ai +aC qe ih Nr @@ -19857,9 +19966,9 @@ mT mT mT mT -mT ak Vy +aC PB PM Ed @@ -20061,7 +20170,7 @@ ak ak ak ak -ak +EL Mo Gx PM @@ -21086,7 +21195,7 @@ vn tv wl nK -ya +JN ya ya nr @@ -21287,8 +21396,8 @@ nK vv tv wz -nK -JN +DW +ya ya Jd nr @@ -21692,7 +21801,7 @@ vw tv wA nK -ya +JN ya ya nr @@ -22502,7 +22611,7 @@ uB uB yf xg -vC +xg nr fy fy @@ -22704,7 +22813,7 @@ kS pK vL yz -nr +vC nr fy fy @@ -23304,12 +23413,12 @@ cx rm uf wQ -kS -pK -kS -pK +dp +XO +pg +XO yj -yF +Ks nr nr UN @@ -23706,14 +23815,14 @@ oW OX qT lw -rZ -kS -kS -kS +xk kS kS +pK kS -nr +sw +hr +Cd nr mT BT @@ -23908,13 +24017,13 @@ oW OX qT lw -rZ +wL kS kS kS kS Dk -vN +Vr nr mT mT @@ -24713,7 +24822,7 @@ la nn oI rg -oP +OI su Kc sh @@ -24924,7 +25033,7 @@ kS tS tS wQ -wQ +kS nr zg yk @@ -25123,11 +25232,11 @@ VF TP wQ kS -kE -kE -xk +tS +tS +wQ +vN yv -nr Av zG Av @@ -25327,9 +25436,9 @@ kS kS tS tS -wQ +kE +nr nr -lw fj fj fj diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 971fefa58f..3605d8a120 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -668,20 +668,6 @@ icon_state = "squareswood" }, /area/yautja) -"bC" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/weapon/claymore/mercsword/machete/arnold{ - anchored = 1; - desc = "Won by an Elder during their youthful hunting days. None are allowed to touch it."; - name = "\improper Dutch's Machete" - }, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/yautja) "bD" = ( /obj/structure/machinery/door/airlock/yautja/secure{ dir = 1; @@ -1266,47 +1252,6 @@ /obj/item/reagent_container/food/drinks/drinkingglass, /turf/open/shuttle/predship, /area/yautja) -"cK" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = 12 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = 8 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = 4 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = -4 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = -12 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25 - }, -/obj/item/weapon/claymore/mercsword{ - attack_speed = 12; - force = 25; - pixel_x = -8 - }, -/turf/open/shuttle/predship, -/area/yautja) "cL" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1801,19 +1746,6 @@ icon_state = "multi_tiles" }, /area/yautja) -"gG" = ( -/obj/structure/machinery/door_control{ - id = "Yautja Armory"; - name = "Armory Shutters"; - needs_power = 0; - pixel_x = 24; - req_one_access_txt = "392" - }, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/yautja) "ha" = ( /obj/structure/barricade/handrail/strata, /obj/structure/barricade/handrail/strata{ @@ -1877,36 +1809,6 @@ icon_state = "squareswood" }, /area/yautja) -"jP" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/weapon/claymore{ - attack_speed = 12; - force = 25; - name = "duelling claymore" - }, -/obj/item/weapon/claymore{ - attack_speed = 12; - force = 25; - name = "duelling claymore"; - pixel_x = -5 - }, -/obj/item/weapon/claymore{ - attack_speed = 12; - force = 25; - name = "duelling claymore"; - pixel_x = 5 - }, -/obj/item/weapon/claymore{ - attack_speed = 12; - force = 25; - name = "duelling claymore"; - pixel_x = 10 - }, -/turf/open/shuttle/predship, -/area/yautja) "jR" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/corsat{ @@ -1949,17 +1851,6 @@ icon_state = "desert1" }, /area/yautja) -"mv" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/storage/large_holster/katana, -/obj/item/weapon/katana, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/yautja) "nd" = ( /turf/open/gm/dirtgrassborder{ icon_state = "desert0" @@ -2173,6 +2064,20 @@ icon_state = "multi_tiles" }, /area/yautja) +"tl" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/weapon/sword/machete/arnold{ + anchored = 1; + desc = "Won by an Elder during their youthful hunting days. None are allowed to touch it."; + name = "\improper Dutch's Machete" + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/yautja) "tn" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2241,16 +2146,6 @@ icon_state = "squareswood" }, /area/yautja) -"uZ" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/weapon/claymore/mercsword/ceremonial, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/yautja) "vO" = ( /obj/structure/machinery/shower{ dir = 4 @@ -2421,6 +2316,47 @@ /obj/structure/machinery/cryopod/right, /turf/open/shuttle/predship, /area/yautja) +"Bf" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = 12 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = 8 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = 4 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = -4 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = -12 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + pixel_x = -8 + }, +/turf/open/shuttle/predship, +/area/yautja) "Bg" = ( /obj/structure/closet/crate/secure{ req_one_access_txt = "392"; @@ -2571,6 +2507,17 @@ icon_state = "multi_tiles" }, /area/yautja) +"EZ" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/storage/large_holster/katana, +/obj/item/weapon/sword/katana, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/yautja) "Fh" = ( /turf/open/floor/strata{ color = "#5e5d5d"; @@ -2918,6 +2865,16 @@ icon_state = "squareswood" }, /area/yautja) +"KX" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/weapon/sword/ceremonial, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/yautja) "Lo" = ( /obj/structure/machinery/vending/dinnerware, /turf/open/floor/corsat{ @@ -3056,6 +3013,19 @@ icon_state = "squareswood" }, /area/yautja) +"Qz" = ( +/obj/structure/machinery/door_control{ + id = "Yautja Armory"; + name = "Armory Shutters"; + needs_power = 0; + pixel_x = 24; + req_one_access_txt = "392" + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/yautja) "QF" = ( /obj/item/weapon/yautja/knife{ color = "#FFE55C"; @@ -3198,6 +3168,36 @@ }, /turf/open/shuttle/predship, /area/yautja) +"Wj" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + name = "duelling claymore" + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + name = "duelling claymore"; + pixel_x = -5 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + name = "duelling claymore"; + pixel_x = 5 + }, +/obj/item/weapon/sword{ + attack_speed = 12; + force = 25; + name = "duelling claymore"; + pixel_x = 10 + }, +/turf/open/shuttle/predship, +/area/yautja) "Ww" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -5615,7 +5615,7 @@ bL cP bL bL -mv +EZ xO JH bL @@ -5640,7 +5640,7 @@ bL bL bL bL -jP +Wj bj aq cP @@ -5900,7 +5900,7 @@ bL bL bL bI -bC +tl bE bL bL @@ -5917,7 +5917,7 @@ OZ bL bL bj -cK +Bf cP cP ca @@ -6191,7 +6191,7 @@ bL cP bL bL -uZ +KX Mb JH bL @@ -7277,7 +7277,7 @@ bj bL bL bL -gG +Qz bL Fy dl diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm index 93392c6b7f..895e8ae84c 100644 --- a/maps/predship/regular.dmm +++ b/maps/predship/regular.dmm @@ -451,7 +451,7 @@ /area/yautja) "bN" = ( /obj/structure/surface/table/reinforced, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /obj/structure/window/reinforced{ dir = 4 }, @@ -1053,12 +1053,12 @@ /area/yautja) "cZ" = ( /obj/structure/surface/table/reinforced, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, /turf/open/floor/holofloor{ dir = 2; icon_state = "cult" diff --git a/tools/build/juke/index.js b/tools/build/juke/index.js index 4ee8fbf0bf..8f2e869193 100644 --- a/tools/build/juke/index.js +++ b/tools/build/juke/index.js @@ -4430,7 +4430,7 @@ var exec = (executable, args = [], options = {}) => { const error = new ExitCode(code); error.code = code; error.signal = signal; - reject(error); + reject(error); return; } resolve({