diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7a79b28b09aa..4dfa55a79231 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,9 +24,8 @@ /tools/docker/ @Fira /Dockerfile @Fira -# MorrowWolf +# Zonespace -/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @morrowwolf -/code/modules/gear_presets/survivors.dm @morrowwolf +/code/modules/gear_presets/survivors.dm @zonespace27 # MULTIPLE OWNERS diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 49eda07616c2..5eb8f0219e73 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -10,6 +10,12 @@ body: placeholder: "#1, #2, #3, etc" validations: required: true + - type: input + id: round-id + attributes: + label: Round ID + description: If known, what was the Round ID this bug was found on? Can be left blank if unknown or occured across multiple rounds. + placeholder: "12345" - type: textarea id: what-happened attributes: diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 683f3909b447..0488055312f7 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -60,6 +60,34 @@ jobs: with: outputFile: output-annotations.txt + + odlint: + name: Lint with OpenDream + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - name: Get OpenDream Version + run: | + source dependencies.sh + echo "OPENDREAM_VERSION=$OPENDREAM_VERSION" >> $GITHUB_ENV + - name: Restore OpenDream cache + uses: actions/cache@v3 + id: cache-od + with: + path: ~/OpenDream + key: ${{ runner.os }}-opendream-${{ env.OPENDREAM_VERSION }} + - name: Download OpenDream + if: steps.cache-od.outputs.cache-hit != 'true' + run: | + bash tools/ci/download_od.sh + - name: Setup OpenDream + if: steps.cache-od.outputs.cache-hit != 'true' + run: | + bash tools/ci/setup_od.sh + - name: Run OpenDream + run: | + bash tools/ci/run_od.sh + compile_all_maps: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Compile Maps diff --git a/.gitignore b/.gitignore index 210efc84d75b..4d2b7e810de8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ test_environment.txt # byond-tracy backend, not shipped with the codebase so it shouldn't be maintained prof.dll libprof.so + +# OpenDream compatibility stuff +colonialmarines.json diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index 113b78dbada1..f1424f5560ec 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -283,7 +283,6 @@ block( \ /// Only use the CEILING_PROTECTION_TIER_X defines for `protection_level` #define CEILING_IS_PROTECTED(ceiling, protection_level) (ceiling >= protection_level) - // Default font settings #define FONT_SIZE "5pt" #define DEFAULT_FONT_COLOR "#09f" @@ -493,6 +492,18 @@ block( \ #define TURF_PROTECTION_CAS 2 #define TURF_PROTECTION_OB 3 +/// Convert a turf protection level to a ceiling protection level +/proc/get_ceiling_protection_level(turf_protection_level) + switch(turf_protection_level) + if(TURF_PROTECTION_OB) + return CEILING_PROTECTION_TIER_4 + if(TURF_PROTECTION_CAS) + return CEILING_PROTECTION_TIER_3 + if(TURF_PROTECTION_MORTAR) + return CEILING_PROTECTION_TIER_2 + else + return CEILING_NO_PROTECTION + // Anything above the deck boundary is the upper deck, anything below is the lower deck // This is exclusive, so anything ON the boundary is an edge case that's neither on the upper nor the lower deck #define ALMAYER_DECK_BOUNDARY 101 diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 3abd79708f7a..de7eb672e87b 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -23,6 +23,8 @@ #define T0C 273.15 // 0degC #define T20C 293.15 // 20degC +#define T90C 363.15 // 90degC +#define T120C 393.15 // 120degC #define TCMB 2.7 // -270.3degC #define ICE_COLONY_TEMPERATURE 223 //-50degC #define SOROKYNE_TEMPERATURE 223 // Same as Ice for now diff --git a/code/__DEFINES/bullet_traits.dm b/code/__DEFINES/bullet_traits.dm index 0ca3bce2e602..40e250cd0dd2 100644 --- a/code/__DEFINES/bullet_traits.dm +++ b/code/__DEFINES/bullet_traits.dm @@ -3,7 +3,7 @@ // list of args if there are any args /// An entry to a list for giving projectiles bullet traits /// Must be placed inside of a list -#define BULLET_TRAIT_ENTRY(trait, args...) trait = #args ? list(##args) : null +#define BULLET_TRAIT_ENTRY(trait, args...) trait = list(##args) /// An entry to a list for giving projectiles bullet traits with a unique ID /// Must be placed inside of a list #define BULLET_TRAIT_ENTRY_ID(id, trait, args...) id = list(trait, ##args) diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm index 0a9e00b59e04..6614272d33e5 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm @@ -36,6 +36,10 @@ #define COMSIG_HUMAN_UPDATE_SIGHT "human_update_sight" #define COMPONENT_OVERRIDE_UPDATE_SIGHT (1<<0) +///from /mob/living/carbon/human/movement_delay() +#define COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION "human_movement_cancel_interaction" + #define COMPONENT_HUMAN_MOVEMENT_KEEP_USING (1<<0) + ///from /mob/living/carbon/human/update_sight() #define COMSIG_HUMAN_POST_UPDATE_SIGHT "human_post_update_sight" ///from /mob/living/carbon/human/movement_delay(): (list/movedata) diff --git a/code/__DEFINES/dcs/signals/atom/signals_atom.dm b/code/__DEFINES/dcs/signals/atom/signals_atom.dm index 7431c5593b17..cac9861d09cb 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_atom.dm @@ -45,3 +45,9 @@ ///When the transform or an atom is varedited through vv topic. #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform" + +/// 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 6c31b77f76a4..64f4c24798e1 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -65,3 +65,6 @@ /// from /obj/item/weapon/gun/proc/load_into_chamber() : () #define COMSIG_GUN_INTERRUPT_FIRE "gun_interrupt_fire" + +//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/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 032a1891a808..dc5e70fcd5ec 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -60,8 +60,11 @@ #define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling" /// From -#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened" +#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "!yautja_armory_opened" /// From /proc/biohazard_lockdown() -#define COMSIG_GLOB_RESEARCH_LOCKDOWN "research_lockdown_closed" -#define COMSIG_GLOB_RESEARCH_LIFT "research_lockdown_opened" +#define COMSIG_GLOB_RESEARCH_LOCKDOWN "!research_lockdown_closed" +#define COMSIG_GLOB_RESEARCH_LIFT "!research_lockdown_opened" + +/// From /obj/structure/machinery/power/fusion_engine/proc/set_overloading() : (set_overloading) +#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading" diff --git a/code/__DEFINES/hijack.dm b/code/__DEFINES/hijack.dm new file mode 100644 index 000000000000..85d4c227ae70 --- /dev/null +++ b/code/__DEFINES/hijack.dm @@ -0,0 +1,13 @@ +#define EVACUATION_TYPE_NONE 0 +#define EVACUATION_TYPE_ADDITIVE 1 +#define EVACUATION_TYPE_MULTIPLICATIVE 2 + +#define HIJACK_ANNOUNCE "ARES Emergency Procedures" +#define XENO_HIJACK_ANNOUNCE "You sense something unusual..." + +#define EVACUATION_STATUS_NOT_INITIATED 0 +#define EVACUATION_STATUS_INITIATED 1 + +#define HIJACK_OBJECTIVES_NOT_STARTED 0 +#define HIJACK_OBJECTIVES_STARTED 1 +#define HIJACK_OBJECTIVES_COMPLETE 2 diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 52263a5e1367..89b88f67c038 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -267,6 +267,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST #define JOB_UPP_GENERAL "UPP Army General" #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic" +#define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic" #define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH) #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN) diff --git a/code/__DEFINES/keybinding.dm b/code/__DEFINES/keybinding.dm index 88f194bb33df..5a0809d83ac1 100644 --- a/code/__DEFINES/keybinding.dm +++ b/code/__DEFINES/keybinding.dm @@ -87,6 +87,7 @@ #define COMSIG_KB_HUMAN_WEAPON_UNLOAD "keybinding_human_weapon_unload" #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT "keybinding_human_weapon_attachment" #define COMSIG_KB_HUMAN_WEAPON_ATTACHMENT_RAIL "keybinding_human_weapon_attachment_rail" +#define COMSIG_KB_HUMAN_WEAPON_SHOTGUN_TUBE "keybinding_human_weapon_shotgun_tube" #define COMSIG_KB_HUMAN_WEAPON_TOGGLE_IFF "keybinding_human_weapon_toggle_iff" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 1bd030313a43..072738184807 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -417,3 +417,4 @@ var/list/default_xeno_onmob_icons = list( #define HANDLING_LIMBS list("l_arm","l_hand", "r_arm", "r_hand") #define EXTREMITY_LIMBS list("l_leg","l_foot","r_leg","r_foot","l_arm","l_hand","r_arm","r_hand") #define CORE_LIMBS list("chest","head","groin") + diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index d283656ccae6..a3299184e4ef 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -100,10 +100,12 @@ #define MOBILE_SHUTTLE_ID_ERT_BIG "ert_boarding_shuttle" #define MOBILE_TRIJENT_ELEVATOR "trijentshuttle2" -#define STAT_TRIJENT_LZ1 "trigent_lz1" -#define STAT_TRIJENT_LZ2 "trigent_lz2" -#define STAT_TRIJENT_ENGI "trigent_engineering" -#define STAT_TRIJENT_OMEGA "trigent_omega" +#define STAT_TRIJENT_EMPTY "trijent_empty" +#define STAT_TRIJENT_OCCUPIED "trijent_occupied" +#define STAT_TRIJENT_LZ1 "trijent_lz1" +#define STAT_TRIJENT_LZ2 "trijent_lz2" +#define STAT_TRIJENT_ENGI "trijent_engineering" +#define STAT_TRIJENT_OMEGA "trijent_omega" #define MOBILE_SHUTTLE_LIFEBOAT_PORT "lifeboat-port" #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard" @@ -115,6 +117,7 @@ #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1" #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2" +#define DROPSHIP_FLYBY_ID "special_flight" #define DROPSHIP_LZ1 "dropship-lz1" #define DROPSHIP_LZ2 "dropship-lz2" diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 8a65a4b961ff..301ca0409655 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -109,36 +109,23 @@ // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. -#define SS_INIT_TICKER_SPAWN 999 #define SS_INIT_INPUT 85 -#define SS_INIT_FAIL_TO_TOPIC 84 #define SS_INIT_TOPIC 83 #define SS_INIT_LOBBYART 82 -#define SS_INIT_RUST 30 #define SS_INIT_INFLUXDRIVER 28 -#define SS_INIT_SUPPLY_SHUTTLE 25 #define SS_INIT_GARBAGE 24 #define SS_INIT_EVENTS 23.5 -#define SS_INIT_JOB 23 +#define SS_INIT_HIJACK 22.6 #define SS_INIT_REDIS 22.5 #define SS_INIT_REAGENTS 22.1 #define SS_INIT_MAPPING 22 #define SS_INIT_NIGHTMARE 21.5 #define SS_INIT_TIMETRACK 21.1 #define SS_INIT_HUMANS 21 -#define SS_INIT_MAP 20 -#define SS_INIT_COMPONENT 19.5 #define SS_INIT_POWER 19 -#define SS_INIT_OBJECT 18 -#define SS_INIT_PIPENET 17.5 -#define SS_INIT_XENOARCH 17 -#define SS_INIT_MORE_INIT 16 -#define SS_INIT_AIR 15 -#define SS_INIT_TELEPORTER 13 #define SS_INIT_INFLUXMCSTATS 12 #define SS_INIT_INFLUXSTATS 11 #define SS_INIT_LIGHTING 10 -#define SS_INIT_DEFCON 9 #define SS_INIT_LAW 6 #define SS_INIT_FZ_TRANSITIONS 5 #define SS_INIT_PROJECTILES 4.1 @@ -152,12 +139,9 @@ #define SS_INIT_RADIO 2 #define SS_INIT_TIMER 100 #define SS_INIT_UNSPECIFIED 0 -#define SS_INIT_EMERGENCY_SHUTTLE -19 #define SS_INIT_ASSETS -20 #define SS_INIT_TICKER -21 #define SS_INIT_VOTE -23 -#define SS_INIT_FINISH -24 -#define SS_INIT_ADMIN -26 #define SS_INIT_DATABASE -27 #define SS_INIT_ENTITYMANAGER -28 #define SS_INIT_PLAYTIME -29 @@ -166,7 +150,6 @@ #define SS_INIT_MINIMAP -34 #define SS_INIT_STATPANELS -98 #define SS_INIT_CHAT -100 //Should be last to ensure chat remains smooth during init. -#define SS_INIT_EARLYRUNTIMES -500 // Post-init notifier // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) @@ -177,7 +160,6 @@ #define SS_PRIORITY_SOUND 250 #define SS_PRIORITY_TICKER 200 #define SS_PRIORITY_NIGHTMARE 180 -#define SS_PRIORITY_MAPVIEW 170 #define SS_PRIORITY_QUADTREE 160 #define SS_PRIORITY_CHAT 155 #define SS_PRIORITY_STATPANEL 154 @@ -195,20 +177,17 @@ #define SS_PRIORITY_VOTE 110 #define SS_PRIORITY_FAST_OBJECTS 105 #define SS_PRIORITY_OBJECTS 104 -#define SS_PRIORITY_FACEHUGGERS 100 #define SS_PRIORITY_DECORATOR 99 +#define SS_PRIORITY_HIJACK 97 #define SS_PRIORITY_POWER 95 #define SS_PRIORITY_EFFECTS 92 #define SS_PRIORITY_MACHINERY 90 #define SS_PRIORITY_FZ_TRANSITIONS 88 -#define SS_PRIORITY_PIPENET 85 #define SS_PRIORITY_ROUND_RECORDING 83 #define SS_PRIORITY_SHUTTLE 80 -#define SS_PRIORITY_TELEPORTER 75 #define SS_PRIORITY_EVENT 65 #define SS_PRIORITY_DISEASE 60 -#define SS_PRIORITY_FAST_MACHINERY 55 -#define SS_PRIORITY_MIDI 40 +#define SS_PRIORITY_DEFENSES 55 #define SS_PRIORITY_ENTITY 37 #define SS_PRIORITY_DEFCON 35 #define SS_PRIORITY_ACID_PILLAR 34 @@ -227,7 +206,6 @@ #define SS_PRIORITY_INFLUXSTATS 8 #define SS_PRIORITY_PLAYTIME 5 #define SS_PRIORITY_PERFLOGGING 4 -#define SS_PRIORITY_CORPSESPAWNER 3 #define SS_PRIORITY_GARBAGE 2 #define SS_PRIORITY_INACTIVITY 1 #define SS_PRIORITY_ADMIN 0 diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm index 1bdf2318d250..9257172eeee5 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/tgs.dm b/code/__DEFINES/tgs.dm index 6187a67825a4..0cc106ec9cf2 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.5.3" +#define TGS_DMAPI_VERSION "6.6.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -129,6 +129,13 @@ /// DreamDaemon Ultrasafe security level. #define TGS_SECURITY_ULTRASAFE 2 +/// DreamDaemon public visibility level. +#define TGS_VISIBILITY_PUBLIC 0 +/// DreamDaemon private visibility level. +#define TGS_VISIBILITY_PRIVATE 1 +/// DreamDaemon invisible visibility level. +#define TGS_VISIBILITY_INVISIBLE 2 + //REQUIRED HOOKS /** @@ -458,6 +465,10 @@ /world/proc/TgsSecurityLevel() return +/// Returns the current BYOND visibility level as a TGS_VISIBILITY_ define if TGS is present, null otherwise. Requires TGS to be using interop API version 5 or higher otherwise the string "___unimplemented" wil be returned. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! +/world/proc/TgsVisibility() + return + /// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsTestMerges() return diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index b40ae85c3f5f..ef500b6af9f8 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -221,6 +221,9 @@ /// Can lockout blackmarket from ASRS console circuits. #define TRAIT_TOOL_TRADEBAND "t_tool_tradeband" +/// Can hack ASRS consoles to access the black market +#define TRAIT_TOOL_BLACKMARKET_HACKER "t_tool_blackmarket_hacker" + // CLOTHING TRAITS #define TRAIT_CLOTHING_HOOD "t_clothing_hood" diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 137095327a2c..5d3fca1a2032 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/icons.dm b/code/__HELPERS/icons.dm index 3a4bbf14773f..24e39ff16c89 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -735,11 +735,12 @@ world if (isnull(dir)) dir = thing.dir - if (ishuman(thing)) // Shitty workaround for a BYOND issue. + // Commented out because this is seemingly our source of bad icon operations + /* if (ishuman(thing)) // Shitty workaround for a BYOND issue. var/icon/temp = icon2collapse icon2collapse = icon() icon2collapse.Insert(temp, dir = SOUTH) - dir = SOUTH + dir = SOUTH*/ else if (isnull(dir)) dir = SOUTH @@ -881,22 +882,93 @@ world return image_to_center //For creating consistent icons for human looking simple animals -/proc/get_flat_human_icon(icon_id, datum/equipment_preset/preset, datum/preferences/prefs, dummy_key, showDirs = GLOB.cardinals, outfit_override) +/proc/get_flat_human_icon(icon_id, equipment_preset_dresscode, datum/preferences/prefs, dummy_key, showDirs = GLOB.cardinals, outfit_override) var/static/list/humanoid_icon_cache = list() if(!icon_id || !humanoid_icon_cache[icon_id]) var/mob/living/carbon/human/dummy/body = generate_or_wait_for_human_dummy(dummy_key) + if(prefs) prefs.copy_all_to(body) - arm_equipment(body, preset) + body.update_body() + body.update_hair() + + // Assumption: Is a list + if(outfit_override) + for(var/obj/item/cur_item as anything in outfit_override) + body.equip_to_appropriate_slot(cur_item) + + // Assumption: Is a string or path + if(equipment_preset_dresscode) + arm_equipment(body, equipment_preset_dresscode) var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing") - for(var/D in showDirs) - body.setDir(D) + for(var/dir in showDirs) + body.setDir(dir) var/icon/partial = getFlatIcon(body) - out_icon.Insert(partial, dir = D) + out_icon.Insert(partial, dir = dir) humanoid_icon_cache[icon_id] = out_icon dummy_key ? unset_busy_human_dummy(dummy_key) : qdel(body) return out_icon else return humanoid_icon_cache[icon_id] + +/proc/get_flat_human_copy_icon(mob/living/carbon/human/original, equipment_preset_dresscode, showDirs = GLOB.cardinals, outfit_override) + var/mob/living/carbon/human/dummy/body = generate_or_wait_for_human_dummy(null) + + if(original) + // From /datum/preferences/proc/copy_appearance_to + body.age = original.age + body.gender = original.gender + body.ethnicity = original.ethnicity + body.body_type = original.body_type + + body.r_eyes = original.r_eyes + body.g_eyes = original.g_eyes + body.b_eyes = original.b_eyes + + body.r_hair = original.r_hair + body.g_hair = original.g_hair + body.b_hair = original.b_hair + + body.r_gradient = original.r_gradient + body.g_gradient = original.g_gradient + body.b_gradient = original.b_gradient + body.grad_style = original.grad_style + + body.r_facial = original.r_facial + body.g_facial = original.g_facial + body.b_facial = original.b_facial + + body.r_skin = original.r_skin + body.g_skin = original.g_skin + body.b_skin = original.b_skin + + body.h_style = original.h_style + body.f_style = original.f_style + + body.underwear = original.underwear + body.undershirt = original.undershirt + + body.update_body() + body.update_hair() + + // Assumption: Is a list + if(outfit_override) + for(var/obj/item/cur_item as anything in outfit_override) + body.equip_to_appropriate_slot(cur_item) + + // Assumption: Is a string or path + if(equipment_preset_dresscode) + arm_equipment(body, equipment_preset_dresscode) + + var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing") + for(var/dir in showDirs) + body.setDir(dir) + var/icon/partial = getFlatIcon(body) + out_icon.Insert(partial, dir = dir) + + // log_debug("get_flat_human_copy_icon called on ref=[REF(original)], instance=[original], type=[original.type], with [length(original.overlays)] overlays reduced to [length(body.overlays)] overlays") + + qdel(body) + return out_icon diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 4e4a1b3ff31c..5d0d113b0c55 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -21,7 +21,7 @@ var/char = copytext(hex, i, i + 1) switch(char) if("0") - //Apparently, switch works with empty statements, yay! If that doesn't work, blame me, though. -- Urist + pass() if("9", "8", "7", "6", "5", "4", "3", "2", "1") num += text2num(char) * 16 ** power if("a", "A") @@ -77,7 +77,6 @@ hex += "E" if(15.0) hex += "F" - else power-- while(length(hex) < placeholder) hex = text("0[]", hex) @@ -165,8 +164,6 @@ return 6 if("SOUTHWEST") return 10 - else - return //Converts an angle (degrees) into an ss13 direction /proc/angle2dir(degree) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 9a6ee4362088..38c02e776735 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/__odlint.dm b/code/__odlint.dm new file mode 100644 index 000000000000..f42517133746 --- /dev/null +++ b/code/__odlint.dm @@ -0,0 +1,11 @@ +// This file is included right at the start of the DME. +// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase +// These are essentially nitpicks the DM compiler should pick up on but doesnt + +#ifndef SPACEMAN_DMM +#ifdef OPENDREAM +// These are in their own file as you need to do it with an include as a hack to avoid +// SpacemanDMM evaluating the #pragma lines, even if its outside a block it cares about +#include "__pragmas.dm" +#endif +#endif diff --git a/code/__pragmas.dm b/code/__pragmas.dm new file mode 100644 index 000000000000..39c14e1bbc95 --- /dev/null +++ b/code/__pragmas.dm @@ -0,0 +1,27 @@ +//1000-1999 +#pragma FileAlreadyIncluded error +#pragma MissingIncludedFile error +#pragma MisplacedDirective error +#pragma UndefineMissingDirective error +#pragma DefinedMissingParen error +#pragma ErrorDirective error +#pragma WarningDirective error +#pragma MiscapitalizedDirective error + +//2000-2999 +#pragma SoftReservedKeyword error +#pragma DuplicateVariable error +#pragma DuplicateProcDefinition error +#pragma TooManyArguments error +#pragma PointlessParentCall error +#pragma PointlessBuiltinCall error +#pragma SuspiciousMatrixCall error +#pragma MalformedRange error +#pragma InvalidRange error +#pragma InvalidSetStatement error +#pragma InvalidOverride error +#pragma DanglingVarType error +#pragma MissingInterpolatedExpression error + +//3000-3999 +#pragma EmptyBlock error diff --git a/code/_byond_version_compat.dm b/code/_byond_version_compat.dm index 719d85654b5f..26968f0f837c 100644 --- a/code/_byond_version_compat.dm +++ b/code/_byond_version_compat.dm @@ -3,7 +3,7 @@ //Update this whenever you need to take advantage of more recent byond features #define MIN_COMPILER_VERSION 514 #define MIN_COMPILER_BUILD 1588 -#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) +#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) && !defined(OPENDREAM) //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. #error You need version 514.1588 or higher diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 0f81b0173ac1..20aa2081318c 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -30,7 +30,7 @@ #define CBT #endif -#if !defined(CBT) && !defined(SPACEMAN_DMM) +#if !defined(CBT) && !defined(SPACEMAN_DMM) && !defined(OPENDREAM) #warn Building with Dream Maker is no longer supported and will result in errors. #warn In order to build, run BUILD.bat in the bin directory. #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index c0cf70b2306f..3ba92a7c4d0c 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -1,6 +1,3 @@ - -var/list/unansweredAhelps = list() //This feels inefficient, but I can't think of a better way. Stores the message indexed by CID - GLOBAL_LIST_EMPTY(PressFaxes) GLOBAL_LIST_EMPTY(WYFaxes) //Departmental faxes GLOBAL_LIST_EMPTY(USCMFaxes) diff --git a/code/_globalvars/lists/object_lists.dm b/code/_globalvars/lists/object_lists.dm index 3a417625538b..3db9bd28cbfe 100644 --- a/code/_globalvars/lists/object_lists.dm +++ b/code/_globalvars/lists/object_lists.dm @@ -31,3 +31,6 @@ GLOBAL_LIST_EMPTY_TYPED(all_multi_vehicles, /obj/vehicle/multitile) GLOBAL_LIST_EMPTY_TYPED(lifeboat_almayer_docks, /obj/docking_port/stationary/lifeboat_dock) GLOBAL_LIST_EMPTY_TYPED(lifeboat_doors, /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor) + +GLOBAL_LIST_EMPTY_TYPED(teleporters, /datum/teleporter) +GLOBAL_LIST_EMPTY(teleporters_by_id) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index 157bb01a271a..cd6708198eae 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -46,3 +46,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 f65dd33c2eea..996f7ed2bf3b 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/human.dm b/code/_onclick/hud/human.dm index d514bdedfcdf..37a858d76699 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -116,6 +116,10 @@ return var/mob/living/carbon/human/H = mymob var/mob/screenmob = viewer || H + + if(!screenmob?.client) + return + if(!gear.len) inventory_shown = FALSE return //species without inv slots don't show items. @@ -181,6 +185,9 @@ var/mob/living/carbon/human/H = mymob var/mob/screenmob = viewer || H + if(!screenmob?.client) + return + if(H.hud_used) if(H.hud_used.hud_shown) if(H.s_store) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 35b6073ee41b..b49bce4111f0 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 e8b010669c0e..147f57fcb1aa 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -20,7 +20,8 @@ var/policy 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()) @@ -53,7 +54,8 @@ loadmaplist(CONFIG_GROUND_MAPS_FILE, GROUND_MAP) loadmaplist(CONFIG_SHIP_MAPS_FILE, SHIP_MAP) LoadChatFilter() - LoadTopicRateWhitelist() + + is_loaded = TRUE if(Master) Master.OnConfigLoad() @@ -333,18 +335,3 @@ /datum/controller/configuration/proc/DelayedMessageAdmins(text) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0) -/datum/controller/configuration/proc/LoadTopicRateWhitelist() - LAZYINITLIST(fail_to_topic_whitelisted_ips) - if(!fexists("[directory]/topic_rate_limit_whitelist.txt")) - log_config("Error 404: topic_rate_limit_whitelist.txt not found!") - return - - log_config("Loading config file topic_rate_limit_whitelist.txt...") - - for(var/line in file2list("[directory]/topic_rate_limit_whitelist.txt")) - if(!line) - continue - if(findtextEx(line, "#", 1, 2)) - continue - - fail_to_topic_whitelisted_ips[line] = 1 diff --git a/code/controllers/subsystem/admin.dm b/code/controllers/subsystem/admin.dm deleted file mode 100644 index 8aab64b04881..000000000000 --- a/code/controllers/subsystem/admin.dm +++ /dev/null @@ -1,40 +0,0 @@ -SUBSYSTEM_DEF(admin) - name = "Admin" - wait = 5 MINUTES - flags = SS_NO_INIT | SS_KEEP_TIMING - runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY - var/list/currentrun = list() - var/times_repeated = 0 - -/datum/controller/subsystem/admin/stat_entry(msg) - msg = "P:[unansweredAhelps.len]" - return ..() - -/datum/controller/subsystem/admin/fire(resumed = FALSE) - if (!resumed) - currentrun = unansweredAhelps.Copy() - - if(!currentrun.len) - times_repeated = 0 - return - - var/msg = "Unheard Ahelps (Repeated [times_repeated] times):" - - while (currentrun.len) - var/ahelp_msg = currentrun[currentrun.len] - currentrun.len-- - - if (!ahelp_msg) - continue - - msg += unansweredAhelps[ahelp_msg] + "\n" - - if (MC_TICK_CHECK) - return - - for(var/client/C in GLOB.admins) - if(C && C.admin_holder && (C.admin_holder.rights & R_MOD)) - if(C.prefs.toggles_sound & SOUND_ADMINHELP) - sound_to(C, 'sound/effects/adminhelp_new.ogg') - to_chat(C, msg) - times_repeated++ diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 23da8cc8c9eb..3d544dca1390 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -131,7 +131,7 @@ SUBSYSTEM_DEF(atoms) switch(result) if (INITIALIZE_HINT_NORMAL) - // pass + pass() if(INITIALIZE_HINT_LATELOAD) if(arguments[1]) //mapload late_loaders += A diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm index 25200cce11ed..b98187ca252c 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -1,22 +1,19 @@ -var/list/active_diseases = list() - - SUBSYSTEM_DEF(disease) name = "Disease" wait = 2 SECONDS flags = SS_NO_INIT | SS_KEEP_TIMING priority = SS_PRIORITY_DISEASE - var/list/currentrun = list() + var/list/datum/disease/all_diseases = list() + var/list/datum/disease/currentrun = list() /datum/controller/subsystem/disease/stat_entry(msg) - msg = "P:[active_diseases.len]" + msg = "P:[all_diseases.len]" return ..() - /datum/controller/subsystem/disease/fire(resumed = FALSE) if (!resumed) - currentrun = active_diseases.Copy() + currentrun = all_diseases.Copy() while (currentrun.len) var/datum/disease/D = currentrun[currentrun.len] diff --git a/code/controllers/subsystem/fail_to_topic.dm b/code/controllers/subsystem/fail_to_topic.dm deleted file mode 100644 index 45674683a443..000000000000 --- a/code/controllers/subsystem/fail_to_topic.dm +++ /dev/null @@ -1,81 +0,0 @@ -SUBSYSTEM_DEF(fail_to_topic) - name = "Fail to Topic" - init_order = SS_INIT_FAIL_TO_TOPIC - flags = SS_BACKGROUND - runlevels = ALL - - var/list/rate_limiting = list() - var/list/fail_counts = list() - var/list/active_bans = list() - var/list/currentrun = list() - - var/rate_limit - var/max_fails - var/enabled = FALSE - -/datum/controller/subsystem/fail_to_topic/Initialize(timeofday) - rate_limit = ((CONFIG_GET(number/topic_rate_limit)) SECONDS) - max_fails = CONFIG_GET(number/topic_max_fails) - enabled = CONFIG_GET(flag/topic_enabled) - - if (world.system_type == UNIX && enabled) - enabled = FALSE - WARNING("fail_to_topic subsystem disabled. UNIX is not supported.") - return SS_INIT_NO_NEED - - if (!enabled) - can_fire = FALSE - return SS_INIT_NO_NEED - - return SS_INIT_SUCCESS - -/datum/controller/subsystem/fail_to_topic/fire(resumed = FALSE) - if(!resumed) - currentrun = rate_limiting.Copy() - //cache for sanic speed (lists are references anyways) - var/list/current_run = currentrun - - while(current_run.len) - var/ip = current_run[current_run.len] - var/last_attempt = current_run[ip] - current_run.len-- - - // last_attempt list housekeeping - if(world.time - last_attempt > rate_limit) - rate_limiting -= ip - fail_counts -= ip - - if(MC_TICK_CHECK) - return - -/datum/controller/subsystem/fail_to_topic/proc/IsRateLimited(ip) - if(!enabled) - return FALSE - - var/last_attempt = rate_limiting[ip] - - if (config.fail_to_topic_whitelisted_ips[ip]) - return FALSE - - if (active_bans[ip]) - return TRUE - - rate_limiting[ip] = world.time - - if (isnull(last_attempt)) - return FALSE - - if (world.time - last_attempt > rate_limit) - fail_counts -= ip - return FALSE - else - var/failures = fail_counts[ip] - - if (isnull(failures)) - fail_counts[ip] = 1 - return TRUE - else if (failures > max_fails) - return TRUE - else - fail_counts[ip] = failures + 1 - return TRUE diff --git a/code/controllers/subsystem/fast_machinery.dm b/code/controllers/subsystem/fast_machinery.dm deleted file mode 100644 index 8211b3b5e310..000000000000 --- a/code/controllers/subsystem/fast_machinery.dm +++ /dev/null @@ -1,27 +0,0 @@ -var/list/fast_machines = list() - - -SUBSYSTEM_DEF(fast_machinery) - name = "Fast Machinery" - wait = 0.7 SECONDS - priority = SS_PRIORITY_FAST_MACHINERY - flags = SS_NO_INIT - var/list/currentrun = list() - -/datum/controller/subsystem/fast_machinery/stat_entry(msg) - msg = "FP:[fast_machines.len]" - return ..() - -/datum/controller/subsystem/fast_machinery/fire(resumed = FALSE) - if(!resumed) - currentrun = fast_machines.Copy() - while(currentrun.len) - var/obj/structure/machinery/M = currentrun[currentrun.len] - currentrun.len-- - - if(QDELETED(M)) - continue - - M.process() - if(MC_TICK_CHECK) - return diff --git a/code/controllers/subsystem/game_decorator.dm b/code/controllers/subsystem/game_decorator.dm new file mode 100644 index 000000000000..cfee0406f84a --- /dev/null +++ b/code/controllers/subsystem/game_decorator.dm @@ -0,0 +1,35 @@ +// Essentially the same as decorators but that apply to the whole game state instead of individual atoms +SUBSYSTEM_DEF(game_decorator) + name = "Game Decorator" + init_order = SS_INIT_DECORATOR + flags = SS_NO_FIRE + +/datum/controller/subsystem/game_decorator/Initialize() + . = ..() + for(var/decorator_type in subtypesof(/datum/game_decorator)) + var/datum/game_decorator/decorator = new decorator_type() + if(!decorator.is_active_decor()) + continue + if(!decorator.defer_decoration) + decorator.decorate() + CHECK_TICK + + return SS_INIT_SUCCESS + +/datum/game_decorator + var/defer_decoration = TRUE //! So map decoration is done post-setup after nightmare and spawners + +/datum/game_decorator/New() + if(defer_decoration) + RegisterSignal(SSdcs, COMSIG_GLOB_MODE_POSTSETUP, PROC_REF(defered_decoration)) + +/datum/game_decorator/proc/is_active_decor() + return FALSE + +/datum/game_decorator/proc/defered_decoration(dcs) + SIGNAL_HANDLER + decorate() + +/datum/game_decorator/proc/decorate() + set waitfor = FALSE + return diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm new file mode 100644 index 000000000000..55b5aa75caf8 --- /dev/null +++ b/code/controllers/subsystem/hijack.dm @@ -0,0 +1,429 @@ +SUBSYSTEM_DEF(hijack) + name = "Hijack" + wait = 2 SECONDS + flags = SS_KEEP_TIMING + priority = SS_PRIORITY_HIJACK + init_order = SS_INIT_HIJACK + + ///Required progress to evacuate safely via lifeboats + var/required_progress = 100 + + ///Current progress towards evacuating safely via lifeboats + var/current_progress = 0 + + /// How much progress is required to early launch + var/early_launch_required_progress = 25 + + ///The estimated time left to get to the safe evacuation point + var/estimated_time_left = 0 + + ///Areas that are marked as having progress, assoc list that is progress_area = boolean, the boolean indicating if it was progressing or not on the last fire() + var/list/area/progress_areas = list() + + ///The areas that need cycled through currently + var/list/area/current_run = list() + + ///The progress of the current run that needs to be added at the end of the current run + var/current_run_progress_additive = 0 + + ///Holds what the current_run_progress_additive should be multiplied by at the end of the current run + var/current_run_progress_multiplicative = 1 + + ///Holds the progress change from last run + var/last_run_progress_change = 0 + + ///Holds the next % point progress should be announced, increments on itself + var/announce_checkpoint = 25 + + ///What stage of evacuation we are currently on + var/evac_status = EVACUATION_STATUS_NOT_INITIATED + + ///What stage of hijack are we currently on + var/hijack_status = HIJACK_OBJECTIVES_NOT_STARTED + + ///Whether or not evacuation has been disabled by admins + var/evac_admin_denied = FALSE + + /// If TRUE, self destruct has been unlocked and is possible with a hold of reactor + var/sd_unlocked = FALSE + + /// Admin var to manually prevent self destruct from occurring + var/admin_sd_blocked = FALSE + + /// Maximum amount of fusion generators that can be overloaded at once for a time benefit + var/maximum_overload_generators = 18 + + /// How many generators are currently overloaded + var/overloaded_generators = 0 + + /// How long the manual self destruct will take on the high end + var/sd_max_time = 15 MINUTES + + /// How long the manual self destruct will take on the low end + var/sd_min_time = 5 MINUTES + + /// How much time left until SD detonates + var/sd_time_remaining = 0 + + /// Roughly what % of the SD countdown remains + var/percent_completion_remaining = 100 + + /// If the engine room has been heated, occurs at 33% SD completion + var/engine_room_heated = FALSE + + /// If the engine room has been superheated, occurs at 66% SD completion + var/engine_room_superheated = FALSE + + /// If the self destruct has/is detonating + var/sd_detonated = FALSE + + /// If a generator has ever been overloaded in the past this round + var/generator_ever_overloaded = FALSE + + /// If ARES has announced the 50% point yet for SD + var/ares_sd_announced = FALSE + +/datum/controller/subsystem/hijack/Initialize(timeofday) + RegisterSignal(SSdcs, COMSIG_GLOB_GENERATOR_SET_OVERLOADING, PROC_REF(on_generator_overload)) + return SS_INIT_SUCCESS + +/datum/controller/subsystem/hijack/stat_entry(msg) + if(!SSticker?.mode?.is_in_endgame) + msg = " Not Hijack" + return ..() + + if(current_progress >= required_progress) + msg = " Complete" + return ..() + + msg = " Progress: [current_progress]% | Last run: [last_run_progress_change]" + return ..() + +/datum/controller/subsystem/hijack/fire(resumed = FALSE) + if(!SSticker?.mode?.is_in_endgame) + return + + if(hijack_status < HIJACK_OBJECTIVES_STARTED) + hijack_status = HIJACK_OBJECTIVES_STARTED + + if(current_progress >= required_progress) + if(hijack_status < HIJACK_OBJECTIVES_COMPLETE) + hijack_status = HIJACK_OBJECTIVES_COMPLETE + + if(sd_unlocked && overloaded_generators) + sd_time_remaining -= wait + if(!engine_room_heated && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.66))) + heat_engine_room() + + if(!ares_sd_announced && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.5))) + announce_sd_halfway() + + if(!engine_room_superheated && (sd_time_remaining <= (max((1 - round(overloaded_generators / maximum_overload_generators, 0.01)) * sd_max_time, sd_min_time) * 0.33))) + superheat_engine_room() + + if((sd_time_remaining <= 0) && !sd_detonated) + detonate_sd() + + return + + if(!resumed) + current_run = progress_areas.Copy() + + for(var/area/almayer/cycled_area as anything in current_run) + current_run -= cycled_area + + if(progress_areas[cycled_area] != cycled_area.power_equip) + progress_areas[cycled_area] = !progress_areas[cycled_area] + announce_area_power_change(cycled_area) + + if(progress_areas[cycled_area]) + switch(cycled_area.hijack_evacuation_type) + if(EVACUATION_TYPE_ADDITIVE) + current_run_progress_additive += cycled_area.hijack_evacuation_weight + if(EVACUATION_TYPE_MULTIPLICATIVE) + current_run_progress_multiplicative *= cycled_area.hijack_evacuation_weight + + if (MC_TICK_CHECK) + return + + last_run_progress_change = current_run_progress_additive * current_run_progress_multiplicative + current_progress += last_run_progress_change + + if(last_run_progress_change) + estimated_time_left = ((required_progress - current_progress) / last_run_progress_change) * wait + else + estimated_time_left = INFINITY + + if(current_progress >= announce_checkpoint) + announce_progress() + announce_checkpoint += initial(announce_checkpoint) + + current_run_progress_additive = 0 + current_run_progress_multiplicative = 1 + +///Called when the xeno dropship crashes into the Almayer and announces the current status of various objectives to marines +/datum/controller/subsystem/hijack/proc/announce_status_on_crash() + var/message = "" + + for(var/area/cycled_area as anything in progress_areas) + message += "[cycled_area] - [cycled_area.power_equip ? "Online" : "Offline"]\n" + progress_areas[cycled_area] = cycled_area.power_equip + + message += "\nDue to low orbit, extra fuel is required for non-surface evacuations.\nMaintain fueling functionality for optimal evacuation conditions." + + marine_announcement(message, HIJACK_ANNOUNCE) + +///Called when an area power status is changed to announce that it has been changed +/datum/controller/subsystem/hijack/proc/announce_area_power_change(area/changed_area) + var/message = "[changed_area] - [changed_area.power_equip ? "Online" : "Offline"]" + + marine_announcement(message, HIJACK_ANNOUNCE) + +///Called to announce to xenos the state of evacuation progression +/datum/controller/subsystem/hijack/proc/announce_progress() + var/announce = announce_checkpoint / initial(announce_checkpoint) + + var/marine_warning_areas = "" + var/xeno_warning_areas = "" + + for(var/area/cycled_area as anything in progress_areas) + if(cycled_area.power_equip) + xeno_warning_areas += "[cycled_area], " + continue + marine_warning_areas += "[cycled_area], " + + if(xeno_warning_areas) + xeno_warning_areas = copytext(xeno_warning_areas, 1, -2) + + if(marine_warning_areas) + marine_warning_areas = copytext(marine_warning_areas, 1, -2) + + var/datum/hive_status/hive + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!length(hive.totalXenos)) + continue + + switch(announce) + if(1) + xeno_announcement(SPAN_XENOANNOUNCE("The talls are a quarter of the way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE) + if(2) + xeno_announcement(SPAN_XENOANNOUNCE("The talls are half way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE) + if(3) + xeno_announcement(SPAN_XENOANNOUNCE("The talls are three quarters of the way towards their goals. Disable the following areas: [xeno_warning_areas]"), hive.hivenumber, XENO_HIJACK_ANNOUNCE) + if(4) + xeno_announcement(SPAN_XENOANNOUNCE("The talls have completed their goals!"), hive.hivenumber, XENO_HIJACK_ANNOUNCE) + + switch(announce) + if(1) + marine_announcement("Emergency fuel replenishment at 25 percent. Lifeboat emergency early launch now available.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + if(2) + marine_announcement("Emergency fuel replenishment at 50 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + if(3) + marine_announcement("Emergency fuel replenishment at 75 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + if(4) + marine_announcement("Emergency fuel replenishment at 100 percent. Safe utilization of lifeboats now possible.", HIJACK_ANNOUNCE) + if(!admin_sd_blocked) + addtimer(CALLBACK(src, PROC_REF(unlock_self_destruct)), 8 SECONDS) + +/// Passes the ETA for status panels +/datum/controller/subsystem/hijack/proc/get_evac_eta() + switch(hijack_status) + if(HIJACK_OBJECTIVES_STARTED) + if(estimated_time_left == INFINITY) + return "Never" + return "[duration2text_sec(estimated_time_left)]" + + if(HIJACK_OBJECTIVES_COMPLETE) + return "Complete" + +/datum/controller/subsystem/hijack/proc/get_sd_eta() + if(!sd_time_remaining) + return "Complete" + + if(overloaded_generators <= 0) + return "Never" + + return "[duration2text_sec(sd_time_remaining)]" + +//~~~~~~~~~~~~~~~~~~~~~~~~ EVAC STUFF ~~~~~~~~~~~~~~~~~~~~~~~~// + +/// Initiates evacuation by announcing and then prepping all lifepods/lifeboats +/datum/controller/subsystem/hijack/proc/initiate_evacuation() + if(evac_status == EVACUATION_STATUS_NOT_INITIATED && !(evac_admin_denied & FLAGS_EVACUATION_DENY)) + evac_status = EVACUATION_STATUS_INITIATED + ai_announcement("Attention. Emergency. All personnel must evacuate immediately.", 'sound/AI/evacuate.ogg') + + for(var/obj/structure/machinery/status_display/cycled_status_display in machines) + if(is_mainship_level(cycled_status_display.z)) + cycled_status_display.set_picture("evac") + for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) + shuttle.prepare_evac() + activate_lifeboats() + return TRUE + +/// Cancels evacuation, tells lifepods/lifeboats and status_displays +/datum/controller/subsystem/hijack/proc/cancel_evacuation() + if(evac_status == EVACUATION_STATUS_INITIATED) + evac_status = EVACUATION_STATUS_NOT_INITIATED + deactivate_lifeboats() + ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg') + + for(var/obj/structure/machinery/status_display/cycled_status_display in machines) + if(is_mainship_level(cycled_status_display.z)) + cycled_status_display.set_sec_level_picture() + + for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) + shuttle.cancel_evac() + return TRUE + +/// Opens the lifeboat doors and gets them ready to launch +/datum/controller/subsystem/hijack/proc/activate_lifeboats() + for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() + if(lifeboat && lifeboat.available) + lifeboat.status = LIFEBOAT_ACTIVE + lifeboat_dock.open_dock() + +/// Turns off ability to manually take off lifeboats +/datum/controller/subsystem/hijack/proc/deactivate_lifeboats() + for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() + if(lifeboat && lifeboat.available) + lifeboat.status = LIFEBOAT_INACTIVE + + +/// Once refueling is done, marines can optionally hold SD for a time for a stalemate instead of a xeno minor +/datum/controller/subsystem/hijack/proc/unlock_self_destruct() + sd_time_remaining = sd_max_time + sd_unlocked = TRUE + marine_announcement("Fuel reserves full. Manual detonation of fuel reserves by overloading the on-board fusion reactors now possible.", HIJACK_ANNOUNCE) + +/datum/controller/subsystem/hijack/proc/on_generator_overload(obj/structure/machinery/power/fusion_engine/source, new_overloading) + SIGNAL_HANDLER + + if(!generator_ever_overloaded) + generator_ever_overloaded = TRUE + var/datum/hive_status/hive + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!length(hive.totalXenos)) + continue + + xeno_announcement(SPAN_XENOANNOUNCE("The talls may be attempting to take their ship down with them in Engineering, stop them!"), hive.hivenumber, XENO_HIJACK_ANNOUNCE) + + adjust_generator_overload_count(new_overloading ? 1 : -1) + +/datum/controller/subsystem/hijack/proc/adjust_generator_overload_count(amount = 1) + var/generator_overload_percent = round(overloaded_generators / maximum_overload_generators, 0.01) + var/old_required_time = sd_min_time + ((1 - generator_overload_percent) * (sd_max_time - sd_min_time)) + percent_completion_remaining = sd_time_remaining / old_required_time + overloaded_generators = clamp(overloaded_generators + amount, 0, maximum_overload_generators) + generator_overload_percent = round(overloaded_generators / maximum_overload_generators, 0.01) + var/new_required_time = sd_min_time + ((1 - generator_overload_percent) * (sd_max_time - sd_min_time)) + sd_time_remaining = percent_completion_remaining * new_required_time + +/datum/controller/subsystem/hijack/proc/heat_engine_room() + engine_room_heated = TRUE + var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core] + engine_room.firealert() + engine_room.temperature = T90C + for(var/mob/current_mob as anything in GLOB.mob_list) + var/area/mob_area = get_area(current_mob) + if(istype(mob_area, /area/almayer/engineering/engine_core)) + to_chat(current_mob, SPAN_BOLDWARNING("You feel the heat of the room increase as the fusion engines whirr louder.")) + +/datum/controller/subsystem/hijack/proc/superheat_engine_room() + engine_room_superheated = TRUE + var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core] + engine_room.firealert() + engine_room.temperature = T120C //slowly deals burn at this temp + for(var/mob/current_mob as anything in GLOB.mob_list) + var/area/mob_area = get_area(current_mob) + if(istype(mob_area, /area/almayer/engineering/engine_core)) + to_chat(current_mob, SPAN_BOLDWARNING("The room feels incredibly hot, you can't take much more of this!")) + +/datum/controller/subsystem/hijack/proc/announce_sd_halfway() + ares_sd_announced = TRUE + marine_announcement("ALERT: Fusion reactor meltdown has reached fifty percent.", HIJACK_ANNOUNCE) + +/datum/controller/subsystem/hijack/proc/detonate_sd() + set waitfor = FALSE + sd_detonated = TRUE + var/creak_picked = pick('sound/effects/creak1.ogg', 'sound/effects/creak2.ogg', 'sound/effects/creak3.ogg') + for(var/mob/current_mob as anything in GLOB.mob_list) + var/turf/current_turf = get_turf(current_mob) + if(!current_mob?.loc || !current_mob.client || !current_turf || !is_mainship_level(current_turf.z)) + continue + + to_chat(current_mob, SPAN_BOLDWARNING("The ship's deck worryingly creaks underneath you.")) + playsound_client(current_mob.client, creak_picked, vol = 50) + + sleep(7 SECONDS) + shakeship(2, 10, TRUE) + + marine_announcement("ALERT: Fusion reactors dangerously overloaded. Runaway meltdown in reactor core imminent.", HIJACK_ANNOUNCE) + sleep(5 SECONDS) + + var/sound_picked = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + for(var/client/player as anything in GLOB.clients) + playsound_client(player, sound_picked, 90) + + var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s). + var/list/dead_mobs = list() //Everyone who only needs to see the cinematic. + for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting. + var/turf/current_turf = get_turf(current_mob) + if(!current_mob?.loc || !current_turf) + continue + + if(current_mob.stat == DEAD) + dead_mobs |= current_mob + continue + + if(is_mainship_level(current_turf.z)) + alive_mobs |= current_mob + shake_camera(current_mob, 110, 4) + + + sleep(10 SECONDS) + /*Hardcoded for now, since this was never really used for anything else. + Would ideally use a better system for showing cutscenes.*/ + var/atom/movable/screen/cinematic/explosion/explosive_cinematic = new() + + for(var/mob/current_mob as anything in (alive_mobs + dead_mobs)) + if(current_mob?.loc && current_mob.client) + current_mob.client.add_to_screen(explosive_cinematic) //They may have disconnected in the mean time. + + sleep(1.5 SECONDS) //Extra 1.5 seconds to look at the ship. + flick("intro_nuke", explosive_cinematic) + + sleep(3.5 SECONDS) + for(var/mob/current_mob as anything in alive_mobs) + var/turf/current_mob_turf = get_turf(current_mob) + if(!current_mob?.loc || !current_mob_turf) //Who knows, maybe they escaped, or don't exist anymore. + continue + + if(is_mainship_level(current_mob_turf.z)) + if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge)) + continue + + current_mob.death(create_cause_data("nuclear explosion")) + else + current_mob.client.remove_from_screen(explosive_cinematic) //those who managed to escape the z level at last second shouldn't have their view obstructed. + + flick("ship_destroyed", explosive_cinematic) + explosive_cinematic.icon_state = "summary_destroyed" + + for(var/client/player as anything in GLOB.clients) + playsound_client(player, 'sound/effects/explosionfar.ogg', 90) + + + sleep(0.5 SECONDS) + if(SSticker.mode) + SSticker.mode.check_win() + + if(!SSticker.mode) //Just a safety, just in case a mode isn't running, somehow. + to_world(SPAN_ROUNDBODY("Resetting in 30 seconds!")) + sleep(30 SECONDS) + log_game("Rebooting due to nuclear detonation.") + world.Reboot() diff --git a/code/controllers/subsystem/htmlui.dm b/code/controllers/subsystem/htmlui.dm deleted file mode 100644 index 5dc885abc625..000000000000 --- a/code/controllers/subsystem/htmlui.dm +++ /dev/null @@ -1,57 +0,0 @@ -// What in the name of god is this? -// You'd think it'd be some form of process for the HTML interface module. -// But it isn't? -// It's some form of proc queue but ??? -// Does anything even *use* this? - -SUBSYSTEM_DEF(html_ui) - name = "HTMLUI" - wait = 1.7 SECONDS - flags = SS_NO_INIT - runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY - var/list/update = list() - -/datum/controller/subsystem/html_ui/fire(resumed = FALSE) - if (update.len) - var/list/L = list() - var/key - - for (var/datum/procqueue_item/item in update) - key = "[item.ref]_[item.procname]" - - if (item.args) - key += "(" - var/first = 1 - for (var/a in item.args) - if (!first) - key += "," - key += "[a]" - first = 0 - key += ")" - - if (!(key in L)) - if (item.args) - call(item.ref, item.procname)(arglist(item.args)) - else - call(item.ref, item.procname)() - - L.Add(key) - - update.Cut() - - -/datum/controller/subsystem/html_ui/proc/queue(ref, procname, ...) - var/datum/procqueue_item/item = new - item.ref = ref - item.procname = procname - - if (args.len > 2) - item.args = args.Copy(3) - - update.Insert(1, item) - - -/datum/procqueue_item - var/ref - var/procname - var/list/args diff --git a/code/controllers/subsystem/inactivity.dm b/code/controllers/subsystem/inactivity.dm index dd547e1f406b..5edd4e8c5294 100644 --- a/code/controllers/subsystem/inactivity.dm +++ b/code/controllers/subsystem/inactivity.dm @@ -1,20 +1,26 @@ -#define INACTIVITY_KICK 6000 //10 minutes in ticks (approx.) +#define INACTIVITY_KICK 10 MINUTES SUBSYSTEM_DEF(inactivity) name = "Inactivity" - wait = INACTIVITY_KICK + wait = 1 MINUTES flags = SS_NO_INIT | SS_BACKGROUND priority = SS_PRIORITY_INACTIVITY runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY /datum/controller/subsystem/inactivity/fire(resumed = FALSE) - if (CONFIG_GET(flag/kick_inactive)) - for(var/i in GLOB.clients) - var/client/C = i - if(C.admin_holder && C.admin_holder.rights & R_ADMIN) //Skip admins. - continue - if (C.is_afk(INACTIVITY_KICK)) - if (!istype(C.mob, /mob/dead)) - log_access("AFK: [key_name(C)]") - to_chat(C, SPAN_WARNING("You have been inactive for more than 10 minutes and have been disconnected.")) - qdel(C) + if(list_clear_nulls(GLOB.clients)) + debug_log("Removed nulls from GLOB.clients!") + if(list_clear_nulls(GLOB.player_list)) + debug_log("Removed nulls from GLOB.player_list!") + + if (!CONFIG_GET(flag/kick_inactive)) + return + + for(var/client/current as anything in GLOB.clients) + if(current.admin_holder && current.admin_holder.rights & R_ADMIN) //Skip admins. + continue + if(current.is_afk(INACTIVITY_KICK)) + if(!istype(current.mob, /mob/dead)) + log_access("AFK: [key_name(current)]") + to_chat(current, SPAN_WARNING("You have been inactive for more than [INACTIVITY_KICK / 600] minutes and have been disconnected.")) + qdel(current) diff --git a/code/controllers/subsystem/init/earlyruntimes.dm b/code/controllers/subsystem/init/earlyruntimes.dm deleted file mode 100644 index 8e43b94a0735..000000000000 --- a/code/controllers/subsystem/init/earlyruntimes.dm +++ /dev/null @@ -1,14 +0,0 @@ -/// Just messages the unwary coder to tell them there are errors that likely escaped their debugguer. -SUBSYSTEM_DEF(earlyruntimes) - name = "Early Runtimes" - init_order = SS_INIT_EARLYRUNTIMES - flags = SS_NO_FIRE - -/datum/controller/subsystem/earlyruntimes/stat_entry(msg) - msg = " Early Runtimes: [init_runtimes_count || 0] | All runtimes: [total_runtimes || 0]" - return ..() - -/datum/controller/subsystem/earlyruntimes/Initialize() - if(init_runtimes_count) - return SS_INIT_FAILURE - return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/init/law.dm b/code/controllers/subsystem/init/law.dm index 52fbbbeadf5d..c7ade815972c 100644 --- a/code/controllers/subsystem/init/law.dm +++ b/code/controllers/subsystem/init/law.dm @@ -8,20 +8,24 @@ SUBSYSTEM_DEF(law_init) var/list/minor_law = list() var/list/major_law = list() var/list/capital_law = list() + var/list/precautionary_law = list() /datum/controller/subsystem/law_init/Initialize() - for(var/L in subtypesof(/datum/law/optional_law)) - optional_law += new L + for(var/law in subtypesof(/datum/law/optional_law)) + optional_law += new law - for(var/L in subtypesof(/datum/law/minor_law)) - minor_law += new L + for(var/law in subtypesof(/datum/law/minor_law)) + minor_law += new law - for(var/L in subtypesof(/datum/law/major_law)) - major_law += new L + for(var/law in subtypesof(/datum/law/major_law)) + major_law += new law - for(var/L in subtypesof(/datum/law/capital_law)) - capital_law += new L + for(var/law in subtypesof(/datum/law/capital_law)) + capital_law += new law - laws = optional_law + minor_law + major_law + capital_law + for(var/law in subtypesof(/datum/law/precautionary_charge)) + precautionary_law += new law + + laws = optional_law + minor_law + major_law + capital_law + precautionary_law return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/interior.dm b/code/controllers/subsystem/interior.dm index 389e95fe6022..8fb7ffbfeee7 100644 --- a/code/controllers/subsystem/interior.dm +++ b/code/controllers/subsystem/interior.dm @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(interior) continue if(x >= bounds[1].x && x <= bounds[2].x && y >= bounds[1].y && y <= bounds[2].y) return current_interior - return FALSE + return /// Checks if an atom is in an interior /datum/controller/subsystem/interior/proc/in_interior(loc) @@ -51,7 +51,7 @@ SUBSYSTEM_DEF(interior) if(!isturf(loc)) loc = get_turf(loc) - var/datum/turf_reservation/interior/reservation = SSmapping.used_turfs[loc] + var/datum/weakref/reservation = SSmapping.used_turfs[loc] if(!istype(reservation)) return FALSE diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index afecabd74be0..913e5dcd50d3 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -6,9 +6,13 @@ SUBSYSTEM_DEF(mapping) var/list/datum/map_config/configs var/list/datum/map_config/next_map_configs + ///Name of all maps var/list/map_templates = list() - + ///Name of all shuttles var/list/shuttle_templates = list() + var/list/all_shuttle_templates = list() + ///map_id of all tents + var/list/tent_type_templates = list() var/list/areas_in_z = list() @@ -29,9 +33,7 @@ SUBSYSTEM_DEF(mapping) /datum/controller/subsystem/mapping/proc/HACK_LoadMapConfig() if(!configs) configs = load_map_configs(ALL_MAPTYPES, error_if_missing = FALSE) - for(var/i in GLOB.clients) - var/client/C = i - winset(C, null, "mainwindow.title='[CONFIG_GET(string/title)] - [SSmapping.configs[SHIP_MAP].map_name]'") + world.name = "[CONFIG_GET(string/title)] - [SSmapping.configs[SHIP_MAP].map_name]" /datum/controller/subsystem/mapping/Initialize(timeofday) HACK_LoadMapConfig() @@ -202,6 +204,7 @@ SUBSYSTEM_DEF(mapping) map_templates[T.name] = T preloadShuttleTemplates() + preload_tent_templates() /proc/generateMapList(filename) . = list() @@ -240,8 +243,14 @@ SUBSYSTEM_DEF(mapping) var/datum/map_template/shuttle/S = new shuttle_type() shuttle_templates[S.shuttle_id] = S + all_shuttle_templates[item] = S map_templates[S.shuttle_id] = S +/datum/controller/subsystem/mapping/proc/preload_tent_templates() + for(var/template in subtypesof(/datum/map_template/tent)) + var/datum/map_template/tent/new_tent = new template() + tent_type_templates[new_tent.map_id] = new_tent + /datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override) UNTIL(initialized && !clearing_reserved_turfs) var/datum/turf_reservation/reserve = new type diff --git a/code/controllers/subsystem/midi.dm b/code/controllers/subsystem/midi.dm deleted file mode 100644 index 158d67cf25ac..000000000000 --- a/code/controllers/subsystem/midi.dm +++ /dev/null @@ -1,45 +0,0 @@ -/datum/midi_record - var/target - var/midi - -SUBSYSTEM_DEF(midi) - name = "Midi" - wait = 2 SECONDS - flags = SS_NO_INIT|SS_BACKGROUND - runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY - priority = SS_PRIORITY_MIDI - - var/list/datum/midi_record/prepped_midis = list() - - var/list/datum/midi_record/currentrun = list() - - -/datum/controller/subsystem/midi/stat_entry(msg) - msg = "MR:[prepped_midis.len]" - return ..() - - -/datum/controller/subsystem/midi/fire(resumed = FALSE) - if (!resumed) - currentrun = prepped_midis - prepped_midis = list() - - while (currentrun.len) - var/datum/midi_record/E = currentrun[currentrun.len] - currentrun.len-- - - if (!E) - continue - - E.target << E.midi - - if (MC_TICK_CHECK) - return - -/datum/controller/subsystem/midi/proc/queue(target, midi) - if(!prepped_midis) - prepped_midis = list() - var/datum/midi_record/MR = new() - MR.target = target - MR.midi = midi - prepped_midis.Add(MR) diff --git a/code/controllers/subsystem/processing/defprocess.dm b/code/controllers/subsystem/processing/defprocess.dm new file mode 100644 index 000000000000..3701a0617a7a --- /dev/null +++ b/code/controllers/subsystem/processing/defprocess.dm @@ -0,0 +1,5 @@ +PROCESSING_SUBSYSTEM_DEF(defprocess) + name = "Defenses Processing" + priority = SS_PRIORITY_DEFENSES + flags = SS_NO_INIT + wait = 0.7 SECONDS diff --git a/code/controllers/subsystem/smoke_system.dm b/code/controllers/subsystem/smoke_system.dm deleted file mode 100644 index 2010687fcba2..000000000000 --- a/code/controllers/subsystem/smoke_system.dm +++ /dev/null @@ -1,31 +0,0 @@ -var/list/active_smoke_effects = list() - - -SUBSYSTEM_DEF(smoke_effects) - name = "Smoke Effects" - wait = 1 SECONDS - flags = SS_NO_INIT | SS_KEEP_TIMING - priority = SS_PRIORITY_OBJECTS - - var/list/currentrun = list() - -/datum/controller/subsystem/smoke_effects/stat_entry(msg) - msg = "P:[active_smoke_effects.len]" - return ..() - - -/datum/controller/subsystem/smoke_effects/fire(resumed = FALSE) - if(!resumed) - currentrun = active_smoke_effects.Copy() - - while(currentrun.len) - var/obj/effect/particle_effect/smoke/E = currentrun[currentrun.len] - currentrun.len-- - - if(!E || QDELETED(E)) - continue - - E.process() - - if(MC_TICK_CHECK) - return diff --git a/code/controllers/subsystem/sound.dm b/code/controllers/subsystem/sound.dm index 1935294394e7..4fdfd7935349 100644 --- a/code/controllers/subsystem/sound.dm +++ b/code/controllers/subsystem/sound.dm @@ -41,5 +41,5 @@ SUBSYSTEM_DEF(sound) if(VI?.ready) var/list/bounds = VI.get_middle_coords() if(bounds.len >= 2) - hearers |= SSquadtree.players_in_range(RECT(bounds[1], bounds[2], VI.map_template.height, VI.map_template.width), bounds[3]) + hearers |= SSquadtree.players_in_range(RECT(bounds[1], bounds[2], VI.map_template.width, VI.map_template.height), bounds[3]) template_queue[template] = hearers diff --git a/code/controllers/subsystem/stamina.dm b/code/controllers/subsystem/stamina.dm deleted file mode 100644 index 84d5b4038cd0..000000000000 --- a/code/controllers/subsystem/stamina.dm +++ /dev/null @@ -1,25 +0,0 @@ -var/global/list/active_staminas = list() - -SUBSYSTEM_DEF(stamina) - name = "Stamina" - wait = 2 SECONDS - priority = SS_PRIORITY_STAMINA - flags = SS_NO_INIT - var/list/currentrun = list() - - -/datum/controller/subsystem/stamina/fire(resumed = FALSE) - if (!resumed) - currentrun = active_staminas.Copy() - - while (currentrun.len) - var/datum/stamina/S = currentrun[currentrun.len] - currentrun.len-- - - if (!S || QDELETED(S)) - continue - - S.process() - - if (MC_TICK_CHECK) - return diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 1f94e67a8c33..b65ca1e758a2 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -44,6 +44,9 @@ SUBSYSTEM_DEF(statpanels) var/client/target = currentrun[length(currentrun)] currentrun.len-- + if(!target) + continue + if(!target.stat_panel.is_ready()) continue @@ -313,14 +316,39 @@ SUBSYSTEM_DEF(statpanels) for(index in 1 to length(to_make)) var/atom/thing = to_make[index] + // var/start_time = REALTIMEOFDAY var/generated_string - /* We're cheap and won't render all overlays. It's expensive and updates with onmob changes! - if(ismob(thing) || length(thing.overlays) > 2) - generated_string = costly_icon2html(thing, parent, sourceonly=TRUE) + // We're cheap and won't render all overlays. It's expensive and updates with onmob changes! + //if(ismob(thing) || length(thing.overlays) > 2) + //generated_string = costly_icon2html(thing, parent, sourceonly=TRUE) + if(ishuman(thing)) + var/mob/living/carbon/human/human_thing = thing + var/icon + + // Ensure they have their armor since its going to be the majority of their appearance + var/list/armor = list() + var/obj/item/uniform = human_thing.get_item_by_slot(WEAR_BODY) + if(uniform) + armor += new uniform.type + var/obj/item/hat = human_thing.get_item_by_slot(WEAR_HEAD) + if(hat) + armor += new hat.type + var/obj/item/suit = human_thing.get_item_by_slot(WEAR_JACKET) + if(suit) + armor += new suit.type + var/obj/item/gloves = human_thing.get_item_by_slot(WEAR_HANDS) + if(gloves) + armor += new gloves.type + var/obj/item/shoes = human_thing.get_item_by_slot(WEAR_FEET) + if(shoes) + armor += new shoes.type + + // If we don't succeed making a flat human icon below, allowing the human to pass into icon2html will throw a bad icon operation because of a workaround in icon2html for humans... + icon = get_flat_human_copy_icon(human_thing, showDirs = list(SOUTH), outfit_override = armor) + generated_string = icon2html(icon, parent, sourceonly=TRUE) + // log_debug("object_window_info called on ref=[REF(thing)], instance=[thing], type=[thing.type], finished in [(REALTIMEOFDAY-start_time) / 10]s") else generated_string = icon2html(thing, parent, sourceonly=TRUE) - */ - generated_string = icon2html(thing, parent, sourceonly=TRUE) newly_seen[thing] = generated_string if(TICK_CHECK) diff --git a/code/controllers/subsystem/stats_collector.dm b/code/controllers/subsystem/stats_collector.dm deleted file mode 100644 index de66e3b2c6b1..000000000000 --- a/code/controllers/subsystem/stats_collector.dm +++ /dev/null @@ -1,17 +0,0 @@ -/// Collects simple round statistics periodically -SUBSYSTEM_DEF(stats_collector) - name = "Round Stats" - wait = 30 SECONDS - priority = SS_PRIORITY_PAGER_STATUS - runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY - flags = SS_KEEP_TIMING | SS_NO_INIT - - var/stat_ticks = 0 - var/players_counter = 0 - -/datum/controller/subsystem/stats_collector/fire(resumed = FALSE) - players_counter += length(GLOB.clients) - stat_ticks++ - -/datum/controller/subsystem/stats_collector/proc/get_avg_players() - return players_counter / stat_ticks diff --git a/code/controllers/subsystem/teleporter.dm b/code/controllers/subsystem/teleporter.dm deleted file mode 100644 index b753bdb0d519..000000000000 --- a/code/controllers/subsystem/teleporter.dm +++ /dev/null @@ -1,10 +0,0 @@ -// Master teleporter controller. -SUBSYSTEM_DEF(teleporter) - name = "Teleporter" - wait = 5 SECONDS - init_order = SS_INIT_TELEPORTER - priority = SS_PRIORITY_TELEPORTER - flags = SS_NO_FIRE|SS_NO_INIT - - var/list/teleporters_by_id = list() // Associative list of teleporters by ID, master list of teleporters to process - var/list/teleporters = list() // Process list (identical contents to teleporters_by_id) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 3882228a5ab1..a56e10636a1e 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -273,7 +273,7 @@ SUBSYSTEM_DEF(vote) question = "Gamemode vote" randomize_entries = TRUE for(var/mode_type in config.gamemode_cache) - var/datum/game_mode/M = initial(mode_type) + var/datum/game_mode/M = mode_type if(initial(M.config_tag)) var/vote_cycle_met = !initial(M.vote_cycle) || (text2num(SSperf_logging?.round?.id) % initial(M.vote_cycle) == 0) if(initial(M.votable) && vote_cycle_met) diff --git a/code/controllers/subsystem/xenocon.dm b/code/controllers/subsystem/xenocon.dm deleted file mode 100644 index d16e59bd9813..000000000000 --- a/code/controllers/subsystem/xenocon.dm +++ /dev/null @@ -1,18 +0,0 @@ -SUBSYSTEM_DEF(xenocon) - name = "XENOCON" - wait = 5 SECONDS - priority = SS_PRIORITY_INACTIVITY - flags = SS_NO_INIT - var/rewarded = FALSE - -/datum/controller/subsystem/xenocon/fire(resumed = FALSE) - if(rewarded) - return - - var/datum/hive_status/hive - for(var/hivenumber in GLOB.hive_datum) - hive = GLOB.hive_datum[hivenumber] - if(hive.xenocon_points >= XENOCON_THRESHOLD) - var/datum/emergency_call/em_call = new /datum/emergency_call/xenos/platoon() - em_call.activate() - rewarded = TRUE diff --git a/code/datums/_ndatabase/code/brsql_adapter.dm b/code/datums/_ndatabase/code/brsql_adapter.dm index 345ddfe005f3..251267a04fdb 100644 --- a/code/datums/_ndatabase/code/brsql_adapter.dm +++ b/code/datums/_ndatabase/code/brsql_adapter.dm @@ -101,8 +101,8 @@ SSdatabase.create_parametric_query(query_updatetable, qpars, CB) /datum/db/adapter/brsql_adapter/insert_table(table_name, list/values, datum/callback/CB, sync = FALSE) - if(!sync) - set waitfor = 0 + set waitfor = FALSE + var/length = values.len var/list/qpars = list() var/query_inserttable = getquery_insert_table(table_name, values, qpars) @@ -530,7 +530,7 @@ if(first && !is_id) if(!items_first) update_items+="," - update_items+="`[table_name]`.[esfield]=`__prep_update`.[esfield]" + update_items+="`[table_name]`.[esfield]=`subquery`.[esfield]" items_first = FALSE local_first = FALSE calltext += "SELECT [local_text]" @@ -539,9 +539,7 @@ issue_log += "No ID passed to update query." return "" // AAAAAAAAAAAAAH FUCK DON'T JUST KILL THE ENTIRE FUCKING TABLE BRUH return {" - WITH __prep_update as ( - [calltext] - ) UPDATE `[connection.database]`.`[table_name]` INNER JOIN `__prep_update` ON `[table_name]`.id = `__prep_update`.id SET [update_items] + UPDATE `[connection.database]`.`[table_name]` JOIN (WITH `__prep_update` AS ( [calltext] ) SELECT * FROM `__prep_update`) subquery ON `[table_name]`.id = subquery.id SET [update_items] "} /datum/db/adapter/brsql_adapter/proc/getquery_delete_table(table_name, list/ids) diff --git a/code/datums/_ndatabase/code/native_adapter.dm b/code/datums/_ndatabase/code/native_adapter.dm index a5e4d41fb6a0..1c23a6ceab8f 100644 --- a/code/datums/_ndatabase/code/native_adapter.dm +++ b/code/datums/_ndatabase/code/native_adapter.dm @@ -83,8 +83,7 @@ SSdatabase.create_query(query_gettable, CB) /datum/db/adapter/native_adapter/update_table(table_name, list/values, datum/callback/CB, sync = FALSE) - if(!sync) - set waitfor = 0 + set waitfor = FALSE for(var/list/vals in values) var/list/qpars = list() diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm new file mode 100644 index 000000000000..a858c6b1f5a7 --- /dev/null +++ b/code/datums/ammo/ammo.dm @@ -0,0 +1,246 @@ +/datum/ammo + var/name = "generic bullet" + //Icon state when a human is permanently killed with it by execution/suicide. + var/headshot_state = null + var/icon = 'icons/obj/items/weapons/projectiles.dmi' + var/icon_state = "bullet" + /// The icon that is displayed when the bullet bounces off something. + var/ping = "ping_b" + /// When it deals damage. + var/sound_hit + /// When it's blocked by human armor. + var/sound_armor + /// When it misses someone. + var/sound_miss + /// When it bounces off something. + var/sound_bounce + /// When the bullet is absorbed by a xeno_shield + var/sound_shield_hit + /// Snipers use this to simulate poor accuracy at close ranges + var/accurate_range_min = 0 + /// How much the ammo scatters when burst fired, added to gun scatter, along with other mods + var/scatter = 0 + var/stamina_damage = 0 + /// This is the base damage of the bullet as it is fired + var/damage = 0 + /// BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here + var/damage_type = BRUTE + /// How much armor it ignores before calculations take place + var/penetration = 0 + /// The % chance it will imbed in a human + var/shrapnel_chance = 0 + /// The shrapnel type the ammo will embed, if the chance rolls + var/shrapnel_type = 0 + /// Type path of the extra projectiles + var/bonus_projectiles_type + /// How many extra projectiles it shoots out. Works kind of like firing on burst, but all of the projectiles travel together + var/bonus_projectiles_amount = 0 + /// Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony + var/debilitate[] = null + /// how much armor breaking will be done per point of penetration. This is for weapons that penetrate with their shape (like needle bullets) + var/pen_armor_punch = 0.5 + /// how much armor breaking is done by sheer weapon force. This is for big blunt weapons + var/damage_armor_punch = 0.5 + /// if we should play a special sound when firing. + var/sound_override = null + var/flags_ammo_behavior = NO_FLAGS + + /// This is added to the bullet's base accuracy. + var/accuracy = HIT_ACCURACY_TIER_1 + /// How much the accuracy varies when fired. // This REDUCES the lower bound of accuracy variance by 2%, to 96%. + var/accuracy_var_low = PROJECTILE_VARIANCE_TIER_9 + /// This INCREASES the upper bound of accuracy variance by 2%, to 107%. + var/accuracy_var_high = PROJECTILE_VARIANCE_TIER_9 + /// For most guns, this is where the bullet dramatically looses accuracy. Not for snipers though. + var/accurate_range = 6 + /// This will de-increment a counter on the bullet. + var/max_range = 22 + /// Same as with accuracy variance. + var/damage_var_low = PROJECTILE_VARIANCE_TIER_9 + /// This INCREASES the upper bound of damage variance by 2%, to 107%. + var/damage_var_high = PROJECTILE_VARIANCE_TIER_9 + /// How much damage the bullet loses per turf traveled after the effective range + var/damage_falloff = DAMAGE_FALLOFF_TIER_10 + /// How much damage the bullet loses per turf away before the effective range + var/damage_buildup = DAMAGE_BUILDUP_TIER_1 + /// What minimum range the ammo deals full damage, builds up the closer you get. 0 for no minimum. Added onto gun range as a modifier. + var/effective_range_min = EFFECTIVE_RANGE_OFF + /// What maximum range the ammo deals full damage, tapers off using damage_falloff after hitting this value. 0 for no maximum. Added onto gun range as a modifier. + var/effective_range_max = EFFECTIVE_RANGE_OFF + /// How fast the projectile moves. + var/shell_speed = AMMO_SPEED_TIER_1 + + var/handful_type = /obj/item/ammo_magazine/handful + var/handful_color + /// custom handful sprite, for shotgun shells or etc. + var/handful_state = "bullet" + /// so handfuls say 'buckshot shells' not 'shell' + var/multiple_handful_name + + /// Does this apply xenomorph behaviour delegate? + var/apply_delegate = TRUE + + /// An assoc list in the format list(/datum/element/bullet_trait_to_give = list(...args)) + /// that will be given to a projectile with the current ammo datum + var/list/list/traits_to_give + + var/flamer_reagent_type = /datum/reagent/napalm/ut + + /// The flicker that plays when a bullet hits a target. Usually red. Can be nulled so it doesn't show up at all. + var/hit_effect_color = "#FF0000" + +/datum/ammo/New() + set_bullet_traits() + +/datum/ammo/proc/on_bullet_generation(obj/projectile/generated_projectile, mob/bullet_generator) //NOT used on New(), applied to the projectiles. + return + +/// Populate traits_to_give in this proc +/datum/ammo/proc/set_bullet_traits() + return + +/datum/ammo/can_vv_modify() + return FALSE + +/datum/ammo/proc/do_at_half_range(obj/projectile/P) + SHOULD_NOT_SLEEP(TRUE) + return + +/datum/ammo/proc/on_embed(mob/embedded_mob, obj/limb/target_organ) + return + +/datum/ammo/proc/do_at_max_range(obj/projectile/P) + SHOULD_NOT_SLEEP(TRUE) + return + +/datum/ammo/proc/on_shield_block(mob/M, obj/projectile/P) //Does it do something special when shield blocked? Ie. a flare or grenade that still blows up. + return + +/datum/ammo/proc/on_hit_turf(turf/T, obj/projectile/P) //Special effects when hitting dense turfs. + SHOULD_NOT_SLEEP(TRUE) + return + +/datum/ammo/proc/on_hit_mob(mob/M, obj/projectile/P, mob/user) //Special effects when hitting mobs. + SHOULD_NOT_SLEEP(TRUE) + return + +///Special effects when pointblanking mobs. Ultimately called from /living/attackby(). Return TRUE to end the PB attempt. +/datum/ammo/proc/on_pointblank(mob/living/L, obj/projectile/P, mob/living/user, obj/item/weapon/gun/fired_from) + return + +/datum/ammo/proc/on_hit_obj(obj/O, obj/projectile/P) //Special effects when hitting objects. + SHOULD_NOT_SLEEP(TRUE) + return + +/datum/ammo/proc/on_near_target(turf/T, obj/projectile/P) //Special effects when passing near something. Range of things that triggers it is controlled by other ammo flags. + return 0 //return 0 means it flies even after being near something. Return 1 means it stops + +/datum/ammo/proc/knockback(mob/living/living_mob, obj/projectile/fired_projectile, max_range = 2) + if(!living_mob || living_mob == fired_projectile.firer) + return + if(fired_projectile.distance_travelled > max_range || living_mob.lying) + return //Two tiles away or more, basically. + + if(living_mob.mob_size >= MOB_SIZE_BIG) + return //Big xenos are not affected. + + shake_camera(living_mob, 3, 4) + knockback_effects(living_mob, fired_projectile) + slam_back(living_mob, fired_projectile) + +/datum/ammo/proc/slam_back(mob/living/living_mob, obj/projectile/fired_projectile) + /// Either knockback or slam them into an obstacle. + var/direction = Get_Compass_Dir(fired_projectile.z ? fired_projectile : fired_projectile.firer, living_mob) //More precise than get_dir. + if(!direction) //Same tile. + return + if(!step(living_mob, direction)) + living_mob.animation_attack_on(get_step(living_mob, direction)) + playsound(living_mob.loc, "punch", 25, 1) + living_mob.visible_message(SPAN_DANGER("[living_mob] slams into an obstacle!"), + isxeno(living_mob) ? SPAN_XENODANGER("You slam into an obstacle!") : SPAN_HIGHDANGER("You slam into an obstacle!"), null, 4, CHAT_TYPE_TAKING_HIT) + living_mob.apply_damage(MELEE_FORCE_TIER_2) + +///The applied effects for knockback(), overwrite to change slow/stun amounts for different ammo datums +/datum/ammo/proc/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + target.apply_effect(0.7, WEAKEN) // 0.9 seconds of stun, per agreement from Balance Team when switched from MC stuns to exact stuns + target.apply_effect(1, SUPERSLOW) + target.apply_effect(2, SLOW) + to_chat(target, SPAN_XENODANGER("You are shaken by the sudden impact!")) + else + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) + +/datum/ammo/proc/slowdown(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + target.apply_effect(1, SUPERSLOW) + target.apply_effect(2, SLOW) + to_chat(target, SPAN_XENODANGER("You are slowed by the sudden impact!")) + else + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) + +/datum/ammo/proc/pushback(mob/target_mob, obj/projectile/fired_projectile, max_range = 2) + if(!target_mob || target_mob == fired_projectile.firer || fired_projectile.distance_travelled > max_range || target_mob.lying) + return + + if(target_mob.mob_size >= MOB_SIZE_BIG) + return //too big to push + + to_chat(target_mob, isxeno(target_mob) ? SPAN_XENODANGER("You are pushed back by the sudden impact!") : SPAN_HIGHDANGER("You are pushed back by the sudden impact!"), null, 4, CHAT_TYPE_TAKING_HIT) + slam_back(target_mob, fired_projectile, max_range) + +/datum/ammo/proc/burst(atom/target, obj/projectile/P, damage_type = BRUTE, range = 1, damage_div = 2, show_message = SHOW_MESSAGE_VISIBLE) //damage_div says how much we divide damage + if(!target || !P) return + for(var/mob/living/carbon/M in orange(range,target)) + if(P.firer == M) + continue + if(show_message) + var/msg = "You are hit by backlash from \a [P.name]!" + M.visible_message(SPAN_DANGER("[M] is hit by backlash from \a [P.name]!"),isxeno(M) ? SPAN_XENODANGER("[msg]"):SPAN_HIGHDANGER("[msg]")) + var/damage = P.damage/damage_div + + var/mob/living/carbon/xenomorph/XNO = null + + if(isxeno(M)) + XNO = M + var/total_explosive_resistance = XNO.caste.xeno_explosion_resistance + XNO.armor_explosive_buff + damage = armor_damage_reduction(GLOB.xeno_explosive, damage, total_explosive_resistance , 60, 0, 0.5, XNO.armor_integrity) + var/armor_punch = armor_break_calculation(GLOB.xeno_explosive, damage, total_explosive_resistance, 60, 0, 0.5, XNO.armor_integrity) + XNO.apply_armorbreak(armor_punch) + + M.apply_damage(damage,damage_type) + + if(XNO && XNO.xeno_shields.len) + P.play_shielded_hit_effect(M) + else + P.play_hit_effect(M) + +/datum/ammo/proc/fire_bonus_projectiles(obj/projectile/original_P) + set waitfor = 0 + + var/turf/curloc = get_turf(original_P.shot_from) + var/initial_angle = Get_Angle(curloc, original_P.target_turf) + + for(var/i in 1 to bonus_projectiles_amount) //Want to run this for the number of bonus projectiles. + var/final_angle = initial_angle + + var/obj/projectile/P = new /obj/projectile(curloc, original_P.weapon_cause_data) + P.generate_bullet(GLOB.ammo_list[bonus_projectiles_type]) //No bonus damage or anything. + P.accuracy = round(P.accuracy * original_P.accuracy/initial(original_P.accuracy)) //if the gun changes the accuracy of the main projectile, it also affects the bonus ones. + original_P.give_bullet_traits(P) + + var/total_scatter_angle = P.scatter + final_angle += rand(-total_scatter_angle, total_scatter_angle) + var/turf/new_target = get_angle_target_turf(curloc, final_angle, 30) + + P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! + +/datum/ammo/proc/drop_flame(turf/T, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 + if(!istype(T)) + return + if(locate(/obj/flamer_fire) in T) + return + + var/datum/reagent/R = new flamer_reagent_type() + new /obj/flamer_fire(T, cause_data, R) diff --git a/code/datums/ammo/bullet/bullet.dm b/code/datums/ammo/bullet/bullet.dm new file mode 100644 index 000000000000..dadb644201df --- /dev/null +++ b/code/datums/ammo/bullet/bullet.dm @@ -0,0 +1,81 @@ +/* +//====== + Default Ammo +//====== +*/ +//Only when things screw up do we use this as a placeholder. +/datum/ammo/bullet + name = "default bullet" + icon_state = "bullet" + headshot_state = HEADSHOT_OVERLAY_LIGHT + flags_ammo_behavior = AMMO_BALLISTIC + sound_hit = "ballistic_hit" + sound_armor = "ballistic_armor" + sound_miss = "ballistic_miss" + sound_bounce = "ballistic_bounce" + sound_shield_hit = "ballistic_shield_hit" + + accurate_range_min = 0 + damage = 10 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_1 + shrapnel_type = /obj/item/shard/shrapnel + shell_speed = AMMO_SPEED_TIER_4 + +/datum/ammo/bullet/proc/handle_battlefield_execution(datum/ammo/firing_ammo, mob/living/hit_mob, obj/projectile/firing_projectile, mob/living/user, obj/item/weapon/gun/fired_from) + SIGNAL_HANDLER + + if(!user || hit_mob == user || user.zone_selected != "head" || user.a_intent != INTENT_HARM || !ishuman_strict(hit_mob)) + return + + if(!skillcheck(user, SKILL_EXECUTION, SKILL_EXECUTION_TRAINED)) + to_chat(user, SPAN_DANGER("You don't know how to execute someone correctly.")) + return + + var/mob/living/carbon/human/execution_target = hit_mob + + if(execution_target.status_flags & PERMANENTLY_DEAD) + to_chat(user, SPAN_DANGER("[execution_target] has already been executed!")) + return + + INVOKE_ASYNC(src, PROC_REF(attempt_battlefield_execution), src, execution_target, firing_projectile, user, fired_from) + + return COMPONENT_CANCEL_AMMO_POINT_BLANK + +/datum/ammo/bullet/proc/attempt_battlefield_execution(datum/ammo/firing_ammo, mob/living/carbon/human/execution_target, obj/projectile/firing_projectile, mob/living/user, obj/item/weapon/gun/fired_from) + user.affected_message(execution_target, + SPAN_HIGHDANGER("You aim \the [fired_from] at [execution_target]'s head!"), + SPAN_HIGHDANGER("[user] aims \the [fired_from] directly at your head!"), + SPAN_DANGER("[user] aims \the [fired_from] at [execution_target]'s head!")) + + user.next_move += 1.1 SECONDS //PB has no click delay; readding it here to prevent people accidentally queuing up multiple executions. + + if(!do_after(user, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE) || !user.Adjacent(execution_target)) + fired_from.delete_bullet(firing_projectile, TRUE) + return + + if(!(fired_from.flags_gun_features & GUN_SILENCED)) + playsound(user, fired_from.fire_sound, fired_from.firesound_volume, FALSE) + else + playsound(user, fired_from.fire_sound, 25, FALSE) + + shake_camera(user, 1, 2) + + execution_target.apply_damage(damage * 3, BRUTE, "head", no_limb_loss = TRUE, permanent_kill = TRUE) //Apply gobs of damage and make sure they can't be revived later... + execution_target.apply_damage(200, OXY) //...fill out the rest of their health bar with oxyloss... + execution_target.death(create_cause_data("execution", user)) //...make certain they're properly dead... + shake_camera(execution_target, 3, 4) + execution_target.update_headshot_overlay(headshot_state) //...and add a gory headshot overlay. + + execution_target.visible_message(SPAN_HIGHDANGER(uppertext("[execution_target] WAS EXECUTED!")), \ + SPAN_HIGHDANGER("You WERE EXECUTED!")) + + user.count_niche_stat(STATISTICS_NICHE_EXECUTION, 1, firing_projectile.weapon_cause_data?.cause_name) + + var/area/execution_area = get_area(execution_target) + + msg_admin_attack(FONT_SIZE_HUGE("[key_name(usr)] has battlefield executed [key_name(execution_target)] in [get_area(usr)] ([usr.loc.x],[usr.loc.y],[usr.loc.z])."), usr.loc.x, usr.loc.y, usr.loc.z) + log_attack("[key_name(usr)] battlefield executed [key_name(execution_target)] at [execution_area.name].") + + if(flags_ammo_behavior & AMMO_EXPLOSIVE) + execution_target.gib() + diff --git a/code/datums/ammo/bullet/lever_action.dm b/code/datums/ammo/bullet/lever_action.dm new file mode 100644 index 000000000000..2770231b6811 --- /dev/null +++ b/code/datums/ammo/bullet/lever_action.dm @@ -0,0 +1,72 @@ +/* +//====== + Lever Action +//====== +*/ + +/datum/ammo/bullet/lever_action + name = "lever-action bullet" + + damage = 80 + penetration = 0 + accuracy = HIT_ACCURACY_TIER_1 + shell_speed = AMMO_SPEED_TIER_6 + accurate_range = 14 + handful_state = "lever_action_bullet" + +//unused and not working. need to refactor MD code. Unobtainable. +//intended mechanic is to have xenos hit with it show up very frequently on any MDs around +/datum/ammo/bullet/lever_action/tracker + name = "tracking lever-action bullet" + icon_state = "redbullet" + damage = 70 + penetration = ARMOR_PENETRATION_TIER_3 + accuracy = HIT_ACCURACY_TIER_1 + handful_state = "tracking_lever_action_bullet" + +/datum/ammo/bullet/lever_action/tracker/on_hit_mob(mob/M, obj/projectile/P, mob/user) + //SEND_SIGNAL(user, COMSIG_BULLET_TRACKING, user, M) + M.visible_message(SPAN_DANGER("You hear a faint beep under [M]'s [M.mob_size > MOB_SIZE_HUMAN ? "chitin" : "skin"].")) + +/datum/ammo/bullet/lever_action/training + name = "lever-action blank" + icon_state = "blank" + damage = 70 //blanks CAN hurt you if shot very close + penetration = 0 + accuracy = HIT_ACCURACY_TIER_1 + damage_falloff = DAMAGE_FALLOFF_BLANK //not much, though (comparatively) + shell_speed = AMMO_SPEED_TIER_5 + handful_state = "training_lever_action_bullet" + +//unused, and unobtainable... for now +/datum/ammo/bullet/lever_action/marksman + name = "marksman lever-action bullet" + shrapnel_chance = 0 + damage_falloff = 0 + accurate_range = 12 + damage = 70 + penetration = ARMOR_PENETRATION_TIER_6 + shell_speed = AMMO_SPEED_TIER_6 + handful_state = "marksman_lever_action_bullet" + +/datum/ammo/bullet/lever_action/xm88 + name = ".458 SOCOM round" + + damage = 80 + penetration = ARMOR_PENETRATION_TIER_2 + accuracy = HIT_ACCURACY_TIER_1 + shell_speed = AMMO_SPEED_TIER_6 + accurate_range = 14 + handful_state = "boomslang_bullet" + +/datum/ammo/bullet/lever_action/xm88/pen20 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/lever_action/xm88/pen30 + penetration = ARMOR_PENETRATION_TIER_6 + +/datum/ammo/bullet/lever_action/xm88/pen40 + penetration = ARMOR_PENETRATION_TIER_8 + +/datum/ammo/bullet/lever_action/xm88/pen50 + penetration = ARMOR_PENETRATION_TIER_10 diff --git a/code/datums/ammo/bullet/pistol.dm b/code/datums/ammo/bullet/pistol.dm new file mode 100644 index 000000000000..8be63b0a15af --- /dev/null +++ b/code/datums/ammo/bullet/pistol.dm @@ -0,0 +1,265 @@ +/* +//====== + Pistol Ammo +//====== +*/ + +// Used by M4A3, M4A3 Custom and B92FS +/datum/ammo/bullet/pistol + name = "pistol bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + accuracy = -HIT_ACCURACY_TIER_3 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + damage = 40 + penetration= ARMOR_PENETRATION_TIER_2 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + +/datum/ammo/bullet/pistol/tiny + name = "light pistol bullet" + +/datum/ammo/bullet/pistol/tranq + name = "tranquilizer bullet" + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST + stamina_damage = 30 + damage = 15 + +//2020 rebalance: is supposed to counter runners and lurkers, dealing high damage to the only castes with no armor. +//Limited by its lack of versatility and lower supply, so marines finally have an answer for flanker castes that isn't just buckshot. + +/datum/ammo/bullet/pistol/hollow + name = "hollowpoint pistol bullet" + + damage = 55 //hollowpoint is strong + penetration = 0 //hollowpoint can't pierce armor! + shrapnel_chance = SHRAPNEL_CHANCE_TIER_3 //hollowpoint causes shrapnel + +// Used by M4A3 AP and mod88 +/datum/ammo/bullet/pistol/ap + name = "armor-piercing pistol bullet" + + damage = 25 + accuracy = HIT_ACCURACY_TIER_2 + penetration= ARMOR_PENETRATION_TIER_8 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + +/datum/ammo/bullet/pistol/ap/penetrating + name = "wall-penetrating pistol bullet" + shrapnel_chance = 0 + + damage = 30 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/pistol/ap/penetrating/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/pistol/ap/toxin + name = "toxic pistol bullet" + var/acid_per_hit = 10 + var/organic_damage_mult = 3 + +/datum/ammo/bullet/pistol/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) + +/datum/ammo/bullet/pistol/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) + . = ..() + if(T.flags_turf & TURF_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/pistol/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) + . = ..() + if(O.flags_obj & OBJ_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/pistol/le + name = "armor-shredding pistol bullet" + + damage = 15 + penetration = ARMOR_PENETRATION_TIER_4 + pen_armor_punch = 3 + +/datum/ammo/bullet/pistol/rubber + name = "rubber pistol bullet" + sound_override = 'sound/weapons/gun_c99.ogg' + + damage = 0 + stamina_damage = 25 + shrapnel_chance = 0 + +// Reskinned rubber bullet used for the ES-4 CL pistol. +/datum/ammo/bullet/pistol/rubber/stun + name = "stun pistol bullet" + sound_override = null + +// Used by M1911, Deagle and KT-42 +/datum/ammo/bullet/pistol/heavy + name = "heavy pistol bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + accuracy = -HIT_ACCURACY_TIER_3 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + damage = 55 + penetration = ARMOR_PENETRATION_TIER_3 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + +/datum/ammo/bullet/pistol/heavy/super //Commander's variant + name = ".50 heavy pistol bullet" + damage = 60 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_6 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/pistol/heavy/super/highimpact + name = ".50 high-impact pistol bullet" + penetration = ARMOR_PENETRATION_TIER_1 + debilitate = list(0,1.5,0,0,0,1,0,0) + flags_ammo_behavior = AMMO_BALLISTIC + +/datum/ammo/bullet/pistol/heavy/super/highimpact/ap + name = ".50 high-impact armor piercing pistol bullet" + penetration = ARMOR_PENETRATION_TIER_10 + damage = 45 + +/datum/ammo/bullet/pistol/heavy/super/highimpact/upp + name = "high-impact pistol bullet" + sound_override = 'sound/weapons/gun_DE50.ogg' + penetration = ARMOR_PENETRATION_TIER_6 + debilitate = list(0,1.5,0,0,0,1,0,0) + flags_ammo_behavior = AMMO_BALLISTIC + +/datum/ammo/bullet/pistol/heavy/super/highimpact/New() + ..() + RegisterSignal(src, COMSIG_AMMO_POINT_BLANK, PROC_REF(handle_battlefield_execution)) + +/datum/ammo/bullet/pistol/heavy/super/highimpact/on_hit_mob(mob/M, obj/projectile/P) + knockback(M, P, 4) + +/datum/ammo/bullet/pistol/deagle + name = ".50 heavy pistol bullet" + damage = 45 + headshot_state = HEADSHOT_OVERLAY_HEAVY + accuracy = -HIT_ACCURACY_TIER_3 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + penetration = ARMOR_PENETRATION_TIER_6 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_5 + +/datum/ammo/bullet/pistol/incendiary + name = "incendiary pistol bullet" + damage_type = BURN + shrapnel_chance = 0 + flags_ammo_behavior = AMMO_BALLISTIC + + accuracy = HIT_ACCURACY_TIER_3 + damage = 20 + +/datum/ammo/bullet/pistol/incendiary/set_bullet_traits() + ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +// Used by the hipower +// I know that the 'high power' in the name is supposed to mean its 'impressive' magazine capacity +// but this is CM, half our guns have baffling misconceptions and mistakes (how do you grab the type-71?) so it's on-brand. +// maybe in the far flung future of 2280 someone screwed up the design. + +/datum/ammo/bullet/pistol/highpower + name = "high-powered pistol bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + accuracy = HIT_ACCURACY_TIER_3 + damage = 36 + penetration = ARMOR_PENETRATION_TIER_5 + damage_falloff = DAMAGE_FALLOFF_TIER_7 + +// Used by VP78 and Auto 9 +/datum/ammo/bullet/pistol/squash + name = "squash-head pistol bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + debilitate = list(0,0,0,0,0,0,0,2) + + accuracy = HIT_ACCURACY_TIER_4 + damage = 45 + penetration= ARMOR_PENETRATION_TIER_6 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + damage_falloff = DAMAGE_FALLOFF_TIER_6 //"VP78 - the only pistol viable as a primary."-Vampmare, probably. + +/datum/ammo/bullet/pistol/squash/toxin + name = "toxic squash-head pistol bullet" + var/acid_per_hit = 10 + var/organic_damage_mult = 3 + +/datum/ammo/bullet/pistol/squash/toxin/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) + +/datum/ammo/bullet/pistol/squash/toxin/on_hit_turf(turf/T, obj/projectile/P) + . = ..() + if(T.flags_turf & TURF_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/pistol/squash/toxin/on_hit_obj(obj/O, obj/projectile/P) + . = ..() + if(O.flags_obj & OBJ_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/pistol/squash/penetrating + name = "wall-penetrating squash-head pistol bullet" + shrapnel_chance = 0 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/pistol/squash/penetrating/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/pistol/squash/incendiary + name = "incendiary squash-head pistol bullet" + damage_type = BURN + shrapnel_chance = 0 + flags_ammo_behavior = AMMO_BALLISTIC + accuracy = HIT_ACCURACY_TIER_3 + damage = 35 + +/datum/ammo/bullet/pistol/squash/incendiary/set_bullet_traits() + ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + + +/datum/ammo/bullet/pistol/mankey + name = "live monkey" + icon_state = "monkey1" + ping = null //no bounce off. + damage_type = BURN + debilitate = list(4,4,0,0,0,0,0,0) + flags_ammo_behavior = AMMO_IGNORE_ARMOR + + damage = 15 + damage_var_high = PROJECTILE_VARIANCE_TIER_5 + shell_speed = AMMO_SPEED_TIER_2 + +/datum/ammo/bullet/pistol/mankey/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/pistol/mankey/on_hit_mob(mob/M,obj/projectile/P) + if(P && P.loc && !M.stat && !istype(M,/mob/living/carbon/human/monkey)) + P.visible_message(SPAN_DANGER("The [src] chimpers furiously!")) + new /mob/living/carbon/human/monkey(P.loc) + +/datum/ammo/bullet/pistol/smart + name = "smartpistol bullet" + flags_ammo_behavior = AMMO_BALLISTIC + + accuracy = HIT_ACCURACY_TIER_8 + damage = 30 + penetration = 20 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + diff --git a/code/datums/ammo/bullet/revolver.dm b/code/datums/ammo/bullet/revolver.dm new file mode 100644 index 000000000000..633bf3e2f7ff --- /dev/null +++ b/code/datums/ammo/bullet/revolver.dm @@ -0,0 +1,180 @@ +/* +//====== + Revolver Ammo +//====== +*/ + +/datum/ammo/bullet/revolver + name = "revolver bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + damage = 55 + penetration = ARMOR_PENETRATION_TIER_1 + accuracy = HIT_ACCURACY_TIER_1 + +/datum/ammo/bullet/revolver/marksman + name = "marksman revolver bullet" + + shrapnel_chance = 0 + damage_falloff = 0 + accurate_range = 12 + penetration = ARMOR_PENETRATION_TIER_7 + +/datum/ammo/bullet/revolver/heavy + name = "heavy revolver bullet" + + damage = 35 + penetration = ARMOR_PENETRATION_TIER_4 + accuracy = HIT_ACCURACY_TIER_3 + +/datum/ammo/bullet/revolver/heavy/on_hit_mob(mob/entity, obj/projectile/bullet) + slowdown(entity, bullet) + pushback(entity, bullet, 4) + +/datum/ammo/bullet/revolver/incendiary + name = "incendiary revolver bullet" + damage = 40 + +/datum/ammo/bullet/revolver/incendiary/set_bullet_traits() + ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/revolver/marksman/toxin + name = "toxic revolver bullet" + var/acid_per_hit = 10 + var/organic_damage_mult = 3 + +/datum/ammo/bullet/revolver/marksman/toxin/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) + +/datum/ammo/bullet/revolver/marksman/toxin/on_hit_turf(turf/T, obj/projectile/P) + . = ..() + if(T.flags_turf & TURF_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/revolver/marksman/toxin/on_hit_obj(obj/O, obj/projectile/P) + . = ..() + if(O.flags_obj & OBJ_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/revolver/penetrating + name = "wall-penetrating revolver bullet" + shrapnel_chance = 0 + + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/revolver/penetrating/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/revolver/upp + name = "heavy revolver bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + penetration = ARMOR_PENETRATION_TIER_4 + damage = 70 + + +/datum/ammo/bullet/revolver/upp/shrapnel + name = "shrapnel shot" + headshot_state = HEADSHOT_OVERLAY_HEAVY //Gol-dang shotgun blow your fething head off. + debilitate = list(0,0,0,0,0,0,0,0) + icon_state = "shrapnelshot" + handful_state = "shrapnel" + bonus_projectiles_type = /datum/ammo/bullet/revolver/upp/shrapnel_bits + + max_range = 6 + damage = 40 // + TIER_4 * 3 + damage_falloff = DAMAGE_FALLOFF_TIER_7 + penetration = ARMOR_PENETRATION_TIER_8 + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 + shrapnel_chance = 100 + shrapnel_type = /obj/item/shard/shrapnel/upp + //roughly 90 or so damage with the additional shrapnel, around 130 in total with primary round + +/datum/ammo/bullet/revolver/upp/shrapnel/on_hit_mob(mob/M, obj/projectile/P) + pushback(M, P, 1) + +/datum/ammo/bullet/revolver/upp/shrapnel_bits + name = "small shrapnel" + icon_state = "shrapnelshot_bit" + + max_range = 6 + damage = 30 + penetration = ARMOR_PENETRATION_TIER_4 + scatter = SCATTER_AMOUNT_TIER_1 + bonus_projectiles_amount = 0 + shrapnel_type = /obj/item/shard/shrapnel/upp/bits + +/datum/ammo/bullet/revolver/small + name = "small revolver bullet" + headshot_state = HEADSHOT_OVERLAY_LIGHT + + damage = 45 + + penetration = ARMOR_PENETRATION_TIER_3 + +/datum/ammo/bullet/revolver/small/hollowpoint + name = "small hollowpoint revolver bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + damage = 75 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong + penetration = 0 + damage_falloff = DAMAGE_FALLOFF_TIER_6 + +/datum/ammo/bullet/revolver/mateba + name = ".454 heavy revolver bullet" + + damage = 60 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_6 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/revolver/mateba/highimpact + name = ".454 heavy high-impact revolver bullet" + debilitate = list(0,2,0,0,0,1,0,0) + penetration = ARMOR_PENETRATION_TIER_1 + flags_ammo_behavior = AMMO_BALLISTIC + +/datum/ammo/bullet/revolver/mateba/highimpact/ap + name = ".454 heavy high-impact armor piercing revolver bullet" + penetration = ARMOR_PENETRATION_TIER_10 + damage = 45 + +/datum/ammo/bullet/revolver/mateba/highimpact/New() + ..() + RegisterSignal(src, COMSIG_AMMO_POINT_BLANK, PROC_REF(handle_battlefield_execution)) + +/datum/ammo/bullet/revolver/mateba/highimpact/on_hit_mob(mob/M, obj/projectile/P) + knockback(M, P, 4) + +/datum/ammo/bullet/revolver/mateba/highimpact/explosive //if you ever put this in normal gameplay, i am going to scream + name = ".454 heavy explosive revolver bullet" + damage = 100 + damage_var_low = PROJECTILE_VARIANCE_TIER_10 + damage_var_high = PROJECTILE_VARIANCE_TIER_1 + penetration = ARMOR_PENETRATION_TIER_10 + flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_BALLISTIC + +/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_mob(mob/M, obj/projectile/P) + ..() + cell_explosion(get_turf(M), 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_obj(obj/O, obj/projectile/P) + ..() + cell_explosion(get_turf(O), 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_turf(turf/T, obj/projectile/P) + ..() + cell_explosion(T, 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/revolver/webley //Mateba round without the knockdown. + name = ".455 Webley bullet" + damage = 60 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_6 + penetration = ARMOR_PENETRATION_TIER_2 diff --git a/code/datums/ammo/bullet/rifle.dm b/code/datums/ammo/bullet/rifle.dm new file mode 100644 index 000000000000..b6085572e3b9 --- /dev/null +++ b/code/datums/ammo/bullet/rifle.dm @@ -0,0 +1,210 @@ +/* +//====== + Rifle Ammo +//====== +*/ + +/datum/ammo/bullet/rifle + name = "rifle bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + damage = 40 + penetration = ARMOR_PENETRATION_TIER_1 + accurate_range = 16 + accuracy = HIT_ACCURACY_TIER_4 + scatter = SCATTER_AMOUNT_TIER_10 + shell_speed = AMMO_SPEED_TIER_6 + effective_range_max = 7 + damage_falloff = DAMAGE_FALLOFF_TIER_7 + max_range = 24 //So S8 users don't have their bullets magically disappaer at 22 tiles (S8 can see 24 tiles) + +/datum/ammo/bullet/rifle/holo_target + name = "holo-targeting rifle bullet" + damage = 30 + var/holo_stacks = 10 + +/datum/ammo/bullet/rifle/holo_target/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) + +/datum/ammo/bullet/rifle/holo_target/hunting + name = "holo-targeting hunting bullet" + damage = 25 + holo_stacks = 15 + +/datum/ammo/bullet/rifle/explosive + name = "explosive rifle bullet" + + damage = 25 + accurate_range = 22 + accuracy = 0 + shell_speed = AMMO_SPEED_TIER_4 + damage_falloff = DAMAGE_FALLOFF_TIER_9 + +/datum/ammo/bullet/rifle/explosive/on_hit_mob(mob/M, obj/projectile/P) + cell_explosion(get_turf(M), 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/rifle/explosive/on_hit_obj(obj/O, obj/projectile/P) + cell_explosion(get_turf(O), 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/rifle/explosive/on_hit_turf(turf/T, obj/projectile/P) + if(T.density) + cell_explosion(T, 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) + +/datum/ammo/bullet/rifle/ap + name = "armor-piercing rifle bullet" + + damage = 30 + penetration = ARMOR_PENETRATION_TIER_8 + +// Basically AP but better. Focused at taking out armour temporarily +/datum/ammo/bullet/rifle/ap/toxin + name = "toxic rifle bullet" + var/acid_per_hit = 7 + var/organic_damage_mult = 3 + +/datum/ammo/bullet/rifle/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) + +/datum/ammo/bullet/rifle/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) + . = ..() + if(T.flags_turf & TURF_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/rifle/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) + . = ..() + if(O.flags_obj & OBJ_ORGANIC) + P.damage *= organic_damage_mult + + +/datum/ammo/bullet/rifle/ap/penetrating + name = "wall-penetrating rifle bullet" + shrapnel_chance = 0 + + damage = 35 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/rifle/ap/penetrating/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/rifle/le + name = "armor-shredding rifle bullet" + + damage = 20 + penetration = ARMOR_PENETRATION_TIER_4 + pen_armor_punch = 5 + +/datum/ammo/bullet/rifle/heap + name = "high-explosive armor-piercing rifle bullet" + + headshot_state = HEADSHOT_OVERLAY_HEAVY + damage = 55//big damage, doesn't actually blow up because thats stupid. + penetration = ARMOR_PENETRATION_TIER_8 + +/datum/ammo/bullet/rifle/rubber + name = "rubber rifle bullet" + sound_override = 'sound/weapons/gun_c99.ogg' + + damage = 0 + stamina_damage = 15 + shrapnel_chance = 0 + +/datum/ammo/bullet/rifle/incendiary + name = "incendiary rifle bullet" + damage_type = BURN + shrapnel_chance = 0 + flags_ammo_behavior = AMMO_BALLISTIC + + damage = 30 + shell_speed = AMMO_SPEED_TIER_4 + accuracy = -HIT_ACCURACY_TIER_2 + damage_falloff = DAMAGE_FALLOFF_TIER_10 + +/datum/ammo/bullet/rifle/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/rifle/m4ra + name = "A19 high velocity bullet" + shrapnel_chance = 0 + damage_falloff = 0 + flags_ammo_behavior = AMMO_BALLISTIC + accurate_range_min = 4 + + damage = 55 + scatter = -SCATTER_AMOUNT_TIER_8 + penetration= ARMOR_PENETRATION_TIER_7 + shell_speed = AMMO_SPEED_TIER_6 + +/datum/ammo/bullet/rifle/m4ra/incendiary + name = "A19 high velocity incendiary bullet" + flags_ammo_behavior = AMMO_BALLISTIC + + damage = 40 + accuracy = HIT_ACCURACY_TIER_4 + scatter = -SCATTER_AMOUNT_TIER_8 + penetration= ARMOR_PENETRATION_TIER_5 + shell_speed = AMMO_SPEED_TIER_6 + +/datum/ammo/bullet/rifle/m4ra/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/rifle/m4ra/impact + name = "A19 high velocity impact bullet" + flags_ammo_behavior = AMMO_BALLISTIC + + damage = 40 + accuracy = -HIT_ACCURACY_TIER_2 + scatter = -SCATTER_AMOUNT_TIER_8 + penetration = ARMOR_PENETRATION_TIER_10 + shell_speed = AMMO_SPEED_TIER_6 + +/datum/ammo/bullet/rifle/m4ra/impact/on_hit_mob(mob/M, obj/projectile/P) + knockback(M, P, 32) // Can knockback basically at max range + +/datum/ammo/bullet/rifle/m4ra/impact/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) + target.apply_effect(0.5, WEAKEN) + target.apply_effect(2, SUPERSLOW) + target.apply_effect(5, SLOW) + else + if(!isyautja(living_mob)) //Not predators. + living_mob.apply_effect(1, SUPERSLOW) + living_mob.apply_effect(2, SLOW) + to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) + +/datum/ammo/bullet/rifle/mar40 + name = "heavy rifle bullet" + + damage = 55 + +/datum/ammo/bullet/rifle/type71 + name = "heavy rifle bullet" + + damage = 55 + penetration = ARMOR_PENETRATION_TIER_3 + +/datum/ammo/bullet/rifle/type71/ap + name = "heavy armor-piercing rifle bullet" + + damage = 40 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/rifle/type71/heap + name = "heavy high-explosive armor-piercing rifle bullet" + + headshot_state = HEADSHOT_OVERLAY_HEAVY + damage = 65 + penetration = ARMOR_PENETRATION_TIER_10 diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm new file mode 100644 index 000000000000..4cedb8b3ee69 --- /dev/null +++ b/code/datums/ammo/bullet/shotgun.dm @@ -0,0 +1,362 @@ +/* +//====== + Shotgun Ammo +//====== +*/ + +/datum/ammo/bullet/shotgun + headshot_state = HEADSHOT_OVERLAY_HEAVY + +/datum/ammo/bullet/shotgun/slug + name = "shotgun slug" + handful_state = "slug_shell" + + accurate_range = 6 + max_range = 8 + damage = 70 + penetration = ARMOR_PENETRATION_TIER_4 + damage_armor_punch = 2 + handful_state = "slug_shell" + +/datum/ammo/bullet/shotgun/slug/on_hit_mob(mob/M,obj/projectile/P) + knockback(M, P, 6) + +/datum/ammo/bullet/shotgun/slug/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) + target.apply_effect(0.5, WEAKEN) + target.apply_effect(1, SUPERSLOW) + target.apply_effect(3, SLOW) + else + if(!isyautja(living_mob)) //Not predators. + living_mob.apply_effect(1, SUPERSLOW) + living_mob.apply_effect(2, SLOW) + to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) + +/datum/ammo/bullet/shotgun/beanbag + name = "beanbag slug" + headshot_state = HEADSHOT_OVERLAY_LIGHT //It's not meant to kill people... but if you put it in your mouth, it will. + handful_state = "beanbag_slug" + icon_state = "beanbag" + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST + sound_override = 'sound/weapons/gun_shotgun_riot.ogg' + + max_range = 12 + shrapnel_chance = 0 + damage = 0 + stamina_damage = 45 + accuracy = HIT_ACCURACY_TIER_3 + shell_speed = AMMO_SPEED_TIER_3 + handful_state = "beanbag_slug" + +/datum/ammo/bullet/shotgun/beanbag/on_hit_mob(mob/M, obj/projectile/P) + if(!M || M == P.firer) return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + shake_camera(H, 2, 1) + + +/datum/ammo/bullet/shotgun/incendiary + name = "incendiary slug" + handful_state = "incendiary_slug" + damage_type = BURN + flags_ammo_behavior = AMMO_BALLISTIC + + accuracy = -HIT_ACCURACY_TIER_2 + max_range = 12 + damage = 55 + penetration= ARMOR_PENETRATION_TIER_1 + handful_state = "incendiary_slug" + +/datum/ammo/bullet/shotgun/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/shotgun/incendiary/on_hit_mob(mob/M,obj/projectile/P) + burst(get_turf(M),P,damage_type) + knockback(M,P) + +/datum/ammo/bullet/shotgun/incendiary/on_hit_obj(obj/O,obj/projectile/P) + burst(get_turf(P),P,damage_type) + +/datum/ammo/bullet/shotgun/incendiary/on_hit_turf(turf/T,obj/projectile/P) + burst(get_turf(T),P,damage_type) + + +/datum/ammo/bullet/shotgun/flechette + name = "flechette shell" + icon_state = "flechette" + handful_state = "flechette_shell" + bonus_projectiles_type = /datum/ammo/bullet/shotgun/flechette_spread + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + max_range = 12 + damage = 30 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_7 + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 + handful_state = "flechette_shell" + multiple_handful_name = TRUE + +/datum/ammo/bullet/shotgun/flechette_spread + name = "additional flechette" + icon_state = "flechette" + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + max_range = 12 + damage = 30 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_7 + scatter = SCATTER_AMOUNT_TIER_5 + +/datum/ammo/bullet/shotgun/buckshot + name = "buckshot shell" + icon_state = "buckshot" + handful_state = "buckshot_shell" + multiple_handful_name = TRUE + bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_5 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_5 + accurate_range = 4 + max_range = 4 + damage = 65 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_1 + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 + shell_speed = AMMO_SPEED_TIER_2 + damage_armor_punch = 0 + pen_armor_punch = 0 + handful_state = "buckshot_shell" + multiple_handful_name = TRUE + +/datum/ammo/bullet/shotgun/buckshot/incendiary + name = "incendiary buckshot shell" + handful_state = "incen_buckshot" + handful_type = /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary + +/datum/ammo/bullet/shotgun/buckshot/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/shotgun/buckshot/on_hit_mob(mob/M,obj/projectile/P) + knockback(M,P) + +//buckshot variant only used by the masterkey shotgun attachment. +/datum/ammo/bullet/shotgun/buckshot/masterkey + bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/masterkey + + damage = 55 + +/datum/ammo/bullet/shotgun/spread + name = "additional buckshot" + icon_state = "buckshot" + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 4 + max_range = 6 + damage = 65 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_1 + shell_speed = AMMO_SPEED_TIER_2 + scatter = SCATTER_AMOUNT_TIER_1 + damage_armor_punch = 0 + pen_armor_punch = 0 + +/datum/ammo/bullet/shotgun/spread/masterkey + damage = 20 + +/* + 8 GAUGE SHOTGUN AMMO +*/ + +/datum/ammo/bullet/shotgun/heavy/buckshot + name = "heavy buckshot shell" + icon_state = "buckshot" + handful_state = "heavy_buckshot" + multiple_handful_name = TRUE + bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/buckshot/spread + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 + accurate_range = 3 + max_range = 3 + damage = 75 + penetration = 0 + shell_speed = AMMO_SPEED_TIER_2 + damage_armor_punch = 0 + pen_armor_punch = 0 + +/datum/ammo/bullet/shotgun/heavy/buckshot/on_hit_mob(mob/M,obj/projectile/P) + knockback(M,P) + +/datum/ammo/bullet/shotgun/heavy/buckshot/spread + name = "additional heavy buckshot" + max_range = 4 + scatter = SCATTER_AMOUNT_TIER_1 + bonus_projectiles_amount = 0 + +//basically the same +/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath + name = "dragon's breath shell" + handful_state = "heavy_dragonsbreath" + multiple_handful_name = TRUE + damage_type = BURN + damage = 60 + accurate_range = 3 + max_range = 4 + bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/spread + +/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/spread + name = "additional dragon's breath" + bonus_projectiles_amount = 0 + accurate_range = 4 + max_range = 5 //make use of the ablaze property + shell_speed = AMMO_SPEED_TIER_4 // so they hit before the main shell stuns + + +/datum/ammo/bullet/shotgun/heavy/slug + name = "heavy shotgun slug" + handful_state = "heavy_slug" + + accurate_range = 7 + max_range = 8 + damage = 90 //ouch. + penetration = ARMOR_PENETRATION_TIER_6 + damage_armor_punch = 2 + +/datum/ammo/bullet/shotgun/heavy/slug/on_hit_mob(mob/M,obj/projectile/P) + knockback(M, P, 7) + +/datum/ammo/bullet/shotgun/heavy/slug/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) + target.apply_effect(0.5, WEAKEN) + target.apply_effect(2, SUPERSLOW) + target.apply_effect(5, SLOW) + else + if(!isyautja(living_mob)) //Not predators. + living_mob.apply_effect(1, SUPERSLOW) + living_mob.apply_effect(2, SLOW) + to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) + +/datum/ammo/bullet/shotgun/heavy/beanbag + name = "heavy beanbag slug" + icon_state = "beanbag" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + handful_state = "heavy_beanbag" + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST + sound_override = 'sound/weapons/gun_shotgun_riot.ogg' + + max_range = 7 + shrapnel_chance = 0 + damage = 0 + stamina_damage = 100 + accuracy = HIT_ACCURACY_TIER_2 + shell_speed = AMMO_SPEED_TIER_2 + +/datum/ammo/bullet/shotgun/heavy/beanbag/on_hit_mob(mob/M, obj/projectile/P) + if(!M || M == P.firer) + return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + shake_camera(H, 2, 1) + +/datum/ammo/bullet/shotgun/heavy/flechette + name = "heavy flechette shell" + icon_state = "flechette" + handful_state = "heavy_flechette" + multiple_handful_name = TRUE + bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/flechette_spread + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_3 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_3 + max_range = 12 + damage = 45 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_10 + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_2 + +/datum/ammo/bullet/shotgun/heavy/flechette_spread + name = "additional heavy flechette" + icon_state = "flechette" + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + max_range = 12 + damage = 45 + damage_var_low = PROJECTILE_VARIANCE_TIER_8 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_10 + scatter = SCATTER_AMOUNT_TIER_4 + +//Enormous shell for Van Bandolier's superheavy double-barreled hunting gun. +/datum/ammo/bullet/shotgun/twobore + name = "two bore bullet" + icon_state = "autocannon" + handful_state = "twobore" + + accurate_range = 8 //Big low-velocity projectile; this is for blasting dangerous game at close range. + max_range = 14 //At this range, it's lost all its damage anyway. + damage = 300 //Hits like a buckshot PB. + penetration = ARMOR_PENETRATION_TIER_3 + damage_falloff = DAMAGE_FALLOFF_TIER_1 * 3 //It has a lot of energy, but the 26mm bullet drops off fast. + effective_range_max = EFFECTIVE_RANGE_MAX_TIER_2 //Full damage up to this distance, then falloff for each tile beyond. + var/hit_messages = list() + +/datum/ammo/bullet/shotgun/twobore/on_hit_mob(mob/living/M, obj/projectile/P) + var/mob/shooter = P.firer + if(shooter && ismob(shooter) && HAS_TRAIT(shooter, TRAIT_TWOBORE_TRAINING) && M.stat != DEAD && prob(40)) //Death is handled by periodic life() checks so this should have a chance to fire on a killshot. + if(!length(hit_messages)) //Pick and remove lines, refill on exhaustion. + hit_messages = list("Got you!", "Aha!", "Bullseye!", "It's curtains for you, Sonny Jim!", "Your head will look fantastic on my wall!", "I have you now!", "You miserable coward! Come and fight me like a man!", "Tally ho!") + var/message = pick_n_take(hit_messages) + shooter.say(message) + + if(P.distance_travelled > 8) + knockback(M, P, 12) + + else if(!M || M == P.firer || M.lying) //These checks are included in knockback and would be redundant above. + return + + shake_camera(M, 3, 4) + M.apply_effect(2, WEAKEN) + M.apply_effect(4, SLOW) + if(iscarbonsizexeno(M)) + to_chat(M, SPAN_XENODANGER("The impact knocks you off your feet!")) + else //This will hammer a Yautja as hard as a human. + to_chat(M, SPAN_HIGHDANGER("The impact knocks you off your feet!")) + + step(M, get_dir(P.firer, M)) + +/datum/ammo/bullet/shotgun/twobore/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) + if(iscarbonsizexeno(living_mob)) + var/mob/living/carbon/xenomorph/target = living_mob + to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) + target.apply_effect(0.5, WEAKEN) + target.apply_effect(2, SUPERSLOW) + target.apply_effect(5, SLOW) + else + if(!isyautja(living_mob)) //Not predators. + living_mob.apply_effect(1, SUPERSLOW) + living_mob.apply_effect(2, SLOW) + to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) + living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) diff --git a/code/datums/ammo/bullet/smg.dm b/code/datums/ammo/bullet/smg.dm new file mode 100644 index 000000000000..e24b3021da97 --- /dev/null +++ b/code/datums/ammo/bullet/smg.dm @@ -0,0 +1,147 @@ +/* +//====== + SMG Ammo +//====== +*/ +//2020 SMG/ammo rebalance. default ammo actually has penetration so it can be useful, by 4khan: should be meh against t3s, better under 15 armor. Perfectly does this right now (oct 2020) +//has reduced falloff compared to the m39. this means it is best for kiting castes (mostly t2s and below admittedly) +//while the m39 ap is better for shredding them at close range, but has reduced velocity, so it's better for just running in and erasing armor-centric castes (defender, crusher) +// which i think is really interesting and good balance, giving both ammo types a reason to exist even against ravagers. +//i feel it is necessary to reflavor the default bullet, because otherwise, people won't be able to notice it has less falloff and faster bullet speed. even with a changelog, +//way too many people don't read the changelog, and after one or two months the changelog entry is all but archive, so there needs to be an ingame description of what the ammo does +//in comparison to armor-piercing rounds. + +/datum/ammo/bullet/smg + name = "submachinegun bullet" + damage = 34 + accurate_range = 4 + effective_range_max = 4 + penetration = ARMOR_PENETRATION_TIER_1 + shell_speed = AMMO_SPEED_TIER_6 + damage_falloff = DAMAGE_FALLOFF_TIER_5 + scatter = SCATTER_AMOUNT_TIER_6 + accuracy = HIT_ACCURACY_TIER_3 + +/datum/ammo/bullet/smg/m39 + name = "high-velocity submachinegun bullet" //i don't want all smgs to inherit 'high velocity' + +/datum/ammo/bullet/smg/ap + name = "armor-piercing submachinegun bullet" + + damage = 26 + penetration = ARMOR_PENETRATION_TIER_6 + shell_speed = AMMO_SPEED_TIER_4 + +/datum/ammo/bullet/smg/heap + name = "high-explosive armor-piercing submachinegun bullet" + + damage = 45 + headshot_state = HEADSHOT_OVERLAY_MEDIUM + penetration = ARMOR_PENETRATION_TIER_6 + shell_speed = AMMO_SPEED_TIER_4 + +/datum/ammo/bullet/smg/ap/toxin + name = "toxic submachinegun bullet" + var/acid_per_hit = 5 + var/organic_damage_mult = 3 + +/datum/ammo/bullet/smg/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) + +/datum/ammo/bullet/smg/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) + . = ..() + if(T.flags_turf & TURF_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/smg/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) + . = ..() + if(O.flags_obj & OBJ_ORGANIC) + P.damage *= organic_damage_mult + +/datum/ammo/bullet/smg/nail + name = "7x45mm plasteel nail" + icon_state = "nail-projectile" + + damage = 25 + penetration = ARMOR_PENETRATION_TIER_5 + damage_falloff = DAMAGE_FALLOFF_TIER_6 + accurate_range = 5 + shell_speed = AMMO_SPEED_TIER_4 + +/datum/ammo/bullet/smg/incendiary + name = "incendiary submachinegun bullet" + damage_type = BURN + shrapnel_chance = 0 + flags_ammo_behavior = AMMO_BALLISTIC + + damage = 25 + accuracy = -HIT_ACCURACY_TIER_2 + +/datum/ammo/bullet/smg/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/smg/ap/penetrating + name = "wall-penetrating submachinegun bullet" + shrapnel_chance = 0 + + damage = 30 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/smg/ap/penetrating/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/smg/le + name = "armor-shredding submachinegun bullet" + + scatter = SCATTER_AMOUNT_TIER_10 + damage = 20 + penetration = ARMOR_PENETRATION_TIER_4 + shell_speed = AMMO_SPEED_TIER_3 + damage_falloff = DAMAGE_FALLOFF_TIER_10 + pen_armor_punch = 4 + +/datum/ammo/bullet/smg/rubber + name = "rubber submachinegun bullet" + sound_override = 'sound/weapons/gun_c99.ogg' + + damage = 0 + stamina_damage = 10 + shrapnel_chance = 0 + +/datum/ammo/bullet/smg/mp27 + name = "simple submachinegun bullet" + damage = 40 + accurate_range = 5 + effective_range_max = 7 + penetration = 0 + shell_speed = AMMO_SPEED_TIER_6 + damage_falloff = DAMAGE_FALLOFF_TIER_6 + scatter = SCATTER_AMOUNT_TIER_6 + accuracy = HIT_ACCURACY_TIER_2 + +// less damage than the m39, but better falloff, range, and AP + +/datum/ammo/bullet/smg/ppsh + name = "crude submachinegun bullet" + damage = 26 + accurate_range = 7 + effective_range_max = 7 + penetration = ARMOR_PENETRATION_TIER_2 + damage_falloff = DAMAGE_FALLOFF_TIER_7 + scatter = SCATTER_AMOUNT_TIER_5 + +/datum/ammo/bullet/smg/pps43 + name = "simple submachinegun bullet" + damage = 35 + accurate_range = 7 + effective_range_max = 10 + penetration = ARMOR_PENETRATION_TIER_4 + damage_falloff = DAMAGE_FALLOFF_TIER_6 + scatter = SCATTER_AMOUNT_TIER_6 diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm new file mode 100644 index 000000000000..a82f00631608 --- /dev/null +++ b/code/datums/ammo/bullet/sniper.dm @@ -0,0 +1,170 @@ +/* +//====== + Sniper Ammo +//====== +*/ + +/datum/ammo/bullet/sniper + name = "sniper bullet" + headshot_state = HEADSHOT_OVERLAY_HEAVY + damage_falloff = 0 + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER + accurate_range_min = 4 + + accuracy = HIT_ACCURACY_TIER_8 + accurate_range = 32 + max_range = 32 + scatter = 0 + damage = 70 + penetration= ARMOR_PENETRATION_TIER_10 + shell_speed = AMMO_SPEED_TIER_6 + damage_falloff = 0 + +/datum/ammo/bullet/sniper/on_hit_mob(mob/M,obj/projectile/P) + if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) + var/mob/living/L = M + L.apply_armoured_damage(damage*2, ARMOR_BULLET, BRUTE, null, penetration) + to_chat(P.firer, SPAN_WARNING("Bullseye!")) + +/datum/ammo/bullet/sniper/incendiary + name = "incendiary sniper bullet" + damage_type = BRUTE + shrapnel_chance = 0 + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER + + //Removed accuracy = 0, accuracy_var_high = Variance Tier 6, and scatter = 0. -Kaga + damage = 60 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/sniper/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/sniper/incendiary/on_hit_mob(mob/M,obj/projectile/P) + if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) + var/mob/living/L = M + var/blind_duration = 5 + if(isxeno(M)) + var/mob/living/carbon/xenomorph/target = M + if(target.mob_size >= MOB_SIZE_BIG) + blind_duration = 2 + L.AdjustEyeBlur(blind_duration) + L.adjust_fire_stacks(10) + to_chat(P.firer, SPAN_WARNING("Bullseye!")) + +/datum/ammo/bullet/sniper/flak + name = "flak sniper bullet" + damage_type = BRUTE + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER + + accuracy = HIT_ACCURACY_TIER_8 + scatter = SCATTER_AMOUNT_TIER_8 + damage = 55 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 //Documenting old code: This converts to a variance of 96-109% damage. -Kaga + penetration = 0 + +/datum/ammo/bullet/sniper/flak/on_hit_mob(mob/M,obj/projectile/P) + if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) + var/slow_duration = 7 + var/mob/living/L = M + if(isxeno(M)) + var/mob/living/carbon/xenomorph/target = M + if(target.mob_size >= MOB_SIZE_BIG) + slow_duration = 4 + M.adjust_effect(slow_duration, SUPERSLOW) + L.apply_armoured_damage(damage, ARMOR_BULLET, BRUTE, null, penetration) + to_chat(P.firer, SPAN_WARNING("Bullseye!")) + else + burst(get_turf(M),P,damage_type, 2 , 2) + burst(get_turf(M),P,damage_type, 1 , 2 , 0) + +/datum/ammo/bullet/sniper/flak/on_near_target(turf/T, obj/projectile/P) + burst(T,P,damage_type, 2 , 2) + burst(T,P,damage_type, 1 , 2, 0) + return 1 + +/datum/ammo/bullet/sniper/crude + name = "crude sniper bullet" + damage = 42 + penetration = ARMOR_PENETRATION_TIER_6 + +/datum/ammo/bullet/sniper/crude/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + pushback(M, P, 3) + +/datum/ammo/bullet/sniper/upp + name = "armor-piercing sniper bullet" + damage = 80 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/bullet/sniper/anti_materiel + name = "anti-materiel sniper bullet" + + shrapnel_chance = 0 // This isn't leaving any shrapnel. + accuracy = HIT_ACCURACY_TIER_8 + damage = 125 + shell_speed = AMMO_SPEED_TIER_6 + +/datum/ammo/bullet/sniper/anti_materiel/on_hit_mob(mob/M,obj/projectile/P) + if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) + var/mob/living/L = M + var/size_damage_mod = 0.8 + if(isxeno(M)) + var/mob/living/carbon/xenomorph/target = M + if(target.mob_size >= MOB_SIZE_XENO) + size_damage_mod += 0.6 + if(target.mob_size >= MOB_SIZE_BIG) + size_damage_mod += 0.6 + L.apply_armoured_damage(damage*size_damage_mod, ARMOR_BULLET, BRUTE, null, penetration) + // 180% damage to all targets (225), 240% (300) against non-Runner xenos, and 300% against Big xenos (375). -Kaga + to_chat(P.firer, SPAN_WARNING("Bullseye!")) + +/datum/ammo/bullet/sniper/anti_materiel/vulture + damage = 400 // Fully intended to vaporize anything smaller than a mini cooper + accurate_range_min = 10 + handful_state = "vulture_bullet" + sound_hit = 'sound/bullets/bullet_vulture_impact.ogg' + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER|AMMO_ANTIVEHICLE + +/datum/ammo/bullet/sniper/anti_materiel/vulture/on_hit_mob(mob/hit_mob, obj/projectile/bullet) + . = ..() + knockback(hit_mob, bullet, 30) + hit_mob.apply_effect(3, SLOW) + +/datum/ammo/bullet/sniper/anti_materiel/vulture/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating/heavy) + )) + +/datum/ammo/bullet/sniper/elite + name = "supersonic sniper bullet" + + shrapnel_chance = 0 // This isn't leaving any shrapnel. + accuracy = HIT_ACCURACY_TIER_8 + damage = 150 + shell_speed = AMMO_SPEED_TIER_6 + AMMO_SPEED_TIER_2 + +/datum/ammo/bullet/sniper/elite/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) + )) + +/datum/ammo/bullet/sniper/elite/on_hit_mob(mob/M,obj/projectile/P) + if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) + var/mob/living/L = M + var/size_damage_mod = 0.5 + if(isxeno(M)) + var/mob/living/carbon/xenomorph/target = M + if(target.mob_size >= MOB_SIZE_XENO) + size_damage_mod += 0.5 + if(target.mob_size >= MOB_SIZE_BIG) + size_damage_mod += 1 + L.apply_armoured_damage(damage*size_damage_mod, ARMOR_BULLET, BRUTE, null, penetration) + else + L.apply_armoured_damage(damage, ARMOR_BULLET, BRUTE, null, penetration) + // 150% damage to runners (225), 300% against Big xenos (450), and 200% against all others (300). -Kaga + to_chat(P.firer, SPAN_WARNING("Bullseye!")) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm new file mode 100644 index 000000000000..cdf30b1af7fe --- /dev/null +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -0,0 +1,176 @@ +/* +//====== + Special Ammo +//====== +*/ + +/datum/ammo/bullet/smartgun + name = "smartgun bullet" + icon_state = "redbullet" + flags_ammo_behavior = AMMO_BALLISTIC + + max_range = 12 + accuracy = HIT_ACCURACY_TIER_4 + damage = 30 + penetration = 0 + +/datum/ammo/bullet/smartgun/armor_piercing + name = "armor-piercing smartgun bullet" + icon_state = "bullet" + + accurate_range = 12 + accuracy = HIT_ACCURACY_TIER_2 + damage = 20 + penetration = ARMOR_PENETRATION_TIER_8 + damage_armor_punch = 1 + +/datum/ammo/bullet/smartgun/dirty + name = "irradiated smartgun bullet" + debilitate = list(0,0,0,3,0,0,0,1) + + shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 + accurate_range = 32 + accuracy = HIT_ACCURACY_TIER_3 + damage = 40 + penetration = 0 + +/datum/ammo/bullet/smartgun/dirty/armor_piercing + debilitate = list(0,0,0,3,0,0,0,1) + + accurate_range = 22 + accuracy = HIT_ACCURACY_TIER_3 + damage = 30 + penetration = ARMOR_PENETRATION_TIER_7 + damage_armor_punch = 3 + +/datum/ammo/bullet/smartgun/holo_target //Royal marines smartgun bullet has only diff between regular ammo is this one does holostacks + name = "holo-targeting smartgun bullet" + damage = 30 + ///Stuff for the HRP holotargetting stacks + var/holo_stacks = 15 + +/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) + +/datum/ammo/bullet/smartgun/holo_target/ap + name = "armor-piercing smartgun bullet" + icon_state = "bullet" + + accurate_range = 12 + accuracy = HIT_ACCURACY_TIER_2 + damage = 20 + penetration = ARMOR_PENETRATION_TIER_8 + damage_armor_punch = 1 + +/datum/ammo/bullet/smartgun/m56_fpw + name = "\improper M56 FPW bullet" + icon_state = "redbullet" + flags_ammo_behavior = AMMO_BALLISTIC + + max_range = 7 + accuracy = HIT_ACCURACY_TIER_7 + damage = 35 + penetration = ARMOR_PENETRATION_TIER_1 + +/datum/ammo/bullet/turret + name = "autocannon bullet" + icon_state = "redbullet" //Red bullets to indicate friendly fire restriction + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_COVER + + accurate_range = 22 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_8 + max_range = 22 + damage = 30 + penetration = ARMOR_PENETRATION_TIER_7 + damage_armor_punch = 0 + pen_armor_punch = 0 + shell_speed = 2*AMMO_SPEED_TIER_6 + accuracy = HIT_ACCURACY_TIER_5 + +/datum/ammo/bullet/turret/dumb + icon_state = "bullet" + flags_ammo_behavior = AMMO_BALLISTIC + +/datum/ammo/bullet/machinegun //Adding this for the MG Nests (~Art) + name = "machinegun bullet" + icon_state = "bullet" // Keeping it bog standard with the turret but allows it to be changed + + accurate_range = 12 + damage = 35 + penetration= ARMOR_PENETRATION_TIER_10 //Bumped the penetration to serve a different role from sentries, MGs are a bit more offensive + accuracy = HIT_ACCURACY_TIER_3 + +/datum/ammo/bullet/machinegun/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) + )) + +/datum/ammo/bullet/machinegun/auto // for M2C, automatic variant for M56D, stats for bullet should always be moderately overtuned to fulfill its ultra-offense + flank-push purpose + name = "heavy machinegun bullet" + + accurate_range = 10 + damage = 50 + penetration = ARMOR_PENETRATION_TIER_6 + accuracy = -HIT_ACCURACY_TIER_2 // 75 accuracy + shell_speed = AMMO_SPEED_TIER_2 + max_range = 15 + effective_range_max = 7 + damage_falloff = DAMAGE_FALLOFF_TIER_8 + +/datum/ammo/bullet/machinegun/auto/set_bullet_traits() + return + +/datum/ammo/bullet/minigun + name = "minigun bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + accuracy = -HIT_ACCURACY_TIER_3 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 12 + damage = 35 + penetration = ARMOR_PENETRATION_TIER_6 + +/datum/ammo/bullet/minigun/New() + ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + damage = 15 + else if(SSticker.current_state < GAME_STATE_PLAYING) + RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(setup_hvh_damage)) + +/datum/ammo/bullet/minigun/proc/setup_hvh_damage() + if(MODE_HAS_FLAG(MODE_FACTION_CLASH)) + damage = 15 + +/datum/ammo/bullet/minigun/tank + accuracy = -HIT_ACCURACY_TIER_1 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_8 + accurate_range = 12 + +/datum/ammo/bullet/m60 + name = "M60 bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + accuracy = HIT_ACCURACY_TIER_2 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 12 + damage = 45 //7.62x51 is scary + penetration= ARMOR_PENETRATION_TIER_6 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + +/datum/ammo/bullet/pkp + name = "machinegun bullet" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + + accuracy = HIT_ACCURACY_TIER_1 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 14 + damage = 35 + penetration= ARMOR_PENETRATION_TIER_6 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 diff --git a/code/datums/ammo/bullet/tank.dm b/code/datums/ammo/bullet/tank.dm new file mode 100644 index 000000000000..70a953c6e273 --- /dev/null +++ b/code/datums/ammo/bullet/tank.dm @@ -0,0 +1,74 @@ +/* +//====== + Tank Ammo +//====== +*/ + +/datum/ammo/bullet/tank/flak + name = "flak autocannon bullet" + icon_state = "autocannon" + damage_falloff = 0 + flags_ammo_behavior = AMMO_BALLISTIC + accurate_range_min = 4 + + accuracy = HIT_ACCURACY_TIER_8 + scatter = 0 + damage = 60 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_6 + accurate_range = 32 + max_range = 32 + shell_speed = AMMO_SPEED_TIER_6 + +/datum/ammo/bullet/tank/flak/on_hit_mob(mob/M,obj/projectile/P) + burst(get_turf(M),P,damage_type, 2 , 3) + burst(get_turf(M),P,damage_type, 1 , 3 , 0) + +/datum/ammo/bullet/tank/flak/on_near_target(turf/T, obj/projectile/P) + burst(get_turf(T),P,damage_type, 2 , 3) + burst(get_turf(T),P,damage_type, 1 , 3, 0) + return 1 + +/datum/ammo/bullet/tank/flak/on_hit_obj(obj/O,obj/projectile/P) + burst(get_turf(P),P,damage_type, 2 , 3) + burst(get_turf(P),P,damage_type, 1 , 3 , 0) + +/datum/ammo/bullet/tank/flak/on_hit_turf(turf/T,obj/projectile/P) + burst(get_turf(T),P,damage_type, 2 , 3) + burst(get_turf(T),P,damage_type, 1 , 3 , 0) + +/datum/ammo/bullet/tank/dualcannon + name = "dualcannon bullet" + icon_state = "autocannon" + damage_falloff = 0 + flags_ammo_behavior = AMMO_BALLISTIC + + accuracy = HIT_ACCURACY_TIER_8 + scatter = 0 + damage = 50 + damage_var_high = PROJECTILE_VARIANCE_TIER_8 + penetration = ARMOR_PENETRATION_TIER_3 + accurate_range = 10 + max_range = 12 + shell_speed = AMMO_SPEED_TIER_5 + +/datum/ammo/bullet/tank/dualcannon/on_hit_mob(mob/M,obj/projectile/P) + for(var/mob/living/carbon/L in get_turf(M)) + if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) + shake_camera(L, 1, 1) + +/datum/ammo/bullet/tank/dualcannon/on_near_target(turf/T, obj/projectile/P) + for(var/mob/living/carbon/L in T) + if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) + shake_camera(L, 1, 1) + return 1 + +/datum/ammo/bullet/tank/dualcannon/on_hit_obj(obj/O,obj/projectile/P) + for(var/mob/living/carbon/L in get_turf(O)) + if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) + shake_camera(L, 1, 1) + +/datum/ammo/bullet/tank/dualcannon/on_hit_turf(turf/T,obj/projectile/P) + for(var/mob/living/carbon/L in T) + if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) + shake_camera(L, 1, 1) diff --git a/code/datums/ammo/energy.dm b/code/datums/ammo/energy.dm new file mode 100644 index 000000000000..01c69ffa0015 --- /dev/null +++ b/code/datums/ammo/energy.dm @@ -0,0 +1,241 @@ +/* +//====== + Energy Ammo +//====== +*/ + +/datum/ammo/energy + ping = null //no bounce off. We can have one later. + sound_hit = "energy_hit" + sound_miss = "energy_miss" + sound_bounce = "energy_bounce" + + damage_type = BURN + flags_ammo_behavior = AMMO_ENERGY + + accuracy = HIT_ACCURACY_TIER_4 + +/datum/ammo/energy/emitter //Damage is determined in emitter.dm + name = "emitter bolt" + icon_state = "emitter" + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_ARMOR + + accurate_range = 6 + max_range = 6 + +/datum/ammo/energy/taser + name = "taser bolt" + icon_state = "stun" + damage_type = OXY + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_ALWAYS_FF //Not that ignoring will do much right now. + + stamina_damage = 45 + accuracy = HIT_ACCURACY_TIER_8 + shell_speed = AMMO_SPEED_TIER_1 // Slightly faster + hit_effect_color = "#FFFF00" + +/datum/ammo/energy/taser/on_hit_mob(mob/M, obj/projectile/P) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.disable_special_items() // Disables scout cloak + +/datum/ammo/energy/taser/precise + name = "precise taser bolt" + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_MP + +/datum/ammo/energy/rxfm_eva + name = "laser blast" + icon_state = "laser_new" + flags_ammo_behavior = AMMO_LASER + accurate_range = 14 + max_range = 22 + damage = 45 + stamina_damage = 25 //why not + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/energy/rxfm_eva/on_hit_mob(mob/living/M, obj/projectile/P) + ..() + if(prob(10)) //small chance for one to ignite on hit + M.fire_act() + +/datum/ammo/energy/laz_uzi + name = "laser bolt" + icon_state = "laser_new" + flags_ammo_behavior = AMMO_ENERGY + damage = 40 + accurate_range = 5 + effective_range_max = 7 + max_range = 10 + shell_speed = AMMO_SPEED_TIER_4 + scatter = SCATTER_AMOUNT_TIER_6 + accuracy = HIT_ACCURACY_TIER_3 + damage_falloff = DAMAGE_FALLOFF_TIER_8 + +/datum/ammo/energy/yautja + headshot_state = HEADSHOT_OVERLAY_MEDIUM + accurate_range = 12 + shell_speed = AMMO_SPEED_TIER_3 + damage_type = BURN + flags_ammo_behavior = AMMO_IGNORE_RESIST + +/datum/ammo/energy/yautja/pistol + name = "plasma pistol bolt" + icon_state = "ion" + + damage = 40 + shell_speed = AMMO_SPEED_TIER_2 + +/datum/ammo/energy/yautja/pistol/incendiary + damage = 10 + +/datum/ammo/energy/yautja/pistol/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/shrapnel/plasma + name = "plasma wave" + shrapnel_chance = 0 + penetration = ARMOR_PENETRATION_TIER_10 + accuracy = HIT_ACCURACY_TIER_MAX + damage = 15 + icon_state = "shrapnel_plasma" + damage_type = BURN + +/datum/ammo/bullet/shrapnel/plasma/on_hit_mob(mob/hit_mob, obj/projectile/hit_projectile) + hit_mob.apply_effect(2, WEAKEN) + +/datum/ammo/energy/yautja/caster + name = "root caster bolt" + icon_state = "ion" + +/datum/ammo/energy/yautja/caster/stun + name = "low power stun bolt" + debilitate = list(2,2,0,0,0,1,0,0) + + damage = 0 + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST + +/datum/ammo/energy/yautja/caster/bolt + name = "plasma bolt" + icon_state = "pulse1" + flags_ammo_behavior = AMMO_IGNORE_RESIST + shell_speed = AMMO_SPEED_TIER_6 + damage = 35 + +/datum/ammo/energy/yautja/caster/bolt/stun + name = "high power stun bolt" + var/stun_time = 2 + + damage = 0 + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST + +/datum/ammo/energy/yautja/caster/bolt/stun/on_hit_mob(mob/M, obj/projectile/P) + var/mob/living/carbon/C = M + var/stun_time = src.stun_time + if(istype(C)) + if(isyautja(C) || ispredalien(C)) + return + to_chat(C, SPAN_DANGER("An electric shock ripples through your body, freezing you in place!")) + log_attack("[key_name(C)] was stunned by a high power stun bolt from [key_name(P.firer)] at [get_area(P)]") + + if(ishuman(C)) + var/mob/living/carbon/human/H = C + stun_time++ + H.apply_effect(stun_time, WEAKEN) + else + M.apply_effect(stun_time, WEAKEN) + + C.apply_effect(stun_time, STUN) + ..() + +/datum/ammo/energy/yautja/caster/sphere + name = "plasma eradicator" + icon_state = "bluespace" + flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_HITS_TARGET_TURF + shell_speed = AMMO_SPEED_TIER_4 + accuracy = HIT_ACCURACY_TIER_8 + + damage = 55 + + accurate_range = 8 + max_range = 8 + + var/vehicle_slowdown_time = 5 SECONDS + +/datum/ammo/energy/yautja/caster/sphere/on_hit_mob(mob/M, obj/projectile/P) + cell_explosion(P, 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/energy/yautja/caster/sphere/on_hit_turf(turf/T, obj/projectile/P) + cell_explosion(P, 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/energy/yautja/caster/sphere/on_hit_obj(obj/O, obj/projectile/P) + if(istype(O, /obj/vehicle/multitile)) + var/obj/vehicle/multitile/multitile_vehicle = O + multitile_vehicle.next_move = world.time + vehicle_slowdown_time + playsound(multitile_vehicle, 'sound/effects/meteorimpact.ogg', 35) + multitile_vehicle.at_munition_interior_explosion_effect(cause_data = create_cause_data("Plasma Eradicator", P.firer)) + multitile_vehicle.interior_crash_effect() + multitile_vehicle.ex_act(150, P.dir, P.weapon_cause_data, 100) + cell_explosion(get_turf(P), 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/energy/yautja/caster/sphere/do_at_max_range(obj/projectile/P) + cell_explosion(get_turf(P), 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + + +/datum/ammo/energy/yautja/caster/sphere/stun + name = "plasma immobilizer" + damage = 0 + flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST + accurate_range = 20 + max_range = 20 + + var/stun_range = 4 // Big + var/stun_time = 6 + +/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_mob(mob/M, obj/projectile/P) + do_area_stun(P) + +/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_turf(turf/T,obj/projectile/P) + do_area_stun(P) + +/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_obj(obj/O,obj/projectile/P) + do_area_stun(P) + +/datum/ammo/energy/yautja/caster/sphere/stun/do_at_max_range(obj/projectile/P) + do_area_stun(P) + +/datum/ammo/energy/yautja/caster/sphere/stun/proc/do_area_stun(obj/projectile/P) + playsound(P, 'sound/weapons/wave.ogg', 75, 1, 25) + for (var/mob/living/carbon/M in view(src.stun_range, get_turf(P))) + var/stun_time = src.stun_time + log_attack("[key_name(M)] was stunned by a plasma immobilizer from [key_name(P.firer)] at [get_area(P)]") + if (isyautja(M)) + stun_time -= 2 + if(ispredalien(M)) + continue + to_chat(M, SPAN_DANGER("A powerful electric shock ripples through your body, freezing you in place!")) + M.apply_effect(stun_time, STUN) + + if (ishuman(M)) + var/mob/living/carbon/human/H = M + H.apply_effect(stun_time, WEAKEN) + else + M.apply_effect(stun_time, WEAKEN) + +/datum/ammo/energy/yautja/rifle/bolt + name = "plasma rifle bolt" + icon_state = "ion" + damage_type = BURN + debilitate = list(0,2,0,0,0,0,0,0) + flags_ammo_behavior = AMMO_IGNORE_RESIST + + damage = 55 + penetration = ARMOR_PENETRATION_TIER_10 + +/datum/ammo/energy/yautja/rifle/bolt/on_hit_mob(mob/hit_mob, obj/projectile/hit_projectile) + if(isxeno(hit_mob)) + var/mob/living/carbon/xenomorph/xeno = hit_mob + xeno.apply_damage(damage * 0.75, BURN) + xeno.interference = 30 diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm new file mode 100644 index 000000000000..bdb284753dc4 --- /dev/null +++ b/code/datums/ammo/misc.dm @@ -0,0 +1,294 @@ +/* +//====== + Misc Ammo +//====== +*/ + +/datum/ammo/alloy_spike + name = "alloy spike" + headshot_state = HEADSHOT_OVERLAY_MEDIUM + ping = "ping_s" + icon_state = "MSpearFlight" + sound_hit = "alloy_hit" + sound_armor = "alloy_armor" + sound_bounce = "alloy_bounce" + + accuracy = HIT_ACCURACY_TIER_8 + accurate_range = 12 + max_range = 12 + damage = 30 + penetration= ARMOR_PENETRATION_TIER_10 + shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 + shrapnel_type = /obj/item/shard/shrapnel + +/datum/ammo/flamethrower + name = "flame" + icon_state = "pulse0" + damage_type = BURN + flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_HITS_TARGET_TURF + + max_range = 6 + damage = 35 + +/datum/ammo/flamethrower/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/flamethrower/on_hit_mob(mob/M, obj/projectile/P) + drop_flame(get_turf(M), P.weapon_cause_data) + +/datum/ammo/flamethrower/on_hit_obj(obj/O, obj/projectile/P) + drop_flame(get_turf(O), P.weapon_cause_data) + +/datum/ammo/flamethrower/on_hit_turf(turf/T, obj/projectile/P) + drop_flame(T, P.weapon_cause_data) + +/datum/ammo/flamethrower/do_at_max_range(obj/projectile/P) + drop_flame(get_turf(P), P.weapon_cause_data) + +/datum/ammo/flamethrower/tank_flamer + flamer_reagent_type = /datum/reagent/napalm/blue + +/datum/ammo/flamethrower/sentry_flamer + flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME + flamer_reagent_type = /datum/reagent/napalm/blue + + accuracy = HIT_ACCURACY_TIER_8 + accurate_range = 6 + max_range = 12 + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/flamethrower/sentry_flamer/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/flamethrower/sentry_flamer/glob + max_range = 14 + accurate_range = 10 + var/datum/effect_system/smoke_spread/phosphorus/smoke + +/datum/ammo/flamethrower/sentry_flamer/glob/New() + . = ..() + smoke = new() + +/datum/ammo/flamethrower/sentry_flamer/glob/drop_flame(turf/T, datum/cause_data/cause_data) + if(!istype(T)) + return + smoke.set_up(1, 0, T, new_cause_data = cause_data) + smoke.start() + +/datum/ammo/flamethrower/sentry_flamer/glob/Destroy() + qdel(smoke) + return ..() + +/datum/ammo/flamethrower/sentry_flamer/mini + name = "normal fire" + +/datum/ammo/flamethrower/sentry_flamer/mini/drop_flame(turf/T, datum/cause_data/cause_data) + if(!istype(T)) + return + var/datum/reagent/napalm/ut/R = new() + R.durationfire = BURN_TIME_INSTANT + new /obj/flamer_fire(T, cause_data, R, 0) + +/datum/ammo/flare + name = "flare" + ping = null //no bounce off. + damage_type = BURN + flags_ammo_behavior = AMMO_HITS_TARGET_TURF + icon_state = "flare" + + damage = 15 + accuracy = HIT_ACCURACY_TIER_3 + max_range = 14 + shell_speed = AMMO_SPEED_TIER_3 + + var/flare_type = /obj/item/device/flashlight/flare/on/gun + handful_type = /obj/item/device/flashlight/flare + +/datum/ammo/flare/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/flare/on_hit_mob(mob/M,obj/projectile/P) + drop_flare(get_turf(M), P, P.firer) + +/datum/ammo/flare/on_hit_obj(obj/O,obj/projectile/P) + drop_flare(get_turf(P), P, P.firer) + +/datum/ammo/flare/on_hit_turf(turf/T, obj/projectile/P) + if(T.density && isturf(P.loc)) + drop_flare(P.loc, P, P.firer) + else + drop_flare(T, P, P.firer) + +/datum/ammo/flare/do_at_max_range(obj/projectile/P, mob/firer) + drop_flare(get_turf(P), P, P.firer) + +/datum/ammo/flare/proc/drop_flare(turf/T, obj/projectile/fired_projectile, mob/firer) + var/obj/item/device/flashlight/flare/G = new flare_type(T) + var/matrix/rotation = matrix() + rotation.Turn(fired_projectile.angle - 90) + G.apply_transform(rotation) + G.visible_message(SPAN_WARNING("\A [G] bursts into brilliant light nearby!")) + return G + +/datum/ammo/flare/signal + name = "signal flare" + icon_state = "flare_signal" + flare_type = /obj/item/device/flashlight/flare/signal/gun + handful_type = /obj/item/device/flashlight/flare/signal + +/datum/ammo/flare/signal/drop_flare(turf/T, obj/projectile/fired_projectile, mob/firer) + var/obj/item/device/flashlight/flare/signal/gun/signal_flare = ..() + signal_flare.activate_signal(firer) + if(istype(fired_projectile.shot_from, /obj/item/weapon/gun/flare)) + var/obj/item/weapon/gun/flare/flare_gun_fired_from = fired_projectile.shot_from + flare_gun_fired_from.last_signal_flare_name = signal_flare.name + +/datum/ammo/flare/starshell + name = "starshell ash" + icon_state = "starshell_bullet" + max_range = 5 + flare_type = /obj/item/device/flashlight/flare/on/starshell_ash + +/datum/ammo/flare/starshell/set_bullet_traits() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff, /datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/souto + name = "Souto Can" + ping = null //no bounce off. + damage_type = BRUTE + shrapnel_type = /obj/item/reagent_container/food/drinks/cans/souto/classic + flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_IGNORE_ARMOR|AMMO_IGNORE_RESIST|AMMO_BALLISTIC|AMMO_STOPPED_BY_COVER|AMMO_SPECIAL_EMBED + var/obj/item/reagent_container/food/drinks/cans/souto/can_type + icon_state = "souto_classic" + + max_range = 12 + shrapnel_chance = 10 + accuracy = HIT_ACCURACY_TIER_8 + HIT_ACCURACY_TIER_8 + accurate_range = 12 + shell_speed = AMMO_SPEED_TIER_1 + +/datum/ammo/souto/on_embed(mob/embedded_mob, obj/limb/target_organ) + if(ishuman(embedded_mob) && !isyautja(embedded_mob)) + if(istype(target_organ)) + target_organ.embed(new can_type) + +/datum/ammo/souto/on_hit_mob(mob/M, obj/projectile/P) + if(!M || M == P.firer) return + if(M.throw_mode && !M.get_active_hand()) //empty active hand and we're in throw mode. If so we catch the can. + if(!M.is_mob_incapacitated()) // People who are not able to catch cannot catch. + if(P.contents.len == 1) + for(var/obj/item/reagent_container/food/drinks/cans/souto/S in P.contents) + M.put_in_active_hand(S) + for(var/mob/O in viewers(world_view_size, P)) //find all people in view. + O.show_message(SPAN_DANGER("[M] catches the [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught. + return //Can was caught. + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.species.name == "Human") //no effect on synths or preds. + H.apply_effect(6, STUN) + H.apply_effect(8, WEAKEN) + H.apply_effect(15, DAZE) + H.apply_effect(15, SLOW) + shake_camera(H, 2, 1) + if(P.contents.len) + drop_can(P.loc, P) //We make a can at the location. + +/datum/ammo/souto/on_hit_obj(obj/O,obj/projectile/P) + drop_can(P.loc, P) //We make a can at the location. + +/datum/ammo/souto/on_hit_turf(turf/T, obj/projectile/P) + drop_can(P.loc, P) //We make a can at the location. + +/datum/ammo/souto/do_at_max_range(obj/projectile/P) + drop_can(P.loc, P) //We make a can at the location. + +/datum/ammo/souto/on_shield_block(mob/M, obj/projectile/P) + drop_can(P.loc, P) //We make a can at the location. + +/datum/ammo/souto/proc/drop_can(loc, obj/projectile/P) + if(P.contents.len) + for(var/obj/item/I in P.contents) + I.forceMove(loc) + randomize_projectile(P) + +/datum/ammo/souto/proc/randomize_projectile(obj/projectile/P) + shrapnel_type = pick(typesof(/obj/item/reagent_container/food/drinks/cans/souto)-/obj/item/reagent_container/food/drinks/cans/souto) + +/datum/ammo/grenade_container + name = "grenade shell" + ping = null + damage_type = BRUTE + var/nade_type = /obj/item/explosive/grenade/high_explosive + icon_state = "grenade" + flags_ammo_behavior = AMMO_IGNORE_COVER|AMMO_SKIPS_ALIENS + + damage = 15 + accuracy = HIT_ACCURACY_TIER_3 + max_range = 6 + +/datum/ammo/grenade_container/on_hit_mob(mob/M,obj/projectile/P) + drop_nade(P) + +/datum/ammo/grenade_container/on_hit_obj(obj/O,obj/projectile/P) + drop_nade(P) + +/datum/ammo/grenade_container/on_hit_turf(turf/T,obj/projectile/P) + drop_nade(P) + +/datum/ammo/grenade_container/do_at_max_range(obj/projectile/P) + drop_nade(P) + +/datum/ammo/grenade_container/proc/drop_nade(obj/projectile/P) + var/turf/T = get_turf(P) + var/obj/item/explosive/grenade/G = new nade_type(T) + G.visible_message(SPAN_WARNING("\A [G] lands on [T]!")) + G.det_time = 10 + G.cause_data = P.weapon_cause_data + G.activate() + +/datum/ammo/grenade_container/rifle + flags_ammo_behavior = NO_FLAGS + +/datum/ammo/grenade_container/smoke + name = "smoke grenade shell" + nade_type = /obj/item/explosive/grenade/smokebomb + icon_state = "smoke_shell" + +/datum/ammo/hugger_container + name = "hugger shell" + ping = null + damage_type = BRUTE + var/hugger_hive = XENO_HIVE_NORMAL + icon_state = "smoke_shell" + + damage = 15 + accuracy = HIT_ACCURACY_TIER_3 + max_range = 6 + +/datum/ammo/hugger_container/on_hit_mob(mob/M,obj/projectile/P) + spawn_hugger(get_turf(P)) + +/datum/ammo/hugger_container/on_hit_obj(obj/O,obj/projectile/P) + spawn_hugger(get_turf(P)) + +/datum/ammo/hugger_container/on_hit_turf(turf/T,obj/projectile/P) + spawn_hugger(get_turf(P)) + +/datum/ammo/hugger_container/do_at_max_range(obj/projectile/P) + spawn_hugger(get_turf(P)) + +/datum/ammo/hugger_container/proc/spawn_hugger(turf/T) + var/obj/item/clothing/mask/facehugger/child = new(T) + child.hivenumber = hugger_hive + INVOKE_ASYNC(child, TYPE_PROC_REF(/obj/item/clothing/mask/facehugger, leap_at_nearest_target)) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm new file mode 100644 index 000000000000..52914f745110 --- /dev/null +++ b/code/datums/ammo/rocket.dm @@ -0,0 +1,300 @@ +/* +//====== + Rocket Ammo +//====== +*/ + +/datum/ammo/rocket + name = "high explosive rocket" + icon_state = "missile" + ping = null //no bounce off. + sound_bounce = "rocket_bounce" + damage_falloff = 0 + flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET|AMMO_STRIKES_SURFACE + var/datum/effect_system/smoke_spread/smoke + + accuracy = HIT_ACCURACY_TIER_2 + accurate_range = 7 + max_range = 7 + damage = 15 + shell_speed = AMMO_SPEED_TIER_2 + +/datum/ammo/rocket/New() + ..() + smoke = new() + +/datum/ammo/rocket/Destroy() + qdel(smoke) + smoke = null + . = ..() + +/datum/ammo/rocket/on_hit_mob(mob/M, obj/projectile/P) + cell_explosion(get_turf(M), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, get_turf(M)) + if(ishuman_strict(M)) // No yautya or synths. Makes humans gib on direct hit. + M.ex_act(350, P.dir, P.weapon_cause_data, 100) + smoke.start() + +/datum/ammo/rocket/on_hit_obj(obj/O, obj/projectile/P) + cell_explosion(get_turf(O), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, get_turf(O)) + smoke.start() + +/datum/ammo/rocket/on_hit_turf(turf/T, obj/projectile/P) + cell_explosion(T, 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, T) + smoke.start() + +/datum/ammo/rocket/do_at_max_range(obj/projectile/P) + cell_explosion(get_turf(P), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, get_turf(P)) + smoke.start() + +/datum/ammo/rocket/ap + name = "anti-armor rocket" + damage_falloff = 0 + flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET + + accuracy = HIT_ACCURACY_TIER_8 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_9 + accurate_range = 6 + max_range = 6 + damage = 10 + penetration= ARMOR_PENETRATION_TIER_10 + +/datum/ammo/rocket/ap/on_hit_mob(mob/M, obj/projectile/P) + var/turf/T = get_turf(M) + M.ex_act(150, P.dir, P.weapon_cause_data, 100) + M.apply_effect(2, WEAKEN) + M.apply_effect(2, PARALYZE) + if(ishuman_strict(M)) // No yautya or synths. Makes humans gib on direct hit. + M.ex_act(300, P.dir, P.weapon_cause_data, 100) + cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, T) + smoke.start() + +/datum/ammo/rocket/ap/on_hit_obj(obj/O, obj/projectile/P) + var/turf/T = get_turf(O) + O.ex_act(150, P.dir, P.weapon_cause_data, 100) + cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, T) + smoke.start() + +/datum/ammo/rocket/ap/on_hit_turf(turf/T, obj/projectile/P) + var/hit_something = 0 + for(var/mob/M in T) + M.ex_act(150, P.dir, P.weapon_cause_data, 100) + M.apply_effect(4, WEAKEN) + M.apply_effect(4, PARALYZE) + hit_something = 1 + continue + if(!hit_something) + for(var/obj/O in T) + if(O.density) + O.ex_act(150, P.dir, P.weapon_cause_data, 100) + hit_something = 1 + continue + if(!hit_something) + T.ex_act(150, P.dir, P.weapon_cause_data, 200) + + cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, T) + smoke.start() + +/datum/ammo/rocket/ap/do_at_max_range(obj/projectile/P) + var/turf/T = get_turf(P) + var/hit_something = 0 + for(var/mob/M in T) + M.ex_act(250, P.dir, P.weapon_cause_data, 100) + M.apply_effect(2, WEAKEN) + M.apply_effect(2, PARALYZE) + hit_something = 1 + continue + if(!hit_something) + for(var/obj/O in T) + if(O.density) + O.ex_act(250, P.dir, P.weapon_cause_data, 100) + hit_something = 1 + continue + if(!hit_something) + T.ex_act(250, P.dir, P.weapon_cause_data) + cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + smoke.set_up(1, T) + smoke.start() + +/datum/ammo/rocket/ap/anti_tank + name = "anti-tank rocket" + damage = 100 + var/vehicle_slowdown_time = 5 SECONDS + shrapnel_chance = 5 + shrapnel_type = /obj/item/large_shrapnel/at_rocket_dud + +/datum/ammo/rocket/ap/anti_tank/on_hit_obj(obj/O, obj/projectile/P) + if(istype(O, /obj/vehicle/multitile)) + var/obj/vehicle/multitile/M = O + M.next_move = world.time + vehicle_slowdown_time + playsound(M, 'sound/effects/meteorimpact.ogg', 35) + M.at_munition_interior_explosion_effect(cause_data = create_cause_data("Anti-Tank Rocket")) + M.interior_crash_effect() + var/turf/T = get_turf(M.loc) + M.ex_act(150, P.dir, P.weapon_cause_data, 100) + smoke.set_up(1, T) + smoke.start() + return + return ..() + + +/datum/ammo/rocket/ltb + name = "cannon round" + icon_state = "ltb" + flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET|AMMO_STRIKES_SURFACE + + accuracy = HIT_ACCURACY_TIER_3 + accurate_range = 32 + max_range = 32 + damage = 25 + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/rocket/ltb/on_hit_mob(mob/M, obj/projectile/P) + cell_explosion(get_turf(M), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + cell_explosion(get_turf(M), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/rocket/ltb/on_hit_obj(obj/O, obj/projectile/P) + cell_explosion(get_turf(O), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + cell_explosion(get_turf(O), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/rocket/ltb/on_hit_turf(turf/T, obj/projectile/P) + cell_explosion(get_turf(T), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + cell_explosion(get_turf(T), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/rocket/ltb/do_at_max_range(obj/projectile/P) + cell_explosion(get_turf(P), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + cell_explosion(get_turf(P), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) + +/datum/ammo/rocket/wp + name = "white phosphorous rocket" + flags_ammo_behavior = AMMO_ROCKET|AMMO_EXPLOSIVE|AMMO_STRIKES_SURFACE + damage_type = BURN + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 8 + damage = 90 + max_range = 8 + +/datum/ammo/rocket/wp/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/rocket/wp/drop_flame(turf/T, datum/cause_data/cause_data) + playsound(T, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) + if(!istype(T)) return + smoke.set_up(1, T) + smoke.start() + var/datum/reagent/napalm/blue/R = new() + new /obj/flamer_fire(T, cause_data, R, 3) + + var/datum/effect_system/smoke_spread/phosphorus/landingSmoke = new /datum/effect_system/smoke_spread/phosphorus + landingSmoke.set_up(3, 0, T, null, 6, cause_data) + landingSmoke.start() + landingSmoke = null + +/datum/ammo/rocket/wp/on_hit_mob(mob/M, obj/projectile/P) + drop_flame(get_turf(M), P.weapon_cause_data) + +/datum/ammo/rocket/wp/on_hit_obj(obj/O, obj/projectile/P) + drop_flame(get_turf(O), P.weapon_cause_data) + +/datum/ammo/rocket/wp/on_hit_turf(turf/T, obj/projectile/P) + drop_flame(T, P.weapon_cause_data) + +/datum/ammo/rocket/wp/do_at_max_range(obj/projectile/P) + drop_flame(get_turf(P), P.weapon_cause_data) + +/datum/ammo/rocket/wp/upp + name = "extreme-intensity incendiary rocket" + flags_ammo_behavior = AMMO_ROCKET|AMMO_EXPLOSIVE|AMMO_STRIKES_SURFACE + damage_type = BURN + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 8 + damage = 150 + max_range = 10 + +/datum/ammo/rocket/wp/upp/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/rocket/wp/upp/drop_flame(turf/T, datum/cause_data/cause_data) + playsound(T, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) + if(!istype(T)) return + smoke.set_up(1, T) + smoke.start() + var/datum/reagent/napalm/upp/R = new() + new /obj/flamer_fire(T, cause_data, R, 3) + +/datum/ammo/rocket/wp/upp/on_hit_mob(mob/M, obj/projectile/P) + drop_flame(get_turf(M), P.weapon_cause_data) + +/datum/ammo/rocket/wp/upp/on_hit_obj(obj/O, obj/projectile/P) + drop_flame(get_turf(O), P.weapon_cause_data) + +/datum/ammo/rocket/wp/upp/on_hit_turf(turf/T, obj/projectile/P) + drop_flame(T, P.weapon_cause_data) + +/datum/ammo/rocket/wp/upp/do_at_max_range(obj/projectile/P) + drop_flame(get_turf(P), P.weapon_cause_data) + +/datum/ammo/rocket/wp/quad + name = "thermobaric rocket" + flags_ammo_behavior = AMMO_ROCKET|AMMO_STRIKES_SURFACE + + damage = 100 + max_range = 32 + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/rocket/wp/quad/on_hit_mob(mob/M, obj/projectile/P) + drop_flame(get_turf(M), P.weapon_cause_data) + explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) + +/datum/ammo/rocket/wp/quad/on_hit_obj(obj/O, obj/projectile/P) + drop_flame(get_turf(O), P.weapon_cause_data) + explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) + +/datum/ammo/rocket/wp/quad/on_hit_turf(turf/T, obj/projectile/P) + drop_flame(T, P.weapon_cause_data) + explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) + +/datum/ammo/rocket/wp/quad/do_at_max_range(obj/projectile/P) + drop_flame(get_turf(P), P.weapon_cause_data) + explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) + +/datum/ammo/rocket/custom + name = "custom rocket" + +/datum/ammo/rocket/custom/proc/prime(atom/A, obj/projectile/P) + var/obj/item/weapon/gun/launcher/rocket/launcher = P.shot_from + var/obj/item/ammo_magazine/rocket/custom/rocket = launcher.current_mag + if(rocket.locked && rocket.warhead && rocket.warhead.detonator) + if(rocket.fuel && rocket.fuel.reagents.get_reagent_amount(rocket.fuel_type) >= rocket.fuel_requirement) + rocket.forceMove(P.loc) + rocket.warhead.cause_data = P.weapon_cause_data + rocket.warhead.prime() + qdel(rocket) + smoke.set_up(1, get_turf(A)) + smoke.start() + +/datum/ammo/rocket/custom/on_hit_mob(mob/M, obj/projectile/P) + prime(M, P) + +/datum/ammo/rocket/custom/on_hit_obj(obj/O, obj/projectile/P) + prime(O, P) + +/datum/ammo/rocket/custom/on_hit_turf(turf/T, obj/projectile/P) + prime(T, P) + +/datum/ammo/rocket/custom/do_at_max_range(obj/projectile/P) + prime(null, P) diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm new file mode 100644 index 000000000000..e27caa4b277d --- /dev/null +++ b/code/datums/ammo/shrapnel.dm @@ -0,0 +1,157 @@ +/* +//====== + Shrapnel +//====== +*/ +/datum/ammo/bullet/shrapnel + name = "shrapnel" + icon_state = "buckshot" + accurate_range_min = 5 + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_STOPPED_BY_COVER + + accuracy = HIT_ACCURACY_TIER_3 + accurate_range = 32 + max_range = 8 + damage = 25 + damage_var_low = -PROJECTILE_VARIANCE_TIER_6 + damage_var_high = PROJECTILE_VARIANCE_TIER_6 + penetration = ARMOR_PENETRATION_TIER_4 + shell_speed = AMMO_SPEED_TIER_2 + shrapnel_chance = 5 + +/datum/ammo/bullet/shrapnel/on_hit_obj(obj/O, obj/projectile/P) + if(istype(O, /obj/structure/barricade)) + var/obj/structure/barricade/B = O + B.health -= rand(2, 5) + B.update_health(1) + +/datum/ammo/bullet/shrapnel/rubber + name = "rubber pellets" + icon_state = "rubber_pellets" + flags_ammo_behavior = AMMO_STOPPED_BY_COVER + + damage = 0 + stamina_damage = 25 + shrapnel_chance = 0 + + +/datum/ammo/bullet/shrapnel/hornet_rounds + name = ".22 hornet round" + icon_state = "hornet_round" + flags_ammo_behavior = AMMO_BALLISTIC + damage = 20 + shrapnel_chance = 0 + shell_speed = AMMO_SPEED_TIER_3//she fast af boi + penetration = ARMOR_PENETRATION_TIER_5 + +/datum/ammo/bullet/shrapnel/hornet_rounds/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + M.AddComponent(/datum/component/bonus_damage_stack, 10, world.time) + +/datum/ammo/bullet/shrapnel/incendiary + name = "flaming shrapnel" + icon_state = "beanbag" // looks suprisingly a lot like flaming shrapnel chunks + flags_ammo_behavior = AMMO_STOPPED_BY_COVER + + shell_speed = AMMO_SPEED_TIER_1 + damage = 20 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/shrapnel/incendiary/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + +/datum/ammo/bullet/shrapnel/metal + name = "metal shrapnel" + icon_state = "shrapnelshot_bit" + flags_ammo_behavior = AMMO_STOPPED_BY_COVER|AMMO_BALLISTIC + shell_speed = AMMO_SPEED_TIER_1 + damage = 30 + shrapnel_chance = 15 + accuracy = HIT_ACCURACY_TIER_8 + penetration = ARMOR_PENETRATION_TIER_4 + +/datum/ammo/bullet/shrapnel/light // weak shrapnel + name = "light shrapnel" + icon_state = "shrapnel_light" + + damage = 10 + penetration = ARMOR_PENETRATION_TIER_1 + shell_speed = AMMO_SPEED_TIER_1 + shrapnel_chance = 0 + +/datum/ammo/bullet/shrapnel/light/human + name = "human bone fragments" + icon_state = "shrapnel_human" + + shrapnel_chance = 50 + shrapnel_type = /obj/item/shard/shrapnel/bone_chips/human + +/datum/ammo/bullet/shrapnel/light/human/var1 // sprite variants + icon_state = "shrapnel_human1" + +/datum/ammo/bullet/shrapnel/light/human/var2 // sprite variants + icon_state = "shrapnel_human2" + +/datum/ammo/bullet/shrapnel/light/xeno + name = "alien bone fragments" + icon_state = "shrapnel_xeno" + + shrapnel_chance = 50 + shrapnel_type = /obj/item/shard/shrapnel/bone_chips/xeno + +/datum/ammo/bullet/shrapnel/spall // weak shrapnel + name = "spall" + icon_state = "shrapnel_light" + + damage = 10 + penetration = ARMOR_PENETRATION_TIER_1 + shell_speed = AMMO_SPEED_TIER_1 + shrapnel_chance = 0 + +/datum/ammo/bullet/shrapnel/light/glass + name = "glass shrapnel" + icon_state = "shrapnel_glass" + +/datum/ammo/bullet/shrapnel/light/effect/ // no damage, but looks bright and neat + name = "sparks" + + damage = 1 // Tickle tickle + +/datum/ammo/bullet/shrapnel/light/effect/ver1 + icon_state = "shrapnel_bright1" + +/datum/ammo/bullet/shrapnel/light/effect/ver2 + icon_state = "shrapnel_bright2" + +/datum/ammo/bullet/shrapnel/jagged + shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 + accuracy = HIT_ACCURACY_TIER_MAX + +/datum/ammo/bullet/shrapnel/jagged/on_hit_mob(mob/M, obj/projectile/P) + if(isxeno(M)) + M.apply_effect(0.4, SLOW) + +/* +//======== + CAS 30mm impacters +//======== +*/ +/datum/ammo/bullet/shrapnel/gau //for the GAU to have a impact bullet instead of firecrackers + name = "30mm Multi-Purpose shell" + + damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects. + damage_type = BRUTE + penetration = ARMOR_PENETRATION_TIER_2 + accuracy = HIT_ACCURACY_TIER_MAX + max_range = 0 + shrapnel_chance = 100 //the least of your problems + +/datum/ammo/bullet/shrapnel/gau/at + name = "30mm Anti-Tank shell" + + damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects. + penetration = ARMOR_PENETRATION_TIER_8 + accuracy = HIT_ACCURACY_TIER_MAX diff --git a/code/datums/ammo/xeno.dm b/code/datums/ammo/xeno.dm new file mode 100644 index 000000000000..9d91920ac6f8 --- /dev/null +++ b/code/datums/ammo/xeno.dm @@ -0,0 +1,394 @@ +/* +//====== + Xeno Spits +//====== +*/ +/datum/ammo/xeno + icon_state = "neurotoxin" + ping = "ping_x" + damage_type = TOX + flags_ammo_behavior = AMMO_XENO + + ///used to make cooldown of the different spits vary. + var/added_spit_delay = 0 + var/spit_cost + + /// Should there be a windup for this spit? + var/spit_windup = FALSE + + /// Should there be an additional warning while winding up? (do not put to true if there is not a windup) + var/pre_spit_warn = FALSE + accuracy = HIT_ACCURACY_TIER_8*2 + max_range = 12 + +/datum/ammo/xeno/toxin + name = "neurotoxic spit" + damage_falloff = 0 + flags_ammo_behavior = AMMO_XENO|AMMO_IGNORE_RESIST + spit_cost = 25 + var/effect_power = XENO_NEURO_TIER_4 + var/datum/callback/neuro_callback + + shell_speed = AMMO_SPEED_TIER_3 + max_range = 7 + +/datum/ammo/xeno/toxin/New() + ..() + + neuro_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(apply_neuro)) + +/proc/apply_neuro(mob/M, power, insta_neuro) + if(skillcheck(M, SKILL_ENDURANCE, SKILL_ENDURANCE_MAX) && !insta_neuro) + M.visible_message(SPAN_DANGER("[M] withstands the neurotoxin!")) + return //endurance 5 makes you immune to weak neurotoxin + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.chem_effect_flags & CHEM_EFFECT_RESIST_NEURO || H.species.flags & NO_NEURO) + H.visible_message(SPAN_DANGER("[M] shrugs off the neurotoxin!")) + return //species like zombies or synths are immune to neurotoxin + + if(!isxeno(M)) + if(insta_neuro) + if(M.knocked_down < 3) + M.adjust_effect(1 * power, WEAKEN) + return + + if(ishuman(M)) + M.apply_effect(2.5, SUPERSLOW) + M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) + + var/no_clothes_neuro = FALSE + + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(!H.wear_suit || H.wear_suit.slowdown == 0) + no_clothes_neuro = TRUE + + if(no_clothes_neuro) + if(M.knocked_down < 5) + M.adjust_effect(1 * power, WEAKEN) // KD them a bit more + M.visible_message(SPAN_DANGER("[M] falls prone.")) + +/proc/apply_scatter_neuro(mob/M) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(skillcheck(M, SKILL_ENDURANCE, SKILL_ENDURANCE_MAX)) + M.visible_message(SPAN_DANGER("[M] withstands the neurotoxin!")) + return //endurance 5 makes you immune to weak neuro + if(H.chem_effect_flags & CHEM_EFFECT_RESIST_NEURO || H.species.flags & NO_NEURO) + H.visible_message(SPAN_DANGER("[M] shrugs off the neurotoxin!")) + return + + if(M.knocked_down < 0.7) // apply knockdown only if current knockdown is less than 0.7 second + M.apply_effect(0.7, WEAKEN) + M.visible_message(SPAN_DANGER("[M] falls prone.")) + +/datum/ammo/xeno/toxin/on_hit_mob(mob/M,obj/projectile/P) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.status_flags & XENO_HOST) + neuro_callback.Invoke(H, effect_power, TRUE) + return + + neuro_callback.Invoke(M, effect_power, FALSE) + +/datum/ammo/xeno/toxin/medium //Spitter + name = "neurotoxic spatter" + spit_cost = 50 + effect_power = 1 + + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/xeno/toxin/queen + name = "neurotoxic spit" + spit_cost = 50 + effect_power = 2 + + accuracy = HIT_ACCURACY_TIER_5*2 + max_range = 6 - 1 + +/datum/ammo/xeno/toxin/queen/on_hit_mob(mob/M,obj/projectile/P) + neuro_callback.Invoke(M, effect_power, TRUE) + +/datum/ammo/xeno/toxin/shotgun + name = "neurotoxic droplet" + flags_ammo_behavior = AMMO_XENO|AMMO_IGNORE_RESIST + bonus_projectiles_type = /datum/ammo/xeno/toxin/shotgun/additional + + accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 + accurate_range = 5 + max_range = 5 + scatter = SCATTER_AMOUNT_NEURO + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_4 + +/datum/ammo/xeno/toxin/shotgun/New() + ..() + + neuro_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(apply_scatter_neuro)) + +/datum/ammo/xeno/toxin/shotgun/additional + name = "additional neurotoxic droplets" + + bonus_projectiles_amount = 0 + +/datum/ammo/xeno/acid + name = "acid spit" + icon_state = "xeno_acid" + sound_hit = "acid_hit" + sound_bounce = "acid_bounce" + damage_type = BURN + spit_cost = 25 + flags_ammo_behavior = AMMO_ACIDIC|AMMO_XENO + accuracy = HIT_ACCURACY_TIER_5 + damage = 20 + max_range = 8 // 7 will disappear on diagonals. i love shitcode + penetration = ARMOR_PENETRATION_TIER_2 + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/xeno/acid/on_shield_block(mob/M, obj/projectile/P) + burst(M,P,damage_type) + +/datum/ammo/xeno/acid/on_hit_mob(mob/M, obj/projectile/P) + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(C.status_flags & XENO_HOST && HAS_TRAIT(C, TRAIT_NESTED) || C.stat == DEAD) + return FALSE + ..() + +/datum/ammo/xeno/acid/spatter + name = "acid spatter" + + damage = 30 + max_range = 6 + +/datum/ammo/xeno/acid/spatter/on_hit_mob(mob/M, obj/projectile/P) + . = ..() + if(. == FALSE) + return + + new /datum/effects/acid(M, P.firer) + +/datum/ammo/xeno/acid/praetorian + name = "acid splash" + + accuracy = HIT_ACCURACY_TIER_10 + HIT_ACCURACY_TIER_5 + max_range = 8 + damage = 30 + shell_speed = AMMO_SPEED_TIER_2 + added_spit_delay = 0 + +/datum/ammo/xeno/acid/dot + name = "acid spit" + +/datum/ammo/xeno/acid/prae_nade // Used by base prae's acid nade + name = "acid scatter" + + flags_ammo_behavior = AMMO_STOPPED_BY_COVER + accuracy = HIT_ACCURACY_TIER_5 + accurate_range = 32 + max_range = 4 + damage = 25 + shell_speed = AMMO_SPEED_TIER_1 + scatter = SCATTER_AMOUNT_TIER_6 + + apply_delegate = FALSE + +/datum/ammo/xeno/acid/prae_nade/on_hit_mob(mob/M, obj/projectile/P) + if (!ishuman(M)) + return + + var/mob/living/carbon/human/H = M + + var/datum/effects/prae_acid_stacks/PAS = null + for (var/datum/effects/prae_acid_stacks/prae_acid_stacks in H.effects_list) + PAS = prae_acid_stacks + break + + if (PAS == null) + PAS = new /datum/effects/prae_acid_stacks(H) + else + PAS.increment_stack_count() + +/datum/ammo/xeno/boiler_gas + name = "glob of neuro gas" + icon_state = "neuro_glob" + ping = "ping_x" + debilitate = list(2,2,0,1,11,12,1,10) // Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony + flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_EXPLOSIVE|AMMO_IGNORE_RESIST|AMMO_HITS_TARGET_TURF|AMMO_ACIDIC + var/datum/effect_system/smoke_spread/smoke_system + spit_cost = 200 + pre_spit_warn = TRUE + spit_windup = 5 SECONDS + accuracy_var_high = PROJECTILE_VARIANCE_TIER_4 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_4 + accuracy = HIT_ACCURACY_TIER_2 + scatter = SCATTER_AMOUNT_TIER_4 + shell_speed = 0.75 + max_range = 16 + /// range on the smoke in tiles from center + var/smokerange = 4 + var/lifetime_mult = 1.0 + +/datum/ammo/xeno/boiler_gas/New() + ..() + set_xeno_smoke() + +/datum/ammo/xeno/boiler_gas/Destroy() + qdel(smoke_system) + smoke_system = null + . = ..() + +/datum/ammo/xeno/boiler_gas/on_hit_mob(mob/moob, obj/projectile/proj) + if(iscarbon(moob)) + var/mob/living/carbon/carbon = moob + if(carbon.status_flags & XENO_HOST && HAS_TRAIT(carbon, TRAIT_NESTED) || carbon.stat == DEAD) + return + var/datum/effects/neurotoxin/neuro_effect = locate() in moob.effects_list + if(!neuro_effect) + neuro_effect = new /datum/effects/neurotoxin(moob, proj.firer) + neuro_effect.duration += 5 + moob.apply_effect(3, DAZE) + to_chat(moob, SPAN_HIGHDANGER("Neurotoxic liquid spreads all over you and immediately soaks into your pores and orifices! Oh fuck!")) // Fucked up but have a chance to escape rather than being game-ended + drop_nade(get_turf(proj), proj,TRUE) + +/datum/ammo/xeno/boiler_gas/on_hit_obj(obj/outbacksteakhouse, obj/projectile/proj) + drop_nade(get_turf(proj), proj) + +/datum/ammo/xeno/boiler_gas/on_hit_turf(turf/Turf, obj/projectile/proj) + if(Turf.density && isturf(proj.loc)) + drop_nade(proj.loc, proj) //we don't want the gas globs to land on dense turfs, they block smoke expansion. + else + drop_nade(Turf, proj) + +/datum/ammo/xeno/boiler_gas/do_at_max_range(obj/projectile/proj) + drop_nade(get_turf(proj), proj) + +/datum/ammo/xeno/boiler_gas/proc/set_xeno_smoke(obj/projectile/proj) + smoke_system = new /datum/effect_system/smoke_spread/xeno_weaken() + +/datum/ammo/xeno/boiler_gas/proc/drop_nade(turf/turf, obj/projectile/proj) + var/lifetime_mult = 1.0 + var/datum/cause_data + if(isboiler(proj.firer)) + cause_data = proj.weapon_cause_data + smoke_system.set_up(smokerange, 0, turf, new_cause_data = cause_data) + smoke_system.lifetime = 12 * lifetime_mult + smoke_system.start() + turf.visible_message(SPAN_DANGER("A glob of acid lands with a splat and explodes into noxious fumes!")) + + +/datum/ammo/xeno/boiler_gas/acid + name = "glob of acid gas" + icon_state = "acid_glob" + ping = "ping_x" + accuracy_var_high = PROJECTILE_VARIANCE_TIER_4 + smokerange = 3 + + +/datum/ammo/xeno/boiler_gas/acid/set_xeno_smoke(obj/projectile/proj) + smoke_system = new /datum/effect_system/smoke_spread/xeno_acid() + +/datum/ammo/xeno/boiler_gas/acid/on_hit_mob(mob/moob, obj/projectile/proj) + if(iscarbon(moob)) + var/mob/living/carbon/carbon = moob + if(carbon.status_flags & XENO_HOST && HAS_TRAIT(carbon, TRAIT_NESTED) || carbon.stat == DEAD) + return + to_chat(moob,SPAN_HIGHDANGER("Acid covers your body! Oh fuck!")) + playsound(moob,"acid_strike",75,1) + INVOKE_ASYNC(moob, TYPE_PROC_REF(/mob, emote), "pain") // why do I need this bullshit + new /datum/effects/acid(moob, proj.firer) + drop_nade(get_turf(proj), proj,TRUE) + +/datum/ammo/xeno/bone_chips + name = "bone chips" + icon_state = "shrapnel_light" + ping = null + flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_STOPPED_BY_COVER|AMMO_IGNORE_ARMOR + damage_type = BRUTE + bonus_projectiles_type = /datum/ammo/xeno/bone_chips/spread + + damage = 8 + max_range = 6 + accuracy = HIT_ACCURACY_TIER_8 + accuracy_var_low = PROJECTILE_VARIANCE_TIER_7 + accuracy_var_high = PROJECTILE_VARIANCE_TIER_7 + bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_7 + shrapnel_type = /obj/item/shard/shrapnel/bone_chips + shrapnel_chance = 60 + +/datum/ammo/xeno/bone_chips/on_hit_mob(mob/M, obj/projectile/P) + if(iscarbon(M)) + var/mob/living/carbon/C = M + if((HAS_FLAG(C.status_flags, XENO_HOST) && HAS_TRAIT(C, TRAIT_NESTED)) || C.stat == DEAD) + return + if(ishuman_strict(M) || isxeno(M)) + playsound(M, 'sound/effects/spike_hit.ogg', 25, 1, 1) + if(M.slowed < 3) + M.apply_effect(3, SLOW) + +/datum/ammo/xeno/bone_chips/spread + name = "small bone chips" + + scatter = 30 // We want a wild scatter angle + max_range = 5 + bonus_projectiles_amount = 0 + +/datum/ammo/xeno/bone_chips/spread/short_range + name = "small bone chips" + + max_range = 3 // Very short range + +/datum/ammo/xeno/bone_chips/spread/runner_skillshot + name = "bone chips" + + scatter = 0 + max_range = 5 + damage = 10 + shrapnel_chance = 0 + +/datum/ammo/xeno/bone_chips/spread/runner/on_hit_mob(mob/M, obj/projectile/P) + if(iscarbon(M)) + var/mob/living/carbon/C = M + if((HAS_FLAG(C.status_flags, XENO_HOST) && HAS_TRAIT(C, TRAIT_NESTED)) || C.stat == DEAD) + return + if(ishuman_strict(M) || isxeno(M)) + playsound(M, 'sound/effects/spike_hit.ogg', 25, 1, 1) + if(M.slowed < 6) + M.apply_effect(6, SLOW) + +/datum/ammo/xeno/oppressor_tail + name = "tail hook" + icon_state = "none" + ping = null + flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_STOPPED_BY_COVER|AMMO_IGNORE_ARMOR + damage_type = BRUTE + + damage = XENO_DAMAGE_TIER_5 + max_range = 4 + accuracy = HIT_ACCURACY_TIER_MAX + +/datum/ammo/xeno/oppressor_tail/on_bullet_generation(obj/projectile/generated_projectile, mob/bullet_generator) + //The projectile has no icon, so the overlay shows up in FRONT of the projectile, and the beam connects to it in the middle. + var/image/hook_overlay = new(icon = 'icons/effects/beam.dmi', icon_state = "oppressor_tail_hook", layer = BELOW_MOB_LAYER) + generated_projectile.overlays += hook_overlay + +/datum/ammo/xeno/oppressor_tail/on_hit_mob(mob/target, obj/projectile/fired_proj) + var/mob/living/carbon/xenomorph/xeno_firer = fired_proj.firer + if(xeno_firer.can_not_harm(target)) + return + + shake_camera(target, 5, 0.1 SECONDS) + var/obj/effect/beam/tail_beam = fired_proj.firer.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 5) + var/image/tail_image = image('icons/effects/status_effects.dmi', "hooked") + target.overlays += tail_image + + new /datum/effects/xeno_slow(target, fired_proj.firer, ttl = 0.5 SECONDS) + target.apply_effect(0.5, STUN) + INVOKE_ASYNC(target, TYPE_PROC_REF(/atom/movable, throw_atom), fired_proj.firer, get_dist(fired_proj.firer, target)-1, SPEED_VERY_FAST) + + qdel(tail_beam) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/ammo/xeno/oppressor_tail, remove_tail_overlay), target, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise. + +/datum/ammo/xeno/oppressor_tail/proc/remove_tail_overlay(mob/overlayed_mob, image/tail_image) + overlayed_mob.overlays -= tail_image diff --git a/code/datums/components/autofire/autofire.dm b/code/datums/components/autofire/autofire.dm index 2b9401e8d346..d052127effc3 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/disease.dm b/code/datums/disease.dm index 92986b668b47..d2f466ebeb39 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -131,7 +131,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease /datum/disease/process() if(!holder) - active_diseases -= src + SSdisease.all_diseases -= src return if(prob(65)) spread(holder) @@ -176,7 +176,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease /datum/disease/New(process=TRUE)//process = 1 - adding the object to global list. List is processed by master controller. cure_list = list(cure_id) // to add more cures, add more vars to this list in the actual disease's New() if(process) // Viruses in list are considered active. - active_diseases += src + SSdisease.all_diseases += src initial_spread = spread /datum/disease/proc/IsSame(datum/disease/D) @@ -191,5 +191,5 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease /datum/disease/Destroy() affected_mob = null holder = null - active_diseases -= src + SSdisease.all_diseases -= src . = ..() diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 6440c9734374..ad4703ba65fe 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -391,7 +391,7 @@ var/list/advance_cures = list( D.AssignName(new_name) D.Refresh() - for(var/datum/disease/advance/AD in active_diseases) + for(var/datum/disease/advance/AD in SSdisease.all_diseases) AD.Refresh() for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list.Copy())) @@ -409,7 +409,7 @@ var/list/advance_cures = list( /* /mob/verb/test() - for(var/datum/disease/D in active_diseases) + for(var/datum/disease/D in SSdisease.all_diseases) to_chat(src, "[D.name] - [D.holder]") */ diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 777ad322befc..a49c0a4ce273 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -100,6 +100,19 @@ to_chat(M, SPAN_BOLD("Corporate Officers chase after paychecks and promotions, but you are motivated to do your sworn duty and care for the population, no matter how far or isolated a colony may be.")) to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction.")) + +// A Nearby Colonial Marshal patrol team responding to Marshals in Distress. +/datum/emergency_call/cmb/alt + name = "CMB - Patrol Team - Marshals in Distress (Friendly)" + mob_max = 5 + mob_min = 1 + probability = 0 + +/datum/emergency_call/cmb/alt/New() + ..() + arrival_message = "CMB Team, this is Anchorpoint Station. We have confirmed you are in distress. Routing nearby units to assist!" + objectives = "Patrol Unit 5807, we have nearby Marshals in Distress! Locate and assist them immediately." + // Anchorpoint Station Colonial Marines, use this primarily for reinforcing or evacuating the CMB, as the CMB themselves are not equipped to handle heavy engagements. /datum/emergency_call/cmb/anchorpoint name = "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)" diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 7ed61852e9bf..19f73a9843ce 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -13,7 +13,7 @@ var/leaders = 0 spawn_max_amount = TRUE -/datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) +/datum/emergency_call/cryo_squad/spawn_candidates(quiet_launch, announce_incoming, override_spawn_loc) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders . = ..() diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm index 70ce52443573..f4fe3c9f2a57 100644 --- a/code/datums/emergency_calls/cryo_marines_heavy.dm +++ b/code/datums/emergency_calls/cryo_marines_heavy.dm @@ -16,7 +16,7 @@ var/leaders = 0 -/datum/emergency_call/cryo_squad_equipped/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) +/datum/emergency_call/cryo_squad_equipped/spawn_candidates(quiet_launch, announce_incoming, override_spawn_loc) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders . = ..() diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 6533086d98f3..4c3dfbbfac2b 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -91,12 +91,12 @@ else return chosen_call -/datum/game_mode/proc/get_specific_call(call_name, quiet_launch = FALSE, announce = TRUE, is_emergency = TRUE, info = "", announce_dispatch_message = TRUE) +/datum/game_mode/proc/get_specific_call(call_name, quiet_launch = FALSE, announce_incoming = TRUE, info = "") for(var/datum/emergency_call/E in all_calls) //Loop through all potential candidates if(E.name == call_name) var/datum/emergency_call/em_call = new E.type() em_call.objective_info = info - em_call.activate(quiet_launch, announce, is_emergency, announce_dispatch_message) + em_call.activate(quiet_launch, announce_incoming) return error("get_specific_call could not find emergency call '[call_name]'") return @@ -168,7 +168,7 @@ return var/deathtime = world.time - usr.timeofdeath - if(deathtime < 1 MINUTES) //Nice try, ghosting right after the announcement + if(deathtime < 30 SECONDS) //Nice try, ghosting right after the announcement if(SSmapping.configs[GROUND_MAP].map_name != MAP_WHISKEY_OUTPOST) // people ghost so often on whiskey outpost. to_chat(src, SPAN_WARNING("You ghosted too recently.")) return @@ -192,7 +192,7 @@ else to_chat(src, SPAN_WARNING("You did not get enlisted in the response team. Better luck next time!")) -/datum/emergency_call/proc/activate(quiet_launch = FALSE, announce = TRUE, turf/override_spawn_loc, announce_dispatch_message = TRUE) +/datum/emergency_call/proc/activate(quiet_launch = FALSE, announce_incoming = TRUE, turf/override_spawn_loc) set waitfor = 0 if(!SSticker.mode) //Something horribly wrong with the gamemode ticker return @@ -205,9 +205,9 @@ if(!quiet_launch) marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) - addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), quiet_launch, announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), quiet_launch, announce_incoming, override_spawn_loc), 30 SECONDS) -/datum/emergency_call/proc/spawn_candidates(quiet_launch = FALSE, announce = TRUE, override_spawn_loc, announce_dispatch_message = TRUE) +/datum/emergency_call/proc/spawn_candidates(quiet_launch = FALSE, announce_incoming = TRUE, override_spawn_loc) if(SSticker.mode) SSticker.mode.picked_calls -= src @@ -248,7 +248,7 @@ if(I.current) to_chat(I.current, SPAN_WARNING("You didn't get selected to join the distress team. Better luck next time!")) - if(announce) + if(announce_incoming) marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT message_admins("Distress beacon: [src.name] finalized, setting up candidates.") @@ -304,7 +304,7 @@ create_member(null, override_spawn_loc) candidates = list() - if(arrival_message && announce) + if(arrival_message && announce_incoming) marine_announcement(arrival_message, "Intercepted Tranmission:") /datum/emergency_call/proc/add_candidate(mob/M) diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm index 4c33d7d9bfa3..ad0200339952 100644 --- a/code/datums/emergency_calls/inspection.dm +++ b/code/datums/emergency_calls/inspection.dm @@ -183,7 +183,7 @@ /datum/emergency_call/inspection_cmb/New() ..() - arrival_message = "[MAIN_SHIP_NAME], This is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." + arrival_message = "[MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." objectives = "Get your instructions from the CMB Office at Anchorpoint Station, and carry out your orders. Ensure that Colonial assets are safe and in your custody. Do not enforce or override Marine Law on a Marine Ship unless requested, as it's outside of your juristiction." will_spawn_icc_liaison = prob(90) @@ -265,7 +265,7 @@ to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction.")) /datum/emergency_call/inspection_cmb/black_market - name = "Inspection - Colonial Marshal Ledger Investigation Team" + name = "Inspection - Colonial Marshals Ledger Investigation Team" mob_max = 3 //Marshal, Deputy, ICC CL mob_min = 2 shuttle_id = "Distress_PMC" diff --git a/code/datums/emergency_calls/upp.dm b/code/datums/emergency_calls/upp.dm index 04bcfecf9128..562dac3fe154 100644 --- a/code/datums/emergency_calls/upp.dm +++ b/code/datums/emergency_calls/upp.dm @@ -4,7 +4,7 @@ /datum/emergency_call/upp name = "UPP Naval Infantry (Squad)" mob_max = 9 - probability = 10 + probability = 20 shuttle_id = "Distress_UPP" name_of_spawn = /obj/effect/landmark/ert_spawns/distress_upp item_spawn = /obj/effect/landmark/ert_spawns/distress_upp/item @@ -14,15 +14,17 @@ max_heavies = 1 max_smartgunners = 0 var/heavy_pick = TRUE // whether heavy should count as either a minigunner or shotgunner - hostility = TRUE var/max_synths = 1 var/synths = 0 /datum/emergency_call/upp/New() - ..() - arrival_message = "T*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns )0r c|*$e @u*r*r$ c0m&*t." - objectives = "Eliminate the UA Forces to ensure the UPP prescence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." - + . = ..() + hostility = pick(50;FALSE,50;TRUE) + arrival_message = "[MAIN_SHIP_NAME] t*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns and pR*epr# t% r@nd$r a(tD." + if(hostility) + objectives = "Eliminate the UA Forces to ensure the UPP prescence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." + else + objectives = "Render assistance towards the UA Forces, do not engage UA forces. Listen to your superior officers." /datum/emergency_call/upp/print_backstory(mob/living/carbon/human/M) if(ishuman_strict(M)) @@ -94,10 +96,26 @@ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) +/datum/emergency_call/upp/hostile + name = "UPP Naval Infantry (Squad) (Hostile)" + hostility = TRUE + +/datum/emergency_call/upp/hostile/New() + ..() + arrival_message = "[MAIN_SHIP_NAME] t*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns and pR*epr# t% r@nd$r a(tD." + objectives = "Eliminate the UA Forces to ensure the UPP presence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." + +/datum/emergency_call/upp/friendly + name = "UPP Naval Infantry (Squad) (Friendly)" + hostility = FALSE + +/datum/emergency_call/upp/friendly/New() + ..() + arrival_message = "This is UPP dispatch. USS Almayer, We are responding to your distress call, we will render aid as able, do not fire." + objectives = "Render assistance towards the UA Forces, Listen to your superior officers." /datum/emergency_call/upp/platoon - name = "UPP Naval Infantry (Platoon)" - mob_min = 4 + name = "UPP Naval Infantry (Platoon) (Hostile)" mob_max = 30 probability = 0 max_medics = 3 @@ -106,6 +124,21 @@ max_engineers = 2 max_synths = 1 heavy_pick = FALSE + hostility = TRUE + +/datum/emergency_call/upp/platoon/New() + ..() + arrival_message = "[MAIN_SHIP_NAME] t*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns and pR*epr# t% r@nd$r a(tD." + objectives = "Eliminate the UA Forces to ensure the UPP presence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." + +/datum/emergency_call/upp/platoon/friendly + name = "UPP Naval Infantry (Platoon) (Friendly)" + hostility = FALSE + +/datum/emergency_call/upp/platoon/friendly/New() + ..() + arrival_message = "This is UPP dispatch. USS Almayer, We are responding to your distress call, we will render aid as able, do not fire." + objectives = "Render assistance towards the UA Forces, Listen to your superior officers." /obj/effect/landmark/ert_spawns/distress_upp name = "Distress_UPP" diff --git a/code/datums/factions/upp.dm b/code/datums/factions/upp.dm index 5a790c89be67..90b04765cf85 100644 --- a/code/datums/factions/upp.dm +++ b/code/datums/factions/upp.dm @@ -41,6 +41,8 @@ hud_icon_state = "co" if(JOB_UPP_COMBAT_SYNTH) hud_icon_state = "synth" + if(JOB_UPP_SUPPORT_SYNTH) + hud_icon_state = "synth" if(JOB_UPP_COMMANDO) hud_icon_state = "com" if(JOB_UPP_COMMANDO_MEDIC) diff --git a/code/datums/keybinding/client.dm b/code/datums/keybinding/client.dm index a5baf09a1360..752287882277 100644 --- a/code/datums/keybinding/client.dm +++ b/code/datums/keybinding/client.dm @@ -4,8 +4,8 @@ /datum/keybinding/client/admin_help - hotkey_keys = list("F1") - classic_keys = list("F1") + hotkey_keys = list("Unbound") + classic_keys = list("Unbound") name = "admin_help" full_name = "Admin Help" description = "Ask an admin for help." diff --git a/code/datums/keybinding/human_combat.dm b/code/datums/keybinding/human_combat.dm index 2f37efc61438..d30414d68563 100644 --- a/code/datums/keybinding/human_combat.dm +++ b/code/datums/keybinding/human_combat.dm @@ -190,3 +190,20 @@ var/obj/item/weapon/gun/rifle/m46c/COgun = held_item COgun.toggle_iff(human) return TRUE + +/datum/keybinding/human/combat/toggle_shotgun_tube + hotkey_keys = list("Unbound") + classic_keys = list("Unbound") + name = "toggle_shotgun_tube" + full_name = "Toggle Shotgun Tube" + keybind_signal = COMSIG_KB_HUMAN_WEAPON_SHOTGUN_TUBE + +/datum/keybinding/human/combat/toggle_shotgun_tube/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human = user.mob + var/obj/item/weapon/gun/shotgun/pump/dual_tube/held_item = human.get_held_item() + if(istype(held_item)) + held_item.toggle_tube() + return TRUE diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index d1a6adafa2f3..83b9be0ac053 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -13,7 +13,6 @@ #define LANGCHAT_LONGEST_TEXT 64 #define LANGCHAT_WIDTH 96 -#define LANGCHAT_X_OFFSET -32 #define LANGCHAT_MAX_ALPHA 196 //pop defines @@ -48,6 +47,13 @@ M.client.images -= langchat_image langchat_listeners = null +/atom/proc/langchat_set_x_offset() + langchat_image.maptext_x = world.icon_size / 2 - langchat_image.maptext_width / 2 +/atom/movable/langchat_set_x_offset() + langchat_image.maptext_x = bound_width / 2 - langchat_image.maptext_width / 2 +/mob/langchat_set_x_offset() + langchat_image.maptext_x = icon_size / 2 - langchat_image.maptext_width / 2 + ///Creates the image if one does not exist, resets settings that are modified by speech procs. /atom/proc/langchat_make_image(override_color = null) if(!langchat_image) @@ -57,8 +63,8 @@ langchat_image.appearance_flags = NO_CLIENT_COLOR|KEEP_APART|RESET_COLOR|RESET_TRANSFORM langchat_image.maptext_y = langchat_height langchat_image.maptext_height = 64 - langchat_image.maptext_x = LANGCHAT_X_OFFSET langchat_image.maptext_y -= LANGCHAT_MESSAGE_POP_Y_SINK + langchat_set_x_offset() langchat_image.pixel_y = 0 langchat_image.alpha = 0 @@ -103,6 +109,7 @@ langchat_image.maptext = text_to_display langchat_image.maptext_width = LANGCHAT_WIDTH + langchat_set_x_offset() langchat_listeners = listeners for(var/mob/M in langchat_listeners) @@ -149,6 +156,7 @@ langchat_image.maptext = text_to_display langchat_image.maptext_width = LANGCHAT_WIDTH * 2 + langchat_set_x_offset() langchat_listeners = listeners for(var/mob/M in langchat_listeners) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 1f3c265ead76..3bf5c601cec9 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -87,12 +87,14 @@ /datum/equipment_preset/synth/survivor/janitor_synth, /datum/equipment_preset/synth/survivor/chef_synth, /datum/equipment_preset/synth/survivor/teacher_synth, + /datum/equipment_preset/synth/survivor/freelancer_synth, + /datum/equipment_preset/synth/survivor/trucker_synth, /datum/equipment_preset/synth/survivor/bartender_synth, /datum/equipment_preset/synth/survivor/detective_synth, /datum/equipment_preset/synth/survivor/cmb_synth, - /datum/equipment_preset/synth/survivor/security_synth, - /datum/equipment_preset/synth/survivor/protection_synth, - /datum/equipment_preset/synth/survivor/corporate_synth, + /datum/equipment_preset/synth/survivor/wy/security_synth, + /datum/equipment_preset/synth/survivor/wy/protection_synth, + /datum/equipment_preset/synth/survivor/wy/corporate_synth, /datum/equipment_preset/synth/survivor/radiation_synth, ) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 2e56b963e88f..9e8279a843a4 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -29,9 +29,14 @@ research_objective_interface = new() /datum/mind/Destroy() + QDEL_NULL(initial_account) QDEL_NULL(objective_memory) QDEL_NULL(objective_interface) QDEL_NULL(research_objective_interface) + current = null + original = null + ghost_mob = null + player_entity = null return ..() /datum/mind/proc/transfer_to(mob/living/new_character, force = FALSE) diff --git a/code/datums/quadtree.dm b/code/datums/quadtree.dm index d00f202cc15c..2b0360152997 100644 --- a/code/datums/quadtree.dm +++ b/code/datums/quadtree.dm @@ -10,14 +10,14 @@ var/z_level /// Don't divide further when truthy - var/final + var/final_divide = FALSE /datum/quadtree/New(datum/shape/rectangle/rect, z) . = ..() boundary = rect z_level = z if(boundary.width <= QUADTREE_BOUNDARY_MINIMUM_WIDTH || boundary.height <= QUADTREE_BOUNDARY_MINIMUM_HEIGHT) - final = TRUE + final_divide = TRUE // By design i guess, discarding branch discards rest with BYOND soft-GCing // There should never be anything else but SSquadtree referencing quadtrees, @@ -103,7 +103,7 @@ player_coords = list(p_coords) return TRUE - else if(!final && player_coords.len >= QUADTREE_CAPACITY) + else if(!final_divide && player_coords.len >= QUADTREE_CAPACITY) if(!is_divided) subdivide() if(nw_branch.insert_player(p_coords)) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index eb1fd2341920..98bcf296755b 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -100,6 +100,18 @@ if(movement_force) M.movement_force = movement_force.Copy() + /datum/map_template/shuttle/vehicle shuttle_id = MOBILE_SHUTTLE_VEHICLE_ELEVATOR name = "Vehicle Elevator" + +/datum/map_template/shuttle/trijent_elevator + name = "Trijent Elevator" + shuttle_id = MOBILE_TRIJENT_ELEVATOR + var/elevator_network + +/datum/map_template/shuttle/trijent_elevator/A + elevator_network = "A" + +/datum/map_template/shuttle/trijent_elevator/B + elevator_network = "B" diff --git a/code/datums/skills.dm b/code/datums/skills.dm deleted file mode 100644 index 9178e6f7a1b1..000000000000 --- a/code/datums/skills.dm +++ /dev/null @@ -1,2199 +0,0 @@ -// Individual skill -/datum/skill - /// Name of the skill - var/skill_name = null - /// used for the view UI - var/readable_skill_name = null - /// Level of skill in this... skill - var/skill_level = 0 - /// the max level this skill can be, used for tgui - var/max_skill_level = 0 - -/datum/skill/proc/get_skill_level() - return skill_level - -/datum/skill/proc/set_skill(new_level, mob/owner) - skill_level = new_level - -/datum/skill/proc/is_skilled(req_level, is_explicit = FALSE) - if(is_explicit) - return (skill_level == req_level) - return (skill_level >= req_level) - -// Lots of defines here. See #define/skills.dm - -/datum/skill/cqc - skill_name = SKILL_CQC - readable_skill_name = "CQC" - skill_level = SKILL_CQC_DEFAULT - max_skill_level = SKILL_CQC_MAX - -/datum/skill/melee_weapons - skill_name = SKILL_MELEE_WEAPONS - readable_skill_name = "melee weapons" - skill_level = SKILL_MELEE_DEFAULT - max_skill_level = SKILL_MELEE_MAX - -/datum/skill/firearms - skill_name = SKILL_FIREARMS - skill_level = SKILL_FIREARMS_TRAINED - max_skill_level = SKILL_FIREARMS_MAX - -/datum/skill/spec_weapons - skill_name = SKILL_SPEC_WEAPONS - readable_skill_name = "specialist weapons" - skill_level = SKILL_SPEC_DEFAULT - max_skill_level = SKILL_SPEC_ALL - -/datum/skill/endurance - skill_name = SKILL_ENDURANCE - skill_level = SKILL_ENDURANCE_WEAK - max_skill_level = SKILL_ENDURANCE_MAX - -/datum/skill/engineer - skill_name = SKILL_ENGINEER - skill_level = SKILL_ENGINEER_DEFAULT - max_skill_level = SKILL_ENGINEER_MAX - -/datum/skill/construction - skill_name = SKILL_CONSTRUCTION - skill_level = SKILL_CONSTRUCTION_DEFAULT - max_skill_level = SKILL_CONSTRUCTION_MAX - -/datum/skill/leadership - skill_name = SKILL_LEADERSHIP - skill_level = SKILL_LEAD_NOVICE - max_skill_level = SKILL_LEAD_MAX - -/datum/skill/leadership/set_skill(new_level, mob/living/owner) - ..() - if(!owner) - return - - if(!ishuman(owner)) - return - - // Give/remove issue order actions - if(is_skilled(SKILL_LEAD_TRAINED)) - ADD_TRAIT(owner, TRAIT_LEADERSHIP, TRAIT_SOURCE_SKILL(skill_name)) - else - REMOVE_TRAIT(owner, TRAIT_LEADERSHIP, TRAIT_SOURCE_SKILL(skill_name)) - -/datum/skill/overwatch - skill_name = SKILL_OVERWATCH - skill_level = SKILL_OVERWATCH_DEFAULT - max_skill_level = SKILL_OVERWATCH_MAX - -/datum/skill/medical - skill_name = SKILL_MEDICAL - skill_level = SKILL_MEDICAL_DEFAULT - max_skill_level = SKILL_MEDICAL_MAX - -/datum/skill/surgery - skill_name = SKILL_SURGERY - skill_level = SKILL_SURGERY_DEFAULT - max_skill_level = SKILL_SURGERY_MAX - -/datum/skill/surgery/set_skill(new_level, mob/living/owner) - ..() - if(!owner) - return - - if(!ishuman(owner)) - return - - // Give/remove surgery toggle action - var/datum/action/surgery_toggle/surgery_action = locate() in owner.actions - if(is_skilled(SKILL_SURGERY_NOVICE)) - if(!surgery_action) - give_action(owner, /datum/action/surgery_toggle) - else - surgery_action.update_surgery_skill() - else - if(surgery_action) - surgery_action.remove_from(owner) - -/datum/skill/research - skill_name = SKILL_RESEARCH - skill_level = SKILL_RESEARCH_DEFAULT - max_skill_level = SKILL_RESEARCH_MAX - -/datum/skill/antag - skill_name = SKILL_ANTAG - readable_skill_name = "illegal technology" - skill_level = SKILL_ANTAG_DEFAULT - max_skill_level = SKILL_ANTAG_MAX - -/datum/skill/pilot - skill_name = SKILL_PILOT - skill_level = SKILL_PILOT_DEFAULT - max_skill_level = SKILL_PILOT_MAX - -/datum/skill/navigations - skill_name = SKILL_NAVIGATIONS - skill_level = SKILL_NAVIGATIONS_DEFAULT - max_skill_level = SKILL_NAVIGATIONS_MAX - -/datum/skill/police - skill_name = SKILL_POLICE - skill_level = SKILL_POLICE_DEFAULT - max_skill_level = SKILL_POLICE_MAX - -/datum/skill/powerloader - skill_name = SKILL_POWERLOADER - skill_level = SKILL_POWERLOADER_DEFAULT - max_skill_level = SKILL_POWERLOADER_MAX - -/datum/skill/vehicles - skill_name = SKILL_VEHICLE - skill_level = SKILL_VEHICLE_DEFAULT - max_skill_level = SKILL_VEHICLE_MAX - -/datum/skill/jtac - skill_name = SKILL_JTAC - readable_skill_name = "JTAC" - skill_level = SKILL_JTAC_NOVICE - max_skill_level = SKILL_JTAC_MAX - -/datum/skill/execution - skill_name = SKILL_EXECUTION - skill_level = SKILL_EXECUTION_DEFAULT - max_skill_level = SKILL_EXECUTION_MAX - -/datum/skill/intel - skill_name = SKILL_INTEL - skill_level = SKILL_INTEL_NOVICE - max_skill_level = SKILL_INTEL_MAX - -/datum/skill/domestic - skill_name = SKILL_DOMESTIC - skill_level = SKILL_DOMESTIC_NONE - max_skill_level = SKILL_DOMESTIC_MAX - -/datum/skill/fireman - skill_name = SKILL_FIREMAN - readable_skill_name = "fireman carrying" - skill_level = SKILL_FIREMAN_DEFAULT - max_skill_level = SKILL_FIREMAN_MAX - -/// Skill with an extra S at the end is a collection of multiple skills. Basically a skillSET -/// This is to organize and provide a common interface to the huge heap of skills there are -/datum/skills - /// The name of the skillset - var/name - // The mob that has this skillset - var/mob/owner - - // List of skill datums. - // Also, if this is populated when the datum is created, it will set the skill levels automagically - var/list/skills = list() - // Same as above, but for children of parents that just add a lil something else - var/list/additional_skills = list() - -/datum/skills/New(mob/skillset_owner) - owner = skillset_owner - - // Setup every single skill - for(var/skill_type in subtypesof(/datum/skill)) - var/datum/skill/S = new skill_type() - - // Fancy hack to convert a list of desired skill levels in each named skill into a skill level in the actual skill datum - // Lets the skills list be used multipurposely for both storing skill datums and choosing skill levels for different skillsets - var/predetermined_skill_level = additional_skills[S.skill_name] ? additional_skills[S.skill_name] : skills[S.skill_name] - skills[S.skill_name] = S - - if(!isnull(predetermined_skill_level)) - S.set_skill(predetermined_skill_level, owner) - -/datum/skills/Destroy() - owner = null - skills = null // Don't need to delete, /datum/skill should softdel - SStgui.close_uis(src) - return ..() - -// Checks if the given skill is contained in this skillset at all -/datum/skills/proc/has_skill(skill) - return isnull(skills[skill]) - -// Returns the skill DATUM for the given skill -/datum/skills/proc/get_skill(skill) - if(!skills) - return null - return skills[skill] - -// Returns the skill level for the given skill -/datum/skills/proc/get_skill_level(skill) - var/datum/skill/S = get_skill(skill) - if(!S) - return -1 - if(QDELETED(S)) - return -1 - return S.get_skill_level() - -// Sets the skill LEVEL for a given skill -/datum/skills/proc/set_skill(skill, new_level) - var/datum/skill/S = skills[skill] - if(!S) - return - return S.set_skill(new_level, owner) - -/datum/skills/proc/increment_skill(skill, increment, cap) - var/datum/skill/S = skills[skill] - if(!S || skillcheck(owner, skill, cap)) - return - return S.set_skill(min(cap,S.skill_level+increment), owner) - -/datum/skills/proc/decrement_skill(skill, increment) - var/datum/skill/S = skills[skill] - if(!S) - return - return S.set_skill(max(0,S.skill_level-increment), owner) - -// Checks if the skillset is AT LEAST skilled enough to pass a skillcheck for the given skill level -/datum/skills/proc/is_skilled(skill, req_level, is_explicit = FALSE) - var/datum/skill/S = get_skill(skill) - if(QDELETED(S)) - return FALSE - return S.is_skilled(req_level, is_explicit) - -// Adjusts the full skillset to a new type of skillset. Pass the datum type path for the desired skillset -/datum/skills/proc/set_skillset(skillset_type) - var/datum/skills/skillset = new skillset_type() - var/list/skill_levels = initial(skillset.skills) - - name = skillset.name - for(var/skill in skill_levels) - set_skill(skill, skill_levels[skill]) - qdel(skillset) - -/* ---------------------- -CIVILIAN ---------------------- -*/ - -/datum/skills/civilian - name = "Civilian" - skills = list( - SKILL_CQC = SKILL_CQC_DEFAULT, - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_ENDURANCE = SKILL_ENDURANCE_NONE, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/manager - name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things. - skills = list( - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_INTEL = SKILL_INTEL_EXPERT, - ) - -/datum/skills/civilian/icc_investigation - name = "ICC CL - Black Market ERT" - skills = list( - SKILL_CQC = SKILL_CQC_DEFAULT, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device - ) - -/datum/skills/civilian/manager/director - name = "Weyland-Yutani Director" - skills = list( - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, - SKILL_INTEL = SKILL_INTEL_EXPERT, - ) - -/datum/skills/civilian/survivor - name = "Survivor" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - ) - -/datum/skills/civilian/survivor/manager - name = "Weyland-Yutani Manager" - skills = list( - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_INTEL = SKILL_INTEL_EXPERT, - ) - -/datum/skills/civilian/survivor/goon - name = "Survivor Goon" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/pmc - name = "Survivor PMC" - additional_skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/pmc/medic - name = "Survivor PMC Medic" - additional_skills = list( - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/pmc/engineer - name = "Survivor PMC Engineer" - additional_skills = list( - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - ) - -/datum/skills/civilian/survivor/doctor - name = "Survivor Doctor" - additional_skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - ) - -/datum/skills/civilian/survivor/clf - name = "Survivor CLF" - additional_skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - ) - -/datum/skills/civilian/survivor/scientist - name = "Survivor Scientist" - additional_skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - ) - -/datum/skills/civilian/survivor/chef - name = "Survivor Chef" - additional_skills = list( - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, - ) - -/datum/skills/civilian/survivor/miner - name = "Survivor Miner" - additional_skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/trucker - name = "Survivor Trucker" - additional_skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, - ) - -/datum/skills/civilian/survivor/engineer - name = "Survivor Engineer" - additional_skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/chaplain - name = "Survivor Chaplain" - additional_skills = list( - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - ) - -/datum/skills/civilian/survivor/marshal - name = "Survivor Marshal" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - ) - -/datum/skills/civilian/survivor/prisoner - name = "Survivor Prisoner" - additional_skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/civilian/survivor/gangleader - name = "Survivor Gang Leader" - additional_skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - ) - -/* ---------------------- -MILITARY SURVIVORS ---------------------- -*/ -//Hardcore survivors with poor equipment and skills, prove you're the best of the best. - -/datum/skills/military/survivor/forecon_standard - name = "Reconnaissance Rifleman" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/forecon_techician - name = "Reconnaissance Support Technician" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/forecon_marksman - name = "Reconnaissance Designated Marksman" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SCOUT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/forecon_smartgunner - name = "Reconnaissance Smartgunner" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/forecon_sniper - name = "Reconnaissance Sniper" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SNIPER, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/forecon_squad_leader - name = "Reconnaissance Squad Leader" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/* ---------------------- -COMMAND STAFF ---------------------- -*/ - -/datum/skills/general - name = "General" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people - SKILL_INTEL = SKILL_INTEL_EXPERT - ) - -/datum/skills/commander - name = "Commanding Officer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED //can change ship alt - ) - -/datum/skills/XO - name = "Executive Officer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc. - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, - ) - -/datum/skills/SO - name = "Staff Officer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/SEA - name = "Senior Enlisted Advisor" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - ) - -/datum/skills/SEA/New(mob/skillset_owner) - ..() - give_action(skillset_owner, /datum/action/looc_toggle) - -/datum/skills/SEA/Destroy() - remove_action(owner, /datum/action/looc_toggle) - return ..() - -/datum/skills/CMO - name = "CMO" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/CMP - name = "Chief MP" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/auxiliary_officer - name = "Auxiliary Support Officer" - skills = list( - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - ) - -/datum/skills/CE - name = "Chief Engineer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_INTEL = SKILL_INTEL_TRAINED, - SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, - ) - -/datum/skills/RO - name = "Requisition Officer" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/* ---------------------- -MILITARY NONCOMBATANT ---------------------- -*/ - -/datum/skills/doctor - name = "Doctor" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - ) - -/datum/skills/nurse - name = "Nurse" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - ) - -/datum/skills/researcher - name = "Researcher" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/pilot - name = "Pilot Officer" - skills = list( - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/crew_chief - name = "Dropship Crew Chief" - skills = list( - SKILL_PILOT = SKILL_PILOT_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - ) - -/datum/skills/MP - name = "Military Police" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - ) - -/datum/skills/MW - name = "Military Warden" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - ) - -/datum/skills/provost - name = "Provost" - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - ) - -/datum/skills/OT - name = "Ordnance Technician" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - ) - -/datum/skills/MT - name = "Maintenance Technician" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, - ) - -/datum/skills/mess_technician - name = "Mess Technician" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, // need to hunt food somehow - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER - ) - -/datum/skills/CT - name = "Cargo Technician" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - ) - -/* ---------------------- -SYNTHETIC ---------------------- -*/ - -/datum/skills/synthetic - name = "Synthetic" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MASTER, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MAX, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, - SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, - ) - -/datum/skills/colonial_synthetic - name = SYNTH_COLONY - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_INTEL = SKILL_INTEL_TRAINED, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, - ) - -/datum/skills/working_joe - name = SYNTH_WORKING_JOE - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, //So they can fully use the Maintenance Jack - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, - ) - -/datum/skills/infiltrator_synthetic - name = SYNTH_INFILTRATOR - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MASTER, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MAX, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, - SKILL_ANTAG = SKILL_ANTAG_AGENT, - ) - -/* ------------------------------- -United States Colonial Marines ------------------------------- -*/ - -/datum/skills/pfc - name = "Private" - //same as default - -/datum/skills/pfc/crafty - name = "Crafty Private" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - ) - -/datum/skills/combat_medic - name = "Combat Medic" - skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/combat_medic/crafty - name = "Crafty Combat Medic" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - ) - -/datum/skills/combat_engineer - name = "Combat Engineer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/smartgunner - name = "Squad Smartgunner" - skills = list( - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/specialist - name = "Squad Weapons Specialist" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. - SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER - ) - -/datum/skills/tl - name = "Fireteam Leader" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/SL - name = "Squad Leader" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_INTEL = SKILL_INTEL_TRAINED, - ) - -/datum/skills/intel - name = "Intelligence Officer" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_INTEL = SKILL_INTEL_EXPERT, - ) - -/* -------------------------- -COLONIAL LIBERATION FRONT -------------------------- -*/ - -/datum/skills/clf - name = "CLF Soldier" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/clf/combat_engineer - name = "CLF Engineer" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/clf/combat_medic - name = "CLF Medic" - skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/clf/specialist - name = "CLF Specialist" - skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED - ) - -/datum/skills/clf/leader - name = "CLF Leader" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4 - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI - ) - -/datum/skills/clf/commander - name = "CLF Cell Commander" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, - ) - -/* ------------ -FREELANCERS ------------ -*/ - -//NOTE: Freelancer training is similar to the USCM's, but with additional construction skills - -/datum/skills/freelancer - name = "Freelancer Private" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - ) - -/datum/skills/freelancer/combat_medic - name = "Freelancer Medic" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - ) - -/datum/skills/freelancer/SL - name = "Freelancer Leader" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/* --------------------------- -UNITED PROGRESSIVE PEOPLES --------------------------- -*/ - -//NOTE: UPP make up for their subpar gear with extreme training. - -/datum/skills/upp - name = "UPP Private" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_DEFAULT, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - ) - -/datum/skills/upp/combat_engineer - name = "UPP Sapper" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_DEFAULT, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - ) - -/datum/skills/upp/combat_medic - name = "UPP Medic" - skills = list( - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_DEFAULT, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - ) - -/datum/skills/upp/specialist - name = "UPP Specialist" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - ) - -/datum/skills/upp/SL - name = "UPP Squad Leader" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/upp/military_police - name = "UPP Military Police" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - ) - -/datum/skills/upp/officer - name = "UPP Officer" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_POLICE = SKILL_POLICE_FLASH, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/upp/kapitan - name = "UPP Kapitan" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/upp/commander - name = "UPP Command Officer" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, - ) -/datum/skills/upp/conscript - name = "UPP Conscript" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - ) - -/* ----------------------------- -Private Military Contractors ----------------------------- -*/ - -//NOTE: Compared to the USCM, PMCs have additional firearms training, construction skills and policing skills - -/datum/skills/pmc - name = "PMC Private" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - ) - -/datum/skills/pmc/medic - name = "PMC Medic" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - ) - -/datum/skills/pmc/medic/chem - name = "PMC Medical Investigator" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - ) - -/datum/skills/pmc/smartgunner - name = "PMC Smartgunner" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/pmc/specialist - name = "PMC Specialist" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/pmc/SL - name = "PMC Leader" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/pmc/SL/chem - name = "PMC Lead Investigator" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/pmc/tank_crew - name = "Vehicle Crewman" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - ) - -/datum/skills/pmc/doctor - name = "PMC Triage Doctor" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, //trained in medicine more than combat - SKILL_CQC = SKILL_CQC_TRAINED - ) - -/datum/skills/pmc/engineer - name = "PMC Corporate Technician" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - ) - -/datum/skills/pmc/director - name = "PMC Site Director" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, - ) - -/* ---------------------- -CONTRACTORS ---------------------- -*/ -/datum/skills/contractor - name = "Contractor Standard" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - ) - -/datum/skills/contractor/leader - name = "Contractor Leader" - skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - SKILL_JTAC = SKILL_JTAC_MASTER, - ) - -/datum/skills/contractor/medic - name = "Contractor Medic" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/contractor/engi - name = "Contractor Engi" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_MAX, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, - ) - -/datum/skills/contractor/heavy - name = "Contractor Machinegunner" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - ) - -/* ---------------------- -COLONIAL MARSHALS ---------------------- -*/ -/datum/skills/cmb - name = "CMB Deputy" - skills = list( - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - ) - -/datum/skills/cmb/leader - name = "CMB Marshal" - skills = list( - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/synthetic/cmb - name = "CMB Investigative Synthetic" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, // incase the synth needs to use consoles for investigations or tracking - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, // Not a medical Synthetic, but operate if absolutely needed. - SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_TRAINED, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MAX, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_INTEL = SKILL_INTEL_EXPERT, - SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER - ) - -/datum/skills/military/survivor/upp_private - name = "UPP Private" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/upp_sapper - name = "UPP Sapper" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/upp_medic - name = "UPP Medic" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/military/survivor/upp_spec - name = "UPP Specialist" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - ) - -/datum/skills/military/survivor/upp_sl - name = "UPP Squad Leader" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, - SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/* ---------------------- -SPEC-OPS ---------------------- -*/ - -/datum/skills/commando - name = "Commando" - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/commando/medic - name = "Commando Medic" - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/commando/leader - name = "Commando Leader" - skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/commando/deathsquad - name = "Deathsquad" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/commando/deathsquad/leader - name = "Deathsquad Leader" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/commando/deathsquad/officer - name = "Deathsquad Officer" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/spy - name = "Spy" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/ninja - name = "Ninja" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/* ---------------------- -MISCELLANEOUS ---------------------- -*/ - -/datum/skills/mercenary - name = "Mercenary" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/mercenary/elite - name = "Elite Mercenary" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - ) - -/datum/skills/mercenary/elite/medic - name = "Elite Mercenary Medic" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_MEDICAL = SKILL_MEDICAL_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SURGERY = SKILL_SURGERY_TRAINED, - ) - -/datum/skills/mercenary/elite/engineer - name = "Elite Mercenary Engineer" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_PILOT = SKILL_PILOT_EXPERT, - ) - -/datum/skills/mercenary/elite/heavy - name = "Elite Mercenary Heavy" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - ) - -/datum/skills/mercenary/elite/leader - name = "Elite Mercenary Leader" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_MASTER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_PILOT = SKILL_PILOT_EXPERT, - ) - -/datum/skills/dutchmerc - name = "Dutch's Dozen Mercenary" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - ) - -/datum/skills/dutchmedic - name = "Dutch's Dozen Medic" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - ) - -/datum/skills/tank_crew - name = "Vehicle Crewman" - skills = list( - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_JTAC = SKILL_JTAC_EXPERT, - ) - -/datum/skills/gladiator - name = "Gladiator" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - ) - -/datum/skills/gladiator/champion - name = "Gladiator Champion" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_TRAINED, - ) - -/datum/skills/gladiator/champion/leader - name = "Gladiator Leader" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, //Spartacus! - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_MASTER, - ) - -/datum/skills/yautja/warrior - name = "Yautja Warrior" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MAX, - SKILL_ANTAG = SKILL_ANTAG_HUNTER, - ) - -/datum/skills/dutch - name = "Dutch" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_EXPERT, - SKILL_ANTAG = SKILL_ANTAG_HUNTER, - ) - -/datum/skills/cultist_leader - name = "Cultist Leader" - skills = list( - SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_JTAC = SKILL_JTAC_MASTER, - ) - -/datum/skills/souto - name = "Souto Man" - skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - ) - -/datum/skills/everything //max it out - name = "Ultra" - skills = list( - SKILL_CQC = SKILL_CQC_MAX, - SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, - SKILL_FIREARMS = SKILL_FIREARMS_MAX, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_ENGINEER = SKILL_ENGINEER_MAX, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX, - SKILL_LEADERSHIP = SKILL_LEAD_MAX, - SKILL_OVERWATCH = SKILL_OVERWATCH_MAX, - SKILL_MEDICAL = SKILL_MEDICAL_MAX, - SKILL_SURGERY = SKILL_SURGERY_MAX, - SKILL_RESEARCH = SKILL_RESEARCH_MAX, - SKILL_ANTAG = SKILL_ANTAG_MAX, - SKILL_PILOT = SKILL_PILOT_MAX, - SKILL_POLICE = SKILL_POLICE_MAX, - SKILL_FIREMAN = SKILL_FIREMAN_MAX, - SKILL_POWERLOADER = SKILL_POWERLOADER_MAX, - SKILL_VEHICLE = SKILL_VEHICLE_MAX, - SKILL_JTAC = SKILL_JTAC_MAX, - SKILL_EXECUTION = SKILL_EXECUTION_MAX, - SKILL_INTEL = SKILL_INTEL_MAX, - ) - -/* ----------------------------- -Royal Marines Commando ----------------------------- -*/ - -//NOTE: Skills take heavy from PMCs - -/datum/skills/rmc - name = "Royal Marines Commando" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - ) - -/datum/skills/rmc/specialist - name = "Royal Marines Commando Specialist" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - ) - -/datum/skills/rmc/smartgun - name = "Royal Marines Commando Smartgunner" - skills = list( - SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, - ) - -/datum/skills/rmc/leader - name = "Royal Marines Commando Leader" - skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, - ) diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm new file mode 100644 index 000000000000..9b55adc9b1f4 --- /dev/null +++ b/code/datums/skills/civilian.dm @@ -0,0 +1,213 @@ +/* +--------------------- +CIVILIAN +--------------------- +*/ + +/datum/skills/civilian + name = "Civilian" + skills = list( + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_ENDURANCE = SKILL_ENDURANCE_NONE, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/manager + name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things. + skills = list( + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) + +/datum/skills/civilian/icc_investigation + name = "ICC CL - Black Market ERT" + skills = list( + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device + ) + +/datum/skills/civilian/manager/director + name = "Weyland-Yutani Director" + skills = list( + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) + +//civilian that are survivor could be in is own file maybe + +/datum/skills/civilian/survivor + name = "Survivor" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + ) + +/datum/skills/civilian/survivor/manager + name = "Weyland-Yutani Manager" + skills = list( + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) + +/datum/skills/civilian/survivor/goon + name = "Survivor Goon" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/pmc + name = "Survivor PMC" + additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/pmc/medic + name = "Survivor PMC Medic" + additional_skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/pmc/engineer + name = "Survivor PMC Engineer" + additional_skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/datum/skills/civilian/survivor/doctor + name = "Survivor Doctor" + additional_skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + ) + +/datum/skills/civilian/survivor/clf + name = "Survivor CLF" + additional_skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + ) + +/datum/skills/civilian/survivor/scientist + name = "Survivor Scientist" + additional_skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + ) + +/datum/skills/civilian/survivor/chef + name = "Survivor Chef" + additional_skills = list( + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, + ) + +/datum/skills/civilian/survivor/miner + name = "Survivor Miner" + additional_skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/trucker + name = "Survivor Trucker" + additional_skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + ) + +/datum/skills/civilian/survivor/engineer + name = "Survivor Engineer" + additional_skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/chaplain + name = "Survivor Chaplain" + additional_skills = list( + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + ) + +/datum/skills/civilian/survivor/marshal + name = "Survivor Marshal" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + ) + +/datum/skills/civilian/survivor/prisoner + name = "Survivor Prisoner" + additional_skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/gangleader + name = "Survivor Gang Leader" + additional_skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + ) diff --git a/code/datums/skills/clf.dm b/code/datums/skills/clf.dm new file mode 100644 index 000000000000..6042febb6b48 --- /dev/null +++ b/code/datums/skills/clf.dm @@ -0,0 +1,92 @@ +/* +------------------------- +COLONIAL LIBERATION FRONT +------------------------- +*/ + +/datum/skills/clf + name = "CLF Soldier" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/clf/combat_engineer + name = "CLF Engineer" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/clf/combat_medic + name = "CLF Medic" + skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/clf/specialist + name = "CLF Specialist" + skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED + ) + +/datum/skills/clf/leader + name = "CLF Leader" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4 + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI + ) + +/datum/skills/clf/commander + name = "CLF Cell Commander" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, + ) diff --git a/code/datums/skills/cmb.dm b/code/datums/skills/cmb.dm new file mode 100644 index 000000000000..b29a4c314567 --- /dev/null +++ b/code/datums/skills/cmb.dm @@ -0,0 +1,60 @@ +/* +--------------------- +COLONIAL MARSHALS +--------------------- +*/ +/datum/skills/cmb + name = "CMB Deputy" + skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + ) + +/datum/skills/cmb/leader + name = "CMB Marshal" + skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_FIREMAN = SKILL_FIREMAN_MASTER, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/synthetic/cmb + name = "CMB Investigative Synthetic" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, // incase the synth needs to use consoles for investigations or tracking + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, // Not a medical Synthetic, but operate if absolutely needed. + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_PILOT = SKILL_PILOT_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER + ) diff --git a/code/datums/skills/commando.dm b/code/datums/skills/commando.dm new file mode 100644 index 000000000000..dabae682bd0b --- /dev/null +++ b/code/datums/skills/commando.dm @@ -0,0 +1,116 @@ +/* +--------------------- +SPEC-OPS +--------------------- +*/ + +/datum/skills/commando + name = "Commando" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/commando/medic + name = "Commando Medic" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/commando/leader + name = "Commando Leader" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/commando/deathsquad + name = "Deathsquad" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/commando/deathsquad/leader + name = "Deathsquad Leader" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/commando/deathsquad/officer + name = "Deathsquad Officer" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/spy + name = "Spy" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/ninja + name = "Ninja" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) diff --git a/code/datums/skills/contractor.dm b/code/datums/skills/contractor.dm new file mode 100644 index 000000000000..183e95c941f5 --- /dev/null +++ b/code/datums/skills/contractor.dm @@ -0,0 +1,90 @@ +/* +--------------------- +CONTRACTORS +--------------------- +*/ +/datum/skills/contractor + name = "Contractor Standard" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + +/datum/skills/contractor/leader + name = "Contractor Leader" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_JTAC = SKILL_JTAC_MASTER, + ) + +/datum/skills/contractor/medic + name = "Contractor Medic" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/contractor/engi + name = "Contractor Engi" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_MAX, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + ) + +/datum/skills/contractor/heavy + name = "Contractor Machinegunner" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) diff --git a/code/datums/skills/dutch.dm b/code/datums/skills/dutch.dm new file mode 100644 index 000000000000..5c2c63a8c463 --- /dev/null +++ b/code/datums/skills/dutch.dm @@ -0,0 +1,46 @@ +/datum/skills/dutch + name = "Dutch" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_ANTAG = SKILL_ANTAG_HUNTER, + ) + +/datum/skills/dutchmerc + name = "Dutch's Dozen Mercenary" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + ) + +/datum/skills/dutchmedic + name = "Dutch's Dozen Medic" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + ) diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm new file mode 100644 index 000000000000..4799dd68d617 --- /dev/null +++ b/code/datums/skills/forecon.dm @@ -0,0 +1,102 @@ +/* +--------------------- +MILITARY SURVIVORS +--------------------- +*/ +//Hardcore survivors with poor equipment and skills, prove you're the best of the best. + +/datum/skills/military/survivor/forecon_standard + name = "Reconnaissance Rifleman" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/forecon_techician + name = "Reconnaissance Support Technician" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/forecon_marksman + name = "Reconnaissance Designated Marksman" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SCOUT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/forecon_smartgunner + name = "Reconnaissance Smartgunner" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/forecon_sniper + name = "Reconnaissance Sniper" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SNIPER, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/forecon_squad_leader + name = "Reconnaissance Squad Leader" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) diff --git a/code/datums/skills/freelancer.dm b/code/datums/skills/freelancer.dm new file mode 100644 index 000000000000..7f7256318edb --- /dev/null +++ b/code/datums/skills/freelancer.dm @@ -0,0 +1,40 @@ +/* +----------- +FREELANCERS +----------- +*/ + +//NOTE: Freelancer training is similar to the USCM's, but with additional construction skills + +/datum/skills/freelancer + name = "Freelancer Private" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + +/datum/skills/freelancer/combat_medic + name = "Freelancer Medic" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + ) + +/datum/skills/freelancer/SL + name = "Freelancer Leader" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + + diff --git a/code/datums/skills/gladiator.dm b/code/datums/skills/gladiator.dm new file mode 100644 index 000000000000..7ba2c9eff455 --- /dev/null +++ b/code/datums/skills/gladiator.dm @@ -0,0 +1,33 @@ +/datum/skills/gladiator + name = "Gladiator" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + ) + +/datum/skills/gladiator/champion + name = "Gladiator Champion" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/gladiator/champion/leader + name = "Gladiator Leader" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, //Spartacus! + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_MASTER, + ) diff --git a/code/datums/skills/mercenary.dm b/code/datums/skills/mercenary.dm new file mode 100644 index 000000000000..8d842ea30dd2 --- /dev/null +++ b/code/datums/skills/mercenary.dm @@ -0,0 +1,85 @@ +/datum/skills/mercenary + name = "Mercenary" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/mercenary/elite + name = "Elite Mercenary" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/mercenary/elite/medic + name = "Elite Mercenary Medic" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_MEDICAL = SKILL_MEDICAL_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + ) + +/datum/skills/mercenary/elite/engineer + name = "Elite Mercenary Engineer" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_PILOT = SKILL_PILOT_EXPERT, + ) + +/datum/skills/mercenary/elite/heavy + name = "Elite Mercenary Heavy" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + ) + +/datum/skills/mercenary/elite/leader + name = "Elite Mercenary Leader" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_PILOT = SKILL_PILOT_EXPERT, + ) diff --git a/code/datums/skills/misc.dm b/code/datums/skills/misc.dm new file mode 100644 index 000000000000..e4f78219b5c6 --- /dev/null +++ b/code/datums/skills/misc.dm @@ -0,0 +1,86 @@ +/* +--------------------- +MISCELLANEOUS +--------------------- +*/ + +/datum/skills/tank_crew + name = "Vehicle Crewman" + skills = list( + SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/yautja/warrior + name = "Yautja Warrior" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_ANTAG = SKILL_ANTAG_HUNTER, + ) + +/datum/skills/cultist_leader + name = "Cultist Leader" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_MASTER, + ) + +/datum/skills/souto + name = "Souto Man" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + ) + +/datum/skills/everything //max it out + name = "Ultra" + skills = list( + SKILL_CQC = SKILL_CQC_MAX, + SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, + SKILL_FIREARMS = SKILL_FIREARMS_MAX, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENGINEER = SKILL_ENGINEER_MAX, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX, + SKILL_LEADERSHIP = SKILL_LEAD_MAX, + SKILL_OVERWATCH = SKILL_OVERWATCH_MAX, + SKILL_MEDICAL = SKILL_MEDICAL_MAX, + SKILL_SURGERY = SKILL_SURGERY_MAX, + SKILL_RESEARCH = SKILL_RESEARCH_MAX, + SKILL_ANTAG = SKILL_ANTAG_MAX, + SKILL_PILOT = SKILL_PILOT_MAX, + SKILL_POLICE = SKILL_POLICE_MAX, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_MAX, + SKILL_VEHICLE = SKILL_VEHICLE_MAX, + SKILL_JTAC = SKILL_JTAC_MAX, + SKILL_EXECUTION = SKILL_EXECUTION_MAX, + SKILL_INTEL = SKILL_INTEL_MAX, + ) diff --git a/code/datums/skills/pmc.dm b/code/datums/skills/pmc.dm new file mode 100644 index 000000000000..df7027e2a7ab --- /dev/null +++ b/code/datums/skills/pmc.dm @@ -0,0 +1,171 @@ +/* +---------------------------- +Private Military Contractors +---------------------------- +*/ + +//NOTE: Compared to the USCM, PMCs have additional firearms training, construction skills and policing skills + +/datum/skills/pmc + name = "PMC Private" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + ) + +/datum/skills/pmc/medic + name = "PMC Medic" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + ) + +/datum/skills/pmc/medic/chem + name = "PMC Medical Investigator" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + ) + +/datum/skills/pmc/smartgunner + name = "PMC Smartgunner" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/pmc/specialist + name = "PMC Specialist" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/pmc/SL + name = "PMC Leader" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/pmc/SL/chem + name = "PMC Lead Investigator" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/pmc/tank_crew + name = "Vehicle Crewman" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/datum/skills/pmc/doctor + name = "PMC Triage Doctor" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, //trained in medicine more than combat + SKILL_CQC = SKILL_CQC_TRAINED + ) + +/datum/skills/pmc/engineer + name = "PMC Corporate Technician" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/datum/skills/pmc/director + name = "PMC Site Director" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, + ) diff --git a/code/datums/skills/rmc.dm b/code/datums/skills/rmc.dm new file mode 100644 index 000000000000..89aa39b154ad --- /dev/null +++ b/code/datums/skills/rmc.dm @@ -0,0 +1,71 @@ +/* +---------------------------- +Royal Marines Commando +---------------------------- +*/ + +//NOTE: Skills take heavy from PMCs + +/datum/skills/rmc + name = "Royal Marines Commando" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + ) + +/datum/skills/rmc/specialist + name = "Royal Marines Commando Specialist" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/rmc/smartgun + name = "Royal Marines Commando Smartgunner" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + ) + +/datum/skills/rmc/leader + name = "Royal Marines Commando Leader" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + ) diff --git a/code/datums/skills/skills.dm b/code/datums/skills/skills.dm new file mode 100644 index 000000000000..5d1a69e174ed --- /dev/null +++ b/code/datums/skills/skills.dm @@ -0,0 +1,267 @@ +// Individual skill +/datum/skill + /// Name of the skill + var/skill_name = null + /// used for the view UI + var/readable_skill_name = null + /// Level of skill in this... skill + var/skill_level = 0 + /// the max level this skill can be, used for tgui + var/max_skill_level = 0 + +/datum/skill/proc/get_skill_level() + return skill_level + +/datum/skill/proc/set_skill(new_level, mob/owner) + skill_level = new_level + +/datum/skill/proc/is_skilled(req_level, is_explicit = FALSE) + if(is_explicit) + return (skill_level == req_level) + return (skill_level >= req_level) + +// Lots of defines here. See #define/skills.dm + +/datum/skill/cqc + skill_name = SKILL_CQC + readable_skill_name = "CQC" + skill_level = SKILL_CQC_DEFAULT + max_skill_level = SKILL_CQC_MAX + +/datum/skill/melee_weapons + skill_name = SKILL_MELEE_WEAPONS + readable_skill_name = "melee weapons" + skill_level = SKILL_MELEE_DEFAULT + max_skill_level = SKILL_MELEE_MAX + +/datum/skill/firearms + skill_name = SKILL_FIREARMS + skill_level = SKILL_FIREARMS_TRAINED + max_skill_level = SKILL_FIREARMS_MAX + +/datum/skill/spec_weapons + skill_name = SKILL_SPEC_WEAPONS + readable_skill_name = "specialist weapons" + skill_level = SKILL_SPEC_DEFAULT + max_skill_level = SKILL_SPEC_ALL + +/datum/skill/endurance + skill_name = SKILL_ENDURANCE + skill_level = SKILL_ENDURANCE_WEAK + max_skill_level = SKILL_ENDURANCE_MAX + +/datum/skill/engineer + skill_name = SKILL_ENGINEER + skill_level = SKILL_ENGINEER_DEFAULT + max_skill_level = SKILL_ENGINEER_MAX + +/datum/skill/construction + skill_name = SKILL_CONSTRUCTION + skill_level = SKILL_CONSTRUCTION_DEFAULT + max_skill_level = SKILL_CONSTRUCTION_MAX + +/datum/skill/leadership + skill_name = SKILL_LEADERSHIP + skill_level = SKILL_LEAD_NOVICE + max_skill_level = SKILL_LEAD_MAX + +/datum/skill/leadership/set_skill(new_level, mob/living/owner) + ..() + if(!owner) + return + + if(!ishuman(owner)) + return + + // Give/remove issue order actions + if(is_skilled(SKILL_LEAD_TRAINED)) + ADD_TRAIT(owner, TRAIT_LEADERSHIP, TRAIT_SOURCE_SKILL(skill_name)) + else + REMOVE_TRAIT(owner, TRAIT_LEADERSHIP, TRAIT_SOURCE_SKILL(skill_name)) + +/datum/skill/overwatch + skill_name = SKILL_OVERWATCH + skill_level = SKILL_OVERWATCH_DEFAULT + max_skill_level = SKILL_OVERWATCH_MAX + +/datum/skill/medical + skill_name = SKILL_MEDICAL + skill_level = SKILL_MEDICAL_DEFAULT + max_skill_level = SKILL_MEDICAL_MAX + +/datum/skill/surgery + skill_name = SKILL_SURGERY + skill_level = SKILL_SURGERY_DEFAULT + max_skill_level = SKILL_SURGERY_MAX + +/datum/skill/surgery/set_skill(new_level, mob/living/owner) + ..() + if(!owner) + return + + if(!ishuman(owner)) + return + + // Give/remove surgery toggle action + var/datum/action/surgery_toggle/surgery_action = locate() in owner.actions + if(is_skilled(SKILL_SURGERY_NOVICE)) + if(!surgery_action) + give_action(owner, /datum/action/surgery_toggle) + else + surgery_action.update_surgery_skill() + else + if(surgery_action) + surgery_action.remove_from(owner) + +/datum/skill/research + skill_name = SKILL_RESEARCH + skill_level = SKILL_RESEARCH_DEFAULT + max_skill_level = SKILL_RESEARCH_MAX + +/datum/skill/antag + skill_name = SKILL_ANTAG + readable_skill_name = "illegal technology" + skill_level = SKILL_ANTAG_DEFAULT + max_skill_level = SKILL_ANTAG_MAX + +/datum/skill/pilot + skill_name = SKILL_PILOT + skill_level = SKILL_PILOT_DEFAULT + max_skill_level = SKILL_PILOT_MAX + +/datum/skill/navigations + skill_name = SKILL_NAVIGATIONS + skill_level = SKILL_NAVIGATIONS_DEFAULT + max_skill_level = SKILL_NAVIGATIONS_MAX + +/datum/skill/police + skill_name = SKILL_POLICE + skill_level = SKILL_POLICE_DEFAULT + max_skill_level = SKILL_POLICE_MAX + +/datum/skill/powerloader + skill_name = SKILL_POWERLOADER + skill_level = SKILL_POWERLOADER_DEFAULT + max_skill_level = SKILL_POWERLOADER_MAX + +/datum/skill/vehicles + skill_name = SKILL_VEHICLE + skill_level = SKILL_VEHICLE_DEFAULT + max_skill_level = SKILL_VEHICLE_MAX + +/datum/skill/jtac + skill_name = SKILL_JTAC + readable_skill_name = "JTAC" + skill_level = SKILL_JTAC_NOVICE + max_skill_level = SKILL_JTAC_MAX + +/datum/skill/execution + skill_name = SKILL_EXECUTION + skill_level = SKILL_EXECUTION_DEFAULT + max_skill_level = SKILL_EXECUTION_MAX + +/datum/skill/intel + skill_name = SKILL_INTEL + skill_level = SKILL_INTEL_NOVICE + max_skill_level = SKILL_INTEL_MAX + +/datum/skill/domestic + skill_name = SKILL_DOMESTIC + skill_level = SKILL_DOMESTIC_NONE + max_skill_level = SKILL_DOMESTIC_MAX + +/datum/skill/fireman + skill_name = SKILL_FIREMAN + readable_skill_name = "fireman carrying" + skill_level = SKILL_FIREMAN_DEFAULT + max_skill_level = SKILL_FIREMAN_MAX + +/// Skill with an extra S at the end is a collection of multiple skills. Basically a skillSET +/// This is to organize and provide a common interface to the huge heap of skills there are +/datum/skills + /// The name of the skillset + var/name + // The mob that has this skillset + var/mob/owner + + // List of skill datums. + // Also, if this is populated when the datum is created, it will set the skill levels automagically + var/list/skills = list() + // Same as above, but for children of parents that just add a lil something else + var/list/additional_skills = list() + +/datum/skills/New(mob/skillset_owner) + owner = skillset_owner + + // Setup every single skill + for(var/skill_type in subtypesof(/datum/skill)) + var/datum/skill/S = new skill_type() + + // Fancy hack to convert a list of desired skill levels in each named skill into a skill level in the actual skill datum + // Lets the skills list be used multipurposely for both storing skill datums and choosing skill levels for different skillsets + var/predetermined_skill_level = additional_skills[S.skill_name] ? additional_skills[S.skill_name] : skills[S.skill_name] + skills[S.skill_name] = S + + if(!isnull(predetermined_skill_level)) + S.set_skill(predetermined_skill_level, owner) + +/datum/skills/Destroy() + owner = null + skills = null // Don't need to delete, /datum/skill should softdel + SStgui.close_uis(src) + return ..() + +// Checks if the given skill is contained in this skillset at all +/datum/skills/proc/has_skill(skill) + return isnull(skills[skill]) + +// Returns the skill DATUM for the given skill +/datum/skills/proc/get_skill(skill) + if(!skills) + return null + return skills[skill] + +// Returns the skill level for the given skill +/datum/skills/proc/get_skill_level(skill) + var/datum/skill/S = get_skill(skill) + if(!S) + return -1 + if(QDELETED(S)) + return -1 + return S.get_skill_level() + +// Sets the skill LEVEL for a given skill +/datum/skills/proc/set_skill(skill, new_level) + var/datum/skill/S = skills[skill] + if(!S) + return + return S.set_skill(new_level, owner) + +/datum/skills/proc/increment_skill(skill, increment, cap) + var/datum/skill/S = skills[skill] + if(!S || skillcheck(owner, skill, cap)) + return + return S.set_skill(min(cap,S.skill_level+increment), owner) + +/datum/skills/proc/decrement_skill(skill, increment) + var/datum/skill/S = skills[skill] + if(!S) + return + return S.set_skill(max(0,S.skill_level-increment), owner) + +// Checks if the skillset is AT LEAST skilled enough to pass a skillcheck for the given skill level +/datum/skills/proc/is_skilled(skill, req_level, is_explicit = FALSE) + var/datum/skill/S = get_skill(skill) + if(QDELETED(S)) + return FALSE + return S.is_skilled(req_level, is_explicit) + +// Adjusts the full skillset to a new type of skillset. Pass the datum type path for the desired skillset +/datum/skills/proc/set_skillset(skillset_type) + var/datum/skills/skillset = new skillset_type() + var/list/skill_levels = initial(skillset.skills) + + name = skillset.name + for(var/skill in skill_levels) + set_skill(skill, skill_levels[skill]) + qdel(skillset) diff --git a/code/datums/skills/synthetic.dm b/code/datums/skills/synthetic.dm new file mode 100644 index 000000000000..3925dd9605b3 --- /dev/null +++ b/code/datums/skills/synthetic.dm @@ -0,0 +1,90 @@ +/* +--------------------- +SYNTHETIC +--------------------- +*/ + +/datum/skills/synthetic + name = "Synthetic" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MASTER, + SKILL_SURGERY = SKILL_SURGERY_EXPERT, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, + ) + +/datum/skills/colonial_synthetic + name = SYNTH_COLONY + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_INTEL = SKILL_INTEL_TRAINED, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, + ) + +/datum/skills/working_joe + name = SYNTH_WORKING_JOE + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, //So they can fully use the Maintenance Jack + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, + ) + +/datum/skills/infiltrator_synthetic + name = SYNTH_INFILTRATOR + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MASTER, + SKILL_SURGERY = SKILL_SURGERY_EXPERT, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, + SKILL_ANTAG = SKILL_ANTAG_AGENT, + ) diff --git a/code/datums/skills/upp.dm b/code/datums/skills/upp.dm new file mode 100644 index 000000000000..77401ab62878 --- /dev/null +++ b/code/datums/skills/upp.dm @@ -0,0 +1,218 @@ +/* +-------------------------- +UNITED PROGRESSIVE PEOPLES +-------------------------- +*/ + +//NOTE: UPP make up for their subpar gear with extreme training. + +/datum/skills/upp + name = "UPP Private" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + ) + +/datum/skills/upp/combat_engineer + name = "UPP Sapper" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + ) + +/datum/skills/upp/combat_medic + name = "UPP Medic" + skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + ) + +/datum/skills/upp/specialist + name = "UPP Specialist" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + ) + +/datum/skills/upp/SL + name = "UPP Squad Leader" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/upp/military_police + name = "UPP Military Police" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + ) + +/datum/skills/upp/officer + name = "UPP Officer" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/upp/kapitan + name = "UPP Kapitan" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/upp/commander + name = "UPP Command Officer" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, + ) +/datum/skills/upp/conscript + name = "UPP Conscript" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + ) + + +//Survivor + +/datum/skills/military/survivor/upp_private + name = "UPP Private" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/upp_sapper + name = "UPP Sapper" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/upp_medic + name = "UPP Medic" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + +/datum/skills/military/survivor/upp_spec + name = "UPP Specialist" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + ) + +/datum/skills/military/survivor/upp_sl + name = "UPP Squad Leader" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm new file mode 100644 index 000000000000..8a6d2fd2c8c2 --- /dev/null +++ b/code/datums/skills/uscm.dm @@ -0,0 +1,410 @@ +/* +------------------------------ +United States Colonial Marines +------------------------------ +*/ + +/datum/skills/pfc + name = "Private" + //same as default + +/datum/skills/pfc/crafty + name = "Crafty Private" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + ) + +/datum/skills/combat_medic + name = "Combat Medic" + skills = list( + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/combat_medic/crafty + name = "Crafty Combat Medic" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + ) + +/datum/skills/combat_engineer + name = "Combat Engineer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/smartgunner + name = "Squad Smartgunner" + skills = list( + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + ) + +/datum/skills/specialist + name = "Squad Weapons Specialist" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. + SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_JTAC = SKILL_JTAC_BEGINNER + ) + +/datum/skills/tl + name = "Fireteam Leader" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) + +/datum/skills/SL + name = "Squad Leader" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/intel + name = "Intelligence Officer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) + +/* +--------------------- +MILITARY NONCOMBATANT +--------------------- +*/ + +/datum/skills/doctor + name = "Doctor" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + ) + +/datum/skills/nurse + name = "Nurse" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + ) + +/datum/skills/researcher + name = "Researcher" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/pilot + name = "Pilot Officer" + skills = list( + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/crew_chief + name = "Dropship Crew Chief" + skills = list( + SKILL_PILOT = SKILL_PILOT_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + ) + +/datum/skills/MP + name = "Military Police" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + +/datum/skills/MW + name = "Military Warden" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + ) + +/datum/skills/provost + name = "Provost" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + ) + +/datum/skills/OT + name = "Ordnance Technician" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/datum/skills/MT + name = "Maintenance Technician" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, + ) + +/datum/skills/mess_technician + name = "Mess Technician" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, // need to hunt food somehow + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER + ) + +/datum/skills/CT + name = "Cargo Technician" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + +/* +--------------------- +COMMAND STAFF +--------------------- +*/ + +/datum/skills/general + name = "General" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people + SKILL_INTEL = SKILL_INTEL_EXPERT + ) + +/datum/skills/commander + name = "Commanding Officer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED //can change ship alt + ) + +/datum/skills/XO + name = "Executive Officer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc. + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, + ) + +/datum/skills/SO + name = "Staff Officer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/SEA + name = "Senior Enlisted Advisor" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + ) + +/datum/skills/SEA/New(mob/skillset_owner) + ..() + give_action(skillset_owner, /datum/action/looc_toggle) + +/datum/skills/SEA/Destroy() + remove_action(owner, /datum/action/looc_toggle) + return ..() + +/datum/skills/CMO + name = "CMO" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/CMP + name = "Chief MP" + skills = list( + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) + +/datum/skills/auxiliary_officer + name = "Auxiliary Support Officer" + skills = list( + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + ) + +/datum/skills/CE + name = "Chief Engineer" + skills = list( + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_JTAC = SKILL_JTAC_MASTER, + SKILL_INTEL = SKILL_INTEL_TRAINED, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, + ) + +/datum/skills/RO + name = "Requisition Officer" + skills = list( + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_POLICE = SKILL_POLICE_FLASH, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_INTEL = SKILL_INTEL_TRAINED, + ) diff --git a/code/datums/stamina/_stamina.dm b/code/datums/stamina/_stamina.dm index 36705e3be300..e233aaa81676 100644 --- a/code/datums/stamina/_stamina.dm +++ b/code/datums/stamina/_stamina.dm @@ -37,13 +37,11 @@ current_stamina = Clamp(current_stamina - amount, 0, max_stamina) if(current_stamina < max_stamina) - if(!(src in active_staminas)) - active_staminas.Add(src) - + START_PROCESSING(SSobj, src) if(amount > 0) apply_rest_period(STAMINA_REST_PERIOD) else - active_staminas.Remove(src) + STOP_PROCESSING(SSobj, src) update_stamina_level() diff --git a/code/datums/statistics/entities/caste_stats.dm b/code/datums/statistics/entities/caste_stats.dm index 639e1b4a05f5..6bfc18d124b7 100644 --- a/code/datums/statistics/entities/caste_stats.dm +++ b/code/datums/statistics/entities/caste_stats.dm @@ -3,6 +3,10 @@ var/total_hits = 0 var/list/abilities_used = list() // types of /datum/entity/statistic, "tail sweep" = 10, "screech" = 2 +/datum/entity/player_stats/caste/Destroy(force) + . = ..() + QDEL_LIST_ASSOC_VAL(abilities_used) + /datum/entity/player_stats/caste/proc/setup_ability(ability) if(!ability) return diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index 4a01e4e9d72b..35ff1769b925 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -84,6 +84,10 @@ if(!mind || statistic_exempt) return + var/area/area = get_area(death_loc) + handle_observer_message(cause_data, cause_mob, death_loc, area) + + // Perform logging above before get_player_from_key to avoid delays var/datum/entity/statistic/death/new_death = DB_ENTITY(/datum/entity/statistic/death) var/datum/entity/player/player_entity = get_player_from_key(mind.ckey) if(player_entity) @@ -95,11 +99,8 @@ new_death.role_name = get_role_name() new_death.mob_name = real_name new_death.faction_name = faction - new_death.is_xeno = FALSE - - var/area/A = get_area(death_loc) - new_death.area_name = A.name + new_death.area_name = area.name new_death.cause_name = cause_data?.cause_name var/datum/entity/player/cause_player = get_player_from_key(cause_data?.ckey) @@ -132,8 +133,6 @@ new_death.total_damage_taken = life_damage_taken_total new_death.total_revives_done = life_revives_total - handle_observer_message(cause_data, cause_mob, death_loc, A) - if(round_statistics) round_statistics.track_death(new_death) @@ -141,16 +140,16 @@ new_death.detach() return new_death -/mob/living/carbon/human/track_mob_death(cause, cause_mob) - . = ..(cause, cause_mob, job) +/mob/living/carbon/human/track_mob_death(datum/cause_data/cause_data, turf/death_loc) + . = ..() if(statistic_exempt || !mind) return var/datum/entity/player_stats/human/human_stats = mind.setup_human_stats() if(human_stats && human_stats.death_list) human_stats.death_list.Insert(1, .) -/mob/living/carbon/xenomorph/track_mob_death(cause, cause_mob) - var/datum/entity/statistic/death/new_death = ..(cause, cause_mob, caste_type) +/mob/living/carbon/xenomorph/track_mob_death(datum/cause_data/cause_data, turf/death_loc) + var/datum/entity/statistic/death/new_death = ..() if(!new_death) return new_death.is_xeno = TRUE // this was placed beneath the if below, which meant gibbing as a xeno wouldn't track properly in stats diff --git a/code/datums/statistics/entities/human_stats.dm b/code/datums/statistics/entities/human_stats.dm index 51b07867dfd3..1e15aa1d161b 100644 --- a/code/datums/statistics/entities/human_stats.dm +++ b/code/datums/statistics/entities/human_stats.dm @@ -5,10 +5,17 @@ var/total_shots = 0 var/total_shots_hit = 0 var/total_screams = 0 - var/datum/entity/weapon_stats/top_weapon = null // reference to /datum/entity/weapon_stats (like tac-shotty) - var/list/weapon_stats_list = list() // list of types /datum/entity/weapon_stats - var/list/job_stats_list = list() // list of types /datum/entity/job_stats - var/list/datum/entity/statistic/medal/medal_list = list() // list of all medals earned + var/list/weapon_stats_list = list() //! indexed list of types /datum/entity/weapon_stats + var/list/job_stats_list = list() //! indexed list of types /datum/entity/job_stats + var/datum/entity/weapon_stats/top_weapon //! reference to /datum/entity/weapon_stats (like tac-shotty) + var/list/datum/entity/statistic/medal/medal_list = list() //! list of all medals earned + +/datum/entity/player_stats/human/Destroy(force) + . = ..() + QDEL_LIST_ASSOC_VAL(weapon_stats_list) + QDEL_LIST_ASSOC_VAL(job_stats_list) + QDEL_NULL(top_weapon) + QDEL_LIST(medal_list) /datum/entity/player_stats/human/get_playtime(type) if(!type) diff --git a/code/datums/statistics/entities/job_stats.dm b/code/datums/statistics/entities/job_stats.dm index ecde1c942082..199c2adb3160 100644 --- a/code/datums/statistics/entities/job_stats.dm +++ b/code/datums/statistics/entities/job_stats.dm @@ -1,8 +1,8 @@ /datum/entity/player_stats/job - var/name = null - var/total_friendly_fire = null - var/total_revives = null - var/total_lives_saved = null - var/total_shots = null - var/total_shots_hit = null - var/total_screams = null + var/name + var/total_friendly_fire + var/total_revives + var/total_lives_saved + var/total_shots + var/total_shots_hit + var/total_screams diff --git a/code/datums/statistics/entities/panel_stats.dm b/code/datums/statistics/entities/panel_stats.dm index d6e391e1731f..e507d5d81a8b 100644 --- a/code/datums/statistics/entities/panel_stats.dm +++ b/code/datums/statistics/entities/panel_stats.dm @@ -8,7 +8,7 @@ update_panel_data(round_statistics) ui_interact(user) -/datum/entity/player_entity/proc/ui_interact(mob/user, ui_key = "statistics", datum/nanoui/ui = null, force_open = 1) +/datum/entity/player_entity/proc/ui_interact(mob/user, ui_key = "statistics", datum/nanoui/ui, force_open = 1) data["menu"] = menu data["subMenu"] = subMenu data["dataMenu"] = dataMenu diff --git a/code/datums/statistics/entities/player_entity.dm b/code/datums/statistics/entities/player_entity.dm index 72f4d95d7aa3..f0b3d37ede7e 100644 --- a/code/datums/statistics/entities/player_entity.dm +++ b/code/datums/statistics/entities/player_entity.dm @@ -8,8 +8,8 @@ /datum/entity/player_entity var/name var/ckey // "cakey" - var/list/datum/entity/player_stats = list() - var/list/datum/entity/statistic/death/death_stats = list() + var/list/player_stats = list() //! Indeed list of /datum/entity/player_stats + var/list/death_stats = list() //! Indexed list of /datum/entity/statistic/death var/menu = 0 var/subMenu = 0 var/dataMenu = 0 @@ -18,6 +18,11 @@ var/savefile_version var/save_loaded = FALSE +/datum/entity/player_entity/Destroy(force) + QDEL_LIST_ASSOC_VAL(player_stats) + QDEL_LIST_ASSOC_VAL(death_stats) + return ..() + /datum/entity/player_entity/proc/get_playtime(branch, type) var/playtime = 0 if(player_stats["[branch]"]) diff --git a/code/datums/statistics/entities/player_stats.dm b/code/datums/statistics/entities/player_stats.dm index b378d7c2ea24..d9fbd3b11e03 100644 --- a/code/datums/statistics/entities/player_stats.dm +++ b/code/datums/statistics/entities/player_stats.dm @@ -6,13 +6,21 @@ var/total_rounds_played = 0 var/steps_walked = 0 var/round_played = FALSE - var/datum/entity/statistic/nemesis = null // "runner" = 3 + var/datum/entity/statistic/nemesis // "runner" = 3 var/list/niche_stats = list() // list of type /datum/entity/statistic, "Total Executions" = number var/list/humans_killed = list() // list of type /datum/entity/statistic, "jobname2" = number var/list/xenos_killed = list() // list of type /datum/entity/statistic, "caste" = number var/list/death_list = list() // list of type /datum/entity/death_stats var/display_stat = TRUE +/datum/entity/player_stats/Destroy(force) + QDEL_NULL(nemesis) + QDEL_LIST_ASSOC_VAL(niche_stats) + QDEL_LIST_ASSOC_VAL(humans_killed) + QDEL_LIST_ASSOC_VAL(xenos_killed) + QDEL_LIST_ASSOC_VAL(death_list) + return ..() + /datum/entity/player_stats/proc/get_playtime() return total_playtime diff --git a/code/datums/statistics/entities/round_stats.dm b/code/datums/statistics/entities/round_stats.dm index 0e1fb6e387db..baed6befa912 100644 --- a/code/datums/statistics/entities/round_stats.dm +++ b/code/datums/statistics/entities/round_stats.dm @@ -23,7 +23,7 @@ var/total_slashes = 0 // untracked data - var/datum/entity/statistic/map/current_map = null // reference to current map + var/datum/entity/statistic/map/current_map // reference to current map var/list/datum/entity/statistic/death/death_stats_list = list() var/list/abilities_used = list() // types of /datum/entity/statistic, "tail sweep" = 10, "screech" = 2 @@ -37,8 +37,20 @@ var/list/job_stats_list = list() // list of types /datum/entity/job_stats // nanoui data - var/round_data[0] - var/death_data[0] + var/list/round_data = list() + var/list/death_data = list() + +/datum/entity/statistic/round/Destroy(force) + . = ..() + QDEL_NULL(current_map) + QDEL_LIST(death_stats_list) + QDEL_LIST_ASSOC_VAL(abilities_used) + QDEL_LIST_ASSOC_VAL(final_participants) + QDEL_LIST_ASSOC_VAL(hijack_participants) + QDEL_LIST_ASSOC_VAL(total_deaths) + QDEL_LIST_ASSOC_VAL(caste_stats_list) + QDEL_LIST_ASSOC_VAL(weapon_stats_list) + QDEL_LIST_ASSOC_VAL(job_stats_list) /datum/entity_meta/statistic_round entity_type = /datum/entity/statistic/round diff --git a/code/datums/statistics/entities/weapon_stats.dm b/code/datums/statistics/entities/weapon_stats.dm index 0d8458c20de2..9fff5c514458 100644 --- a/code/datums/statistics/entities/weapon_stats.dm +++ b/code/datums/statistics/entities/weapon_stats.dm @@ -1,16 +1,23 @@ /datum/entity/weapon_stats - var/datum/entity/player = null // "deanthelis" - var/list/niche_stats = list() // list of type /datum/entity/statistic, "Total Reloads" = number - var/list/humans_killed = list() // list of type /datum/entity/statistic, "jobname2" = number - var/list/xenos_killed = list() // list of type /datum/entity/statistic, "caste" = number - var/name = null + var/datum/entity/player + var/list/niche_stats = list() //! Indexed list of /datum/entity/statistic, "Total Reloads" = number + var/list/humans_killed = list() //! Indexed list of /datum/entity/statistic, "jobname2" = number + var/list/xenos_killed = list() //! Indexed list of /datum/entity/statistic, "caste" = number + var/name var/total_kills = 0 - var/total_hits = null - var/total_shots = null - var/total_shots_hit = null - var/total_friendly_fire = null + var/total_hits + var/total_shots + var/total_shots_hit + var/total_friendly_fire var/display_stat = TRUE +/datum/entity/weapon_stats/Destroy(force) + player = null + QDEL_LIST_ASSOC_VAL(niche_stats) + QDEL_LIST_ASSOC_VAL(humans_killed) + QDEL_LIST_ASSOC_VAL(xenos_killed) + return ..() + /datum/entity/weapon_stats/proc/count_human_kill(job_name) if(!job_name) return diff --git a/code/datums/statistics/entities/xeno_stats.dm b/code/datums/statistics/entities/xeno_stats.dm index 9ed327258258..8fff4a2e5dd3 100644 --- a/code/datums/statistics/entities/xeno_stats.dm +++ b/code/datums/statistics/entities/xeno_stats.dm @@ -4,6 +4,12 @@ var/list/caste_stats_list = list() // list of types /datum/entity/player_stats/caste var/list/datum/entity/statistic/medal/medal_list = list() // list of all royal jelly earned +/datum/entity/player_stats/xeno/Destroy(force) + . = ..() + QDEL_NULL(top_caste) + QDEL_LIST_ASSOC_VAL(caste_stats_list) + QDEL_LIST(medal_list) + /datum/entity/player_stats/xeno/get_playtime(type) if(!type || type == FACTION_XENOMORPH) return ..() diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 5f8fae824312..1af965898548 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -127,70 +127,42 @@ Non-USCM items, from CLF, UPP, colonies, etc. Mostly combat-related. spawn_guns() //the crate gives 2 guns /obj/structure/largecrate/black_market/confiscated_weaponry/proc/spawn_guns() - switch(rand(1,6)) + switch(rand(1, 5)) if(1) //pmc - if(prob(50)) - new /obj/item/weapon/gun/rifle/nsg23/no_lock(src) - new /obj/item/ammo_magazine/rifle/nsg23(src) - new /obj/item/ammo_magazine/rifle/nsg23(src) - new /obj/item/ammo_magazine/rifle/nsg23/ap(src) - new /obj/item/ammo_magazine/rifle/nsg23/extended(src) - else - new /obj/item/weapon/gun/smg/fp9000(src) - new /obj/item/ammo_magazine/smg/fp9000(src) - new /obj/item/ammo_magazine/smg/fp9000(src) - new /obj/item/ammo_magazine/smg/fp9000(src) - new /obj/item/ammo_magazine/smg/fp9000(src) + new /obj/item/weapon/gun/smg/fp9000(src) + new /obj/item/ammo_magazine/smg/fp9000(src) + new /obj/item/ammo_magazine/smg/fp9000(src) + new /obj/item/ammo_magazine/smg/fp9000(src) + new /obj/item/ammo_magazine/smg/fp9000(src) if(2) //pizza new /obj/item/weapon/gun/pistol/holdout(src) new /obj/item/ammo_magazine/pistol/holdout(src) if(3) //clf - switch(rand(1, 3)) + switch(rand(1, 2)) if(1) - new /obj/item/weapon/twohanded/lungemine/damaged(src) - if(2) new /obj/item/weapon/gun/smg/uzi(src) new /obj/item/ammo_magazine/smg/uzi/extended(src) new /obj/item/ammo_magazine/smg/uzi(src) new /obj/item/ammo_magazine/smg/uzi(src) - if(3) + if(2) new /obj/item/weapon/gun/smg/mac15(src) new /obj/item/ammo_magazine/smg/mac15/extended(src) new /obj/item/ammo_magazine/smg/mac15(src) new /obj/item/ammo_magazine/smg/mac15(src) if(4) //upp - if(prob(50)) - new /obj/item/weapon/gun/rifle/type71(src) - new /obj/item/ammo_magazine/rifle/type71/ap(src) - new /obj/item/ammo_magazine/rifle/type71(src) - new /obj/item/ammo_magazine/rifle/type71(src) - else - new /obj/item/weapon/gun/shotgun/type23/riot_control(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) - new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) //NO buckshot! + new /obj/item/weapon/gun/shotgun/type23/riot_control(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) + new /obj/item/ammo_magazine/handful/shotgun/heavy/slug(src) //NO buckshot! if(5) //freelancer - if(prob(80)) - new /obj/item/weapon/gun/rifle/mar40(src) - new /obj/item/ammo_magazine/rifle/mar40/extended(src) - new /obj/item/ammo_magazine/rifle/mar40(src) - new /obj/item/ammo_magazine/rifle/mar40(src) - else - new /obj/item/weapon/gun/rifle/mar40/lmg(src) - new /obj/item/ammo_magazine/rifle/mar40/lmg(src) - if(6) //VAIPO - if(prob(50)) - new /obj/item/weapon/gun/rifle/mar40/tactical(src) - new /obj/item/ammo_magazine/rifle/mar40/extended(src) - new /obj/item/ammo_magazine/rifle/mar40/extended(src) - new /obj/item/ammo_magazine/rifle/mar40(src) - else - new /obj/item/weapon/gun/rifle/mar40/lmg(src) - new /obj/item/ammo_magazine/rifle/mar40/lmg(src) - new /obj/item/ammo_magazine/rifle/mar40/lmg(src) + new /obj/item/weapon/gun/rifle/mar40(src) + new /obj/item/ammo_magazine/rifle/mar40/extended(src) + new /obj/item/ammo_magazine/rifle/mar40(src) + new /obj/item/ammo_magazine/rifle/mar40(src) + /* Misc. Individual Guns */ @@ -561,10 +533,6 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat /obj/item/reagent_container/food/snacks/egg/random, /obj/item/reagent_container/food/snacks/egg/random, //not a dupe /obj/item/reagent_container/food/snacks/xemeatpie, - /obj/item/reagent_container/food/snacks/monkeycube, - /obj/item/reagent_container/food/snacks/monkeycube/farwacube, - /obj/item/reagent_container/food/snacks/monkeycube/stokcube, - /obj/item/reagent_container/food/snacks/monkeycube/yirencube, /obj/item/reagent_container/food/snacks/upp, /obj/item/reagent_container/food/snacks/mre_pack/xmas1, /obj/item/reagent_container/food/snacks/mre_pack/xmas2, @@ -617,7 +585,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, @@ -722,13 +690,6 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted dollar_cost = 50 containertype = /obj/structure/largecrate/black_market -/datum/supply_packs/contraband/surplus/surplus_m4ra_extended - name = "surplus magazine box (Ext M4RA x 12)" - contains = list(/obj/item/ammo_box/magazine/m4ra/ext) - dollar_cost = 45 - crate_heat = 3 - containertype = /obj/structure/largecrate/black_market - /* - Misc. USCM weaponry - */ /datum/supply_packs/contraband/surplus/mk45_automag @@ -1108,7 +1069,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/item/ammo_magazine/smg/mac15/extended(loc) new /obj/item/ammo_magazine/smg/mac15/extended(loc) loot_message = SPAN_NOTICE("It's some CLF SMG armaments.") - if(21 to 25) + if(21 to 29) // Discovered Yautja ruins.. (None of these will trigger any alarms. They are far too old, degraded, and useless for any Yautja to care.) new /obj/item/clothing/mask/yautja_flavor(loc) new /obj/item/clothing/suit/armor/yautja_flavor(loc) @@ -1116,13 +1077,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/item/weapon/twohanded/yautja/glaive/damaged(loc) new /obj/item/stack/yautja_rope(loc) loot_message = SPAN_NOTICE("It's some strange ancient gear...?") - if(26 to 30) - // Damaged lunge mines, don't let the marines near these. Not even *close* to effective against even a runner. - new /obj/item/weapon/twohanded/lungemine/damaged(loc) - new /obj/item/weapon/twohanded/lungemine/damaged(loc) - new /obj/item/weapon/twohanded/lungemine/damaged(loc) - loot_message = SPAN_NOTICE("It's a bunch of lunge mines..?") - if(31 to 35) + if(30 to 35) // CLF nades! loot_message = SPAN_NOTICE("It's a package of assorted CLF grenades!") var/list/nades_to_pick = list( diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 60bf117a6b92..8e42fd1e76a8 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -45,13 +45,11 @@ if((H.faction != faction_to_display && !add_PMCs) || (H.faction != faction_to_display && add_PMCs && !(H.faction in FACTION_LIST_WY)) && !(faction_to_display in H.faction_group)) //faction checks targets.Remove(H) - var/datum/ares_link/link = GLOB.ares_link - if(ares_can_log()) - switch(logging) - if(ARES_LOG_MAIN) - link.log_ares_announcement(title, message) - if(ARES_LOG_SECURITY) - link.log_ares_security(title, message) + switch(logging) + if(ARES_LOG_MAIN) + log_ares_announcement(title, message) + if(ARES_LOG_SECURITY) + log_ares_security(title, message) else if(faction_to_display == "Everyone (-Yautja)") for(var/mob/M in targets) @@ -98,13 +96,11 @@ for(var/mob/living/silicon/decoy/ship_ai/AI in ai_mob_list) INVOKE_ASYNC(AI, TYPE_PROC_REF(/mob/living/silicon/decoy/ship_ai, say), message) - var/datum/ares_link/link = GLOB.ares_link - if(ares_can_log()) - switch(logging) - if(ARES_LOG_MAIN) - link.log_ares_announcement("[MAIN_AI_SYSTEM] Comms Update", message) - if(ARES_LOG_SECURITY) - link.log_ares_security("[MAIN_AI_SYSTEM] Security Update", message) + switch(logging) + if(ARES_LOG_MAIN) + log_ares_announcement("[MAIN_AI_SYSTEM] Comms Update", message) + if(ARES_LOG_SECURITY) + log_ares_security("[MAIN_AI_SYSTEM] Security Update", message) /proc/ai_silent_announcement(message, channel_prefix, bypass_cooldown = FALSE) if(!message) @@ -135,13 +131,11 @@ if(!isnull(signature)) message += "

Signed by,
[signature]" - var/datum/ares_link/link = GLOB.ares_link - if(ares_can_log()) - switch(ares_logging) - if(ARES_LOG_MAIN) - link.log_ares_announcement(title, message) - if(ARES_LOG_SECURITY) - link.log_ares_security(title, message) + switch(ares_logging) + if(ARES_LOG_MAIN) + log_ares_announcement(title, message) + if(ARES_LOG_SECURITY) + log_ares_security(title, message) announcement_helper(message, title, targets, sound_to_play) @@ -154,9 +148,7 @@ if(!ishuman(T) || isyautja(T) || !is_mainship_level(T.z)) targets.Remove(T) - var/datum/ares_link/link = GLOB.ares_link - if(ares_can_log()) - link.log_ares_announcement("[title] Shipwide Update", message) + log_ares_announcement("[title] Shipwide Update", message) announcement_helper(message, title, targets, sound_to_play) diff --git a/code/game/area/WhiskeyOutpost.dm b/code/game/area/WhiskeyOutpost.dm index 02d94dc942da..aef72d1a9941 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/area/almayer.dm b/code/game/area/almayer.dm index 6ced81a22b15..742ae7a1addb 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -13,6 +13,21 @@ ambience_exterior = AMBIENCE_ALMAYER ceiling_muffle = FALSE + ///Whether this area is used for hijack evacuation progress + var/hijack_evacuation_area = FALSE + + ///The weight this area gives towards hijack evacuation progress + var/hijack_evacuation_weight = 0 + + ///Whether this area is additive or multiplicative towards evacuation progress + var/hijack_evacuation_type = EVACUATION_TYPE_NONE + +/area/almayer/Initialize(mapload, ...) + . = ..() + + if(hijack_evacuation_area) + SShijack.progress_areas[src] = power_equip + /area/shuttle/almayer/elevator_maintenance/upperdeck name = "\improper Maintenance Elevator" icon_state = "shuttle" @@ -160,6 +175,9 @@ fake_zlevel = 2 // lowerdeck soundscape_playlist = SCAPE_PL_ENG soundscape_interval = 15 + hijack_evacuation_area = TRUE + hijack_evacuation_weight = 0.2 + hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE /area/almayer/engineering/starboard_atmos name = "\improper Atmospherics Starboard" @@ -183,6 +201,9 @@ name = "\improper Astronavigational Deck" icon_state = "astronavigation" fake_zlevel = 2 // lowerdeck + hijack_evacuation_area = TRUE + hijack_evacuation_weight = 1.1 + hijack_evacuation_type = EVACUATION_TYPE_MULTIPLICATIVE /area/almayer/shipboard/panic name = "\improper Hangar Panic Room" @@ -712,6 +733,9 @@ icon_state = "lifeboat_pump" requires_power = 1 fake_zlevel = 1 + hijack_evacuation_area = TRUE + hijack_evacuation_weight = 0.1 + hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE /area/almayer/lifeboat_pumps/north1 name = "North West Lifeboat Fuel Pump" diff --git a/code/game/bioscans.dm b/code/game/bioscans.dm index 62c801a02d29..ff6e00ec430e 100644 --- a/code/game/bioscans.dm +++ b/code/game/bioscans.dm @@ -109,24 +109,21 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) to_chat(ghost, ghost_scan) -/// This will do something after Project ARES. /datum/bioscan_data/proc/ares_can_bioscan() var/datum/ares_link/link = GLOB.ares_link if(!istype(link)) return FALSE - if(link.p_bioscan && !link.p_bioscan.inoperable()) + if(link.processor_bioscan && !link.processor_bioscan.inoperable()) return TRUE return FALSE /// The announcement to all Humans. Slightly off for the planet and elsewhere, accurate for the ship. /datum/bioscan_data/proc/ares_bioscan(forced = FALSE, variance = 2) - var/datum/ares_link/link = GLOB.ares_link if(!forced && !ares_can_bioscan()) message_admins("An ARES Bioscan has failed.") var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = "Bioscan failed. \n\nInvestigation into Bioscan subsystem recommended." - if(ares_can_log()) - link.log_ares_bioscan(name, input) + log_ares_bioscan(name, input) if(ares_can_interface()) marine_announcement(input, name, 'sound/misc/interference.ogg', logging = ARES_LOG_NONE) return @@ -137,8 +134,7 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) log_game("BIOSCAN: ARES bioscan completed. [input]") - if(forced || ares_can_log()) - link.log_ares_bioscan(name, input) //if interface is down, bioscan still logged, just have to go read it. + log_ares_bioscan(name, input) //if interface is down, bioscan still logged, just have to go read it. if(forced || ares_can_interface()) marine_announcement(input, name, 'sound/AI/bioscan.ogg', logging = ARES_LOG_NONE) else diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index d7c939b76e16..330521f34e36 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -181,7 +181,7 @@ apply_upgrade(user) if(!(user in guidance.users)) guidance.users += user - RegisterSignal(usr, COMSIG_MOB_RESISTED, PROC_REF(exit_cam_resist)) + RegisterSignal(user, COMSIG_MOB_RESISTED, PROC_REF(exit_cam_resist)) /datum/cas_fire_envelope/proc/apply_upgrade(user) @@ -220,6 +220,7 @@ M.reset_view() remove_upgrades(user) guidance.users -= user + UnregisterSignal(user, COMSIG_MOB_RESISTED) /datum/cas_fire_envelope/proc/exit_cam_resist(mob/user) SIGNAL_HANDLER diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm deleted file mode 100644 index b86de24eed74..000000000000 --- a/code/game/gamemodes/cm_self_destruct.dm +++ /dev/null @@ -1,476 +0,0 @@ -/* -TODO -Look into animation screen not showing on self-destruct and other weirdness -Intergrate distress into this controller. -Finish nanoui conversion for comm console. -Make sure people who get nuked and wake up from SSD don't live. -Add flashing lights to evac. //DEFERRED TO BETTER LIGHTING -Finish the game mode announcement thing. -Fix escape doors to work properly. -*/ - -/* -How this works: - -First: All of the linking is done automatically on world start, so nothing needs to be done on that end other than making -sure that objects are actually placed in the game world. If not, the game will error and let you know about it. But you -don't need to modify variables or worry about area placement. It's all done for you. -The rods, for example, configure the time per activation based on their number. Shuttles link their own machines via area. -Nothing in this controller is linked to game mode, so it's stand alone, more or less, but it's best used during a game mode. -Admins have a lot of tools in their disposal via the check antagonist panel, and devs can access the VV of this controller -through that panel. - -Second: The communication console handles most of the IC triggers for activating these functions, the rest is handled elsewhere. -Check communications.dm for that. shuttle_controller.dm handles the set up for the escape pods. escape_pods.dm handles most of the -functions of the escape pods themselves. This file would likely need to be broken down into individual parts at some point in the -future. - -Evacuation takes place when sufficient alert level is reaised and a distress beacon was launched. All of the evac pods come online -and open their doors to allow entry inside. Characters may then get inside of the cryo units to before the shuttles automatically launch. -If wanted, a nearby controller object may launch each individual shuttle early. Only three people may ride on a shuttle to escape, -otherwise the launch will fail and the shuttle will become inoperable. -Any launched shuttles are taken out of the game. If the evacuation is canceled, any persons inside of the cryo tubes will be ejected. -They may temporarily open the door to exit if they are stuck inside after evac is canceled. - -When the self-destruct is enabled, the console comes online. This usually happens during an evacuation. Once the console is -interacted with, it fires up the self-destruct sequence. Several rods rise and must be interacted with in order to arm the system. -Once that happens, the console must be interacted with again to trigger the self-destruct. The self-destruct may also be -canceled from the console. - -The self-destruct may also happen if a nuke is detonated on the ship's zlevel; if it is detonated elsewhere, the ship will not blow up. -Regardless of where it's detonated, or how, a successful detonation will end the round or automatically restart the game. - -All of the necessary difines are stored under mode.dm in defines. -*/ - -var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initited elsewhere so that the world has a chance to load in. - -/datum/authority/branch/evacuation - var/name = "Evacuation Authority" - var/evac_time //Time the evacuation was initiated. - var/evac_status = EVACUATION_STATUS_STANDING_BY //What it's doing now? It can be standing by, getting ready to launch, or finished. - - var/obj/structure/machinery/self_destruct/console/dest_master //The main console that does the brunt of the work. - var/dest_rods[] //Slave devices to make the explosion work. - var/dest_cooldown //How long it takes between rods, determined by the amount of total rods present. - var/dest_index = 1 //What rod the thing is currently on. - var/dest_status = NUKE_EXPLOSION_INACTIVE - var/dest_started_at = 0 - - var/flags_scuttle = NO_FLAGS - -/datum/authority/branch/evacuation/New() - ..() - dest_master = locate() - if(!dest_master) - log_debug("ERROR CODE SD1: could not find master self-destruct console") - to_world(SPAN_DEBUG("ERROR CODE SD1: could not find master self-destruct console")) - return FALSE - dest_rods = new - for(var/obj/structure/machinery/self_destruct/rod/I in dest_master.loc.loc) dest_rods += I - if(!dest_rods.len) - log_debug("ERROR CODE SD2: could not find any self-destruct rods") - to_world(SPAN_DEBUG("ERROR CODE SD2: could not find any self-destruct rods")) - QDEL_NULL(dest_master) - return FALSE - dest_cooldown = SELF_DESTRUCT_ROD_STARTUP_TIME / dest_rods.len - dest_master.desc = "The main operating panel for a self-destruct system. It requires very little user input, but the final safety mechanism is manually unlocked.\nAfter the initial start-up sequence, [dest_rods.len] control rods must be armed, followed by manually flipping the detonation switch." - -/** - * This proc returns the ship's z level list (or whatever specified), - * when an evac/self-destruct happens. - */ -/datum/authority/branch/evacuation/proc/get_affected_zlevels() - //Nuke is not in progress, end the round on ship only. - if(dest_status < NUKE_EXPLOSION_IN_PROGRESS && SSticker?.mode.is_in_endgame) - . = SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP)) - return - -//========================================================================================= -//========================================================================================= -//=====================================EVACUATION========================================== -//========================================================================================= -//========================================================================================= - - -/datum/authority/branch/evacuation/proc/initiate_evacuation(force=0) //Begins the evacuation procedure. - if(force || (evac_status == EVACUATION_STATUS_STANDING_BY && !(flags_scuttle & FLAGS_EVACUATION_DENY))) - evac_time = world.time - evac_status = EVACUATION_STATUS_INITIATING - ai_announcement("Attention. Emergency. All personnel must evacuate immediately. You have [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] minute\s until departure.", 'sound/AI/evacuate.ogg') - xeno_message_all("A wave of adrenaline ripples through the hive. The fleshy creatures are trying to escape!") - - for(var/obj/structure/machinery/status_display/SD in machines) - if(is_mainship_level(SD.z)) - SD.set_picture("evac") - for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) - shuttle.prepare_evac() - activate_lifeboats() - process_evacuation() - return TRUE - -/datum/authority/branch/evacuation/proc/cancel_evacuation() //Cancels the evac procedure. Useful if admins do not want the marines leaving. - if(evac_status == EVACUATION_STATUS_INITIATING) - evac_time = null - evac_status = EVACUATION_STATUS_STANDING_BY - deactivate_lifeboats() - ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg') - - if(get_security_level() == "red") - for(var/obj/structure/machinery/status_display/SD in machines) - if(is_mainship_level(SD.z)) - SD.set_picture("redalert") - - for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) - shuttle.cancel_evac() - return TRUE - -/datum/authority/branch/evacuation/proc/begin_launch() //Launches the pods. - if(evac_status == EVACUATION_STATUS_INITIATING) - evac_status = EVACUATION_STATUS_IN_PROGRESS //Cannot cancel at this point. All shuttles are off. - spawn() //One of the few times spawn() is appropriate. No need for a new proc. - ai_announcement("WARNING: Evacuation order confirmed. Launching escape pods.", 'sound/AI/evacuation_confirmed.ogg') - addtimer(CALLBACK(src, PROC_REF(launch_lifeboats)), 10 SECONDS) // giving some time to board lifeboats - - for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) - shuttle.evac_launch() - sleep(50) - - sleep(300) //Sleep 30 more seconds to make sure everyone had a chance to leave. - var/lifesigns = 0 - // lifesigns += P.passengers - var/obj/docking_port/mobile/crashable/lifeboat/lifeboat1 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_PORT) - lifeboat1.check_for_survivors() - lifesigns += lifeboat1.survivors - var/obj/docking_port/mobile/crashable/lifeboat/lifeboat2 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_STARBOARD) - lifeboat2.check_for_survivors() - lifesigns += lifeboat2.survivors - ai_announcement("ATTENTION: Evacuation complete. Outbound lifesigns detected: [lifesigns ? lifesigns : "none"].", 'sound/AI/evacuation_complete.ogg') - evac_status = EVACUATION_STATUS_COMPLETE - return TRUE - -/datum/authority/branch/evacuation/proc/process_evacuation() //Process the timer. - set background = 1 - - spawn while(evac_status == EVACUATION_STATUS_INITIATING) //If it's not departing, no need to process. - if(world.time >= evac_time + EVACUATION_AUTOMATIC_DEPARTURE) begin_launch() - sleep(10) //One second. - -/datum/authority/branch/evacuation/proc/get_status_panel_eta() - switch(evac_status) - if(EVACUATION_STATUS_INITIATING) - var/eta = EVACUATION_ESTIMATE_DEPARTURE - . = "[(eta / 60) % 60]:[add_zero(num2text(eta % 60), 2)]" - if(EVACUATION_STATUS_IN_PROGRESS) . = "NOW" - -// LIFEBOATS CORNER -/datum/authority/branch/evacuation/proc/activate_lifeboats() - for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks) - var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() - if(lifeboat && lifeboat.available) - lifeboat.status = LIFEBOAT_ACTIVE - lifeboat_dock.open_dock() - - -/datum/authority/branch/evacuation/proc/deactivate_lifeboats() - for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks) - var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() - if(lifeboat && lifeboat.available) - lifeboat.status = LIFEBOAT_INACTIVE - -/datum/authority/branch/evacuation/proc/launch_lifeboats() - for(var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock in GLOB.lifeboat_almayer_docks) - var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() - if(lifeboat && lifeboat.available) - lifeboat.evac_launch() - -//========================================================================================= -//========================================================================================= -//=====================================SELF DETRUCT======================================== -//========================================================================================= -//========================================================================================= - -/datum/authority/branch/evacuation/proc/enable_self_destruct(force=0) - if(force || (dest_status == NUKE_EXPLOSION_INACTIVE && !(flags_scuttle & FLAGS_SELF_DESTRUCT_DENY))) - dest_status = NUKE_EXPLOSION_ACTIVE - dest_master.lock_or_unlock() - dest_started_at = world.time - set_security_level(SEC_LEVEL_DELTA) //also activate Delta alert, to open the SD shutters. - spawn(0) - for(var/obj/structure/machinery/door/poddoor/shutters/almayer/D in machines) - if(D.id == "sd_lockdown") - D.open() - return TRUE - -//Override is for admins bypassing normal player restrictions. -/datum/authority/branch/evacuation/proc/cancel_self_destruct(override) - if(dest_status == NUKE_EXPLOSION_ACTIVE) - var/obj/structure/machinery/self_destruct/rod/I - var/i - for(i in EvacuationAuthority.dest_rods) - I = i - if(I.active_state == SELF_DESTRUCT_MACHINE_ARMED && !override) - dest_master.state(SPAN_WARNING("WARNING: Unable to cancel detonation. Please disarm all control rods.")) - return FALSE - - dest_status = NUKE_EXPLOSION_INACTIVE - dest_master.in_progress = 1 - dest_started_at = 0 - for(i in dest_rods) - I = i - if(I.active_state == SELF_DESTRUCT_MACHINE_ACTIVE || (I.active_state == SELF_DESTRUCT_MACHINE_ARMED && override)) I.lock_or_unlock(1) - dest_master.lock_or_unlock(1) - dest_index = 1 - ai_announcement("The emergency destruct system has been deactivated.", 'sound/AI/selfdestruct_deactivated.ogg') - if(evac_status == EVACUATION_STATUS_STANDING_BY) //the evac has also been cancelled or was never started. - set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level. - return TRUE - -/datum/authority/branch/evacuation/proc/initiate_self_destruct(override) - if(dest_status < NUKE_EXPLOSION_IN_PROGRESS) - var/obj/structure/machinery/self_destruct/rod/I - var/i - for(i in dest_rods) - I = i - if(I.active_state != SELF_DESTRUCT_MACHINE_ARMED && !override) - dest_master.state(SPAN_WARNING("WARNING: Unable to trigger detonation. Please arm all control rods.")) - return FALSE - dest_master.in_progress = !dest_master.in_progress - for(i in EvacuationAuthority.dest_rods) - I = i - I.in_progress = 1 - ai_announcement("DANGER. DANGER. Self-destruct system activated. DANGER. DANGER. Self-destruct in progress. DANGER. DANGER.") - trigger_self_destruct(,,override) - return TRUE - -/datum/authority/branch/evacuation/proc/trigger_self_destruct(list/z_levels = SSmapping.levels_by_trait(ZTRAIT_MARINE_MAIN_SHIP), origin = dest_master, override = FALSE, end_type = NUKE_EXPLOSION_FINISHED, play_anim = TRUE, end_round = TRUE) - set waitfor = 0 - if(dest_status < NUKE_EXPLOSION_IN_PROGRESS) //One more check for good measure, in case it's triggered through a bomb instead of the destruct mechanism/admin panel. - dest_status = NUKE_EXPLOSION_IN_PROGRESS - playsound(origin, 'sound/machines/Alarm.ogg', 75, 0, 30) - world << pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') - - var/ship_status = 1 - for(var/i in z_levels) - if(is_mainship_level(i)) - ship_status = 0 //Destroyed. - break - - var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s). - var/list/dead_mobs = list() //Everyone who only needs to see the cinematic. - for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting. - if(!current_mob || !current_mob.loc) - continue //In case something changes when we sleep(). - if(current_mob.stat == DEAD) - dead_mobs |= current_mob - continue - var/turf/current_turf = get_turf(current_mob) - if(current_turf.z in z_levels) - alive_mobs |= current_mob - shake_camera(current_mob, 110, 4) - - - sleep(100) - /*Hardcoded for now, since this was never really used for anything else. - Would ideally use a better system for showing cutscenes.*/ - var/atom/movable/screen/cinematic/explosion/C = new - - if(play_anim) - for(var/mob/current_mob as anything in alive_mobs + dead_mobs) - if(current_mob && current_mob.loc && current_mob.client) - current_mob.client.add_to_screen(C) //They may have disconnected in the mean time. - - sleep(15) //Extra 1.5 seconds to look at the ship. - flick(override ? "intro_override" : "intro_nuke", C) - sleep(35) - for(var/mob/current_mob in alive_mobs) - if(current_mob && current_mob.loc) //Who knows, maybe they escaped, or don't exist anymore. - var/turf/current_mob_turf = get_turf(current_mob) - if(current_mob_turf.z in z_levels) - if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge)) - continue - current_mob.death(create_cause_data("nuclear explosion")) - else - if(play_anim) - current_mob.client.remove_from_screen(C) //those who managed to escape the z level at last second shouldn't have their view obstructed. - if(play_anim) - flick(ship_status ? "ship_spared" : "ship_destroyed", C) - C.icon_state = ship_status ? "summary_spared" : "summary_destroyed" - world << sound('sound/effects/explosionfar.ogg') - - if(end_round) - dest_status = end_type - - sleep(5) - if(SSticker.mode) - SSticker.mode.check_win() - - if(!SSticker.mode) //Just a safety, just in case a mode isn't running, somehow. - to_world(SPAN_ROUNDBODY("Resetting in 30 seconds!")) - sleep(300) - log_game("Rebooting due to nuclear detonation.") - world.Reboot() - return TRUE - -/datum/authority/branch/evacuation/proc/process_self_destruct() - set background = 1 - - spawn while(dest_master && dest_master.loc && dest_master.active_state == SELF_DESTRUCT_MACHINE_ARMED && dest_status == NUKE_EXPLOSION_ACTIVE && dest_index <= dest_rods.len) - var/obj/structure/machinery/self_destruct/rod/I = dest_rods[dest_index] - if(world.time >= dest_cooldown + I.activate_time) - I.lock_or_unlock() //Unlock it. - if(++dest_index <= dest_rods.len) - I = dest_rods[dest_index]//Start the next sequence. - I.activate_time = world.time - sleep(10) //Checks every second. Could integrate into another controller for better tracking. - -//Generic parent base for the self_destruct items. -/obj/structure/machinery/self_destruct - icon = 'icons/obj/structures/machinery/self_destruct.dmi' - icon_state = "console_1" - var/base_icon_state = "console" - use_power = USE_POWER_NONE //Runs unpowered, may need to change later. - density = FALSE - anchored = TRUE //So it doesn't go anywhere. - unslashable = TRUE - unacidable = TRUE //Cannot C4 it either. - mouse_opacity = FALSE //No need to click or interact with this initially. - var/in_progress = 0 //Cannot interact with while it's doing something, like an animation. - var/active_state = SELF_DESTRUCT_MACHINE_INACTIVE //What step of the process it's on. - -/obj/structure/machinery/self_destruct/Initialize(mapload, ...) - . = ..() - icon_state = "[base_icon_state]_1" - -/obj/structure/machinery/self_destruct/Destroy() - . = ..() - machines -= src - operator = null - -/obj/structure/machinery/self_destruct/ex_act(severity) - return FALSE - -/obj/structure/machinery/self_destruct/attack_hand() - if(..() || in_progress) - return FALSE //This check is backward, ugh. - return TRUE - -//Add sounds. -/obj/structure/machinery/self_destruct/proc/lock_or_unlock(lock) - set waitfor = 0 - in_progress = 1 - flick("[base_icon_state]" + (lock? "_5" : "_2"),src) - sleep(9) - mouse_opacity = !mouse_opacity - icon_state = "[base_icon_state]" + (lock? "_1" : "_3") - in_progress = 0 - active_state = active_state > SELF_DESTRUCT_MACHINE_INACTIVE ? SELF_DESTRUCT_MACHINE_INACTIVE : SELF_DESTRUCT_MACHINE_ACTIVE - -/obj/structure/machinery/self_destruct/console - name = "self-destruct control panel" - icon_state = "console_1" - base_icon_state = "console" - req_one_access = list(ACCESS_MARINE_CO, ACCESS_MARINE_SENIOR) - -/obj/structure/machinery/self_destruct/console/Destroy() - . = ..() - EvacuationAuthority.dest_master = null - EvacuationAuthority.dest_rods = null - -/obj/structure/machinery/self_destruct/console/lock_or_unlock(lock) - playsound(src, 'sound/machines/hydraulics_1.ogg', 25, 1) - ..() - -//TODO: Add sounds. -/obj/structure/machinery/self_destruct/console/attack_hand(mob/user) - if(inoperable()) - return - - tgui_interact(user) - -/obj/structure/machinery/self_destruct/console/tgui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "SelfDestructConsole", name) - ui.open() - -/obj/structure/machinery/sleep_console/ui_status(mob/user, datum/ui_state/state) - . = ..() - if(inoperable()) - return UI_CLOSE - - -/obj/structure/machinery/self_destruct/console/ui_data(mob/user) - var/list/data = list() - - data["dest_status"] = active_state - - return data - -/obj/structure/machinery/self_destruct/console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - if(.) - return - - switch(action) - if("dest_start") - to_chat(usr, SPAN_NOTICE("You press a few keys on the panel.")) - to_chat(usr, SPAN_NOTICE("The system must be booting up the self-destruct sequence now.")) - playsound(src.loc, 'sound/items/rped.ogg', 25, TRUE) - sleep(2 SECONDS) - ai_announcement("Danger. The emergency destruct system is now activated. The ship will detonate in T-minus 20 minutes. Automatic detonation is unavailable. Manual detonation is required.", 'sound/AI/selfdestruct.ogg') - active_state = SELF_DESTRUCT_MACHINE_ARMED //Arm it here so the process can execute it later. - var/obj/structure/machinery/self_destruct/rod/I = EvacuationAuthority.dest_rods[EvacuationAuthority.dest_index] - I.activate_time = world.time - EvacuationAuthority.process_self_destruct() - . = TRUE - - if("dest_trigger") - EvacuationAuthority.initiate_self_destruct() - . = TRUE - - if("dest_cancel") - if(!allowed(usr)) - to_chat(usr, SPAN_WARNING("You don't have the necessary clearance to cancel the emergency destruct system!")) - return - EvacuationAuthority.cancel_self_destruct() - . = TRUE - -/obj/structure/machinery/self_destruct/rod - name = "self-destruct control rod" - desc = "It is part of a complicated self-destruct sequence, but relatively simple to operate. Twist to arm or disarm." - icon_state = "rod_1" - base_icon_state = "rod" - layer = BELOW_OBJ_LAYER - var/activate_time - -/obj/structure/machinery/self_destruct/rod/Destroy() - . = ..() - if(EvacuationAuthority && EvacuationAuthority.dest_rods) - EvacuationAuthority.dest_rods -= src - -/obj/structure/machinery/self_destruct/rod/lock_or_unlock(lock) - playsound(src, 'sound/machines/hydraulics_2.ogg', 25, 1) - ..() - if(lock) - activate_time = null - density = FALSE - layer = initial(layer) - else - density = TRUE - layer = ABOVE_OBJ_LAYER - -/obj/structure/machinery/self_destruct/rod/attack_hand(mob/user) - if(..()) - switch(active_state) - if(SELF_DESTRUCT_MACHINE_ACTIVE) - to_chat(user, SPAN_NOTICE("You twist and release the control rod, arming it.")) - playsound(src, 'sound/machines/switch.ogg', 25, 1) - icon_state = "rod_4" - active_state = SELF_DESTRUCT_MACHINE_ARMED - if(SELF_DESTRUCT_MACHINE_ARMED) - to_chat(user, SPAN_NOTICE("You twist and release the control rod, disarming it.")) - playsound(src, 'sound/machines/switch.ogg', 25, 1) - icon_state = "rod_3" - active_state = SELF_DESTRUCT_MACHINE_ACTIVE - else to_chat(user, SPAN_WARNING("The control rod is not ready.")) diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 258a1a962713..7b1c695ade2b 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -265,7 +265,7 @@ continue if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER)) - SSticker.mode.get_specific_call("Xenomorphs Groundside (Forsaken)", TRUE, FALSE, FALSE, announce_dispatch_message = FALSE) + SSticker.mode.get_specific_call("Xenomorphs Groundside (Forsaken)", TRUE, FALSE) TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_GROUND_CHECK, 1 MINUTES) @@ -297,29 +297,25 @@ if(SSticker.current_state != GAME_STATE_PLAYING) return - var/living_player_list[] = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels()) + var/living_player_list[] = count_humans_and_xenos(get_affected_zlevels()) var/num_humans = living_player_list[1] var/num_xenos = living_player_list[2] if(force_end_at && world.time > force_end_at) round_finished = MODE_INFESTATION_X_MINOR - if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED) - round_finished = MODE_GENERIC_DRAW_NUKE //Nuke went off, ending the round. - if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_GROUND_FINISHED) - round_finished = MODE_INFESTATION_M_MINOR //Nuke went off, ending the round. - if(EvacuationAuthority.dest_status < NUKE_EXPLOSION_IN_PROGRESS) //If the nuke ISN'T in progress. We do not want to end the round before it detonates. - if(!num_humans && num_xenos) //No humans remain alive. - round_finished = MODE_INFESTATION_X_MAJOR //Evacuation did not take place. Everyone died. - else if(num_humans && !num_xenos) - if(SSticker.mode && SSticker.mode.is_in_endgame) - round_finished = MODE_INFESTATION_X_MINOR //Evacuation successfully took place. - else - SSticker.roundend_check_paused = TRUE - round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs. - ares_conclude() - addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY) - else if(!num_humans && !num_xenos) - round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed. + + if(!num_humans && num_xenos) //No humans remain alive. + round_finished = MODE_INFESTATION_X_MAJOR //Evacuation did not take place. Everyone died. + else if(num_humans && !num_xenos) + if(SSticker.mode && SSticker.mode.is_in_endgame) + round_finished = MODE_INFESTATION_X_MINOR //Evacuation successfully took place. + else + SSticker.roundend_check_paused = TRUE + round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs. + ares_conclude() + addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY) + else if(!num_humans && !num_xenos) + round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed. /datum/game_mode/colonialmarines/check_queen_status(hivenumber) set waitfor = 0 @@ -367,7 +363,7 @@ round_statistics.current_map.total_marine_victories++ round_statistics.current_map.total_marine_majors++ if(MODE_INFESTATION_X_MINOR) - var/list/living_player_list = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels()) + var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels()) if(living_player_list[1] && !living_player_list[2]) // If Xeno Minor but Xenos are dead and Humans are alive, see which faction is the last standing var/headcount = count_per_faction() var/living = headcount["total_headcount"] diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm index c8c90fa51c0c..bd5302bf7ec0 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 3d856f35ce77..9b3ef1df4c15 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -152,9 +152,6 @@ spawn(0) //Deleting Almayer, for performance! SSitem_cleanup.delete_almayer() - if(SSxenocon) - //Don't need XENOCON - SSxenocon.wait = 30 MINUTES //PROCCESS @@ -193,7 +190,7 @@ announce_xeno_wave(wave) if(xeno_wave == 7) //Wave when Marines get reinforcements! - get_specific_call("Marine Reinforcements (Squad)", FALSE, TRUE, FALSE) + get_specific_call("Marine Reinforcements (Squad)", FALSE, TRUE) xeno_wave = min(xeno_wave + 1, WO_MAX_WAVE) @@ -322,9 +319,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 +337,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 +360,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 +368,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 +383,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 +391,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 +401,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 +409,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/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index 5623295f1915..a19c3e3582c1 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -79,9 +79,6 @@ spawn(0) //Deleting Almayer, for performance! SSitem_cleanup.delete_almayer() - if(SSxenocon) - //Don't need XENOCON - SSxenocon.wait = 30 MINUTES //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index 04e0545361aa..a6b909022aef 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -95,7 +95,7 @@ possible_survivors -= new_survivor //either we drafted a survivor, or we're skipping over someone, either or - remove them /datum/game_mode/infection/check_win() - var/living_player_list[] = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels()) + var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels()) var/num_humans = living_player_list[1] var/zed = living_player_list[2] diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 5382d80f37a2..e467631c915e 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -111,6 +111,10 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki log_game("Server IP: [world.internet_address]:[world.port]") return TRUE +/datum/game_mode/proc/get_affected_zlevels() + if(is_in_endgame) + . = SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP)) + return ///process() ///Called by the gameticker @@ -119,8 +123,7 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki /datum/game_mode/proc/check_finished() //to be called by ticker - if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED || EvacuationAuthority.dest_status == NUKE_EXPLOSION_GROUND_FINISHED ) - return TRUE + return /datum/game_mode/proc/cleanup() //This is called when the round has ended but not the game, if any cleanup would be necessary in that case. return diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index 7f73376a05dd..cbbb87124957 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 4b1975015a95..97578eb1159d 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/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 5c82241c47de..23097e139eda 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -10,6 +10,8 @@ job_options = SURVIVOR_VARIANT_LIST var/intro_text var/story_text + /// Whether or not the survivor is an inherently hostile to marines. + var/hostile = FALSE /datum/job/civilian/survivor/set_spawn_positions(count) spawn_positions = Clamp((round(count * SURVIVOR_TO_TOTAL_SPAWN_RATIO)), 2, 8) @@ -59,23 +61,32 @@ if(picked_spawner.story_text) story_text = picked_spawner.story_text + + if(picked_spawner.hostile) + hostile = TRUE + new /datum/cm_objective/move_mob/almayer/survivor(H) -/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/H) +/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/survivor) if(intro_text) for(var/line in intro_text) - to_chat(H, line) + to_chat(survivor, line) else - to_chat(H, "

You are a survivor!

") - to_chat(H, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message)) - to_chat(H, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit.")) - to_chat(H, SPAN_NOTICE("You are NOT aware of the marines or their intentions. ")) + to_chat(survivor, "

You are a survivor!

") + to_chat(survivor, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message)) + to_chat(survivor, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit.")) + to_chat(survivor, SPAN_NOTICE("You are NOT aware of the marines or their intentions. ")) if(story_text) - to_chat(H, story_text) - H.mind.memory += story_text + to_chat(survivor, story_text) + survivor.mind.memory += story_text + else + tell_survivor_story(survivor) + + if(hostile) + to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!")) else - tell_survivor_story(H) + to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!")) /datum/job/civilian/survivor/proc/tell_survivor_story(mob/living/carbon/human/H) var/list/survivor_story = list( diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 8c4690ea2057..835f16f7d814 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 7a0cab16f559..8912011298dc 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 61245c8164ab..21163f27959d 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 3e02385bc96c..70060fb36a15 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 e5155c949a32..5f6293000365 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 c8dfe2a8eb37..0770bcd60ffa 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 8d83d49ed143..9905bc9d3747 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 a75846f92919..1a7a7c21d5a0 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 5e9b7caf1f10..014db9569b2a 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 98db585e1d07..72f861351912 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 fff51624aa4b..94769de2158f 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -6,7 +6,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." /datum/job/command/bridge/set_spawn_positions(count) spawn_positions = so_slot_formula(count) diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm index b76943c4d0ac..63e6d8023f17 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 7285c5b278b1..e05bc2e96256 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 55cbea975401..d2775e197537 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 0d68d23e5524..48ad372e1f33 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 3b588022bd97..c4725289c3ff 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 76b7e98f2db8..5d5123e687ed 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 3a15c8632953..b6aa23f9c4a6 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 8562408360d7..b13062127a12 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 bed0acf15887..43a8a7122a8f 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 00a6b91dcffd..1910248a61a2 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 960a80d5f659..be78438db3d6 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -5,7 +5,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." /datum/job/marine/leader/whiskey title = JOB_WO_SQUAD_LEADER diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index cdbd74acefde..3df0a3793ca5 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.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/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." /datum/job/marine/medic/set_spawn_positions(count) for(var/datum/squad/sq in RoleAuthority.squads) diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index aacc562f921b..1a89abf5d3be 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -6,7 +6,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." /datum/job/marine/smartgunner/set_spawn_positions(count) spawn_positions = sg_slot_formula(count) diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 42ee69ef2d5c..e69241cdc70b 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 e2502576e5ea..2fcd8a3cdd28 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -6,7 +6,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 ..() /datum/job/marine/standard/set_spawn_positions(count) spawn_positions = max((round(count * STANDARD_MARINE_TO_TOTAL_SPAWN_RATIO)), 8) diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index ebebf360e830..2b0cff3ea3ed 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.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/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." /datum/job/marine/tl/generate_entry_conditions(mob/living/carbon/human/spawning_human) . = ..() diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 80f00c540383..d984aaa72c8a 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -604,7 +604,7 @@ if(JOB_SQUAD_MEDIC) old_lead.comm_title = "HM" if(JOB_SQUAD_TEAM_LEADER) - old_lead.comm_title = "TL" + old_lead.comm_title = "FTL" if(JOB_SQUAD_SMARTGUN) old_lead.comm_title = "SG" if(JOB_SQUAD_LEADER) diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index c147807f004e..51039663a43f 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -501,85 +501,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.dm b/code/game/machinery/ARES/ARES.dm index ed4391c89c24..1ecbb4a5d7d6 100644 --- a/code/game/machinery/ARES/ARES.dm +++ b/code/game/machinery/ARES/ARES.dm @@ -8,7 +8,6 @@ unslashable = TRUE unacidable = TRUE - var/link_id = MAIN_SHIP_DEFAULT_NAME var/datum/ares_link/link /obj/structure/machinery/ares/ex_act(severity) @@ -40,14 +39,12 @@ log_debug("Error: link_systems called without a link datum") if(link && !override) return FALSE - if(new_link.link_id == link_id) + if(new_link) link = new_link - log_debug("[name] linked to Ares Link [link_id]") new_link.linked_systems += src return TRUE /obj/structure/machinery/ares/proc/delink() - log_debug("[name] delinked from Ares Link [link.link_id]") link.linked_systems -= src link = null @@ -63,11 +60,11 @@ /obj/structure/machinery/ares/processor/apollo/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) ..() - new_link.p_apollo = src + new_link.processor_apollo = src /obj/structure/machinery/ares/processor/apollo/delink() - if(link && link.p_apollo == src) - link.p_apollo = null + if(link && link.processor_apollo == src) + link.processor_apollo = null ..() /obj/structure/machinery/ares/processor/interface @@ -77,11 +74,11 @@ /obj/structure/machinery/ares/processor/interface/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) ..() - new_link.p_interface = src + new_link.processor_interface = src /obj/structure/machinery/ares/processor/interface/delink() - if(link && link.p_interface == src) - link.p_interface = null + if(link && link.processor_interface == src) + link.processor_interface = null ..() /obj/structure/machinery/ares/processor/bioscan @@ -91,11 +88,11 @@ /obj/structure/machinery/ares/processor/bioscan/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) ..() - new_link.p_bioscan = src + new_link.processor_bioscan = src /obj/structure/machinery/ares/processor/bioscan/delink() - if(link && link.p_bioscan == src) - link.p_bioscan = null + if(link && link.processor_bioscan == src) + link.processor_bioscan = null ..() /// Central Core @@ -104,130 +101,17 @@ desc = "This is ARES' central processor. Made of a casing designed to withstand nuclear blasts, the CPU also contains ARES' blackbox recorder." icon_state = "CPU" +/obj/structure/machinery/ares/cpu/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + ..() + new_link.central_processor = src + +/obj/structure/machinery/ares/cpu/delink() + if(link && link.central_processor == src) + link.central_processor = null + ..() + /// Memory Substrate, /obj/structure/machinery/ares/substrate name = "ARES Substrate" desc = "The memory substrate of ARES, containing complex protocols and information. Limited capabilities can operate on substrate alone, without the main ARES Unit operational." icon_state = "substrate" - -// #################### ARES Interface Console ##################### -/obj/structure/machinery/computer/ares_console - name = "ARES Interface" - desc = "A console built to interface with ARES, allowing for 1:1 communication." - icon = 'icons/obj/structures/machinery/ares.dmi' - icon_state = "console" - exproof = TRUE - - var/current_menu = "login" - var/last_menu = "" - - var/authentication = ARES_ACCESS_BASIC - - /// The last person to login. - var/last_login - /// The person pretending to be last_login - var/sudo_holder - /// A record of who logged in and when. - var/list/access_list = list() - - /// The ID used to link all devices. - var/link_id = MAIN_SHIP_DEFAULT_NAME - var/datum/ares_link/link - - /// The current deleted chat log of 1:1 conversations being read. - var/list/deleted_1to1 = list() - - /// Holds all (/datum/ares_record/announcement)s - var/list/records_announcement = list() - /// Holds all (/datum/ares_record/bioscan)s - var/list/records_bioscan = list() - /// Holds all (/datum/ares_record/bombardment)s - var/list/records_bombardment = list() - /// Holds all (/datum/ares_record/deletion)s - var/list/records_deletion = list() - /// Holds all (/datum/ares_record/talk_log)s - var/list/records_talking = list() - /// Holds all (/datum/ares_record/requisition_log)s - var/list/records_asrs = list() - /// Holds all (/datum/ares_record/security)s (including AA) - var/list/records_security = list() - /// Holds all (/datum/ares_record/flight)s - var/list/records_flight = list() - /// Is nuke request usable or not? - var/nuke_available = TRUE - - - COOLDOWN_DECLARE(ares_distress_cooldown) - COOLDOWN_DECLARE(ares_nuclear_cooldown) - COOLDOWN_DECLARE(ares_quarters_cooldown) - -/obj/structure/machinery/computer/ares_console/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) - if(link && !override) - return FALSE - if(new_link.link_id == link_id) - new_link.interface = src - link = new_link - log_debug("[name] linked to Ares Link [link_id]") - new_link.linked_systems += src - return TRUE - -/obj/structure/machinery/computer/ares_console/Initialize(mapload, ...) - link_systems(override = FALSE) - . = ..() - -/obj/structure/machinery/computer/ares_console/proc/delink() - if(link && link.interface == src) - link.interface = null - link.linked_systems -= src - link = null - -/obj/structure/machinery/computer/ares_console/Destroy() - delink() - return ..() - -// #################### Working Joe Ticket Console ##################### -/obj/structure/machinery/computer/working_joe - name = "APOLLO Maintenance Controller" - desc = "A console built to facilitate Working Joes and their operation, allowing for simple allocation of resources." - icon = 'icons/obj/structures/machinery/ares.dmi' - icon_state = "console" - exproof = TRUE - - /// The ID used to link all devices. - var/link_id = MAIN_SHIP_DEFAULT_NAME - var/datum/ares_link/link - var/obj/structure/machinery/ares/processor/interface/processor - - var/current_menu = "login" - var/last_menu = "" - - var/authentication = ARES_ACCESS_BASIC - /// The last person to login. - var/last_login - /// A record of who logged in and when. - var/list/login_list = list() - - -/obj/structure/machinery/computer/working_joe/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) - if(link && !override) - return FALSE - if(new_link.link_id == link_id) - new_link.ticket_computers += src - link = new_link - log_debug("[name] linked to Ares Link [link_id]") - new_link.linked_systems += src - return TRUE - -/obj/structure/machinery/computer/working_joe/Initialize(mapload, ...) - link_systems(override = FALSE) - . = ..() - -/obj/structure/machinery/computer/working_joe/proc/delink() - if(link) - link.ticket_computers -= src - link.linked_systems -= src - link = null - -/obj/structure/machinery/computer/working_joe/Destroy() - delink() - return ..() diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm new file mode 100644 index 000000000000..0e45d5ee171b --- /dev/null +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -0,0 +1,471 @@ +// #################### ARES Interface Console ##################### +/obj/structure/machinery/computer/ares_console + name = "ARES Interface" + desc = "A console built to interface with ARES, allowing for 1:1 communication." + icon = 'icons/obj/structures/machinery/ares.dmi' + icon_state = "console" + exproof = TRUE + + var/current_menu = "login" + var/last_menu = "" + + var/authentication = ARES_ACCESS_BASIC + + /// The last person to login. + var/last_login + /// The person pretending to be last_login + var/sudo_holder + + /// The current deleted chat log of 1:1 conversations being read. + var/list/deleted_1to1 = list() + + /// The ID used to link all devices. + var/datum/ares_link/link + /// The datacore storing all the information. + var/datum/ares_datacore/datacore + +/obj/structure/machinery/computer/ares_console/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + if(new_link) + new_link.interface = src + link = new_link + new_link.linked_systems += src + if(!datacore) + datacore = GLOB.ares_datacore + return TRUE + +/obj/structure/machinery/computer/ares_console/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/structure/machinery/computer/ares_console/proc/delink() + if(link) + if(link.interface == src) + link.interface = null + link.linked_systems -= src + link = null + datacore = null + +/obj/structure/machinery/computer/ares_console/Destroy() + delink() + return ..() + +// ------ ARES Interface UI ------ // + +/obj/structure/machinery/computer/ares_console/attack_hand(mob/user as mob) + if(..() || !allowed(usr) || inoperable()) + return FALSE + + tgui_interact(user) + return TRUE + +/obj/structure/machinery/computer/ares_console/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, "AresInterface", name) + ui.open() + +/obj/structure/machinery/computer/ares_console/ui_data(mob/user) + var/list/data = list() + + data["current_menu"] = current_menu + data["last_page"] = last_menu + + data["logged_in"] = last_login + data["sudo"] = sudo_holder ? TRUE : FALSE + + data["access_text"] = "[sudo_holder ? "(SUDO)," : ""] access level [authentication], [ares_auth_to_text(authentication)]." + data["access_level"] = authentication + + data["alert_level"] = security_level + data["evac_status"] = SShijack.evac_status + data["worldtime"] = world.time + + data["access_log"] = datacore.interface_access_list + data["apollo_log"] = datacore.apollo_log + + data["deleted_conversation"] = deleted_1to1 + + data["distresstime"] = datacore.ares_distress_cooldown + data["distresstimelock"] = DISTRESS_TIME_LOCK + data["quarterstime"] = datacore.ares_quarters_cooldown + data["mission_failed"] = SSticker.mode.is_in_endgame + data["nuketimelock"] = NUCLEAR_TIME_LOCK + data["nuke_available"] = datacore.nuke_available + + var/list/logged_announcements = list() + for(var/datum/ares_record/announcement/broadcast as anything in datacore.records_announcement) + var/list/current_broadcast = list() + current_broadcast["time"] = broadcast.time + current_broadcast["title"] = broadcast.title + current_broadcast["details"] = broadcast.details + current_broadcast["ref"] = "\ref[broadcast]" + logged_announcements += list(current_broadcast) + data["records_announcement"] = logged_announcements + + var/list/logged_alerts = list() + for(var/datum/ares_record/security/security_alert as anything in datacore.records_security) + var/list/current_alert = list() + current_alert["time"] = security_alert.time + current_alert["title"] = security_alert.title + current_alert["details"] = security_alert.details + current_alert["ref"] = "\ref[security_alert]" + logged_alerts += list(current_alert) + data["records_security"] = logged_alerts + + var/list/logged_flights = list() + for(var/datum/ares_record/flight/flight_log as anything in datacore.records_flight) + var/list/current_flight = list() + current_flight["time"] = flight_log.time + current_flight["title"] = flight_log.title + current_flight["details"] = flight_log.details + current_flight["user"] = flight_log.user + current_flight["ref"] = "\ref[flight_log]" + logged_flights += list(current_flight) + data["records_flight"] = logged_flights + + var/list/logged_bioscans = list() + for(var/datum/ares_record/bioscan/scan as anything in datacore.records_bioscan) + var/list/current_scan = list() + current_scan["time"] = scan.time + current_scan["title"] = scan.title + current_scan["details"] = scan.details + current_scan["ref"] = "\ref[scan]" + logged_bioscans += list(current_scan) + data["records_bioscan"] = logged_bioscans + + var/list/logged_bombs = list() + for(var/datum/ares_record/bombardment/bomb as anything in datacore.records_bombardment) + var/list/current_bomb = list() + current_bomb["time"] = bomb.time + current_bomb["title"] = bomb.title + current_bomb["details"] = bomb.details + current_bomb["user"] = bomb.user + current_bomb["ref"] = "\ref[bomb]" + logged_bombs += list(current_bomb) + data["records_bombardment"] = logged_bombs + + var/list/logged_deletes = list() + for(var/datum/ares_record/deletion/deleted as anything in datacore.records_deletion) + if(!istype(deleted)) + continue + var/list/current_delete = list() + current_delete["time"] = deleted.time + current_delete["title"] = deleted.title + current_delete["details"] = deleted.details + current_delete["user"] = deleted.user + current_delete["ref"] = "\ref[deleted]" + logged_deletes += list(current_delete) + data["records_deletion"] = logged_deletes + + var/list/logged_discussions = list() + for(var/datum/ares_record/deleted_talk/deleted_convo as anything in datacore.records_deletion) + if(!istype(deleted_convo)) + continue + var/list/deleted_disc = list() + deleted_disc["time"] = deleted_convo.time + deleted_disc["title"] = deleted_convo.title + deleted_disc["ref"] = "\ref[deleted_convo]" + logged_discussions += list(deleted_disc) + data["deleted_discussions"] = logged_discussions + + var/list/logged_orders = list() + for(var/datum/ares_record/requisition_log/req_order as anything in datacore.records_asrs) + if(!istype(req_order)) + continue + var/list/current_order = list() + current_order["time"] = req_order.time + current_order["details"] = req_order.details + current_order["title"] = req_order.title + current_order["user"] = req_order.user + current_order["ref"] = "\ref[req_order]" + logged_orders += list(current_order) + data["records_requisition"] = logged_orders + + var/list/logged_convos = list() + var/list/active_convo = list() + var/active_ref + for(var/datum/ares_record/talk_log/log as anything in datacore.records_talking) + if(!istype(log)) + continue + if(log.user == last_login) + active_convo = log.conversation + active_ref = "\ref[log]" + + var/list/current_convo = list() + current_convo["user"] = log.user + current_convo["ref"] = "\ref[log]" + current_convo["conversation"] = log.conversation + logged_convos += list(current_convo) + + data["active_convo"] = active_convo + data["active_ref"] = active_ref + data["conversations"] = logged_convos + + return data + +/obj/structure/machinery/computer/ares_console/ui_status(mob/user, datum/ui_state/state) + . = ..() + if(!allowed(user)) + return UI_UPDATE + if(inoperable()) + return UI_DISABLED + +/obj/structure/machinery/computer/ares_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + playsound(src, "keyboard_alt", 15, 1) + + 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/mob/living/carbon/human/operator = usr + 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(usr, 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.interface_access_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." + current_menu = "main" + + if("sudo") + var/new_user = tgui_input_text(usr, "Enter Sudo Username", "Sudo User", encode = FALSE) + if(new_user) + if(new_user == sudo_holder) + last_login = sudo_holder + sudo_holder = null + return FALSE + if(new_user == last_login) + to_chat(usr, SPAN_WARNING("Already remote logged in as this user.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + sudo_holder = last_login + last_login = new_user + datacore.interface_access_list += "[last_login] at [worldtime2text()], Sudo Access." + return TRUE + if("sudo_logout") + datacore.interface_access_list += "[last_login] at [worldtime2text()], Sudo Logout." + last_login = sudo_holder + sudo_holder = null + return + // -- Page Changers -- // + if("logout") + last_menu = current_menu + current_menu = "login" + if(sudo_holder) + datacore.interface_access_list += "[last_login] at [worldtime2text()], Sudo Logout." + last_login = sudo_holder + sudo_holder = null + datacore.interface_access_list += "[last_login] logged out at [worldtime2text()]." + + if("home") + last_menu = current_menu + current_menu = "main" + if("page_1to1") + last_menu = current_menu + current_menu = "talking" + if("page_announcements") + last_menu = current_menu + current_menu = "announcements" + if("page_bioscans") + last_menu = current_menu + current_menu = "bioscans" + if("page_bombardments") + last_menu = current_menu + current_menu = "bombardments" + if("page_apollo") + last_menu = current_menu + current_menu = "apollo" + if("page_access") + last_menu = current_menu + current_menu = "access_log" + if("page_security") + last_menu = current_menu + current_menu = "security" + if("page_flight") + last_menu = current_menu + current_menu = "flight_log" + if("page_requisitions") + last_menu = current_menu + current_menu = "requisitions" + if("page_emergency") + last_menu = current_menu + current_menu = "emergency" + if("page_deleted") + last_menu = current_menu + current_menu = "delete_log" + if("page_deleted_1to1") + last_menu = current_menu + current_menu = "deleted_talks" + + // -- Delete Button -- // + if("delete_record") + var/datum/ares_record/record = locate(params["record"]) + if(record.record_name == ARES_RECORD_DELETED) + return FALSE + var/datum/ares_record/deletion/new_delete = new + var/new_details = "Error" + var/new_title = "Error" + switch(record.record_name) + if(ARES_RECORD_ANNOUNCE) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_announcement -= record + if(ARES_RECORD_SECURITY, ARES_RECORD_ANTIAIR) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_security -= record + if(ARES_RECORD_BIOSCAN) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_bioscan -= record + if(ARES_RECORD_BOMB) + new_title = "[record.title] at [record.time]" + new_details = "[record.details] Launched by [record.user]." + datacore.records_bombardment -= record + + new_delete.details = new_details + new_delete.user = last_login + new_delete.title = new_title + + datacore.records_deletion += new_delete + + // -- 1:1 Conversation -- // + if("new_conversation") + var/datum/ares_record/talk_log/convo = new(last_login) + convo.conversation += "[MAIN_AI_SYSTEM] at [worldtime2text()], 'New 1:1 link initiated. Greetings, [last_login].'" + datacore.records_talking += convo + + if("clear_conversation") + var/datum/ares_record/talk_log/conversation = locate(params["active_convo"]) + if(!istype(conversation)) + return FALSE + var/datum/ares_record/deleted_talk/deleted = new + deleted.title = conversation.title + deleted.conversation = conversation.conversation + deleted.user = conversation.user + datacore.records_deletion += deleted + datacore.records_talking -= conversation + + if("message_ares") + var/message = tgui_input_text(usr, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) + if(message) + message_ares(message, usr, params["active_convo"]) + + if("read_record") + var/datum/ares_record/deleted_talk/conversation = locate(params["record"]) + deleted_1to1 = conversation.conversation + last_menu = current_menu + current_menu = "read_deleted" + + // -- Emergency Buttons -- // + if("general_quarters") + if(!COOLDOWN_FINISHED(datacore, ares_quarters_cooldown)) + to_chat(usr, SPAN_WARNING("It has not been long enough since the last General Quarters call!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(security_level < SEC_LEVEL_RED) + set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) + shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') + log_game("[key_name(usr)] has called for general quarters via ARES.") + message_admins("[key_name_admin(usr)] has called for general quarters via ARES.") + log_ares_security("General Quarters", "[last_login] has called for general quarters via ARES.") + COOLDOWN_START(datacore, ares_quarters_cooldown, 10 MINUTES) + . = TRUE + + if("evacuation_start") + if(security_level < SEC_LEVEL_RED) + to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + if(SShijack.evac_admin_denied) + to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + if(!SShijack.initiate_evacuation()) + to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + log_game("[key_name(usr)] has called for an emergency evacuation via ARES.") + message_admins("[key_name_admin(usr)] has called for an emergency evacuation via ARES.") + log_ares_security("Initiate Evacuation", "[last_login] has called for an emergency evacuation via ARES.") + . = TRUE + + if("distress") + if(!SSticker.mode) + return FALSE //Not a game mode? + if(world.time < DISTRESS_TIME_LOCK) + to_chat(usr, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(datacore, ares_distress_cooldown)) + to_chat(usr, SPAN_WARNING("The distress launcher is cooling down!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(security_level == SEC_LEVEL_DELTA) + to_chat(usr, SPAN_WARNING("The ship is already undergoing self destruct procedures!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + else if(security_level < SEC_LEVEL_RED) + to_chat(usr, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + for(var/client/admin in GLOB.admins) + if((R_ADMIN|R_MOD) & admin.admin_holder.rights) + playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) + SSticker.mode.request_ert(usr, TRUE) + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) + COOLDOWN_START(datacore, ares_distress_cooldown, COOLDOWN_COMM_REQUEST) + return TRUE + + if("nuclearbomb") + if(!SSticker.mode) + return FALSE //Not a game mode? + if(world.time < NUCLEAR_TIME_LOCK) + to_chat(usr, SPAN_WARNING("It is too soon to request Nuclear Ordnance!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(datacore, ares_nuclear_cooldown)) + to_chat(usr, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame) + to_chat(usr, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + var/reason = tgui_input_text(usr, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance") + if(!reason) + return FALSE + for(var/client/admin in GLOB.admins) + if((R_ADMIN|R_MOD) & admin.admin_holder.rights) + playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) + message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") + to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) + log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]") + if(ares_can_interface()) + ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V") + ai_silent_announcement("Reason given: [reason].", ".V") + COOLDOWN_START(datacore, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) + return TRUE diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm new file mode 100644 index 000000000000..3bbc6065a88a --- /dev/null +++ b/code/game/machinery/ARES/ARES_interface_apollo.dm @@ -0,0 +1,414 @@ +// #################### Working Joe Ticket Console ##################### +/obj/structure/machinery/computer/working_joe + name = "APOLLO Maintenance Controller" + desc = "A console built to facilitate Working Joes and their operation, allowing for simple allocation of resources." + icon = 'icons/obj/structures/machinery/ares.dmi' + icon_state = "console" + exproof = TRUE + + /// 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 = "" + + var/authentication = APOLLO_ACCESS_LOGOUT + /// The last person to login. + var/last_login + + +/obj/structure/machinery/computer/working_joe/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/structure/machinery/computer/working_joe/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/structure/machinery/computer/working_joe/proc/delink() + if(link) + link.ticket_computers -= src + link.linked_systems -= src + link = null + datacore = null + +/obj/structure/machinery/computer/working_joe/Destroy() + delink() + return ..() + +// ------ Maintenance Controller UI ------ // +/obj/structure/machinery/computer/working_joe/attack_hand(mob/user as mob) + if(..() || !allowed(usr) || inoperable()) + return FALSE + + tgui_interact(user) + return TRUE + +/obj/structure/machinery/computer/working_joe/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/structure/machinery/computer/working_joe/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/structure/machinery/computer/working_joe/ui_status(mob/user, datum/ui_state/state) + . = ..() + if(!allowed(user)) + return UI_UPDATE + if(inoperable()) + return UI_DISABLED + +/obj/structure/machinery/computer/working_joe/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" + + if("logout") + last_menu = current_menu + current_menu = "login" + datacore.apollo_login_list += "[last_login] logged out at [worldtime2text()]." + + 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) + playsound(src, "keyboard_alt", 15, 1) + +/obj/item/card/id/proc/handle_ares_access(logged_in, mob/user) + var/operator = key_name(user) + var/datum/ares_link/link = GLOB.ares_link + if(logged_in == MAIN_AI_SYSTEM) + if(!user) + operator = "[MAIN_AI_SYSTEM] (Sensor Trip)" + else + operator = "[user.ckey]/([MAIN_AI_SYSTEM])" + if(ACCESS_MARINE_AI_TEMP in access) + access -= ACCESS_MARINE_AI_TEMP + link.active_ids -= src + modification_log += "Temporary AI access revoked by [operator]" + to_chat(user, SPAN_NOTICE("Access revoked from [registered_name].")) + else + access += ACCESS_MARINE_AI_TEMP + modification_log += "Temporary AI access granted by [operator]" + to_chat(user, SPAN_NOTICE("Access granted to [registered_name].")) + link.waiting_ids -= src + link.active_ids += src + return TRUE diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index e03f218f0f34..831f76e48930 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -1,4 +1,5 @@ GLOBAL_DATUM_INIT(ares_link, /datum/ares_link, new) +GLOBAL_DATUM_INIT(ares_datacore, /datum/ares_datacore, new) GLOBAL_LIST_INIT(maintenance_categories, list( "Broken Light", "Shattered Glass", @@ -15,26 +16,56 @@ GLOBAL_LIST_INIT(maintenance_categories, list( )) /datum/ares_link - var/link_id = MAIN_SHIP_DEFAULT_NAME /// All motion triggers for the link var/list/linked_alerts = list() /// All machinery for the link var/list/linked_systems = list() - var/obj/structure/machinery/ares/processor/interface/p_interface - var/obj/structure/machinery/ares/processor/apollo/p_apollo - var/obj/structure/machinery/ares/processor/bioscan/p_bioscan + var/obj/structure/machinery/ares/cpu/central_processor + var/obj/structure/machinery/ares/processor/interface/processor_interface + var/obj/structure/machinery/ares/processor/apollo/processor_apollo + var/obj/structure/machinery/ares/processor/bioscan/processor_bioscan var/obj/structure/machinery/computer/ares_console/interface var/list/obj/structure/machinery/computer/working_joe/ticket_computers = list() - /// The chat log of the apollo link. Timestamped. - var/list/apollo_log = list() - /// Working Joe stuff var/list/tickets_maintenance = list() var/list/tickets_access = list() var/list/waiting_ids = list() var/list/active_ids = list() +/datum/ares_datacore + /// A record of who logged in and when. + var/list/interface_access_list = list() + /// Access list for Apollo Maintenance Console + var/list/apollo_login_list = list() + + /// The chat log of the apollo link. Timestamped. + var/list/apollo_log = list() + + /// Holds all (/datum/ares_record/announcement)s + var/list/records_announcement = list() + /// Holds all (/datum/ares_record/bioscan)s + var/list/records_bioscan = list() + /// Holds all (/datum/ares_record/bombardment)s + var/list/records_bombardment = list() + /// Holds all (/datum/ares_record/deletion)s + var/list/records_deletion = list() + /// Holds all (/datum/ares_record/talk_log)s + var/list/records_talking = list() + /// Holds all (/datum/ares_record/requisition_log)s + var/list/records_asrs = list() + /// Holds all (/datum/ares_record/security)s (including AA) + var/list/records_security = list() + /// Holds all (/datum/ares_record/flight)s + var/list/records_flight = list() + /// Is nuke request usable or not? + var/nuke_available = TRUE + + + COOLDOWN_DECLARE(ares_distress_cooldown) + COOLDOWN_DECLARE(ares_nuclear_cooldown) + COOLDOWN_DECLARE(ares_quarters_cooldown) + /datum/ares_link/Destroy() for(var/obj/structure/machinery/ares/link in linked_systems) link.delink() @@ -46,38 +77,6 @@ GLOBAL_LIST_INIT(maintenance_categories, list( // ------ ARES Logging Procs ------ // -/proc/log_ares_apollo(speaker, message) - if(!speaker) - speaker = "Unknown" - var/datum/ares_link/link = GLOB.ares_link - if(!link.p_apollo || link.p_apollo.inoperable()) - return FALSE - if(!link.p_interface || link.p_interface.inoperable()) - return FALSE - link.apollo_log.Add("[worldtime2text()]: [speaker], '[message]'") - -/datum/ares_link/proc/log_ares_bioscan(title, input) - interface.records_bioscan.Add(new /datum/ares_record/bioscan(title, input)) - -/datum/ares_link/proc/log_ares_bombardment(user_name, ob_name, coordinates) - interface.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name)) - -/datum/ares_link/proc/log_ares_announcement(title, message) - interface.records_announcement.Add(new /datum/ares_record/announcement(title, message)) - -/datum/ares_link/proc/log_ares_requisition(source, details, user_name) - interface.records_asrs.Add(new /datum/ares_record/requisition_log(source, details, user_name)) - -/datum/ares_link/proc/log_ares_security(title, details) - interface.records_security.Add(new /datum/ares_record/security(title, details)) - -/datum/ares_link/proc/log_ares_antiair(details) - interface.records_security.Add(new /datum/ares_record/security/antiair(details)) - -/datum/ares_link/proc/log_ares_flight(user_name, details) - interface.records_flight.Add(new /datum/ares_record/flight(details, user_name)) -// ------ End ARES Logging Procs ------ // - /proc/ares_apollo_talk(broadcast_message) var/datum/language/apollo/apollo = GLOB.all_languages[LANGUAGE_APOLLO] for(var/mob/living/silicon/decoy/ship_ai/ai in ai_mob_list) @@ -89,7 +88,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list( playsound_client(listener.client, sound('sound/misc/interference.ogg'), listener, vol = 45) /proc/ares_can_interface() - var/obj/structure/machinery/ares/processor/interface/processor = GLOB.ares_link.p_interface + var/obj/structure/machinery/ares/processor/interface/processor = GLOB.ares_link.processor_interface if(!istype(GLOB.ares_link)) return FALSE if(processor && !processor.inoperable()) @@ -97,12 +96,66 @@ GLOBAL_LIST_INIT(maintenance_categories, list( return FALSE //interface processor not found or is broken /proc/ares_can_log() - var/obj/structure/machinery/computer/ares_console/interface = GLOB.ares_link.interface - if(!istype(GLOB.ares_link)) + if(!istype(GLOB.ares_link) || !istype(GLOB.ares_datacore)) return FALSE - if(interface && !interface.inoperable()) + var/obj/structure/machinery/ares/cpu/central_processor = GLOB.ares_link.central_processor + if(central_processor && !central_processor.inoperable()) return TRUE - return FALSE //ares interface not found or is broken + return FALSE //CPU not found or is broken + +/proc/log_ares_apollo(speaker, message) + if(!ares_can_log()) + return FALSE + var/datum/ares_link/link = GLOB.ares_link + if(!link.processor_apollo || link.processor_apollo.inoperable()) + return FALSE + if(!speaker) + speaker = "Unknown" + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.apollo_log.Add("[worldtime2text()]: [speaker], '[message]'") + +/proc/log_ares_bioscan(title, input) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_bioscan.Add(new /datum/ares_record/bioscan(title, input)) + +/proc/log_ares_bombardment(user_name, ob_name, coordinates) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name)) + +/proc/log_ares_announcement(title, message) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_announcement.Add(new /datum/ares_record/announcement(title, message)) + +/proc/log_ares_requisition(source, details, user_name) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_asrs.Add(new /datum/ares_record/requisition_log(source, details, user_name)) + +/proc/log_ares_security(title, details) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_security.Add(new /datum/ares_record/security(title, details)) + +/proc/log_ares_antiair(details) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_security.Add(new /datum/ares_record/security/antiair(details)) + +/proc/log_ares_flight(user_name, details) + if(!ares_can_log()) + return FALSE + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_flight.Add(new /datum/ares_record/flight(details, user_name)) +// ------ End ARES Logging Procs ------ // // ------ ARES Interface Procs ------ // /obj/structure/machinery/computer/proc/get_ares_access(obj/item/card/id/card) @@ -172,440 +225,6 @@ GLOBAL_LIST_INIT(maintenance_categories, list( conversation.conversation += "[MAIN_AI_SYSTEM] at [worldtime2text()], '[text]'" // ------ End ARES Interface Procs ------ // -// ------ ARES Interface UI ------ // - -/obj/structure/machinery/computer/ares_console/attack_hand(mob/user as mob) - if(..() || !allowed(usr) || inoperable()) - return FALSE - - tgui_interact(user) - return TRUE - -/obj/structure/machinery/computer/ares_console/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, "AresInterface", name) - ui.open() - -/obj/structure/machinery/computer/ares_console/ui_data(mob/user) - var/list/data = list() - - data["current_menu"] = current_menu - data["last_page"] = last_menu - - data["logged_in"] = last_login - data["sudo"] = sudo_holder ? TRUE : FALSE - - data["access_text"] = "[sudo_holder ? "(SUDO)," : ""] access level [authentication], [ares_auth_to_text(authentication)]." - data["access_level"] = authentication - - data["alert_level"] = security_level - data["evac_status"] = EvacuationAuthority.evac_status - data["worldtime"] = world.time - - data["access_log"] = list() - data["access_log"] += access_list - data["apollo_log"] = list() - data["apollo_log"] += link.apollo_log - - data["deleted_conversation"] = list() - data["deleted_conversation"] += deleted_1to1 - - data["distresstime"] = ares_distress_cooldown - data["distresstimelock"] = DISTRESS_TIME_LOCK - data["quarterstime"] = ares_quarters_cooldown - data["mission_failed"] = SSticker.mode.is_in_endgame - data["nuketimelock"] = NUCLEAR_TIME_LOCK - data["nuke_available"] = nuke_available - - var/list/logged_announcements = list() - for(var/datum/ares_record/announcement/broadcast as anything in records_announcement) - var/list/current_broadcast = list() - current_broadcast["time"] = broadcast.time - current_broadcast["title"] = broadcast.title - current_broadcast["details"] = broadcast.details - current_broadcast["ref"] = "\ref[broadcast]" - logged_announcements += list(current_broadcast) - data["records_announcement"] = logged_announcements - - var/list/logged_alerts = list() - for(var/datum/ares_record/security/security_alert as anything in records_security) - var/list/current_alert = list() - current_alert["time"] = security_alert.time - current_alert["title"] = security_alert.title - current_alert["details"] = security_alert.details - current_alert["ref"] = "\ref[security_alert]" - logged_alerts += list(current_alert) - data["records_security"] = logged_alerts - - var/list/logged_flights = list() - for(var/datum/ares_record/flight/flight_log as anything in records_flight) - var/list/current_flight = list() - current_flight["time"] = flight_log.time - current_flight["title"] = flight_log.title - current_flight["details"] = flight_log.details - current_flight["user"] = flight_log.user - current_flight["ref"] = "\ref[flight_log]" - logged_flights += list(current_flight) - data["records_flight"] = logged_flights - - var/list/logged_bioscans = list() - for(var/datum/ares_record/bioscan/scan as anything in records_bioscan) - var/list/current_scan = list() - current_scan["time"] = scan.time - current_scan["title"] = scan.title - current_scan["details"] = scan.details - current_scan["ref"] = "\ref[scan]" - logged_bioscans += list(current_scan) - data["records_bioscan"] = logged_bioscans - - var/list/logged_bombs = list() - for(var/datum/ares_record/bombardment/bomb as anything in records_bombardment) - var/list/current_bomb = list() - current_bomb["time"] = bomb.time - current_bomb["title"] = bomb.title - current_bomb["details"] = bomb.details - current_bomb["user"] = bomb.user - current_bomb["ref"] = "\ref[bomb]" - logged_bombs += list(current_bomb) - data["records_bombardment"] = logged_bombs - - var/list/logged_deletes = list() - for(var/datum/ares_record/deletion/deleted as anything in records_deletion) - if(!istype(deleted)) - continue - var/list/current_delete = list() - current_delete["time"] = deleted.time - current_delete["title"] = deleted.title - current_delete["details"] = deleted.details - current_delete["user"] = deleted.user - current_delete["ref"] = "\ref[deleted]" - logged_deletes += list(current_delete) - data["records_deletion"] = logged_deletes - - var/list/logged_discussions = list() - for(var/datum/ares_record/deleted_talk/deleted_convo as anything in records_deletion) - if(!istype(deleted_convo)) - continue - var/list/deleted_disc = list() - deleted_disc["time"] = deleted_convo.time - deleted_disc["title"] = deleted_convo.title - deleted_disc["ref"] = "\ref[deleted_convo]" - logged_discussions += list(deleted_disc) - data["deleted_discussions"] = logged_discussions - - var/list/logged_orders = list() - for(var/datum/ares_record/requisition_log/req_order as anything in records_asrs) - if(!istype(req_order)) - continue - var/list/current_order = list() - current_order["time"] = req_order.time - current_order["details"] = req_order.details - current_order["title"] = req_order.title - current_order["user"] = req_order.user - current_order["ref"] = "\ref[req_order]" - logged_orders += list(current_order) - data["records_requisition"] = logged_orders - - var/list/logged_convos = list() - var/list/active_convo = list() - var/active_ref - for(var/datum/ares_record/talk_log/log as anything in records_talking) - if(!istype(log)) - continue - if(log.user == last_login) - active_convo = log.conversation - active_ref = "\ref[log]" - - var/list/current_convo = list() - current_convo["user"] = log.user - current_convo["ref"] = "\ref[log]" - current_convo["conversation"] = log.conversation - logged_convos += list(current_convo) - - data["active_convo"] = active_convo - data["active_ref"] = active_ref - data["conversations"] = logged_convos - - return data - -/obj/structure/machinery/computer/ares_console/ui_static_data(mob/user) - var/list/data = list() - - data["link_id"] = link_id - - return data - -/obj/structure/machinery/computer/ares_console/ui_status(mob/user, datum/ui_state/state) - . = ..() - if(!allowed(user)) - return UI_UPDATE - if(inoperable()) - return UI_DISABLED - -/obj/structure/machinery/computer/ares_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - if(.) - return - - playsound(src, "keyboard_alt", 15, 1) - - 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/mob/living/carbon/human/operator = usr - 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(usr, SPAN_WARNING("You require an ID card to access this terminal!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(authentication) - access_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." - current_menu = "main" - - if("sudo") - var/new_user = tgui_input_text(usr, "Enter Sudo Username", "Sudo User", encode = FALSE) - if(new_user) - if(new_user == sudo_holder) - last_login = sudo_holder - sudo_holder = null - return FALSE - if(new_user == last_login) - to_chat(usr, SPAN_WARNING("Already remote logged in as this user.")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - sudo_holder = last_login - last_login = new_user - access_list += "[last_login] at [worldtime2text()], Sudo Access." - return TRUE - if("sudo_logout") - access_list += "[last_login] at [worldtime2text()], Sudo Logout." - last_login = sudo_holder - sudo_holder = null - return - // -- Page Changers -- // - if("logout") - last_menu = current_menu - current_menu = "login" - if(sudo_holder) - access_list += "[last_login] at [worldtime2text()], Sudo Logout." - last_login = sudo_holder - sudo_holder = null - access_list += "[last_login] logged out at [worldtime2text()]." - - if("home") - last_menu = current_menu - current_menu = "main" - if("page_1to1") - last_menu = current_menu - current_menu = "talking" - if("page_announcements") - last_menu = current_menu - current_menu = "announcements" - if("page_bioscans") - last_menu = current_menu - current_menu = "bioscans" - if("page_bombardments") - last_menu = current_menu - current_menu = "bombardments" - if("page_apollo") - last_menu = current_menu - current_menu = "apollo" - if("page_access") - last_menu = current_menu - current_menu = "access_log" - if("page_security") - last_menu = current_menu - current_menu = "security" - if("page_flight") - last_menu = current_menu - current_menu = "flight_log" - if("page_requisitions") - last_menu = current_menu - current_menu = "requisitions" - if("page_emergency") - last_menu = current_menu - current_menu = "emergency" - if("page_deleted") - last_menu = current_menu - current_menu = "delete_log" - if("page_deleted_1to1") - last_menu = current_menu - current_menu = "deleted_talks" - - // -- Delete Button -- // - if("delete_record") - var/datum/ares_record/record = locate(params["record"]) - if(record.record_name == ARES_RECORD_DELETED) - return FALSE - var/datum/ares_record/deletion/new_delete = new - var/new_details = "Error" - var/new_title = "Error" - switch(record.record_name) - if(ARES_RECORD_ANNOUNCE) - new_title = "[record.title] at [record.time]" - new_details = record.details - records_announcement -= record - if(ARES_RECORD_SECURITY, ARES_RECORD_ANTIAIR) - new_title = "[record.title] at [record.time]" - new_details = record.details - records_security -= record - if(ARES_RECORD_BIOSCAN) - new_title = "[record.title] at [record.time]" - new_details = record.details - records_bioscan -= record - if(ARES_RECORD_BOMB) - new_title = "[record.title] at [record.time]" - new_details = "[record.details] Launched by [record.user]." - records_bombardment -= record - - new_delete.details = new_details - new_delete.user = last_login - new_delete.title = new_title - - records_deletion += new_delete - - // -- 1:1 Conversation -- // - if("new_conversation") - var/datum/ares_record/talk_log/convo = new(last_login) - convo.conversation += "[MAIN_AI_SYSTEM] at [worldtime2text()], 'New 1:1 link initiated. Greetings, [last_login].'" - records_talking += convo - - if("clear_conversation") - var/datum/ares_record/talk_log/conversation = locate(params["active_convo"]) - if(!istype(conversation)) - return FALSE - var/datum/ares_record/deleted_talk/deleted = new - deleted.title = conversation.title - deleted.conversation = conversation.conversation - deleted.user = conversation.user - records_deletion += deleted - records_talking -= conversation - - if("message_ares") - var/message = tgui_input_text(usr, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) - if(message) - message_ares(message, usr, params["active_convo"]) - - if("read_record") - var/datum/ares_record/deleted_talk/conversation = locate(params["record"]) - deleted_1to1 = conversation.conversation - last_menu = current_menu - current_menu = "read_deleted" - - // -- Emergency Buttons -- // - if("general_quarters") - if(!COOLDOWN_FINISHED(src, ares_quarters_cooldown)) - to_chat(usr, SPAN_WARNING("It has not been long enough since the last General Quarters call!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(security_level < SEC_LEVEL_RED) - set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) - shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') - log_game("[key_name(usr)] has called for general quarters via ARES.") - message_admins("[key_name_admin(usr)] has called for general quarters via ARES.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("General Quarters", "[last_login] has called for general quarters via ARES.") - COOLDOWN_START(src, ares_quarters_cooldown, 10 MINUTES) - . = TRUE - - if("evacuation_start") - if(security_level < SEC_LEVEL_RED) - to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - - if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY) - to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - - if(!EvacuationAuthority.initiate_evacuation()) - to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - - log_game("[key_name(usr)] has called for an emergency evacuation via ARES.") - message_admins("[key_name_admin(usr)] has called for an emergency evacuation via ARES.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Initiate Evacuation", "[last_login] has called for an emergency evacuation via ARES.") - . = TRUE - - if("distress") - if(!SSticker.mode) - return FALSE //Not a game mode? - if(world.time < DISTRESS_TIME_LOCK) - to_chat(usr, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(!COOLDOWN_FINISHED(src, ares_distress_cooldown)) - to_chat(usr, SPAN_WARNING("The distress launcher is cooling down!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(security_level == SEC_LEVEL_DELTA) - to_chat(usr, SPAN_WARNING("The ship is already undergoing self destruct procedures!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - else if(security_level < SEC_LEVEL_RED) - to_chat(usr, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - - for(var/client/admin in GLOB.admins) - if((R_ADMIN|R_MOD) & admin.admin_holder.rights) - playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) - SSticker.mode.request_ert(usr, TRUE) - to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) - COOLDOWN_START(src, ares_distress_cooldown, COOLDOWN_COMM_REQUEST) - return TRUE - - if("nuclearbomb") - if(!SSticker.mode) - return FALSE //Not a game mode? - if(world.time < NUCLEAR_TIME_LOCK) - to_chat(usr, SPAN_WARNING("It is too soon to request Nuclear Ordnance!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(!COOLDOWN_FINISHED(src, ares_nuclear_cooldown)) - to_chat(usr, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - if(security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame) - to_chat(usr, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!")) - playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return FALSE - var/reason = tgui_input_text(usr, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance") - if(!reason) - return FALSE - for(var/client/admin in GLOB.admins) - if((R_ADMIN|R_MOD) & admin.admin_holder.rights) - playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) - message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") - to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) - if(ares_can_log()) - link.log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]") - if(ares_can_interface()) - ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V") - ai_silent_announcement("Reason given: [reason].", ".V") - COOLDOWN_START(src, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) - return TRUE -// ------ End ARES Interface UI ------ // - - /obj/structure/machinery/computer/working_joe/get_ares_access(obj/item/card/id/card) if(ACCESS_ARES_DEBUG in card.access) return APOLLO_ACCESS_DEBUG @@ -640,368 +259,36 @@ GLOBAL_LIST_INIT(maintenance_categories, list( if(APOLLO_ACCESS_DEBUG)//6 return "AI Service Technician" -// ------ Maintenance Controller UI ------ // -/obj/structure/machinery/computer/working_joe/attack_hand(mob/user as mob) - if(..() || !allowed(usr) || inoperable()) - return FALSE - - tgui_interact(user) - return TRUE - -/obj/structure/machinery/computer/working_joe/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/structure/machinery/computer/working_joe/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"] += login_list - - data["apollo_log"] = list() - data["apollo_log"] += link.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/structure/machinery/computer/working_joe/ui_static_data(mob/user) - var/list/data = list() - - data["link_id"] = link_id - - return data - -/obj/structure/machinery/computer/working_joe/ui_status(mob/user, datum/ui_state/state) - . = ..() - if(!allowed(user)) - return UI_UPDATE - if(inoperable()) - return UI_DISABLED - -/obj/structure/machinery/computer/working_joe/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) - login_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." - current_menu = "main" - - if("logout") - last_menu = current_menu - current_menu = "login" - login_list += "[last_login] logged out at [worldtime2text()]." - - 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/ticket_holder = last_login - if(!ticket_holder) - 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: '[ticket_holder]' \n Details: '[details]' \n\n Is this correct?", "Confirmation", "Yes", "No") - if(confirm != "Yes" || !link) - return FALSE - var/datum/ares_ticket/access/access_ticket = new(last_login, ticket_holder, 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 Holder '[ticket_holder]' and Details of '[details]'.") - message_admins(SPAN_STAFF_IC("[key_name_admin(operator)] created a new ARES Access Ticket."), 1) - 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("[last_login] surrendered their access ticket.") - - authentication = get_ares_access(identification) - if(authentication) - 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) - 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) - return TRUE - return FALSE - - if(playsound) - playsound(src, "keyboard_alt", 15, 1) - -/obj/item/card/id/proc/handle_ares_access(logged_in, mob/user) - var/announce_text = "[logged_in] revoked core access from [registered_name]'s ID card." - var/operator = key_name(user) - var/datum/ares_link/link = GLOB.ares_link - if(logged_in == MAIN_AI_SYSTEM) - if(!user) - operator = "[MAIN_AI_SYSTEM] (Sensor Trip)" - else - operator = "[user.ckey]/([MAIN_AI_SYSTEM])" - if(ACCESS_MARINE_AI_TEMP in access) - access -= ACCESS_MARINE_AI_TEMP - link.active_ids -= src - modification_log += "Temporary AI access revoked by [operator]" - to_chat(user, SPAN_NOTICE("Access revoked from [registered_name].")) +/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 - access += ACCESS_MARINE_AI_TEMP - modification_log += "Temporary AI access granted by [operator]" - announce_text = "[logged_in] granted core access to [registered_name]'s ID card." - to_chat(user, SPAN_NOTICE("Access granted to [registered_name].")) - link.waiting_ids -= src - link.active_ids += src - ares_apollo_talk(announce_text) - return TRUE + 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/ARES_records.dm b/code/game/machinery/ARES/ARES_records.dm index 19751462bc37..f89b2c120e05 100644 --- a/code/game/machinery/ARES/ARES_records.dm +++ b/code/game/machinery/ARES/ARES_records.dm @@ -102,6 +102,7 @@ var/ref_holder = "\ref[src]" var/pos = length(ref_holder) var/new_id = "#[copytext("\ref[src]", pos - 4, pos)]" + new_id = uppertext(new_id) ticket_time = worldtime2text() ticket_submitter = user @@ -115,17 +116,18 @@ /datum/ares_ticket/access ticket_type = ARES_RECORD_ACCESS + ticket_name = ARES_RECORD_ACCESS var/user_id_num -/datum/ares_ticket/access/New(user, name, details, priority, global_id_num) +/datum/ares_ticket/access/New(user, details, priority, global_id_num) var/ref_holder = "\ref[src]" var/pos = length(ref_holder) var/new_id = "#[copytext("\ref[src]", pos - 4, pos)]" + new_id = uppertext(new_id) ticket_time = worldtime2text() ticket_submitter = user ticket_details = details - ticket_name = name ticket_priority = priority ticket_id = new_id user_id_num = global_id_num diff --git a/code/game/machinery/ARES/ARES_step_triggers.dm b/code/game/machinery/ARES/ARES_step_triggers.dm index 51480371be51..fdf7b26b2e65 100644 --- a/code/game/machinery/ARES/ARES_step_triggers.dm +++ b/code/game/machinery/ARES/ARES_step_triggers.dm @@ -3,7 +3,6 @@ layer = 5 /// Link alerts to ARES Link var/datum/ares_link/link - var/link_id = MAIN_SHIP_DEFAULT_NAME /// Alert message to report unless area based. var/alert_message = "ALERT: Unauthorized movement detected in ARES Core!" /// Connect alerts to use same cooldowns @@ -53,7 +52,7 @@ /obj/effect/step_trigger/ares_alert/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) if(link && !override) return FALSE - if(new_link.link_id == link_id) + if(new_link) link = new_link new_link.linked_alerts += src return TRUE @@ -70,7 +69,7 @@ broadcast_message = "ALERT: Unauthorized movement detected in [area_name]!" var/datum/ares_link/link = GLOB.ares_link - if(link.p_apollo.inoperable()) + if(link.processor_apollo.inoperable()) return FALSE to_chat(passer, SPAN_BOLDWARNING("You hear a soft beeping sound as you cross the threshold.")) @@ -113,8 +112,6 @@ /obj/effect/step_trigger/ares_alert/access_control/Crossed(atom/passer as mob|obj) if(isobserver(passer) || isxeno(passer)) return FALSE - if(!COOLDOWN_FINISHED(src, sensor_cooldown))//Don't want alerts spammed. - return FALSE if(!passer) return FALSE if(HAS_TRAIT(passer, TRAIT_CLOAKED))//Can't be seen/detected to trigger alert. @@ -157,11 +154,12 @@ var/broadcast_message = get_broadcast(passer, idcard, failure) var/datum/ares_link/link = GLOB.ares_link - if(link.p_apollo.inoperable()) + if(link.processor_apollo.inoperable()) return FALSE to_chat(passer, SPAN_BOLDWARNING("You hear a harsh buzzing sound as you cross the threshold!")) - ares_apollo_talk(broadcast_message) + if(COOLDOWN_FINISHED(src, sensor_cooldown))//Don't want alerts spammed. + ares_apollo_talk(broadcast_message) if(idcard) /// Removes the access from the ID and updates the ID's modification log. for(var/obj/item/card/id/identification in link.active_ids) diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm new file mode 100644 index 000000000000..26ec9d5120bd --- /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/OpTable.dm b/code/game/machinery/OpTable.dm index 3c4104b6c283..c9092a750f73 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -59,8 +59,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/structure/machinery/optable/get_examine_text(mob/user) . = ..() diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 16512a944be1..e6fc0c8de76e 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -431,8 +431,6 @@ var/wireIndex = AAlarmWireColorToIndex[wireColor] //not used in this function AAlarmwires |= wireFlag switch(wireIndex) - if(AALARM_WIRE_IDSCAN) - if(AALARM_WIRE_POWER) shorted = 0 shock(usr, 50) diff --git a/code/game/machinery/biohazard_lockdown.dm b/code/game/machinery/biohazard_lockdown.dm index fd6205baa1d9..2e3cbf6de234 100644 --- a/code/game/machinery/biohazard_lockdown.dm +++ b/code/game/machinery/biohazard_lockdown.dm @@ -102,8 +102,7 @@ GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY) shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg') message_admins(log) - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Containment Lockdown", ares_log) + log_ares_security("Containment Lockdown", ares_log) #undef LOCKDOWN_READY #undef LOCKDOWN_ACTIVE diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 81d498ba02e2..65f6fe1842f4 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -113,6 +113,10 @@ switch(action) if("print") + if(working) + //If we're already printing something then we're too busy to multi task. + to_chat(usr, SPAN_NOTICE("[src] is busy at the moment.")) + return FALSE var/recipe = params["recipe_id"] var/valid_recipe = FALSE for(var/datum/bioprinter_recipe/product_recipes in products) @@ -124,6 +128,10 @@ message_admins("[key_name(usr)] attempted to print an invalid recipe on \the [src].") return FALSE var/datum/bioprinter_recipe/recipe_datum = new recipe + if(stored_metal < recipe_datum.metal) + to_chat(usr, SPAN_NOTICE("[src] does not have enough stored metal.")) + QDEL_NULL(recipe_datum) + return FALSE stored_metal -= recipe_datum.metal to_chat(usr, SPAN_NOTICE("\The [src] is now printing the selected organ. Please hold.")) working = TRUE @@ -146,6 +154,8 @@ /obj/structure/machinery/bioprinter/proc/print_limb(limb_path) if(inoperable()) + //In case we lose power or anything between the print and the callback we don't want to permenantly break the printer + working = FALSE return new limb_path(get_turf(src)) working = FALSE diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index b70829c708ed..d82591994e7b 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -551,7 +551,7 @@ var/speed = ((wires & WIRE_MOTOR1) ? 1:0) + ((wires & WIRE_MOTOR2) ? 2:0) switch(speed) if(0) - // do nothing + pass() if(1) process_bot() spawn(2) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index ee83c430c2db..8d4b27778c69 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -1,15 +1,3 @@ -/obj/structure/machinery/driver_button - name = "mass driver button" - icon = 'icons/obj/objects.dmi' - icon_state = "launcherbtt" - desc = "A remote control switch for a mass driver." - var/id = null - var/active = 0 - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 2 - active_power_usage = 4 - /obj/structure/machinery/ignition_switch name = "ignition switch" icon = 'icons/obj/objects.dmi' diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm index c3b17dbf8090..fb9f7a0375d9 100644 --- a/code/game/machinery/computer/almayer_control.dm +++ b/code/game/machinery/computer/almayer_control.dm @@ -81,9 +81,9 @@ data["worldtime"] = world.time - data["evac_status"] = EvacuationAuthority.evac_status - if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING) - data["evac_eta"] = EvacuationAuthority.get_status_panel_eta() + data["evac_status"] = SShijack.evac_status + if(SShijack.evac_status == EVACUATION_STATUS_INITIATED) + data["evac_eta"] = SShijack.get_evac_eta() if(!messagetitle.len) data["messages"] = null @@ -108,7 +108,6 @@ . = ..() if(.) return - switch(action) if("award") print_medal(usr, src) @@ -121,31 +120,27 @@ to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) return FALSE - if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY) + if(SShijack.evac_admin_denied) to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) return FALSE - if(!EvacuationAuthority.initiate_evacuation()) + if(!SShijack.initiate_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) return FALSE log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") + log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") . = TRUE if("evacuation_cancel") - if(!EvacuationAuthority.cancel_evacuation()) + if(!SShijack.cancel_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!")) return FALSE - addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/structure/machinery/computer/almayer_control, cancel_evac)), 4 SECONDS) - log_game("[key_name(usr)] has canceled the emergency evacuation.") message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") + log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") . = TRUE // evac stuff end \\ @@ -167,8 +162,7 @@ set_security_level(seclevel2num(level_selected), log = ARES_LOG_NONE) log_game("[key_name(usr)] has changed the security level to [get_security_level()].") message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Manual Security Update", "[usr] has changed the security level to [get_security_level()].") + log_ares_security("Manual Security Update", "[usr] has changed the security level to [get_security_level()].") . = TRUE if("messageUSCM") @@ -280,10 +274,3 @@ // end tgui interact \\ // end tgui \\ - -/obj/structure/machinery/computer/almayer_control/proc/cancel_evac() - if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait - //if the self_destruct is active we try to cancel it (which includes lowering alert level to red) - if(!EvacuationAuthority.cancel_self_destruct(1)) - //if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually. - set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level. diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index f5cd63d4356d..b39f59530adc 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -65,7 +65,6 @@ if(..()) return FALSE usr.set_interaction(src) - var/datum/ares_link/link = GLOB.ares_link switch(href_list["operation"]) if("mapview") tacmap.tgui_interact(usr) @@ -139,37 +138,30 @@ to_chat(usr, SPAN_WARNING("The ship must be under delta alert in order to enact evacuation procedures.")) return FALSE - if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY) + if(SShijack.evac_admin_denied) to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) return FALSE - if(!EvacuationAuthority.initiate_evacuation()) + if(!SShijack.initiate_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) return FALSE log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") - link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") + log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") return TRUE state = STATE_EVACUATION if("evacuation_cancel") if(state == STATE_EVACUATION_CANCEL) - if(!EvacuationAuthority.cancel_evacuation()) + if(!SShijack.cancel_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!")) return FALSE - spawn(35)//some time between AI announcements for evac cancel and SD cancel. - if(EvacuationAuthority.evac_status == EVACUATION_STATUS_STANDING_BY)//nothing changed during the wait - //if the self_destruct is active we try to cancel it (which includes lowering alert level to red) - if(!EvacuationAuthority.cancel_self_destruct(1)) - //if SD wasn't active (likely canceled manually in the SD room), then we lower the alert level manually. - set_security_level(SEC_LEVEL_RED, TRUE) //both SD and evac are inactive, lowering the security level. - log_game("[key_name(usr)] has canceled the emergency evacuation.") message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.") - link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") + log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") return TRUE state = STATE_EVACUATION_CANCEL @@ -328,8 +320,8 @@ user.set_interaction(src) var/dat = "Communications Console" - if(EvacuationAuthority.evac_status == EVACUATION_STATUS_INITIATING) - dat += "Evacuation in Progress\n
\nETA: [EvacuationAuthority.get_status_panel_eta()]
" + if(SShijack.evac_status == EVACUATION_STATUS_INITIATED) + dat += "Evacuation in Progress\n
\nETA: [SShijack.get_evac_eta()]
" switch(state) if(STATE_DEFAULT) if(authenticated) @@ -352,9 +344,11 @@ dat += "
Award a medal" dat += "
Send Distress Beacon" dat += "
Activate Self-Destruct" - switch(EvacuationAuthority.evac_status) - if(EVACUATION_STATUS_STANDING_BY) dat += "
Initiate emergency evacuation" - if(EVACUATION_STATUS_INITIATING) dat += "
Cancel emergency evacuation" + switch(SShijack.evac_status) + if(EVACUATION_STATUS_NOT_INITIATED) + dat += "
Initiate emergency evacuation" + if(EVACUATION_STATUS_INITIATED) + dat += "
Cancel emergency evacuation" else dat += "
LOG IN" @@ -409,20 +403,8 @@ if(STATE_ALERT_LEVEL) dat += "Current alert level: [get_security_level()]
" - if(security_level == SEC_LEVEL_DELTA) - if(EvacuationAuthority.dest_status >= NUKE_EXPLOSION_ACTIVE) - dat += SET_CLASS("The self-destruct mechanism is active. [EvacuationAuthority.evac_status != EVACUATION_STATUS_INITIATING ? "You have to manually deactivate the self-destruct mechanism." : ""]", INTERFACE_RED) - dat += "
" - switch(EvacuationAuthority.evac_status) - if(EVACUATION_STATUS_INITIATING) - dat += SET_CLASS("Evacuation initiated. Evacuate or rescind evacuation orders.", INTERFACE_RED) - if(EVACUATION_STATUS_IN_PROGRESS) - dat += SET_CLASS("Evacuation in progress.", INTERFACE_RED) - if(EVACUATION_STATUS_COMPLETE) - dat += SET_CLASS("Evacuation complete.", INTERFACE_RED) - else - dat += "Blue
" - dat += "Green" + dat += "Blue
" + dat += "Green" if(STATE_CONFIRM_LEVEL) dat += "Current alert level: [get_security_level()]
" diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index adce72f7d8b6..304b24a14f04 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -53,8 +53,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/structure/machinery/computer/bullet_act(obj/projectile/Proj) if(exproof) diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm index 60bf17388db8..6218bf0cdedb 100644 --- a/code/game/machinery/computer/dropship_weapons.dm +++ b/code/game/machinery/computer/dropship_weapons.dm @@ -594,14 +594,21 @@ return var/targ_id = text2num(href_list["cas_camera"]) + + var/datum/cas_signal/new_signal for(var/datum/cas_signal/LT as anything in cas_group.cas_signals) if(LT.target_id == targ_id && LT.valid_signal()) - selected_cas_signal = LT + new_signal = LT break - if(!selected_cas_signal) + if(!new_signal) to_chat(usr, SPAN_WARNING("Target lost or obstructed.")) return + + if(usr in selected_cas_signal?.linked_cam?.viewing_users) // Reset previous cam + remove_from_view(usr) + + selected_cas_signal = new_signal if(selected_cas_signal && selected_cas_signal.linked_cam) selected_cas_signal.linked_cam.view_directly(usr) else diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index b68ca41d6f09..fe85599018ae 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -123,7 +123,6 @@ else dat += "
[bdat]" - else else dat += text("{Log In}", src) show_browser(user, dat, "Medical Records", "med_rec") @@ -365,8 +364,6 @@ for(var/datum/data/record/E in GLOB.data_core.medical) if ((E.fields["ref"] == R.fields["ref"] || E.fields["id"] == R.fields["id"])) M = E - else - //Foreach continue //goto(2540) src.active1 = R src.active2 = M src.screen = 4 @@ -417,16 +414,12 @@ for(var/datum/data/record/R as anything in GLOB.data_core.medical) if ((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]))) src.active2 = R - else - //Foreach continue //goto(3229) if (!active2) temp = "Could not locate record [t1]." else for(var/datum/data/record/E in GLOB.data_core.general) if ((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"])) src.active1 = E - else - //Foreach continue //goto(3334) src.screen = 4 if (href_list["print_p"]) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 3858230a089c..7ec97874bb7f 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -1,159 +1,8 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - -/obj/structure/machinery/computer/pod - name = "Pod Launch Control" - desc = "A control for launching pods. Some people prefer firing Mechas." +// Legacy SS13 machinery turned into props +/obj/structure/machinery/computer/pod/old + name = "DoorMex Control Computer" + desc = "A control for launching pods." icon_state = "computer_generic" density = TRUE - circuit = /obj/item/circuitboard/computer/pod - var/id = 1 - var/obj/structure/machinery/mass_driver/connected = null - var/timing = 0 - var/time = 30 - var/title = "Mass Driver Controls" + circuit = /obj/item/circuitboard/computer/pod/old processing = TRUE - - -/obj/structure/machinery/computer/pod/New() - ..() - spawn( 5 ) - for(var/obj/structure/machinery/mass_driver/M in machines) - if(M.id == id) - connected = M - else - return - return - - -/obj/structure/machinery/computer/pod/proc/alarm() - if(inoperable()) - return - - if(!( connected )) - to_chat(viewers(null, null), "Cannot locate mass driver connector. Cancelling firing sequence!") - return - - for(var/obj/structure/machinery/door/poddoor/M in machines) - if(M.id == id) - M.open() - - sleep(20) - - for(var/obj/structure/machinery/mass_driver/M in machines) - if(M.id == id) - M.power = connected.power - M.drive() - - sleep(50) - for(var/obj/structure/machinery/door/poddoor/M in machines) - if(M.id == id) - M.close() - return - return - -/obj/structure/machinery/computer/pod/attack_remote(mob/user as mob) - return attack_hand(user) - -/obj/structure/machinery/computer/pod/attack_hand(mob/user as mob) - if(..()) - return - - var/dat = "[title]" - user.set_interaction(src) - if(connected) - var/d2 - if(timing) //door controls do not need timers. - d2 = "Stop Time Launch" - else - d2 = "Initiate Time Launch" - var/second = time % 60 - var/minute = (time - second) / 60 - dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +" - var/temp = "" - var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) - for(var/t in L) - if(t == connected.power) - temp += "[t] " - else - temp += "[t] " - dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" - else - dat += "
\nToggle Outer Door
" - dat += "

Close" - show_browser(user, dat, "computer", "size=400x500") - add_fingerprint(usr) - return - - -/obj/structure/machinery/computer/pod/process() - if(!..()) - return - if(timing) - if(time > 0) - time = round(time) - 1 - else - alarm() - time = 0 - timing = 0 - updateDialog() - return - - -/obj/structure/machinery/computer/pod/Topic(href, href_list) - if(..()) - return - if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (isRemoteControlling(usr))) - usr.set_interaction(src) - if(href_list["power"]) - var/t = text2num(href_list["power"]) - t = min(max(0.25, t), 16) - if(connected) - connected.power = t - if(href_list["alarm"]) - alarm() - if(href_list["drive"]) - for(var/obj/structure/machinery/mass_driver/M in machines) - if(M.id == id) - M.power = connected.power - M.drive() - - if(href_list["time"]) - timing = text2num(href_list["time"]) - if(href_list["tp"]) - var/tp = text2num(href_list["tp"]) - time += tp - time = min(max(round(time), 0), 120) - if(href_list["door"]) - for(var/obj/structure/machinery/door/poddoor/M in machines) - if(M.id == id) - if(M.density) - M.open() - else - M.close() - updateUsrDialog() - return - - - -/obj/structure/machinery/computer/pod/old - name = "DoorMex Control Computer" - title = "Door Controls" - -/obj/structure/machinery/computer/pod/old/syndicate - name = "ProComp Executive IIc" - desc = "The Syndicate operate on a tight budget. Operates external airlocks." - icon_state = "syndicomp" - title = "External Airlock Controls" - req_access = list(ACCESS_ILLEGAL_PIRATE) - -/obj/structure/machinery/computer/pod/old/syndicate/attack_hand(mob/user as mob) - if(!allowed(user)) - to_chat(user, SPAN_DANGER("Access Denied")) - return - else - ..() - -/obj/structure/machinery/computer/pod/old/swf - name = "Magix System IV" - icon_state = "wizard" - desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition" diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 12f4faedc979..c5a13e2c3e74 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -55,8 +55,7 @@ dat += " Locked Down |" else dat += " Operating Normally |" - if (!R.canmove) - else if(R.cell) + if(R.canmove && R.cell) dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |" else dat += " No Cell Installed |" diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm index 52a4159a2a90..3aa9b5a032a8 100644 --- a/code/game/machinery/computer/sentencing.dm +++ b/code/game/machinery/computer/sentencing.dm @@ -78,6 +78,7 @@ data["laws"] += list(create_law_data("Major Laws", SSlaw_init.major_law)) data["laws"] += list(create_law_data("Capital Laws", SSlaw_init.capital_law)) data["laws"] += list(create_law_data("Optional Laws", SSlaw_init.optional_law)) + data["laws"] += list(create_law_data("Precautionary Laws", SSlaw_init.precautionary_law)) return data diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index f891d46bc36b..a20d344b53a9 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -43,16 +43,16 @@ var/dat if (temp) - dat = text("[]

Clear Screen", temp, src) + dat = "[temp]

Clear Screen" else - dat = text("Confirm Identity: []
", src, (scan ? text("[]", scan.name) : "----------")) + dat = "Confirm Identity: [scan ? scan.name : "----------"]
" if (authenticated) switch(screen) if(1.0) dat += {"

"} - dat += text("Search Records
", src) - dat += text("New Record
", src) + dat += "Search Records
" + dat += "New Record
" dat += {"

@@ -70,20 +70,19 @@ if(!isnull(GLOB.data_core.general)) for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order)) for(var/datum/data/record/E in GLOB.data_core.security) - var/background - dat += text("", background, src, R, R.fields["name"]) - dat += text("", R.fields["id"]) - dat += text("", R.fields["rank"]) + dat += "" + dat += "" + dat += "" dat += "
[][][]
[R.fields["name"]][R.fields["id"]][R.fields["rank"]]
" - dat += text("Record Maintenance

", src) - dat += text("{Log Out}",src) + dat += "Record Maintenance

" + dat += "{Log Out}" if(2.0) dat += "Records Maintenance
" dat += "
Delete All Records

Back" if(3.0) dat += "
Employment Record

" if ((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))) - dat += text("
\ + dat += " \
\ Name: [active1.fields["name"]]
\ ID: [active1.fields["id"]]
\n \ Sex: [active1.fields["sex"]]
\n \ @@ -93,18 +92,18 @@ Mental Status: [active1.fields["m_stat"]]

\n \ Employment/skills summary:
[decode(active1.fields["notes"])]
Photo:
\ -
") +
" else dat += "General Record Lost!
" - dat += text("\nDelete Record (ALL)

\nPrint Record
\nBack
", src, src, src) + dat += "\nDelete Record (ALL)

\nPrint Record
\nBack
" if(4.0) if(!Perp.len) - dat += text("ERROR. String could not be located.

Back", src) + dat += "ERROR. String could not be located.

Back" else dat += {" "} - dat += text("", tempname) + dat += "" dat += {"
Search Results for '[]':Search Results for '[tempname]':
@@ -121,17 +120,14 @@ if(istype(Perp[i+1],/datum/data/record/)) var/datum/data/record/E = Perp[i+1] crimstat = E.fields["criminal"] - var/background - background = "'background-color:#00FF7F;'" - dat += text("[]", background, src, R, R.fields["name"]) - dat += text("[]", R.fields["id"]) - dat += text("[]", R.fields["rank"]) - dat += text("[]", crimstat) + dat += "[R.fields["name"]]" + dat += "[R.fields["id"]]" + dat += "[R.fields["rank"]]" + dat += "[crimstat]" dat += "
" - dat += text("
Return to index.", src) - else + dat += "
Return to index." else - dat += text("{Log In}", src) + dat += "{Log In}" show_browser(user, dat, "Employment Records", "secure_rec", "size=600x400") onclose(user, "secure_rec") return @@ -342,7 +338,6 @@ What a mess.*/ if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) GLOB.data_core.medical -= R qdel(R) - else QDEL_NULL(active1) else temp = "This function does not appear to be working at the moment. Our apologies." diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index eb9aed4f71e4..86bb5f79a035 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li //Lifted from Unity stasis.dm and refactored. ~Zuhayr /obj/structure/machinery/cryopod/process() - if(occupant && !(WEAKREF(occupant) in GLOB.freed_mob_list)) //ignore freed mobs + if(occupant && !(occupant in GLOB.freed_mob_list)) //ignore freed mobs //if occupant ghosted, time till despawn is severely shorter if(!occupant.key && time_till_despawn == 10 MINUTES) time_till_despawn -= 8 MINUTES diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index e6df92d258c0..99996bea8978 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -54,7 +54,6 @@ src.health -= W.force * 0.75 if("brute") src.health -= W.force * 0.5 - else if (src.health <= 0) src.explode() ..() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 8be8609d6008..8b73588f1d0b 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -150,47 +150,6 @@ else icon_state = initial(icon_state) + "0" -/obj/structure/machinery/driver_button/attack_remote(mob/user as mob) - return src.attack_hand(user) - -/obj/structure/machinery/driver_button/attackby(obj/item/W, mob/user as mob) - return src.attack_hand(user) - -/obj/structure/machinery/driver_button/attack_hand(mob/user as mob) - - src.add_fingerprint(usr) - if(inoperable()) - return - if(active) - return - add_fingerprint(user) - - use_power(5) - - active = 1 - icon_state = "launcheract" - - for(var/obj/structure/machinery/door/poddoor/M in machines) - if(M.id == src.id) - INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, open)) - - sleep(20) - - for(var/obj/structure/machinery/mass_driver/M in machines) - if(M.id == src.id) - M.drive() - - sleep(50) - - for(var/obj/structure/machinery/door/poddoor/M in machines) - if(M.id == src.id) - INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, close)) - - icon_state = "launcherbtt" - active = 0 - - return - // Controls elevator railings /obj/structure/machinery/door_control/railings name = "railing controls" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index dc28cdca6f5c..b7257ff4e7d3 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -550,13 +550,13 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( add_fingerprint(usr) update_icon() -/obj/structure/machinery/door/airlock/attackby(obj/item/C, mob/user) - if(SEND_SIGNAL(C, COMSIG_ITEM_ATTACK_AIRLOCK, src, user) & COMPONENT_CANCEL_AIRLOCK_ATTACK) +/obj/structure/machinery/door/airlock/attackby(obj/item/attacking_item, mob/user) + if(SEND_SIGNAL(attacking_item, COMSIG_ITEM_ATTACK_AIRLOCK, src, user) & COMPONENT_CANCEL_AIRLOCK_ATTACK) return - if(istype(C, /obj/item/clothing/mask/cigarette)) + if(istype(attacking_item, /obj/item/clothing/mask/cigarette)) if(isElectrified()) - var/obj/item/clothing/mask/cigarette/L = C + var/obj/item/clothing/mask/cigarette/L = attacking_item L.light(SPAN_NOTICE("[user] lights their [L] on an electrical arc from the [src]")) return @@ -567,7 +567,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( add_fingerprint(user) - if(istype(C, /obj/item/weapon/zombie_claws) && (welded || locked)) + if(istype(attacking_item, /obj/item/weapon/zombie_claws) && (welded || locked)) user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on the [src]!"), \ SPAN_NOTICE("You start prying your hand into the gaps of the door with your fingers... This will take about 30 seconds."), \ SPAN_NOTICE("You hear tearing noises!")) @@ -584,8 +584,8 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( return - if((iswelder(C) && !operating && density)) - var/obj/item/tool/weldingtool/W = C + if((iswelder(attacking_item) && !operating && density)) + var/obj/item/tool/weldingtool/W = attacking_item var/weldtime = 50 if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) weldtime = 70 @@ -609,7 +609,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() return - else if(HAS_TRAIT(C, TRAIT_TOOL_SCREWDRIVER)) + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER)) if(no_panel) to_chat(user, SPAN_WARNING("\The [src] has no panel to open!")) return @@ -619,17 +619,17 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() return - else if(HAS_TRAIT(C, TRAIT_TOOL_WIRECUTTERS)) + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_WIRECUTTERS)) return attack_hand(user) - else if(HAS_TRAIT(C, TRAIT_TOOL_MULTITOOL)) + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_MULTITOOL)) return attack_hand(user) - else if(isgun(C)) - var/obj/item/weapon/gun/G = C - for(var/slot in G.attachments) - if(istype(G.attachments[slot], /obj/item/attachable/bayonet)) - var/obj/item/attachable/bayonet/a_bayonet = G.attachments[slot] + else if(isgun(attacking_item)) + var/obj/item/weapon/gun/gun_item = attacking_item + for(var/slot in gun_item.attachments) + if(istype(gun_item.attachments[slot], /obj/item/attachable/bayonet)) + var/obj/item/attachable/bayonet/a_bayonet = gun_item.attachments[slot] if(arePowerSystemsOn()) to_chat(user, SPAN_WARNING("The airlock's motors resist your efforts to force it.")) else if(locked) @@ -647,50 +647,48 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( if(do_after(user, a_bayonet.pry_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) close(1) - else if(C.pry_capable) - if(C.pry_capable == IS_PRY_CAPABLE_CROWBAR && panel_open && welded) + else if(attacking_item.pry_capable) + if(attacking_item.pry_capable == IS_PRY_CAPABLE_CROWBAR && panel_open && welded) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You don't seem to know how to deconstruct machines.")) return - if(width > 1) - to_chat(user, SPAN_WARNING("Large doors seem impossible to disassemble.")) - return playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) user.visible_message("[user] starts removing the electronics from the airlock assembly.", "You start removing electronics from the airlock assembly.") if(do_after(user, 40, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) to_chat(user, SPAN_NOTICE(" You removed the airlock electronics!")) - var/obj/structure/airlock_assembly/da = new assembly_type(loc) - if(istype(da, /obj/structure/airlock_assembly/multi_tile)) - da.setDir(dir) + var/obj/structure/airlock_assembly/doors_assembly = new assembly_type(loc) + if(istype(doors_assembly, /obj/structure/airlock_assembly/multi_tile)) + doors_assembly.setDir(dir) + doors_assembly.update_collision_box() - da.anchored = TRUE + doors_assembly.anchored = TRUE if(mineral) - da.glass = mineral + doors_assembly.glass = mineral //else if(glass) - else if(glass && !da.glass) - da.glass = 1 - da.state = 0 - da.created_name = name - da.update_icon() + else if(glass && !doors_assembly.glass) + doors_assembly.glass = TRUE + doors_assembly.state = 0 + doors_assembly.created_name = name + doors_assembly.update_icon() - var/obj/item/circuitboard/airlock/ae + var/obj/item/circuitboard/airlock/airlock_electronics if(!electronics) - ae = new/obj/item/circuitboard/airlock( loc ) + airlock_electronics = new/obj/item/circuitboard/airlock(loc) if(!req_access || !req_one_access) check_access() if(req_access.len) - ae.conf_access = req_access + airlock_electronics.conf_access = req_access else if(req_one_access.len) - ae.conf_access = req_one_access - ae.one_access = 1 + airlock_electronics.conf_access = req_one_access + airlock_electronics.one_access = TRUE else - ae = electronics + airlock_electronics = electronics electronics = null - ae.forceMove(loc) + airlock_electronics.forceMove(loc) if(operating == -1) - ae.fried = TRUE - ae.update_icon() + airlock_electronics.fried = TRUE + airlock_electronics.update_icon() operating = 0 msg_admin_niche("[key_name(user)] deconstructed [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z])") @@ -698,7 +696,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( deconstruct() return - else if(arePowerSystemsOn() && C.pry_capable != IS_PRY_CAPABLE_FORCE) + else if(arePowerSystemsOn() && attacking_item.pry_capable != IS_PRY_CAPABLE_FORCE) to_chat(user, SPAN_WARNING("The airlock's motors resist your efforts to force it.")) else if(locked) @@ -707,7 +705,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( else if(welded) to_chat(user, SPAN_WARNING("The airlock is welded shut.")) - else if(C.pry_capable == IS_PRY_CAPABLE_FORCE) + else if(attacking_item.pry_capable == IS_PRY_CAPABLE_FORCE) return FALSE //handled by the item's afterattack else if(!operating) @@ -719,7 +717,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( return TRUE //no afterattack call - if(istype(C, /obj/item/large_shrapnel)) + if(istype(attacking_item, /obj/item/large_shrapnel)) return FALSE //trigger afterattack call else return ..() diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 6123d56b8f23..65ecd67a438e 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -2,19 +2,25 @@ /obj/structure/machinery/door/airlock/multi_tile width = 2 damage_cap = 650 // Bigger = more endurable + assembly_type = /obj/structure/airlock_assembly/multi_tile /obj/structure/machinery/door/airlock/multi_tile/close() //Nasty as hell O(n^2) code but unfortunately necessary - for(var/turf/T in locs) - for(var/obj/vehicle/multitile/M in T) - if(M) return 0 + for(var/turf/turf_tile in locs) + for(var/obj/vehicle/multitile/vehicle_tile in turf_tile) + if(vehicle_tile) return 0 return ..() +/obj/structure/machinery/door/airlock/multi_tile/Initialize() + . = ..() + handle_multidoor() + update_icon() + /obj/structure/machinery/door/airlock/multi_tile/glass name = "Glass Airlock" icon = 'icons/obj/structures/doors/Door2x1glass.dmi' opacity = FALSE - glass = 1 + glass = TRUE assembly_type = /obj/structure/airlock_assembly/multi_tile /obj/structure/machinery/door/airlock/multi_tile/glass/colony @@ -25,7 +31,7 @@ name = "Security Airlock" icon = 'icons/obj/structures/doors/Door2x1security.dmi' opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/security/colony req_access = null @@ -35,7 +41,7 @@ name = "Command Airlock" icon = 'icons/obj/structures/doors/Door2x1command.dmi' opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/command/colony req_access = null @@ -45,7 +51,7 @@ name = "Medical Airlock" icon = 'icons/obj/structures/doors/Door2x1medbay.dmi' opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/medical/colony req_access = null @@ -55,7 +61,7 @@ name = "Engineering Airlock" icon = 'icons/obj/structures/doors/Door2x1engine.dmi' opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/engineering/colony req_access = null @@ -65,7 +71,7 @@ name = "Research Airlock" icon = 'icons/obj/structures/doors/Door2x1research.dmi' opacity = FALSE - glass = 1 + glass = TRUE req_one_access = list(ACCESS_MARINE_RESEARCH, ACCESS_WY_RESEARCH, ACCESS_WY_EXEC) /obj/structure/machinery/door/airlock/multi_tile/research/colony @@ -103,7 +109,7 @@ name = "Secure Airlock" icon = 'icons/obj/structures/doors/Door2x1_secure2_glass.dmi' opacity = FALSE - glass = 1 + glass = TRUE openspeed = 31 req_access = null @@ -141,10 +147,10 @@ . = ..() relativewall_neighbours() -/obj/structure/machinery/door/airlock/multi_tile/almayer/take_damage(dam, mob/M) - var/damage_check = max(0, damage + dam) - if(damage_check >= damage_cap && M && is_mainship_level(z)) - SSclues.create_print(get_turf(M), M, "The fingerprint contains bits of wire and metal specks.") +/obj/structure/machinery/door/airlock/multi_tile/almayer/take_damage(taken_damage, mob/damaging_mob) + var/damage_check = max(0, damage + taken_damage) + if(damage_check >= damage_cap && damaging_mob && is_mainship_level(z)) + SSclues.create_print(get_turf(damaging_mob), damaging_mob, "The fingerprint contains bits of wire and metal specks.") ..() /obj/structure/machinery/door/airlock/multi_tile/almayer/generic @@ -156,6 +162,11 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname autoname = TRUE +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/solid + icon = 'icons/obj/structures/doors/2x1generic_solid.dmi' + opacity = TRUE + glass = FALSE + /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor name = "\improper Medical Airlock" icon = 'icons/obj/structures/doors/2x1medidoor.dmi' @@ -223,15 +234,10 @@ req_one_access = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL) /obj/structure/machinery/door/airlock/multi_tile/almayer/handle_multidoor() + . = ..() if(!(width > 1)) return //Bubblewrap update_filler_turfs() - if(dir in list(NORTH, SOUTH)) - bound_height = world.icon_size * width - bound_width = world.icon_size - else if(dir in list(EAST, WEST)) - bound_width = world.icon_size * width - bound_height = world.icon_size //We have to find these again since these doors are used on shuttles a lot so the turfs changes /obj/structure/machinery/door/airlock/multi_tile/almayer/proc/update_filler_turfs() @@ -427,7 +433,7 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/access icon = 'icons/obj/structures/doors/4x1_elevator_access.dmi' opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/elevator/access/research name = "\improper Research Elevator Hatch" @@ -547,7 +553,7 @@ icon = 'icons/obj/structures/doors/prepdoor.dmi' req_one_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_CARGO, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) opacity = FALSE - glass = 1 + glass = TRUE /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo name = "\improper Alpha-Bravo Squads Preparations" diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index ff26ce802b08..7bbc86681eb1 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -324,22 +324,22 @@ var/list/alldepartments = list() switch(target_department) if(DEPARTMENT_HC) - GLOB.USCMFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.USCMFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " if(DEPARTMENT_PROVOST) - GLOB.ProvostFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.ProvostFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " if(DEPARTMENT_CMB) - GLOB.CMBFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.CMBFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " if(DEPARTMENT_WY) - GLOB.WYFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.WYFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " if(DEPARTMENT_PRESS) - GLOB.PressFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.PressFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " else - GLOB.GeneralFaxes.Add("\[view message at [world.timeofday]\] REPLY") + GLOB.GeneralFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... view message") diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm index 4158727e3745..8e3097ef52d1 100644 --- a/code/game/machinery/fusion_engine.dm +++ b/code/game/machinery/fusion_engine.dm @@ -15,6 +15,7 @@ unacidable = TRUE //NOPE.jpg anchored = TRUE density = TRUE + power_machine = TRUE var/power_gen_percent = 0 //50,000W at full capacity var/buildstate = 0 //What state of building it are we on, 0-3, 1 is "broken", the default @@ -24,7 +25,8 @@ var/obj/item/fuelCell/fusion_cell = new //Starts with a fuel cell loaded in. Maybe replace with the plasma tanks in the future and have it consume plasma? Possibly remove this later if it's irrelevent... var/fuel_rate = 0 //Rate at which fuel is used. Based mostly on how long the generator has been running. - power_machine = TRUE + /// If the generator is overloaded. Only possible during hijack once fuel is at 100%. + var/overloaded = FALSE /obj/structure/machinery/power/fusion_engine/Initialize(mapload, ...) . = ..() @@ -35,11 +37,25 @@ /obj/structure/machinery/power/fusion_engine/Destroy() QDEL_NULL(fusion_cell) - . = ..() + return ..() +/obj/structure/machinery/power/fusion_engine/attack_alien(mob/living/carbon/xenomorph/xeno) + if(!overloaded) + to_chat(xeno, SPAN_WARNING("You see no reason to attack [src].")) + return XENO_NO_DELAY_ACTION + + xeno.animation_attack_on(src) + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src], stopping its overload process!"), \ + SPAN_DANGER("You [xeno.slash_verb] [src], stopping its overload process!"), null, 5, CHAT_TYPE_XENO_COMBAT) + set_overloading(FALSE) + return XENO_ATTACK_ACTION /obj/structure/machinery/power/fusion_engine/power_change() - return + . = ..() + if(overloaded) + set_overloading(FALSE) + visible_message("[icon2html(src, viewers(src))] [src]'s overload suddenly ceases as primary power is lost.") /obj/structure/machinery/power/fusion_engine/process() if(!is_on || buildstate || !anchored || !powernet || !fusion_cell) //Default logic checking @@ -60,9 +76,18 @@ stop_processing() return FALSE - if(!check_failure()) + if(overloaded && prob(1)) // up to 18 generators at 1% every 3.5 seconds means that every ~21 seconds or so, one generator will make noise assuming all are overloaded + switch(rand(1, 2)) + if(1) + visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("[src] loudly hums.")]") + playsound(src, 'sound/machines/resource_node/node_idle.ogg', 60, TRUE) + if(2) + visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("[src] makes a worrying hiss.")]") + playsound(src, 'sound/machines/hiss.ogg', 60, TRUE) - if(power_gen_percent < 100) power_gen_percent++ + if(!check_failure()) + if(power_gen_percent < 100) + power_gen_percent++ switch(power_gen_percent) //Flavor text! if(10) @@ -96,6 +121,10 @@ to_chat(user, SPAN_NOTICE("Use a wrench to repair it.")) return FALSE if(is_on) + if(overloaded) + to_chat(user, SPAN_WARNING("You can't shut off [src] while it's overloaded!")) + return + visible_message("[icon2html(src, viewers(src))] [SPAN_WARNING("[src] beeps softly and the humming stops as [usr] shuts off the generator.")]") is_on = 0 power_gen_percent = 0 @@ -208,11 +237,18 @@ if(buildstate) to_chat(user, SPAN_WARNING("You must repair the generator before working with its fuel cell.")) return + + if(overloaded) + to_chat(user, SPAN_WARNING("You must restore the safeties on the generator before working with its fuel cell.")) + return + if(is_on) to_chat(user, SPAN_WARNING("You must turn off the generator before working with its fuel cell.")) return + if(!fusion_cell) to_chat(user, SPAN_WARNING("There is no cell to remove.")) + else if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) user.visible_message(SPAN_WARNING("[user] fumbles around figuring out [src]'s fuel receptacle."), @@ -232,23 +268,73 @@ fusion_cell = null update_icon() return TRUE + + else if(HAS_TRAIT(O, TRAIT_TOOL_MULTITOOL)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + to_chat(user, SPAN_WARNING("You have no idea what to do with [src].")) + return + + if(!overloaded) + if(!SShijack.sd_unlocked) + to_chat(user, SPAN_WARNING("You consider overloading [src]'s safeties, but you decide against it.")) + return + + if(inoperable()) + to_chat(user, SPAN_WARNING("[src] needs to be working and have external power in order to overload it!")) + return + + to_chat(user, SPAN_WARNING("You start overloading the safeties on [src]...")) + if(!do_after(user, 1.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + return + + if(inoperable()) + return + + to_chat(user, SPAN_WARNING("You finish overloading the safeties on [src].")) + set_overloading(TRUE) + log_game("[key_name(user)] has overloaded a generator.") + + else + to_chat(user, SPAN_WARNING("You start restoring the safeties on [src]...")) + if(!do_after(user, 1.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + return + + if(inoperable()) + return + + to_chat(user, SPAN_WARNING("You finish restoring the safeties on [src].")) + log_game("[key_name(user)] has restored the safeties of a generator.") + set_overloading(FALSE) + + return TRUE + else return ..() /obj/structure/machinery/power/fusion_engine/get_examine_text(mob/user) . = ..() - if(ishuman(user)) + if(isxeno(user)) + if(overloaded) + . += SPAN_INFO("You could attack this to stop the overload process.") + + else if(ishuman(user)) if(buildstate) . += SPAN_INFO("It's broken.") switch(buildstate) if(1) - . += SPAN_INFO("Use a blowtorch, then wirecutters, then wrench to repair it.") + . += SPAN_INFO("Use a blowtorch, then wirecutters, then wrench to repair it.") if(2) - . += SPAN_INFO("Use a wirecutters, then wrench to repair it.") + . += SPAN_INFO("Use a wirecutters, then wrench to repair it.") if(3) - . += SPAN_INFO("Use a wrench to repair it.") + . += SPAN_INFO("Use a wrench to repair it.") return FALSE + if(SShijack.sd_unlocked && skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!overloaded) + . += SPAN_INFO("You could overload this with a multitool.") + else + . += SPAN_INFO("You could restore its safeties with a multitool.") + if(!is_on) . += SPAN_INFO("It looks offline.") else @@ -274,18 +360,21 @@ switch(buildstate) if(0) if(fusion_cell) - var/pstatus = is_on ? "on" : "off" - switch(fusion_cell.get_fuel_percent()) - if(0 to 10) - icon_state = "[pstatus]-10" - if(10 to 25) - icon_state = "[pstatus]-25" - if(25 to 50) - icon_state = "[pstatus]-50" - if(50 to 75) - icon_state = "[pstatus]-75" - if(75 to INFINITY) - icon_state = "[pstatus]-100" + if(overloaded) + icon_state = "overloaded" + else + var/pstatus = is_on ? "on" : "off" + switch(fusion_cell.get_fuel_percent()) + if(0 to 10) + icon_state = "[pstatus]-10" + if(10 to 25) + icon_state = "[pstatus]-25" + if(25 to 50) + icon_state = "[pstatus]-50" + if(50 to 75) + icon_state = "[pstatus]-75" + if(75 to INFINITY) + icon_state = "[pstatus]-100" else icon_state = "off" @@ -317,9 +406,13 @@ else return 0 +/obj/structure/machinery/power/fusion_engine/proc/set_overloading(new_overloading) + if(overloaded == new_overloading) + return - - + overloaded = new_overloading + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GENERATOR_SET_OVERLOADING, overloaded) + update_icon() diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index f52350aa8db3..903cd06c3119 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -23,7 +23,7 @@ var/icon_on = "smartfridge" var/icon_off = "smartfridge-off" var/icon_panel = "smartfridge-panel" - var/item_quants = list() + var/list/item_quants = list() //! Assoc list of names -> list(items) var/ispowered = TRUE //starts powered var/is_secure_fridge = FALSE var/shoot_inventory = FALSE @@ -40,6 +40,24 @@ GLOB.vending_products[/obj/item/reagent_container/glass/bottle] = 1 GLOB.vending_products[/obj/item/storage/pill_bottle] = 1 +/obj/structure/machinery/smartfridge/Destroy(force) + if(is_in_network()) // Delete all contents from networked storage index + for(var/atom/movable/item as anything in contents) + delete_contents(item) + item_quants.Cut() + return ..() // parent will delete contents if we're not networked + +/// Deletes given object in contents of the smartfridge +/obj/structure/machinery/smartfridge/proc/delete_contents(obj/item/item) + if(item.loc != src) + return + contents -= item + if(item_quants[item.name]) + item_quants[item.name] -= item + if(is_in_network() && chemical_data.shared_item_storage[item.name]) + chemical_data.shared_item_storage[item.name] -= item + qdel(item) + /obj/structure/machinery/smartfridge/proc/accept_check(obj/item/O as obj) if(istype(O,/obj/item/reagent_container/food/snacks/grown/) || istype(O,/obj/item/seeds/)) return 1 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index f4ad7a63ba77..4ce295aa9965 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -105,7 +105,7 @@ Class Procs: var/list/component_parts //list of all the parts used to build it, if made from certain kinds of frames. var/manual = 0 layer = OBJ_LAYER - var/machine_processing = 0 // whether the machine is busy and requires process() calls in scheduler. + var/machine_processing = 0 // whether the machine is busy and requires process() calls in scheduler. // Please replace this by DF_ISPROCESSING in another refactor --fira throwpass = 1 projectile_coverage = PROJECTILE_COVERAGE_MEDIUM var/power_machine = FALSE //Whether the machine should process on power, or normal processor diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm deleted file mode 100644 index 591cec1f5baa..000000000000 --- a/code/game/machinery/magnet.dm +++ /dev/null @@ -1,421 +0,0 @@ -// Magnetic attractor, creates variable magnetic fields and attraction. -// Can also be used to emit electron/proton beams to create a center of magnetism on another tile - -// tl;dr: it's magnets lol -// This was created for firing ranges, but I suppose this could have other applications - Doohl - -/obj/structure/machinery/magnetic_module - - icon = 'icons/obj/objects.dmi' - icon_state = "floor_magnet-f" - name = "Electromagnetic Generator" - desc = "A device that uses station power to create points of magnetic energy." - level = 1 // underfloor - layer = UNDERFLOOR_OBJ_LAYER - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 50 - - var/freq = 1449 // radio frequency - var/electricity_level = 1 // intensity of the magnetic pull - var/magnetic_field = 1 // the range of magnetic attraction - var/code = 0 // frequency code, they should be different unless you have a group of magnets working together or something - var/turf/center // the center of magnetic attraction - var/on = 0 - var/pulling = 0 - - // x, y modifiers to the center turf; (0, 0) is centered on the magnet, whereas (1, -1) is one tile right, one tile down - var/center_x = 0 - var/center_y = 0 - var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer - -/obj/structure/machinery/magnetic_module/Initialize(mapload, ...) - . = ..() - - var/turf/T = loc - hide(T.intact_tile) - center = T - - SSradio.add_object(src, freq, RADIO_MAGNETS) - - INVOKE_ASYNC(src, PROC_REF(magnetic_process)) - -/obj/structure/machinery/magnetic_module/Destroy() - center = null - SSradio.remove_object(src, freq) - . = ..() - - - // update the invisibility and icon -/obj/structure/machinery/magnetic_module/hide(intact) - invisibility = intact ? 101 : 0 - updateicon() - - // update the icon_state -/obj/structure/machinery/magnetic_module/proc/updateicon() - var/state="floor_magnet" - var/onstate="" - if(!on) - onstate="0" - - if(invisibility) - icon_state = "[state][onstate]-f" // if invisible, set icon to faded version - // in case of being revealed by T-scanner - else - icon_state = "[state][onstate]" - -/obj/structure/machinery/magnetic_module/receive_signal(datum/signal/signal) - - var/command = signal.data["command"] - var/modifier = signal.data["modifier"] - var/signal_code = signal.data["code"] - if(command && (signal_code == code)) - - Cmd(command, modifier) - - - -/obj/structure/machinery/magnetic_module/proc/Cmd(command, modifier) - - if(command) - switch(command) - if("set-electriclevel") - if(modifier) electricity_level = modifier - if("set-magneticfield") - if(modifier) magnetic_field = modifier - - if("add-elec") - electricity_level++ - if(electricity_level > 12) - electricity_level = 12 - if("sub-elec") - electricity_level-- - if(electricity_level <= 0) - electricity_level = 1 - if("add-mag") - magnetic_field++ - if(magnetic_field > 4) - magnetic_field = 4 - if("sub-mag") - magnetic_field-- - if(magnetic_field <= 0) - magnetic_field = 1 - - if("set-x") - if(modifier) center_x = modifier - if("set-y") - if(modifier) center_y = modifier - - if("N") // NORTH - center_y++ - if("S") // SOUTH - center_y-- - if("E") // EAST - center_x++ - if("W") // WEST - center_x-- - if("C") // CENTER - center_x = 0 - center_y = 0 - if("R") // RANDOM - center_x = rand(-max_dist, max_dist) - center_y = rand(-max_dist, max_dist) - - if("set-code") - if(modifier) code = modifier - if("toggle-power") - on = !on - - if(on) - INVOKE_ASYNC(src, PROC_REF(magnetic_process)) - - -/obj/structure/machinery/magnetic_module/process() - if(stat & NOPOWER) - on = 0 - - // Sanity checks: - if(electricity_level <= 0) - electricity_level = 1 - if(magnetic_field <= 0) - magnetic_field = 1 - - - // Limitations: - if(abs(center_x) > max_dist) - center_x = max_dist - if(abs(center_y) > max_dist) - center_y = max_dist - if(magnetic_field > 4) - magnetic_field = 4 - if(electricity_level > 12) - electricity_level = 12 - - // Update power usage: - if(on) - use_power = USE_POWER_ACTIVE - active_power_usage = electricity_level*15 - else - use_power = USE_POWER_NONE - - - // Overload conditions: - /* // Eeeehhh kinda stupid - if(on) - if(electricity_level > 11) - if(prob(electricity_level)) - explosion(loc, 0, 1, 2, 3) // ooo dat shit EXPLODES son - spawn(2) - qdel(src) - */ - - updateicon() - - -/obj/structure/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the pulling - if(pulling) return - while(on) - - pulling = 1 - center = locate(x+center_x, y+center_y, z) - if(center) - for(var/obj/M in orange(magnetic_field, center)) - if(!M.anchored && (M.flags_atom & CONDUCT)) - step_towards(M, center) - - for(var/mob/living/silicon/S in orange(magnetic_field, center)) - if(isAI(S)) continue - step_towards(S, center) - - use_power(electricity_level * 5) - sleep(13 - electricity_level) - - pulling = 0 - -/obj/structure/machinery/magnetic_controller - name = "Magnetic Control Console" - icon = 'icons/obj/structures/machinery/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING! - icon_state = "airlock_control_standby" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 45 - var/frequency = 1449 - var/code = 0 - var/list/magnets = list() - var/title = "Magnetic Control Console" - var/autolink = 0 // if set to 1, can't probe for other magnets! - - var/pathpos = 1 // position in the path - var/path = "NULL" // text path of the magnet - var/speed = 1 // lowest = 1, highest = 10 - var/list/rpath = list() // real path of the magnet, used in iterator - - var/moving = 0 // 1 if scheduled to loop - var/looping = 0 // 1 if looping - - var/datum/radio_frequency/radio_connection - -/obj/structure/machinery/magnetic_controller/Initialize(mapload, ...) - . = ..() - if(autolink) - for(var/obj/structure/machinery/magnetic_module/M in machines) - if(M.freq == frequency && M.code == code) - magnets.Add(M) - - SSradio.add_object(src, frequency, RADIO_MAGNETS) - - if(path) // check for default path - filter_path() // renders rpath - -/obj/structure/machinery/magnetic_controller/Destroy() - QDEL_NULL_LIST(magnets) - SSradio.remove_object(src, frequency) - . = ..() - - -/obj/structure/machinery/magnetic_controller/process() - if(magnets.len == 0 && autolink) - for(var/obj/structure/machinery/magnetic_module/M in machines) - if(M.freq == frequency && M.code == code) - magnets.Add(M) - -/obj/structure/machinery/magnetic_controller/attack_remote(mob/user as mob) - return src.attack_hand(user) - -/obj/structure/machinery/magnetic_controller/attack_hand(mob/user as mob) - if(inoperable()) - return - user.set_interaction(src) - var/dat = "Magnetic Control Console

" - if(!autolink) - dat += {" - Frequency: [frequency]
- Code: [code]
- Probe Generators
- "} - - if(magnets.len >= 1) - - dat += "Magnets confirmed:
" - var/i = 0 - for(var/obj/structure/machinery/magnetic_module/M in magnets) - i++ - dat += "     < \[[i]\] ([M.on ? "On":"Off"])|Electricity level: - [M.electricity_level] +; Magnetic field: - [M.magnetic_field] +
" - - dat += "
Speed: - [speed] +
" - dat += "Path: {[path]}
" - dat += "Moving: [moving ? "Enabled":"Disabled"]" - - - show_browser(user, dat, name, "magnet", "size=400x500") - -/obj/structure/machinery/magnetic_controller/Topic(href, href_list) - . = ..() - if(.) - return - if(inoperable()) - return - usr.set_interaction(src) - src.add_fingerprint(usr) - - if(href_list["radio-op"]) - - // Prepare signal beforehand, because this is a radio operation - var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission - signal.source = src - signal.frequency = frequency - signal.data["code"] = code - - // Apply any necessary commands - switch(href_list["radio-op"]) - if("togglepower") - signal.data["command"] = "toggle-power" - - if("minuselec") - signal.data["command"] = "sub-elec" - if("pluselec") - signal.data["command"] = "add-elec" - - if("minusmag") - signal.data["command"] = "sub-mag" - if("plusmag") - signal.data["command"] = "add-mag" - - - // Broadcast the signal - - radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) - - addtimer(CALLBACK(src, PROC_REF(updateUsrDialog)), 1) - - if(href_list["operation"]) - switch(href_list["operation"]) - if("plusspeed") - speed ++ - if(speed > 10) - speed = 10 - if("minusspeed") - speed -- - if(speed <= 0) - speed = 1 - if("setpath") - var/newpath = copytext(sanitize(input(usr, "Please define a new path!",,path) as text|null),1,MAX_MESSAGE_LEN) - if(newpath && newpath != "") - moving = 0 // stop moving - path = newpath - pathpos = 1 // reset position - filter_path() // renders rpath - - if("togglemoving") - moving = !moving - if(moving) - INVOKE_ASYNC(src, PROC_REF(MagnetMove)) - - - updateUsrDialog() - -/obj/structure/machinery/magnetic_controller/proc/MagnetMove() - if(looping) return - - while(moving && rpath.len >= 1) - - if(inoperable()) - break - - looping = 1 - - // Prepare the radio signal - var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission - signal.source = src - signal.frequency = frequency - signal.data["code"] = code - - if(pathpos > rpath.len) // if the position is greater than the length, we just loop through the list! - pathpos = 1 - - var/nextmove = uppertext(rpath[pathpos]) // makes it un-case-sensitive - - if(!(nextmove in list("N","S","E","W","C","R"))) - // N, S, E, W are directional - // C is center - // R is random (in magnetic field's bounds) - qdel(signal) - break // break the loop if the character located is invalid - - signal.data["command"] = nextmove - - - pathpos++ // increase iterator - - // Broadcast the signal - spawn() - radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) - - if(speed == 10) - sleep(1) - else - sleep(12-speed) - - looping = 0 - - -/obj/structure/machinery/magnetic_controller/proc/filter_path() - // Generates the rpath variable using the path string, think of this as "string2list" - // Doesn't use params2list() because of the akward way it stacks entities - rpath = list() // clear rpath - var/maximum_character = min( 50, length(path) ) // chooses the maximum length of the iterator. 50 max length - - for(var/i=1, i<=maximum_character, i++) // iterates through all characters in path - - var/nextchar = copytext(path, i, i+1) // find next character - - if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore - rpath += copytext(path, i, i+1) // else, add to list - - // there doesn't HAVE to be separators but it makes paths syntatically visible - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index d1e2fecce20f..f1b0081e3a39 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -1,5 +1,4 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - +// Legacy SS13 machinery turned into a prop /obj/structure/machinery/mass_driver name = "mass driver" desc = "Shoots things into space." @@ -9,32 +8,3 @@ use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 50 - - var/power = 1 - var/code = 1 - var/id = 1 - var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. - - -/obj/structure/machinery/mass_driver/proc/drive(amount) - if(inoperable()) - return - use_power(500) - var/O_limit - var/atom/target = get_edge_target_turf(src, dir) - for(var/atom/movable/O in loc) - if(!O.anchored) - if(O_limit >= 20) - for(var/mob/M in hearers(src, null)) - to_chat(M, SPAN_NOTICE(" The mass driver lets out a screech, it mustn't be able to handle any more items.")) - break - use_power(500) - INVOKE_ASYNC(O, TYPE_PROC_REF(/atom/movable, throw_atom), target, drive_range * power, 100/power) - flick("mass_driver1", src) - return - -/obj/structure/machinery/mass_driver/emp_act(severity) - if(inoperable()) - return - drive() - ..(severity) diff --git a/code/game/machinery/medical_pod/bodyscanner.dm b/code/game/machinery/medical_pod/bodyscanner.dm index 4756121e50ae..fdcd0ceb62e6 100644 --- a/code/game/machinery/medical_pod/bodyscanner.dm +++ b/code/game/machinery/medical_pod/bodyscanner.dm @@ -62,8 +62,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return #ifdef OBJECTS_PROXY_SPEECH // Transfers speech to occupant @@ -124,8 +122,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/structure/machinery/body_scanconsole/power_change() ..() diff --git a/code/game/machinery/medical_pod/sleeper.dm b/code/game/machinery/medical_pod/sleeper.dm index 805fedb29257..35d9a44863d2 100644 --- a/code/game/machinery/medical_pod/sleeper.dm +++ b/code/game/machinery/medical_pod/sleeper.dm @@ -385,7 +385,6 @@ t1 = "Unconscious" if(2) t1 = "*dead*" - else to_chat(user, "[]\t Health %: [] ([])", (occupant.health > 50 ? SPAN_NOTICE("") : SPAN_DANGER("")), occupant.health, t1) to_chat(user, "[]\t -Core Temperature: []°C ([]°F)
", (occupant.bodytemperature > 50 ? "" : ""), occupant.bodytemperature-T0C, occupant.bodytemperature*1.8-459.67) to_chat(user, "[]\t -Brute Damage %: []", (occupant.getBruteLoss() < 60 ? SPAN_NOTICE("") : SPAN_DANGER("")), occupant.getBruteLoss()) diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm index 743f53e4f03b..28ebbecc7552 100644 --- a/code/game/machinery/nuclearbomb.dm +++ b/code/game/machinery/nuclearbomb.dm @@ -394,7 +394,38 @@ var/bomb_set = FALSE update_icon() safety = TRUE - EvacuationAuthority.trigger_self_destruct(list(z), src, FALSE, NUKE_EXPLOSION_GROUND_FINISHED, FALSE, end_round) + playsound(src, 'sound/machines/Alarm.ogg', 75, 0, 30) + world << pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + + var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s). + var/list/dead_mobs = list() //Everyone who only needs to see the cinematic. + for(var/mob/current_mob as anything in GLOB.mob_list) + if(!current_mob?.loc) + continue + if(current_mob.stat == DEAD) + dead_mobs |= current_mob + continue + var/turf/current_turf = get_turf(current_mob) + if(z == current_turf.z) + alive_mobs |= current_mob + shake_camera(current_mob, 110, 4) + + for(var/mob/current_mob in alive_mobs) + if(current_mob && current_mob.loc) + var/turf/current_mob_turf = get_turf(current_mob) + if(z == current_mob_turf.z) + if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge)) + continue + current_mob.death(create_cause_data("nuclear explosion")) + + for(var/mob/current_mob in (alive_mobs + dead_mobs)) + if(current_mob && current_mob.loc) + var/turf/current_mob_turf = get_turf(current_mob) + if(z == current_mob_turf.z) + if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge)) + continue + for(var/obj/item/alien_embryo/embryo in current_mob) + qdel(embryo) sleep(100) cell_explosion(loc, 500, 150, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name))) diff --git a/code/game/machinery/sentry_holder.dm b/code/game/machinery/sentry_holder.dm index 61f87251282d..fe676e9103d2 100644 --- a/code/game/machinery/sentry_holder.dm +++ b/code/game/machinery/sentry_holder.dm @@ -10,13 +10,12 @@ idle_power_usage = 1000 power_channel = 1 use_power = USE_POWER_IDLE - machine_processing = 1 var/deployment_cooldown var/turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable // Path of the turret used var/obj/structure/machinery/defenses/sentry/premade/deployable/deployed_turret var/ox = 0 var/oy = 0 - var/ind = FALSE + var/require_red_alert = FALSE /obj/structure/machinery/sentry_holder/Initialize() . = ..() @@ -36,34 +35,38 @@ . += "It's offline." /obj/structure/machinery/sentry_holder/attack_hand(mob/user) - if(deployed_turret) - if(deployment_cooldown > world.time) - to_chat(user, SPAN_WARNING("[src] is busy.")) - return //prevents spamming deployment/undeployment - if(deployed_turret.loc == src) //not deployed - if(stat & NOPOWER) - to_chat(user, SPAN_WARNING("[src] is non-functional.")) - else - to_chat(user, SPAN_NOTICE("You deploy [src].")) - deploy_sentry() - else - to_chat(user, SPAN_NOTICE("You retract [src].")) - undeploy_sentry() - else + if(!deployed_turret) to_chat(user, SPAN_WARNING("[src] is unresponsive.")) + return -/obj/structure/machinery/sentry_holder/process() - if(stat & NOPOWER) - if(deployed_turret) - undeploy_sentry() - ind = FALSE - else - icon_state = "sentry_system_destroyed" - else - update_use_power(USE_POWER_IDLE) - if(!ind) - deploy_sentry() - ind = TRUE + if(deployment_cooldown > world.time) + to_chat(user, SPAN_WARNING("[src] is busy.")) + return + + if(deployed_turret.loc == src) //not deployed + if(stat & NOPOWER) + to_chat(user, SPAN_WARNING("[src] is non-functional.")) + return + + if(require_red_alert && (seclevel2num(get_security_level()) < SEC_LEVEL_RED)) + to_chat(user, SPAN_WARNING("[src] can only be activated in emergencies.")) + return + + to_chat(user, SPAN_NOTICE("You deploy [src].")) + deploy_sentry() + return + + to_chat(user, SPAN_NOTICE("You retract [src].")) + undeploy_sentry() + return + +/obj/structure/machinery/sentry_holder/update_use_power(new_use_power) + ..() + + if(!(stat & NOPOWER)) + return + + undeploy_sentry() /obj/structure/machinery/sentry_holder/proc/deploy_sentry() if(!deployed_turret) @@ -111,3 +114,6 @@ desc = "A box that deploys a sentry turret for protection of the residents in the area." turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/colony +/obj/structure/machinery/sentry_holder/almayer + turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer + require_red_alert = TRUE diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 6c6d2bda8b07..c56f8da36150 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -78,7 +78,7 @@ return 1 if(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME) //emergency shuttle timer message1 = "EVAC" - message2 = EvacuationAuthority.get_status_panel_eta() + message2 = SShijack.get_evac_eta() if(message2) if(length(message2) > CHARS_PER_LINE) message2 = "Error" update_display(message1, message2) @@ -163,6 +163,15 @@ if(maptext) maptext = "" +/obj/structure/machinery/status_display/proc/set_sec_level_picture() + switch(security_level) + if(SEC_LEVEL_GREEN) + set_picture("default") + if(SEC_LEVEL_BLUE) + set_picture("bluealert") + if(SEC_LEVEL_RED, SEC_LEVEL_DELTA) + set_picture("redalert") + /obj/structure/machinery/ai_status_display icon = 'icons/obj/structures/machinery/status_display.dmi' icon_state = "frame" diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index bf7c4fffee65..c530da73d8e5 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.")) @@ -774,8 +789,8 @@ GLOBAL_LIST_EMPTY(vending_products) desc = "An automated closet hooked up to a colossal storage of standard-issue uniform and armor." icon_state = "clothing" use_points = TRUE + show_points = TRUE vendor_theme = VENDOR_THEME_USCM - show_points = FALSE vend_flags = VEND_CLUTTER_PROTECTION | VEND_UNIFORM_RANKS | VEND_UNIFORM_AUTOEQUIP | VEND_CATEGORY_CHECK /obj/structure/machinery/cm_vending/clothing/ui_static_data(mob/user) diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm index a74dd923cbe7..414ab4a562e1 100644 --- a/code/game/machinery/vending/vending.dm +++ b/code/game/machinery/vending/vending.dm @@ -398,28 +398,25 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending /obj/structure/machinery/vending/proc/GetProductIndex(datum/data/vending_product/product) var/list/plist - switch(product.category) - if(CAT_NORMAL) - plist=product_records - if(CAT_HIDDEN) - plist=hidden_records - if(CAT_COIN) - plist=coin_records - else - warning("UNKNOWN CATEGORY [product.category] IN TYPE [product.product_path] INSIDE [type]!") + if(product.category == CAT_NORMAL) + plist = product_records + else if(product.category == CAT_HIDDEN) + plist = hidden_records + else if(product.category == CAT_COIN) + plist = coin_records + else + warning("UNKNOWN CATEGORY [product.category] IN TYPE [product.product_path] INSIDE [type]!") return plist.Find(product) /obj/structure/machinery/vending/proc/GetProductByID(pid, category) - switch(category) - if(CAT_NORMAL) - return product_records[pid] - if(CAT_HIDDEN) - return hidden_records[pid] - if(CAT_COIN) - return coin_records[pid] - else - warning("UNKNOWN PRODUCT: PID: [pid], CAT: [category] INSIDE [type]!") - return null + if(category == CAT_NORMAL) + return product_records[pid] + else if(category == CAT_HIDDEN) + return hidden_records[pid] + else if(category == CAT_COIN) + return coin_records[pid] + else + warning("UNKNOWN PRODUCT: PID: [pid], CAT: [category] INSIDE [type]!") /obj/structure/machinery/vending/attack_hand(mob/user) if(is_tipped_over) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a61934324491..c109db25b3a9 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/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index 830511ad4b19..d7d49a8ae044 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -1,9 +1,9 @@ //------------GEAR VENDOR--------------- GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list( - list("COMMANDING OFFICER'S PRIMARY (CHOOSE 1)", 0, null, null, null), - list("M46C pulse rifle", 0, /obj/effect/essentials_set/co/riflepreset, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), - list("M56C Smartgun", 0, /obj/item/storage/box/m56c_system, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("COMMANDER'S PRIMARY (CHOOSE 1)", 0, null, null, null), + list("M46C Pulse Rifle", 0, /obj/effect/essentials_set/co/riflepreset, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY), + list("M56C Smartgun", 0, /obj/item/storage/box/m56c_system, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_MANDATORY), list("PRIMARY AMMUNITION", 0, null, null, null), list("M41A MK1 Magazine", 30, /obj/item/ammo_magazine/rifle/m41aMK1, null, VENDOR_ITEM_RECOMMENDED), @@ -28,11 +28,19 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list( list("M41A Rubber Shot Magazine", 10, /obj/item/ammo_magazine/rifle/rubber, null, VENDOR_ITEM_REGULAR), list("Beanbag Slugs", 10, /obj/item/ammo_magazine/shotgun/beanbag, null, VENDOR_ITEM_REGULAR), + list("EXPLOSIVES", 0, null, null, null), + list("HEDP Grenade Pack", 15, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR), + list("HEFA Grenade Pack", 15, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR), + list("WP Grenade Pack", 15, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR), + list("RAIL ATTACHMENTS", 0, null, null, null), list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), list("Reflex Sight", 15, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), list("S4 2x Telescopic Mini-Scope", 15, /obj/item/attachable/scope/mini, null, VENDOR_ITEM_REGULAR), + list("Helmet Visors", 0, null, null, null), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_RECOMMENDED), + list("UNDERBARREL ATTACHMENTS", 0, null, null, null), list("Laser Sight", 15, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), @@ -40,12 +48,13 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list( list("Underbarrel Shotgun", 15, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), list("Underbarrel Extinguisher", 15, /obj/item/attachable/attached_gun/extinguisher, null, VENDOR_ITEM_REGULAR), list("Underbarrel Flamethrower", 15, /obj/item/attachable/attached_gun/flamer, null, VENDOR_ITEM_REGULAR), + list("Underbarrel Grenade Launcher", 5, /obj/item/attachable/attached_gun/grenade, null, VENDOR_ITEM_REGULAR), list("BARREL ATTACHMENTS", 0, null, null, null), - list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Recoil Compensator", 15, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), - )) + list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), + )) /obj/structure/machinery/cm_vending/gear/commanding_officer name = "\improper ColMarTech Commanding Officer Weapon Rack" @@ -63,9 +72,15 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list( GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("COMMANDING OFFICER ESSENTIALS KIT (TAKE ALL)", 0, null, null, null), + list("Commanding Officer Essentials Kit", 0, /obj/effect/essentials_set/commanding_officer, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + + list("BAGS (CHOOSE 1)", 0, null, null, null), + list("Commanding Officer Backpack", 0, /obj/item/storage/backpack/mcommander, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Secure Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Commanding Officer's M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/CO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Commanding Officer's M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/CO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), @@ -84,8 +99,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - list("BELTS (TAKE ALL)", 0, null, null, null), + list("BELTS (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("Military Police Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Medical Storage Rig", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Holster Toolrig", 0, /obj/item/storage/belt/gun/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -110,6 +130,15 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( /obj/structure/machinery/cm_vending/clothing/commanding_officer/get_listed_products(mob/user) return GLOB.cm_vending_clothing_commanding_officer +/obj/effect/essentials_set/commanding_officer + spawned_gear_list = list( + /obj/item/device/binoculars/range/designator, + /obj/item/map/current_map, + /obj/item/device/whistle, + /obj/item/weapon/gun/energy/taser, + /obj/item/device/megaphone, + ) + // This gets around the COs' weapon not spawning without incendiary mag. /obj/effect/essentials_set/co/riflepreset spawned_gear_list = list( diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm index 0da9181beb97..cb6698c6f714 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -56,6 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( list("M3-L Pattern Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), list("M3 Pattern Padded Armor", 0, /obj/item/clothing/suit/storage/marine/padded, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("Bulletproof Vest", 0, /obj/item/clothing/suit/armor/bulletproof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm index 85a8a58d162e..50b83ccdc54f 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -13,13 +13,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Service Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("Operations Uniform", 0, /obj/item/clothing/under/marine/officer/boiler, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED), + list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR), list("JACKET (CHOOSE 1)", 0, null, null, null), list("Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), @@ -33,66 +33,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), - list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("VP78 Pistol", 0, /obj/item/storage/belt/gun/m4a3/vp78, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("VP78 Pistol", 0, /obj/item/storage/belt/gun/m4a3/vp78, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("Radio Telephone Pack", 0, /obj/item/storage/backpack/marine/satchel/rto, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), - list("BELT (CHOOSE 1)", 0, null, null, null), - list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - - list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - - list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), - list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), - list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("OTHER SUPPLIES", 0, null, null, null), list("Binoculars", 5,/obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), list("Rangefinder", 8, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), list("Laser Designator", 12, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_RECOMMENDED), - list("Data Detector", 5, /obj/item/device/motiondetector/intel, null, VENDOR_ITEM_REGULAR), list("Flashlight", 1, /obj/item/device/flashlight, null, VENDOR_ITEM_RECOMMENDED), - list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), - list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED), list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), - list("Machete Scabbard (Full)", 2, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR) )) diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm new file mode 100644 index 000000000000..ac7b22b4e0a0 --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm @@ -0,0 +1,83 @@ +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory + name = "\improper ColMarTech Staff Officer Armory Equipment Rack" + desc = "An automated combat equipment vendor for Staff Officers." + req_access = list(ACCESS_MARINE_COMMAND) + icon_state = "mar_rack" + vendor_role = list(JOB_SO) + +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_staff_officer_armory + +//------------GEAR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list( + list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_COMBAT_ARMOR, VENDOR_ITEM_MANDATORY), + list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_COMBAT_HELMET, VENDOR_ITEM_MANDATORY), + list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), + list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + + list("SPECIALISATION KIT (CHOOSE 1)", 0, null, null, null), + list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), + list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), + + list("BELT (CHOOSE 1)", 0, null, null, null), + list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("OTHER SUPPLIES", 0, null, null, null), + list("Medical Helmet Optic", 5, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("Magnetic Harness", 12, /obj/item/attachable/magnetic_harness, null, VENDOR_ITEM_REGULAR), + list("Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_RECOMMENDED), + list("Binoculars", 5,/obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Rangefinder", 8, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 12, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_RECOMMENDED), + list("Data Detector", 5, /obj/item/device/motiondetector/intel, null, VENDOR_ITEM_REGULAR), + list("Flashlight", 1, /obj/item/device/flashlight, null, VENDOR_ITEM_RECOMMENDED), + list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), + list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Machete Scabbard (Full)", 5, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR) + )) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 07284e7f8e71..1dbd31c63de4 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -175,24 +175,10 @@ //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 + vend_dir = WEST + vend_dir_whitelist = list(NORTH, SOUTH) -/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 - -/obj/structure/machinery/cm_vending/sorted/cargo_guns/blend +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend icon_state = "req_guns_wall" tiles_with = list( /obj/structure/window/framed/almayer, @@ -209,6 +195,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/vend_fail() return @@ -296,7 +284,7 @@ updateUsrDialog() return //We found our item, no reason to go on. -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend icon_state = "req_ammo_wall" tiles_with = list( /obj/structure/window/framed/almayer, @@ -307,22 +295,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 @@ -331,6 +303,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/vend_fail() return @@ -379,22 +354,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( @@ -402,7 +361,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/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index c0daad04f0ce..65397570511c 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -98,11 +98,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine/engineer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine/tech, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine/engineer, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine/tech), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 9845ff9cb610..81c1941c3423 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -114,12 +114,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Armor", 0, /obj/item/clothing/suit/storage/marine/leader, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine/leader, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine/leader), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("B12 Pattern Armor", 0, /obj/item/clothing/suit/storage/marine/leader, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 1b634335f5d2..f6b99887bbbb 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -116,11 +116,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine/medic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine/medic, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine/medic, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine/medic), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("Combat Sterile Gloves", 0, /obj/item/clothing/gloves/marine/medical, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index 0691dfcee371..41710b477769 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -66,11 +66,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 38c74481205d..e800fc1efd56 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -56,10 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 875f84264c0a..7bd45cb46a60 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -78,12 +78,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine/rto), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("M4 Pattern Armor", 0, /obj/item/clothing/suit/storage/marine/rto, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine/rto, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("Essential Fireteam Leader Utilities", 0, /obj/effect/essentials_set/tl, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm index 645640f9dc84..557933754f07 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/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 49d758b52b19..867c6924b39d 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -287,19 +287,23 @@ opacity = FALSE anchored = TRUE unacidable = TRUE + /// Target the acid is melting var/atom/acid_t - var/ticks = 0 - var/acid_strength = 1 //100% speed, normal - var/barricade_damage = 40 + /// Duration left to next acid stage + var/remaining = 0 + /// Acid stages left to complete melting + var/ticks_left = 3 + /// Factor of duration between acid progression + var/acid_delay = 1 /// How much fuel the acid drains from the flare every acid tick var/flare_damage = 500 - var/barricade_damage_ticks = 10 // tick is once per 5 seconds. This tells us how many times it will try damaging barricades + var/barricade_damage = 40 var/in_weather = FALSE //Sentinel weakest acid /obj/effect/xenomorph/acid/weak name = "weak acid" - acid_strength = 2.5 //250% normal speed + acid_delay = 2.5 //250% delay (40% speed) barricade_damage = 20 flare_damage = 150 icon_state = "acid_weak" @@ -307,24 +311,32 @@ //Superacid /obj/effect/xenomorph/acid/strong name = "strong acid" - acid_strength = 0.4 //40% normal speed + acid_delay = 0.4 //40% delay (250% speed) barricade_damage = 100 flare_damage = 1875 icon_state = "acid_strong" -/obj/effect/xenomorph/acid/New(loc, target) - ..(loc) +/obj/effect/xenomorph/acid/Initialize(mapload, atom/target) + . = ..() acid_t = target - var/strength_t = isturf(acid_t) ? 8:4 // Turf take twice as long to take down. + if(isturf(acid_t)) + ticks_left = 7 // Turf take twice as long to take down. + else if(istype(acid_t, /obj/structure/barricade)) + ticks_left = 9 handle_weather() - tick(strength_t) - RegisterSignal(SSdcs, COMSIG_GLOB_WEATHER_CHANGE, PROC_REF(handle_weather)) + RegisterSignal(acid_t, COMSIG_PARENT_QDELETING, PROC_REF(cleanup)) + START_PROCESSING(SSeffects, src) /obj/effect/xenomorph/acid/Destroy() acid_t = null + STOP_PROCESSING(SSeffects, src) . = ..() +/obj/effect/xenomorph/acid/proc/cleanup() + SIGNAL_HANDLER + qdel(src) + /obj/effect/xenomorph/acid/proc/handle_weather() SIGNAL_HANDLER @@ -333,76 +345,85 @@ return if(SSweather.is_weather_event && locate(acids_area) in SSweather.weather_areas) - acid_strength = acid_strength + (SSweather.weather_event_instance.fire_smothering_strength * 0.33) //smothering_strength is 1-10, acid strength is a multiplier + acid_delay = acid_delay + (SSweather.weather_event_instance.fire_smothering_strength * 0.33) //smothering_strength is 1-10, acid strength is a multiplier in_weather = SSweather.weather_event_instance.fire_smothering_strength else - acid_strength = initial(acid_strength) + acid_delay = initial(acid_delay) in_weather = FALSE /obj/effect/xenomorph/acid/proc/handle_barricade() + if(prob(in_weather)) + visible_message(SPAN_XENOWARNING("Acid on \The [acid_t] subsides!")) + return NONE var/obj/structure/barricade/cade = acid_t - if(istype(cade)) - cade.take_acid_damage(barricade_damage) - -/obj/effect/xenomorph/acid/proc/tick(strength_t) - set waitfor = 0 - if(!acid_t || !acid_t.loc) - qdel(src) + cade.take_acid_damage(barricade_damage) + return (5 SECONDS) + +/obj/effect/xenomorph/acid/proc/handle_flashlight() + var/obj/item/device/flashlight/flare/flare = acid_t + if(flare.fuel <= 0) + return NONE + flare.fuel -= flare_damage + return (rand(15, 25) SECONDS) * acid_delay + +/obj/effect/xenomorph/acid/process(delta_time) + remaining -= delta_time * (1 SECONDS) + if(remaining > 0) return + ticks_left -= 1 - if(istype(acid_t,/obj/structure/barricade)) - if(++ticks >= barricade_damage_ticks || prob(in_weather)) - visible_message(SPAN_XENOWARNING("Acid on \The [acid_t] subsides!")) - qdel(src) - return - handle_barricade() - sleep(50) - .() - return - if(istype(acid_t, /obj/item/device/flashlight/flare)) - var/obj/item/device/flashlight/flare/flare = acid_t - if(flare.fuel > 0) //Flares that have fuel in them lose fuel instead of melting - flare.fuel -= flare_damage - sleep(rand(150,250) * (acid_strength)) - return .() - - if(++ticks >= strength_t) - visible_message(SPAN_XENODANGER("[acid_t] collapses under its own weight into a puddle of goop and undigested debris!")) - playsound(src, "acid_hit", 25, TRUE) - - if(istype(acid_t, /turf)) - if(istype(acid_t, /turf/closed/wall)) - var/turf/closed/wall/W = acid_t - new /obj/effect/acid_hole (W) - else - var/turf/T = acid_t - T.ScrapeAway() - else if (istype(acid_t, /obj/structure/girder)) - var/obj/structure/girder/G = acid_t - G.dismantle() - else if(istype(acid_t, /obj/structure/window/framed)) - var/obj/structure/window/framed/WF = acid_t - WF.deconstruct(disassembled = FALSE) - else if(istype(acid_t,/obj/item/explosive/plastic)) - qdel(acid_t) + var/return_delay = NONE + if(istype(acid_t, /obj/structure/barricade)) + return_delay = handle_barricade() + else if(istype(acid_t, /obj/item/device/flashlight/flare)) + return_delay = handle_flashlight() + else + return_delay = (rand(20, 30) SECONDS) * acid_delay - else - if(acid_t.contents.len) //Hopefully won't auto-delete things inside melted stuff.. - for(var/mob/M in acid_t.contents) - if(acid_t.loc) M.forceMove(acid_t.loc) - QDEL_NULL(acid_t) + if(!ticks_left) + finish_melting() + return PROCESS_KILL + if(!return_delay) qdel(src) - return + return PROCESS_KILL - switch(strength_t - ticks) + remaining = return_delay + + switch(ticks_left) if(6) visible_message(SPAN_XENOWARNING("\The [acid_t] is barely holding up against the acid!")) if(4) visible_message(SPAN_XENOWARNING("\The [acid_t]\s structure is being melted by the acid!")) if(2) visible_message(SPAN_XENOWARNING("\The [acid_t] is struggling to withstand the acid!")) if(0 to 1) visible_message(SPAN_XENOWARNING("\The [acid_t] begins to crumble under the acid!")) - sleep(rand(200,300) * (acid_strength)) - .() +/obj/effect/xenomorph/acid/proc/finish_melting() + visible_message(SPAN_XENODANGER("[acid_t] collapses under its own weight into a puddle of goop and undigested debris!")) + playsound(src, "acid_hit", 25, TRUE) + + if(istype(acid_t, /turf)) + if(istype(acid_t, /turf/closed/wall)) + var/turf/closed/wall/wall = acid_t + new /obj/effect/acid_hole(wall) + else + var/turf/turf = acid_t + turf.ScrapeAway() + + else if (istype(acid_t, /obj/structure/girder)) + var/obj/structure/girder/girder = acid_t + girder.dismantle() + + else if(istype(acid_t, /obj/structure/window/framed)) + var/obj/structure/window/framed/window = acid_t + window.deconstruct(disassembled = FALSE) + + else if(istype(acid_t, /obj/structure/barricade)) + pass() // Don't delete it, just damaj + + else + for(var/mob/mob in acid_t) + mob.forceMove(loc) + qdel(acid_t) + qdel(src) /obj/effect/xenomorph/boiler_bombard name = "???" diff --git a/code/game/objects/effects/decals/cleanable/blood/tracks.dm b/code/game/objects/effects/decals/cleanable/blood/tracks.dm index 32593f6f30fa..c764259a6252 100644 --- a/code/game/objects/effects/decals/cleanable/blood/tracks.dm +++ b/code/game/objects/effects/decals/cleanable/blood/tracks.dm @@ -14,6 +14,9 @@ var/list/overlay_images = list() + /// Amount of pixels to shift either way in an attempt to make the tracks more organic + var/transverse_amplitude = 3 + /obj/effect/decal/cleanable/blood/tracks/Crossed() return @@ -21,19 +24,27 @@ return FALSE /obj/effect/decal/cleanable/blood/tracks/proc/add_tracks(direction, tcolor, out) - var/image/I = image(icon = icon, icon_state = out ? going_state : coming_state, dir = direction) - var/mutable_appearance/MA = new(I) + var/image/image = image(icon = icon, icon_state = out ? going_state : coming_state, dir = direction) + + var/mutable_appearance/MA = new(image) MA.color = tcolor MA.layer = layer MA.appearance_flags |= RESET_COLOR - I.appearance = MA + image.appearance = MA + + switch(direction) + if(NORTH, SOUTH) + image.pixel_x += rand(-transverse_amplitude, transverse_amplitude) + if(EAST, WEST) + image.pixel_y += rand(-transverse_amplitude, transverse_amplitude) + if(out) - LAZYSET(steps_out, "[direction]", I) + LAZYSET(steps_out, "[direction]", image) else - LAZYSET(steps_in, "[direction]", I) + LAZYSET(steps_in, "[direction]", image) - overlay_images += I - cleanable_turf.overlays += I + overlay_images += image + cleanable_turf.overlays += image /obj/effect/decal/cleanable/blood/tracks/clear_overlay() if(length(overlay_images)) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 78aa01b5dacb..b80f53b14d2e 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -31,13 +31,13 @@ amount = oldamount - 1 cause_data = new_cause_data time_to_live += rand(-1,1) - active_smoke_effects += src + START_PROCESSING(SSeffects, src) /obj/effect/particle_effect/smoke/Destroy() . = ..() if(opacity) set_opacity(0) - active_smoke_effects -= src + STOP_PROCESSING(SSeffects, src) cause_data = null /obj/effect/particle_effect/smoke/initialize_pass_flags(datum/pass_flags_container/PF) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index bebe0ec8b27f..56c6ae45cda7 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -95,8 +95,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/effect/glowshroom/fire_act(exposed_temperature, exposed_volume) if(exposed_temperature > 300) diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index fe4254982d57..a53fead0d3bf 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -8,6 +8,8 @@ var/roundstart_damage_min = 0 var/roundstart_damage_max = 0 var/roundstart_damage_times = 1 + /// Whether or not the spawner is for an inherently hostile survivor subtype. + var/hostile = FALSE var/spawn_priority = LOWEST_SPAWN_PRIORITY @@ -27,6 +29,7 @@ return TRUE /obj/effect/landmark/survivor_spawner/lv624_crashed_clf + hostile = TRUE equipment = /datum/equipment_preset/survivor/clf synth_equipment = /datum/equipment_preset/clf/synth intro_text = list("

You are a survivor of a crash landing!

",\ @@ -40,6 +43,7 @@ spawn_priority = SPAWN_PRIORITY_HIGH /obj/effect/landmark/survivor_spawner/lv624_crashed_clf_engineer + hostile = TRUE equipment = /datum/equipment_preset/clf/engineer synth_equipment = /datum/equipment_preset/clf/synth intro_text = list("

You are a survivor of a crash landing!

",\ @@ -53,6 +57,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/lv624_crashed_clf_medic + hostile = TRUE equipment = /datum/equipment_preset/clf/medic synth_equipment = /datum/equipment_preset/clf/synth intro_text = list("

You are a survivor of a crash landing!

",\ diff --git a/code/game/objects/effects/spawners/faction_spawners.dm b/code/game/objects/effects/spawners/faction_spawners.dm new file mode 100644 index 000000000000..2daf6392e5e7 --- /dev/null +++ b/code/game/objects/effects/spawners/faction_spawners.dm @@ -0,0 +1,197 @@ +/* + * USCM weapons + */ +/obj/effect/spawner/random/gun/uscm_primary + name = "USCM primary weapon spawner" + desc = "spawns USCM primary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/rifle/m41a = /obj/item/ammo_magazine/rifle, + /obj/item/weapon/gun/rifle/m41a/tactical = /obj/item/ammo_magazine/rifle, + /obj/item/weapon/gun/smg/m39 = /obj/item/ammo_magazine/smg/m39, + /obj/item/weapon/gun/smg/m39 = /obj/item/ammo_magazine/smg/m39, + /obj/item/weapon/gun/shotgun/pump = /datum/ammo/bullet/shotgun/buckshot + ) + +/obj/effect/spawner/random/gun/uscm_primary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_20" + +/obj/effect/spawner/random/gun/uscm_primary/midchance + spawn_nothing_percentage = 50 + icon_state = "loot_rifle_50" + +/obj/effect/spawner/random/gun/uscm_primary/highchance + spawn_nothing_percentage = 20 + icon_state = "loot_rifle_80" + +/obj/effect/spawner/random/gun/uscm_secondary + name = "USCM secondary weapon spawner" + desc = "spawns USCM secondary weapons" + spawn_nothing_percentage = 0 + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/pistol/m4a3 = /obj/item/ammo_magazine/pistol, + /obj/item/weapon/gun/revolver/m44 = /obj/item/ammo_magazine/handful/revolver/marksman + ) + +/obj/effect/spawner/random/gun/uscm_secondary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_pistol_20" + +/obj/effect/spawner/random/gun/uscm_secondary/midchance + spawn_nothing_percentage = 50 + icon_state = "loot_pistol_50" + +/obj/effect/spawner/random/gun/uscm_secondary/highchance + spawn_nothing_percentage = 80 + icon_state = "loot_pistol_80" + + +/* + * UPP weapons + */ +/obj/effect/spawner/random/gun/upp_primary + name = "UPP primary weapon spawner" + desc = "spawns UPP primary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/smg/bizon/upp = /obj/item/ammo_magazine/smg/bizon, + /obj/item/weapon/gun/rifle/type71 = /obj/item/ammo_magazine/rifle/type71, + /obj/item/weapon/gun/rifle/type71/carbine = /obj/item/ammo_magazine/rifle/type71 + ) + +/obj/effect/spawner/random/gun/upp_primary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_20" + +/obj/effect/spawner/random/gun/upp_primary/midchance + spawn_nothing_percentage = 50 + icon_state = "loot_rifle_50" + +/obj/effect/spawner/random/gun/upp_primary/highchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_80" + +/obj/effect/spawner/random/gun/upp_secondary + name = "UPP secondary weapon spawner" + desc = "spawns UPP secondary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/pistol/t73 = /obj/item/ammo_magazine/pistol/t73, + /obj/item/weapon/gun/pistol/np92 = /obj/item/ammo_magazine/pistol/np92, + /obj/item/weapon/gun/revolver/upp = /obj/item/ammo_magazine/revolver/upp + ) + +/obj/effect/spawner/random/gun/upp_secondary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_pistol_20" + +/obj/effect/spawner/random/gun/upp_secondary/medchance + spawn_nothing_percentage = 50 + icon_state = "loot_pistol_50" + +/obj/effect/spawner/random/gun/upp_secondary/highchance + spawn_nothing_percentage = 20 + icon_state = "loot_pistol_80" +/* + * PMC weapons + */ +/obj/effect/spawner/random/gun/pmc_primary + name = "PMC primary weapon spawner" + desc = "spawns PMC primary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/rifle/m41a/elite = /obj/item/ammo_magazine/rifle/ap, + /obj/item/weapon/gun/rifle/m41a/elite = /obj/item/ammo_magazine/rifle/extended, + /obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/ap, + /obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/extended, + /obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/ap, + /obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/extended + ) + +/obj/effect/spawner/random/gun/pmc_primary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_20" + +/obj/effect/spawner/random/gun/pmc_primary/midchance + spawn_nothing_percentage = 50 + icon_state = "loot_rifle_50" + +/obj/effect/spawner/random/gun/pmc_primary/highchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_80" + +/obj/effect/spawner/random/gun/pmc_secondary + name = "PMC secondary weapon spawner" + desc = "spawns PMC secondary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/pistol/vp78 = /obj/item/ammo_magazine/pistol/vp78, + /obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88 + ) + +/obj/effect/spawner/random/gun/pmc_secondary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_pistol_20" + +/obj/effect/spawner/random/gun/pmc_secondary/medchance + spawn_nothing_percentage = 50 + icon_state = "loot_pistol_50" + +/obj/effect/spawner/random/gun/pmc_secondary/highchance + spawn_nothing_percentage = 20 + icon_state = "loot_pistol_80" + +/* + * CLF weapons + */ +/obj/effect/spawner/random/gun/clf_primary + name = "CLF primary weapon spawner" + desc = "spawns CLF primary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/rifle/m16 = /obj/item/ammo_magazine/rifle/m16, + /obj/item/weapon/gun/rifle/mar40/carbine = /obj/item/ammo_magazine/rifle/mar40 + ) + +/obj/effect/spawner/random/gun/clf_primary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_20" + +/obj/effect/spawner/random/gun/clf_primary/midchance + spawn_nothing_percentage = 50 + icon_state = "loot_rifle_50" + +/obj/effect/spawner/random/gun/clf_primary/highchance + spawn_nothing_percentage = 80 + icon_state = "loot_rifle_80" + +/obj/effect/spawner/random/gun/clf_secondary + name = "CLF secondary weapon spawner" + desc = "spawns CLF secondary weapons" + mags_max = 2 + mags_min = 1 + guns = list( + /obj/item/weapon/gun/pistol/kt42 = /obj/item/ammo_magazine/pistol/kt42, + /obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs + ) + +/obj/effect/spawner/random/gun/clf_secondary/lowchance + spawn_nothing_percentage = 80 + icon_state = "loot_pistol_20" + +/obj/effect/spawner/random/gun/clf_secondary/medchance + spawn_nothing_percentage = 50 + icon_state = "loot_pistol_50" + +/obj/effect/spawner/random/gun/clf_secondary/highchance + spawn_nothing_percentage = 20 + icon_state = "loot_pistol_80" diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm index 450981377a73..d302e7794f8b 100644 --- a/code/game/objects/effects/spawners/random.dm +++ b/code/game/objects/effects/spawners/random.dm @@ -57,10 +57,13 @@ icon_state = "atmos" /obj/effect/spawner/random/technology_scanner/item_to_spawn() - return pick(prob(5);/obj/item/device/t_scanner,\ - prob(2);/obj/item/device/radio,\ - prob(5);/obj/item/device/analyzer) - + return pick_weight(list( + "none" = 10, + /obj/item/device/t_scanner = 10, + /obj/item/device/radio = 8, + /obj/item/device/analyzer = 10, + /obj/item/device/black_market_hacking_device = 2, + )) /obj/effect/spawner/random/powercell name = "Random Powercell" @@ -348,8 +351,7 @@ /obj/effect/spawner/random/gun/proc/spawn_weapon_on_floor(gunpath, ammopath, ammo_amount = 1) - var/atom/spawnloc = src - spawnloc = get_turf(spawnloc) + var/turf/spawnloc = get_turf(src) var/obj/gun var/obj/ammo @@ -357,20 +359,20 @@ gun = new gunpath(spawnloc) if(scatter) var/direction = pick(alldirs) - var/turf/T = get_step(gun, direction) - if(!T || T.density) + var/turf/turf = get_step(gun, direction) + if(!turf || turf.density) return - gun.loc = T + gun.forceMove(turf) if(ammopath) for(var/i in 0 to ammo_amount-1) ammo = new ammopath(spawnloc) if(scatter) for(i=0, i= 0) spread_power *= 0.75 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 077c0a463aaa..d0970907366d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -156,6 +156,11 @@ var/list/inherent_traits + /// How much to offset the item randomly either way alongside X visually + var/ground_offset_x = 0 + /// How much to offset the item randomly either way alongside Y visually + var/ground_offset_y = 0 + /obj/item/Initialize(mapload, ...) . = ..() @@ -175,6 +180,8 @@ if(flags_item & MOB_LOCK_ON_EQUIP) AddComponent(/datum/component/id_lock) + scatter_item() + /obj/item/Destroy() flags_item &= ~DELONDROP //to avoid infinite loop of unequip, delete, unequip, delete. flags_item &= ~NODROP //so the item is properly unequipped if on a mob. @@ -268,7 +275,6 @@ cases. Override_icon_state should be a list.*/ size = "huge" if(SIZE_MASSIVE) size = "massive" - else . += "This is a [blood_color ? blood_color != "#030303" ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. It is a [size] item." if(desc) . += desc @@ -459,27 +465,32 @@ cases. Override_icon_state should be a list.*/ /obj/item/proc/item_action_slot_check(mob/user, slot) return TRUE +/obj/item/proc/scatter_item() + if(!pixel_x && !pixel_y) + pixel_x = rand(-ground_offset_x, ground_offset_x) + pixel_y = rand(-ground_offset_y, ground_offset_y) + // The mob M is attempting to equip this item into the slot passed through as 'slot'. return TRUE if it can do this and 0 if it can't. // 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) @@ -490,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 @@ -627,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 @@ -824,6 +833,8 @@ cases. Override_icon_state should be a list.*/ unzoom(user) /obj/item/proc/unzoom(mob/living/user) + if(user.interactee == src) + user.unset_interaction() var/zoom_device = zoomdevicename ? "\improper [zoomdevicename] of [src]" : "\improper [src]" INVOKE_ASYNC(user, TYPE_PROC_REF(/atom, visible_message), SPAN_NOTICE("[user] looks up from [zoom_device]."), SPAN_NOTICE("You look up from [zoom_device].")) diff --git a/code/game/objects/items/XMAS.dm b/code/game/objects/items/XMAS.dm index 4b7bca2fb319..b10ea2035d96 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/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index db19b79ac0fd..122136f6f2fa 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -96,9 +96,9 @@ /obj/item/circuitboard/computer/atmos_alert name = "Circuit board (Atmospheric Alert)" build_path = /obj/structure/machinery/computer/atmos_alert -/obj/item/circuitboard/computer/pod - name = "Circuit board (Massdriver control)" - build_path = /obj/structure/machinery/computer/pod +/obj/item/circuitboard/computer/pod/old + name = "Circuit board (DoorMex)" + build_path = /obj/structure/machinery/computer/pod/old /obj/item/circuitboard/computer/robotics name = "Circuit board (Robotics Control)" build_path = /obj/structure/machinery/computer/robotics @@ -117,15 +117,6 @@ /obj/item/circuitboard/computer/powermonitor name = "Circuit board (Power Monitor)" build_path = /obj/structure/machinery/power/monitor -/obj/item/circuitboard/computer/olddoor - name = "Circuit board (DoorMex)" - build_path = /obj/structure/machinery/computer/pod/old -/obj/item/circuitboard/computer/syndicatedoor - name = "Circuit board (ProComp Executive)" - build_path = /obj/structure/machinery/computer/pod/old/syndicate -/obj/item/circuitboard/computer/swfdoor - name = "Circuit board (Magix)" - build_path = /obj/structure/machinery/computer/pod/old/swf /obj/item/circuitboard/computer/prisoner name = "Circuit board (Prisoner Management)" build_path = /obj/structure/machinery/computer/prisoner @@ -177,7 +168,11 @@ /obj/item/circuitboard/computer/supplycomp/attackby(obj/item/tool, mob/user) if(HAS_TRAIT(tool, TRAIT_TOOL_MULTITOOL)) - to_chat(user, SPAN_WARNING("You start messing around with the electronics of \the [src]...")) + to_chat(user, SPAN_WARNING("You try to pulse the circuit board, but nothing happens. Maybe you need something more specialized?")) + return + + else if(HAS_TRAIT(tool, TRAIT_TOOL_BLACKMARKET_HACKER)) + to_chat(user, SPAN_WARNING("You start messing around with the electronics of [src]...")) if(do_after(user, 8 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You have no idea what you're doing.")) @@ -191,8 +186,7 @@ to_chat(user, SPAN_WARNING("You weaken the broadcasting function with \the [tool], and the red light stops blinking, turning off. It's probably good now.")) contraband_enabled = FALSE - if(HAS_TRAIT(tool, TRAIT_TOOL_TRADEBAND)) - + else if(HAS_TRAIT(tool, TRAIT_TOOL_TRADEBAND)) if(!skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED)) to_chat(user, SPAN_NOTICE("You do not know how to use [tool]")) return diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index a4589fb1dd78..2d44ce076f30 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -38,10 +38,14 @@ /obj/item/device/binoculars/on_set_interaction(mob/user) flags_atom |= RELAY_CLICK - + RegisterSignal(user, COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION, PROC_REF(interaction_handler)) /obj/item/device/binoculars/on_unset_interaction(mob/user) flags_atom &= ~RELAY_CLICK + UnregisterSignal(user, COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION) + +/obj/item/device/binoculars/proc/interaction_handler() + return COMPONENT_HUMAN_MOVEMENT_KEEP_USING /obj/item/device/binoculars/civ desc = "A pair of binoculars." diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index e8320b0273a2..69e745da0803 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -64,7 +64,7 @@ var/list/data = list() data["alert_level"] = security_level - data["evac_status"] = EvacuationAuthority.evac_status + data["evac_status"] = SShijack.evac_status data["endtime"] = announcement_cooldown data["distresstime"] = distress_cooldown data["worldtime"] = world.time @@ -138,18 +138,17 @@ to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) return FALSE - if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY) + if(SShijack.evac_admin_denied) to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) return FALSE - if(!EvacuationAuthority.initiate_evacuation()) + if(!SShijack.initiate_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) return FALSE log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") + log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") . = TRUE if("distress") diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 6ab79e3216d4..139ea1cbac8c 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -11,11 +11,8 @@ black_market_value = 10 var/string_attached var/sides = 2 - -/obj/item/coin/Initialize() - . = ..() - pixel_x = rand(0,16)-8 - pixel_y = rand(0,8)-8 + ground_offset_x = 8 + ground_offset_y = 4 /obj/item/coin/gold name = "gold coin" @@ -29,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/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index e795f4e28de4..114964464a25 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -12,6 +12,8 @@ light_range = 5 light_power = 1 + ground_offset_x = 2 + ground_offset_y = 6 actions_types = list(/datum/action/item_action) var/on = FALSE @@ -33,6 +35,11 @@ else icon_state = initial(icon_state) +/obj/item/device/flashlight/animation_spin(speed = 5, loop_amount = -1, clockwise = TRUE, sections = 3, angular_offset = 0, pixel_fuzz = 0) + clockwise = pick(TRUE, FALSE) + angular_offset = rand(360) + return ..() + /obj/item/device/flashlight/proc/update_brightness(mob/user = null) if(on) set_light_range(light_range) @@ -296,8 +303,6 @@ // Causes flares to stop with a rotation offset for visual purposes /obj/item/device/flashlight/flare/animation_spin(speed = 5, loop_amount = -1, clockwise = TRUE, sections = 3, angular_offset = 0, pixel_fuzz = 0) - clockwise = pick(TRUE, FALSE) - angular_offset = rand(360) pixel_fuzz = 16 return ..() /obj/item/device/flashlight/flare/pickup() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 38ff8859ef97..512ca8baad9b 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -457,6 +457,16 @@ FORENSIC SCANNER playsound(user, 'sound/machines/twobeep.ogg', 15, TRUE) to_chat(user, SPAN_NOTICE("You scan [hit_atom] and notice a reading on [src]'s pad, it says: ITEM HAS [market_value] VALUE ")) +/obj/item/device/black_market_hacking_device + name = "modified security access tuner" + desc = "A security access tuner with wires and electrical pins sticking out at odd angles. A handwritten label on the bottom says something about the ASRS system." + icon_state = "bm_hacker" + item_state = "analyzer" + w_class = SIZE_SMALL + flags_atom = FPRINT + flags_equip_slot = SLOT_WAIST + inherent_traits = list(TRAIT_TOOL_BLACKMARKET_HACKER) + /obj/item/device/cmb_black_market_tradeband name = "\improper CMB Tradeband Compliance Device" desc = "A device used to reset any tampering done to trading devices' signal range. Occasionally used to fix any signal chips damaged in an accident, but often for malpractice in trading. Use this with caution, as it will also reset any evidence of potential illicit trade. Created to fulfill a joint-organization requirement for CMB-ICC teams on the frontier, where tampered machinery was difficult to move and refurbish. Smugglers beware." diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 01567084d5c7..a4247c90a5b3 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -168,7 +168,7 @@ mytape.timestamp += mytape.used_capacity var/language_known = (M.universal_speak || (speaking && (speaking.name in known_languages))) var/mob_name = language_known ? M.GetVoice() : "Unknown" - var/message = language_known ? msg : speaking.scramble(msg) + var/message = (!speaking || language_known) ? msg : speaking.scramble(msg) mytape.storedinfo += "\[[time2text(mytape.used_capacity,"mm:ss")]\] [mob_name] [verb], \"[italics ? "" : null][message][italics ? "" : null]\"" diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm index 7e98e9819931..6b793233678d 100644 --- a/code/game/objects/items/explosives/grenades/grenade.dm +++ b/code/game/objects/items/explosives/grenades/grenade.dm @@ -20,12 +20,12 @@ var/hand_throwable = TRUE harmful = TRUE //Is it harmful? Are they banned for synths? antigrief_protection = TRUE //Should it be checked by antigrief? + ground_offset_x = 7 + ground_offset_y = 6 /obj/item/explosive/grenade/Initialize() . = ..() det_time = max(0, rand(det_time - 5, det_time + 5)) - pixel_y = rand(-6, 6) - pixel_x = rand(-7, 7) /obj/item/explosive/grenade/proc/can_use_grenade(mob/living/carbon/human/user) if(!hand_throwable) diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index 5dfdf2a41eac..9825d7483193 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -2,11 +2,8 @@ icon = 'icons/obj/items/weapons/grenade.dmi' customizable = TRUE allowed_sensors = list() //We only need a detonator - -/obj/item/explosive/warhead/Initialize(mapload, ...) - . = ..() - pixel_y = rand(-6, 6) - pixel_x = rand(-7, 7) + ground_offset_x = 7 + ground_offset_y = 6 /obj/item/explosive/warhead/rocket name = "84mm rocket warhead" diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm index d3f99134cd23..c11a7a57c350 100644 --- a/code/game/objects/items/handheld_distress_beacon.dm +++ b/code/game/objects/items/handheld_distress_beacon.dm @@ -1,12 +1,21 @@ ///handheld distress beacons used by goon chem retrieval team to call for PMC back up /obj/item/handheld_distress_beacon - name = "handheld distress beacon" + name = "\improper PMC handheld distress beacon" desc = "A standard handheld distress beacon. Generally used by teams who may be out of regular communications range but must signal for assistance. This one is branded with a Weyland Yutani symbol and sold en masse to colonies across the Neroid Sector." icon = 'icons/obj/items/handheld_distress_beacon.dmi' icon_state = "beacon_inactive" w_class = SIZE_SMALL + ///The beacons faction that will be sent in message_admins + var/beacon_type = "PMC beacon" + ///Tells the user who the beacon will be sent to IC + var/recipient = "the USCSS Royce" + ///The name of the ERT that will be passed to get_specific_call + var/list/ert_full_name = list("Weyland-Yutani PMC (Chemical Investigation Squad)") + ///The clickable version that will be sent in message_admins + var/list/ert_short_name = list("SEND PMCs") + ///Whether beacon can be used, or has already been used var/active = FALSE /obj/item/handheld_distress_beacon/get_examine_text(mob/user) @@ -20,8 +29,8 @@ if(active) icon_state = "beacon_active" - else - icon_state = initial(icon_state) + return + icon_state = initial(icon_state) /obj/item/handheld_distress_beacon/attack_self(mob/user) . = ..() @@ -29,12 +38,29 @@ if(active) to_chat(user, "[src] is already active!") return - - for(var/client/C in GLOB.admins) - if((R_ADMIN|R_MOD) & C.admin_holder.rights) - playsound_client(C,'sound/effects/sos-morse-code.ogg',10) - message_admins("[key_name(user)] has requested a PMC Distress Beacon! [CC_MARK(user)] (SEND) (DENY) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]") - to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to the USCSS Royce.")) - active = TRUE update_icon() + + if(!ert_full_name || !ert_short_name || (length(ert_full_name) != length(ert_short_name))) //Make sure they are greater than 0, and both are same length + to_chat(user, SPAN_BOLDWARNING("[src] is broken!")) + CRASH("[src] was improperly set, and has been disabled.") //For the runtime logs + + var/beacon_call_buttons + for(var/current_ert_num in 1 to length(ert_full_name)) + beacon_call_buttons += "([ert_short_name[current_ert_num]]) " + + for(var/client/admin_client in GLOB.admins) + if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights) + playsound_client(admin_client,'sound/effects/sos-morse-code.ogg',10) + message_admins("[key_name(user)] has used a [beacon_type]! [CC_MARK(user)] [beacon_call_buttons](DENY) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]") + to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to [recipient].")) + +/// CMB distress beacon held by CMB Marshal for signalling distress to Anchorpoint Station +/obj/item/handheld_distress_beacon/cmb + name = "\improper CMB handheld distress beacon" + desc = "An emergency beacon. This one is branded with a Colonial Marshal Bureau star and 'ANCHORPOINT STATION' is etched in stencil on the side. This device is issued to CMB Marshals and features an extended relay antenna." + + beacon_type = "CMB beacon" + recipient = "Anchorpoint Station" + ert_full_name = list("CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)") + ert_short_name = list("SEND CMB", "SEND QRF") diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index abd8404d6e25..50c5cd75551b 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 661c8d422316..72c49a0ea15a 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/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 06a4d785e677..2892eb1113e7 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -182,10 +182,9 @@ return 0 var/inaccurate = 0 - if(W.sharp == IS_SHARP_ITEM_ACCURATE) - else if(W.sharp == IS_SHARP_ITEM_BIG) + if(W.sharp == IS_SHARP_ITEM_BIG) inaccurate = 1 - else + else if(W.sharp != IS_SHARP_ITEM_ACCURATE) return 1 if ( !istype(loc, /obj/structure/surface/table) && \ (!isturf(src.loc) || \ @@ -206,7 +205,7 @@ SPAN_NOTICE("[user] crudely slices \the [src] with [W]!"), \ SPAN_NOTICE("You crudely slice \the [src] with your [W]!") \ ) - slices_lost = rand(1,min(1,round(slices_num/2))) + slices_lost = rand(1,max(1,round(slices_num/2))) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i=1 to (slices_num-slices_lost)) var/obj/slice = new slice_path (src.loc) diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm index 240809b7851f..df344506c72c 100644 --- a/code/game/objects/items/reagent_containers/glass.dm +++ b/code/game/objects/items/reagent_containers/glass.dm @@ -363,11 +363,8 @@ matter = list() possible_transfer_amounts = list(5,10,15,25,30) flags_atom = FPRINT|OPENCONTAINER - -/obj/item/reagent_container/glass/beaker/vial/Initialize() - . = ..() - pixel_y = rand(-8, 8) - pixel_x = rand(-9, 9) + ground_offset_x = 9 + ground_offset_y = 8 /obj/item/reagent_container/glass/beaker/vial/tricordrazine name = "tricordrazine vial" diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm index dd857d391b52..01eb751774e1 100644 --- a/code/game/objects/items/reagent_containers/glass/bottle.dm +++ b/code/game/objects/items/reagent_containers/glass/bottle.dm @@ -30,7 +30,7 @@ /obj/item/reagent_container/glass/bottle/Initialize() . = ..() if(!icon_state) - icon_state = "bottle-[rand(1.4)]" + icon_state = "bottle-[rand(1,4)]" /obj/item/reagent_container/glass/bottle/update_icon() overlays.Cut() diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index de86ad07f53a..6c71d8be3c0c 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -23,6 +23,8 @@ w_class = SIZE_TINY volume = 60 reagent_desc_override = TRUE //it has a special examining mechanic + ground_offset_x = 7 + ground_offset_y = 7 var/identificable = TRUE //can medically trained people tell what's in it? var/pill_desc = "An unknown pill." // The real description of the pill, shown when examined by a medically trained person var/pill_icon_class = "random" // Pills with the same icon class share icons diff --git a/code/game/objects/items/reagent_containers/reagent_container.dm b/code/game/objects/items/reagent_containers/reagent_container.dm index eddbf5197a9e..327f6ba1ce1c 100644 --- a/code/game/objects/items/reagent_containers/reagent_container.dm +++ b/code/game/objects/items/reagent_containers/reagent_container.dm @@ -14,6 +14,8 @@ var/transparent = FALSE //can we see what's in it? var/reagent_desc_override = FALSE //does it have a special examining mechanic that should override the normal /reagent_containers examine proc? actions_types = list(/datum/action/item_action/reagent_container/set_transfer_amount) + ground_offset_x = 7 + ground_offset_y = 7 /obj/item/reagent_container/Initialize() if(!possible_transfer_amounts) @@ -65,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/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm index 9135c793cd00..e846979c00b4 100644 --- a/code/game/objects/items/stacks/cable_coil.dm +++ b/code/game/objects/items/stacks/cable_coil.dm @@ -20,14 +20,14 @@ attack_verb = list("whipped", "lashed", "disciplined", "flogged") stack_id = "cable coil" attack_speed = 3 + ground_offset_x = 2 + ground_offset_y = 2 /obj/item/stack/cable_coil/Initialize(mapload, length = MAXCOIL, param_color = null) . = ..() src.amount = length if (param_color) // It should be red by default, so only recolor it if parameter was specified. color = param_color - pixel_x = rand(-2,2) - pixel_y = rand(-2,2) updateicon() update_wclass() @@ -276,8 +276,6 @@ /obj/item/stack/cable_coil/cut/Initialize() . = ..() src.amount = rand(1,2) - pixel_x = rand(-2,2) - pixel_y = rand(-2,2) updateicon() update_wclass() diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 32e9a030462e..754a36c6012a 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -40,7 +40,7 @@ H.pain.recalculate_pain() H.updatehealth() use(1) - var/others_msg = "\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"] [S.display_name] with \the [src]." // Needs to create vars for these messages because macro doesn't work otherwise + var/others_msg = "\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " the"] [S.display_name] with \the [src]." // Needs to create vars for these messages because macro doesn't work otherwise var/user_msg = "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name]." user.visible_message(SPAN_NOTICE("[others_msg]"),\ SPAN_NOTICE("[user_msg]")) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 972898e6449b..6d0736f8aeb2 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/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 98a7ab036f06..07345dcdc09f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -69,6 +69,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ sheettype = "metal" stack_id = "metal" + /obj/item/stack/sheet/metal/small_stack amount = STACK_10 @@ -114,6 +115,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ amount_sprites = TRUE sheettype = "plasteel" stack_id = "plasteel" + ground_offset_x = 4 + ground_offset_y = 5 /obj/item/stack/sheet/plasteel/New(loc, amount=null) recipes = plasteel_recipes @@ -208,6 +211,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ + new/datum/stack_recipe("dartboard", /obj/item/dartboard), \ null, \ new/datum/stack_recipe_list("folders",list( \ new/datum/stack_recipe("blue folder", /obj/item/folder/blue), \ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index ac778c0569ed..3912e2d64165 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -182,6 +182,11 @@ Also change the icon to reflect the amount of sheets, if possible.*/ to_chat(usr, SPAN_WARNING("The [R.title] cannot be built here!")) //might cause some friendly fire regarding other items like barbed wire, shouldn't be a problem? return + var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in usr.loc + if(tunnel) + to_chat(usr, SPAN_WARNING("The [R.title] cannot be constructed on a tunnel!")) + return + if((R.flags & RESULT_REQUIRES_SNOW) && !(istype(usr.loc, /turf/open/snow) || istype(usr.loc, /turf/open/auto_turf/snow))) to_chat(usr, SPAN_WARNING("The [R.title] must be built on snow!")) return @@ -202,13 +207,21 @@ Also change the icon to reflect the amount of sheets, if possible.*/ if(check_one_per_turf(R,usr)) return - var/atom/O = new R.result_type(usr.loc, usr) - usr.visible_message(SPAN_NOTICE("[usr] assembles \a [O]."), - SPAN_NOTICE("You assemble \a [O].")) - O.setDir(usr.dir) + var/atom/new_item + if(ispath(R.result_type, /turf)) + var/turf/current_turf = get_turf(usr) + if(!current_turf) + return + new_item = current_turf.ChangeTurf(R.result_type) + else + new_item = new R.result_type(usr.loc, usr) + + usr.visible_message(SPAN_NOTICE("[usr] assembles \a [new_item]."), + SPAN_NOTICE("You assemble \a [new_item].")) + new_item.setDir(usr.dir) if(R.max_res_amount > 1) - var/obj/item/stack/new_item = O - new_item.amount = R.res_amount * multiplier + var/obj/item/stack/new_stack = new_item + new_stack.amount = R.res_amount * multiplier amount -= R.req_amount * multiplier update_icon() @@ -218,25 +231,25 @@ Also change the icon to reflect the amount of sheets, if possible.*/ usr.drop_inv_item_on_ground(oldsrc) qdel(oldsrc) - if(istype(O,/obj/item/stack)) //floor stacking convenience - var/obj/item/stack/S = O - for(var/obj/item/stack/F in usr.loc) - if(S.stack_id == F.stack_id && S != F) - var/diff = F.max_amount - F.amount - if (S.amount < diff) - F.amount += S.amount - qdel(S) + if(istype(new_item,/obj/item/stack)) //floor stacking convenience + var/obj/item/stack/stack_item = new_item + for(var/obj/item/stack/found_item in usr.loc) + if(stack_item.stack_id == found_item.stack_id && stack_item != found_item) + var/diff = found_item.max_amount - found_item.amount + if (stack_item.amount < diff) + found_item.amount += stack_item.amount + qdel(stack_item) else - S.amount -= diff - F.amount += diff + stack_item.amount -= diff + found_item.amount += diff break - O?.add_fingerprint(usr) + new_item?.add_fingerprint(usr) //BubbleWrap - so newly formed boxes are empty - if(isstorage(O)) - for (var/obj/item/I in O) - qdel(I) + if(isstorage(new_item)) + for (var/obj/item/found_item in new_item) + qdel(found_item) //BubbleWrap END if(src && usr.interactee == src) //do not reopen closed window INVOKE_ASYNC(src, PROC_REF(interact), usr) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 3b65811b05b3..d10c14b914f1 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -566,6 +566,18 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r /obj/item/storage/backpack/marine/satchel/rto/pickup(mob/user) . = ..() + autoset_phone_id(user) + +/obj/item/storage/backpack/marine/satchel/rto/equipped(mob/user, slot) + . = ..() + autoset_phone_id(user) + +/// Automatically sets the phone_id based on the current or updated user +/obj/item/storage/backpack/marine/satchel/rto/proc/autoset_phone_id(mob/user) + if(!user) + internal_transmitter.phone_id = "[src]" + internal_transmitter.enabled = FALSE + return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.comm_title) @@ -579,13 +591,11 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r internal_transmitter.phone_id += " ([H.assigned_squad.name])" else internal_transmitter.phone_id = "[user]" - internal_transmitter.enabled = TRUE /obj/item/storage/backpack/marine/satchel/rto/dropped(mob/user) . = ..() - internal_transmitter.phone_id = "[src]" - internal_transmitter.enabled = FALSE + autoset_phone_id(null) // Disable phone when dropped /obj/item/storage/backpack/marine/satchel/rto/proc/use_phone(mob/user) internal_transmitter.attack_hand(user) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 301f6de2bc70..71edc21e29f9 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -151,7 +151,7 @@ storage_slots = 14 max_w_class = SIZE_MEDIUM max_storage_space = 28 - var/mode = 0 //Pill picking mode + var/mode = 1 //Picking from pill bottle mode can_hold = list( /obj/item/device/healthanalyzer, diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 6266f0eef77d..4a3afa00f368 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -151,6 +151,7 @@ RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(handle_delete_clash_contents)) /obj/item/storage/box/flashbangs/proc/handle_delete_clash_contents() + SIGNAL_HANDLER if(MODE_HAS_FLAG(MODE_FACTION_CLASH)) var/grenade_count = 0 var/grenades_desired = 4 diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 509690a8dc2a..2514e2e5f10c 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -98,6 +98,11 @@ /obj/item/storage/firstaid/regular/empty/fill_preset_inventory() return +/obj/item/storage/firstaid/regular/response + desc = "It's an emergency medical kit containing basic medication and equipment. No training required to use. This one is simpler and requires no training to store." + required_skill_for_nest_opening = SKILL_MEDICAL + required_skill_level_for_nest_opening = SKILL_MEDICAL_DEFAULT + /obj/item/storage/firstaid/robust icon_state = "firstaid" diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index ef2bcfb7216a..27026165fc31 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 @@ -326,7 +329,7 @@ /obj/item/storage/large_holster/fuelpack/get_examine_text(mob/user) . = ..() if(contents.len) - . += "It is storing \a M240-T incinerator unit." + . += "It is storing a M240-T incinerator unit." if (get_dist(user, src) <= 1) if(fuel) . += "The [fuel.caliber] currently contains: [round(fuel.get_ammo_percent())]% fuel." diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index ee274aaab32b..086b1b603d8a 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -142,9 +142,9 @@ /obj/item/storage/pouch/survival name = "survival pouch" - desc = "It can carry flashlights, a pill, a crowbar, metal sheets, and some bandages." + desc = "A pouch given to colonists in the event of an emergency." icon_state = "tools" - storage_slots = 6 + storage_slots = 7 max_w_class = SIZE_MEDIUM can_hold = list( /obj/item/device/flashlight, @@ -153,6 +153,7 @@ /obj/item/stack/medical/bruise_pack, /obj/item/device/radio, /obj/item/attachable/bayonet, + /obj/item/stack/medical/splint, ) /obj/item/storage/pouch/survival/full/fill_preset_inventory() @@ -162,12 +163,12 @@ new /obj/item/stack/medical/bruise_pack(src) new /obj/item/device/radio(src) new /obj/item/attachable/bayonet(src) - + new /obj/item/stack/medical/splint(src) /obj/item/storage/pouch/survival/synth name = "synth survival pouch" desc = "An emergency pouch given to synthetics in the event of an emergency." icon_state = "tools" - storage_slots = 7 + storage_slots = 6 max_w_class = SIZE_MEDIUM can_hold = list( /obj/item/device/flashlight, @@ -180,7 +181,6 @@ ) /obj/item/storage/pouch/survival/synth/full/fill_preset_inventory() - new /obj/item/device/flashlight(src) new /obj/item/tool/crowbar/red(src) new /obj/item/tool/weldingtool(src) new /obj/item/stack/cable_coil(src) @@ -1372,7 +1372,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' @@ -1392,4 +1392,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/storage/storage.dm b/code/game/objects/items/storage/storage.dm index e3fbe86c0e3b..cfdb2f88b090 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -22,7 +22,7 @@ var/atom/movable/screen/storage/storage_start = null //storage UI var/atom/movable/screen/storage/storage_continue = null var/atom/movable/screen/storage/storage_end = null - var/datum/item_storage_box/stored_ISB = null // This contains what previously was known as stored_start, stored_continue, and stored_end + var/datum/item_storage_box/stored_ISB //! This contains what previously was known as stored_start, stored_continue, and stored_end var/atom/movable/screen/close/closer = null var/foldable = null var/use_sound = "rustle" //sound played when used. null for no sound. @@ -212,16 +212,17 @@ if (storage_flags & STORAGE_SHOW_FULLNESS) boxes.update_fullness(src) -var/list/global/item_storage_box_cache = list() +GLOBAL_LIST_EMPTY_TYPED(item_storage_box_cache, /datum/item_storage_box) /datum/item_storage_box - var/atom/movable/screen/storage/start = null - var/atom/movable/screen/storage/continued = null - var/atom/movable/screen/storage/end = null - /// The index that indentifies me inside item_storage_box_cache + var/atom/movable/screen/storage/start + var/atom/movable/screen/storage/continued + var/atom/movable/screen/storage/end + /// The index that indentifies me inside GLOB.item_storage_box_cache var/index /datum/item_storage_box/New() + . = ..() start = new() start.icon_state = "stored_start" continued = new() @@ -233,7 +234,7 @@ var/list/global/item_storage_box_cache = list() QDEL_NULL(start) QDEL_NULL(continued) QDEL_NULL(end) - item_storage_box_cache[index] = null // Or would it be better to -= src? + GLOB.item_storage_box_cache -= index return ..() /obj/item/storage/proc/space_orient_objs(list/obj/item/display_contents) @@ -271,7 +272,7 @@ var/list/global/item_storage_box_cache = list() click_border_start.Add(startpoint) click_border_end.Add(endpoint) - if(!item_storage_box_cache[isb_index]) + if(!GLOB.item_storage_box_cache[isb_index]) var/datum/item_storage_box/box = new() var/matrix/M_start = matrix() var/matrix/M_continue = matrix() @@ -284,9 +285,9 @@ var/list/global/item_storage_box_cache = list() box.continued.apply_transform(M_continue) box.end.apply_transform(M_end) box.index = isb_index - item_storage_box_cache[isb_index] = box + GLOB.item_storage_box_cache[isb_index] = box - var/datum/item_storage_box/ISB = item_storage_box_cache[isb_index] + var/datum/item_storage_box/ISB = GLOB.item_storage_box_cache[isb_index] stored_ISB = ISB storage_start.overlays += ISB.start diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index 130bd567098b..7681e74a1d88 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 b5be55eed540..98dc89321d34 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 b2a66becd869..7a17904635f0 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 4b4b31539064..2fe80f123bce 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 20bf8ac951e9..0497a410a373 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 aaa2a33d4e63..efa898ba9937 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/objs.dm b/code/game/objects/objs.dm index 184fc51bd507..3fa16af05875 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -226,9 +226,14 @@ /obj/proc/afterbuckle(mob/M as mob) // Called after somebody buckled / unbuckled handle_rotation() SEND_SIGNAL(src, COSMIG_OBJ_AFTER_BUCKLE, buckled_mob) + if(!buckled_mob) + UnregisterSignal(M, COMSIG_PARENT_QDELETING) + else + RegisterSignal(buckled_mob, COMSIG_PARENT_QDELETING, PROC_REF(unbuckle)) return buckled_mob /obj/proc/unbuckle() + SIGNAL_HANDLER if(buckled_mob && buckled_mob.buckled == src) buckled_mob.buckled = null buckled_mob.anchored = initial(buckled_mob.anchored) diff --git a/code/game/objects/structures/airlock_assembly.dm b/code/game/objects/structures/airlock_assembly.dm index 0679e1287ff7..d9e55e868016 100644 --- a/code/game/objects/structures/airlock_assembly.dm +++ b/code/game/objects/structures/airlock_assembly.dm @@ -22,9 +22,11 @@ var/airlock_type = "generic" //the type path of the airlock once completed var/glass = AIRLOCK_NOGLASS // see defines var/created_name = null + /// Used for multitile assemblies + var/width = 1 + /obj/structure/airlock_assembly/Initialize(mapload, ...) . = ..() - update_icon() /obj/structure/airlock_assembly/get_examine_text(mob/user) @@ -35,23 +37,26 @@ switch(state) if(STATE_STANDARD) if(anchored) - helpmessage += "It looks like a [SPAN_HELPFUL("wrench")] will unsecure it. Insert a [SPAN_HELPFUL("airlock circuit")]." + var/temp = "" + if(width == 1) + temp += "It looks like a [SPAN_HELPFUL("wrench")] will unsecure it. " + helpmessage += "[temp]You can insert an [SPAN_HELPFUL("airlock circuit")]. " if(!glass) - helpmessage += "Insert some [SPAN_HELPFUL("glass sheets")] to add windows to it." + helpmessage += "Insert some [SPAN_HELPFUL("glass sheets")] to add windows to it. " else if(glass == AIRLOCK_GLASSIN) - helpmessage += "You can take out the windows with a [SPAN_HELPFUL("screwdriver")]." + helpmessage += "You can take out the windows with a [SPAN_HELPFUL("screwdriver")]. " else - helpmessage += "It looks like a [SPAN_HELPFUL("wrench")] will secure it." + helpmessage += "It looks like a [SPAN_HELPFUL("wrench")] will secure it. " if(STATE_CIRCUIT) - helpmessage += "Add [SPAN_HELPFUL("cable coil")] to the circuit." + helpmessage += "Add [SPAN_HELPFUL("cable coil")] to the circuit. " if(STATE_WIRES) - helpmessage += "Secure the circuit with a [SPAN_HELPFUL("screwdriver")]." + helpmessage += "Secure the circuit with a [SPAN_HELPFUL("screwdriver")]. " if(STATE_SCREWDRIVER) - helpmessage += "[SPAN_HELPFUL("Weld")] it all in place." + helpmessage += "[SPAN_HELPFUL("Weld")] it all in place. " helpmessage += "You can name it with a [SPAN_HELPFUL("pen")]." . += SPAN_NOTICE(helpmessage) -/obj/structure/airlock_assembly/attackby(obj/item/W as obj, mob/user as mob) +/obj/structure/airlock_assembly/attackby(obj/item/attacking_item as obj, mob/user as mob) if(user.action_busy) return TRUE //no afterattack @@ -59,16 +64,16 @@ to_chat(user, SPAN_WARNING("You are not trained to configure \the [src]...")) return - if(HAS_TRAIT(W, TRAIT_TOOL_PEN)) - var/t = copytext(stripped_input(user, "Enter the name for the airlock.", name, created_name), 1, MAX_NAME_LEN) - if(!t || !in_range(src, usr) && loc != usr) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_PEN)) + var/input_text = copytext(stripped_input(user, "Enter the name for the airlock.", name, created_name), 1, MAX_NAME_LEN) + if(!input_text || !in_range(src, usr) && loc != usr) return - created_name = t + created_name = input_text playsound(src, "paper_writing", 15, TRUE) return - if(istype(W, /obj/item/stack/sheet/glass)) - var/obj/item/stack/sheet/glass/G = W + if(istype(attacking_item, /obj/item/stack/sheet/glass)) + var/obj/item/stack/sheet/glass/glass_sheet = attacking_item if(!anchored) to_chat(user, SPAN_NOTICE("The airlock is not secured!")) return @@ -83,7 +88,7 @@ return if(!do_after(user, 20 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return - if(G.use(5)) + if(glass_sheet.use(5)) playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) glass = AIRLOCK_GLASSIN to_chat(user, SPAN_NOTICE("You insert some glass into \the [src], adding windows to it.")) @@ -93,7 +98,7 @@ to_chat(user, SPAN_WARNING("You need five sheets of glass to add windows to \the [src]!")) return - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR)) to_chat(user, SPAN_NOTICE("You start pulling \the [src] apart.")) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) if(!do_after(user, 20 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) @@ -108,10 +113,14 @@ switch(state) if(STATE_STANDARD) - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_WRENCH)) + //Moving wide doors is wonky and doesn't work properly, if it's fixed we could make it unwrenchable again + if(width > 1 && anchored) + to_chat(user, SPAN_WARNING("[src] cannot be unwrenched.")) + return if(!anchored) - var/turf/open/T = loc - if(!(istype(T) && T.allow_construction)) + var/turf/open/checked_turf = loc + if(!(istype(checked_turf) && checked_turf.allow_construction)) to_chat(user, SPAN_WARNING("\The [src] cannot be secured here!")) return playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) @@ -127,10 +136,10 @@ to_chat(user, SPAN_NOTICE("The airlock is not secured!")) return ..() - if(istype(W, /obj/item/circuitboard/airlock)) - var/obj/item/circuitboard/airlock/C = W - if(C.fried) // guess what this used to check? ICON STATE!! - to_chat(user, SPAN_WARNING("\The [C] are totally broken!")) + if(istype(attacking_item, /obj/item/circuitboard/airlock)) + var/obj/item/circuitboard/airlock/airlock_circuit = attacking_item + if(airlock_circuit.fried) // guess what this used to check? ICON STATE!! + to_chat(user, SPAN_WARNING("\The [airlock_circuit] are totally broken!")) return playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) to_chat(user, SPAN_NOTICE("You start installing the airlock electronics.")) @@ -138,14 +147,14 @@ return playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) user.drop_held_item() - W.forceMove(src) + attacking_item.forceMove(src) to_chat(user, SPAN_NOTICE("You installed the airlock electronics!")) state = STATE_CIRCUIT - electronics = W + electronics = attacking_item update_icon() return - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER)) if(!anchored) to_chat(user, SPAN_NOTICE("The airlock is not secured!")) return @@ -163,22 +172,22 @@ if(STATE_CIRCUIT) - if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/C = W - if (C.get_amount() < 1) + if(istype(attacking_item, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/airlock_circuit = attacking_item + if (airlock_circuit.get_amount() < 1) to_chat(user, SPAN_WARNING("You need one length of coil to wire the airlock assembly.")) return to_chat(user, SPAN_NOTICE("You start to wire the circuit.")) if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return - if(C.use(1)) + if(airlock_circuit.use(1)) state = STATE_WIRES to_chat(user, SPAN_NOTICE("You wire the circuit.")) update_icon() return if(STATE_WIRES) - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER)) playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) to_chat(user, SPAN_NOTICE("You start securing the circuit")) if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) @@ -190,27 +199,23 @@ return if(STATE_SCREWDRIVER) - if(iswelder(W)) - if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) + if(iswelder(attacking_item)) + if(!HAS_TRAIT(attacking_item, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return - var/obj/item/tool/weldingtool/WT = W - if(!WT.remove_fuel(5, user)) + var/obj/item/tool/weldingtool/welder = attacking_item + if(!welder.remove_fuel(5, user)) return playsound(loc, 'sound/items/Welder2.ogg', 25, 1) to_chat(user, SPAN_NOTICE("Now finishing the airlock.")) if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - WT.remove_fuel(-5) + welder.remove_fuel(-5) return playsound(loc, 'sound/items/Welder2.ogg', 25, 1) to_chat(user, SPAN_NOTICE("You finish the airlock!")) - var/path - if (glass == AIRLOCK_GLASSIN) - path = text2path("/obj/structure/machinery/door/airlock/almayer/[airlock_type]/glass") - else - path = text2path("/obj/structure/machinery/door/airlock/almayer/[airlock_type]") + var/path = get_airlock_path() var/obj/structure/machinery/door/airlock/door = new path(loc) door.assembly_type = type door.electronics = electronics @@ -225,7 +230,7 @@ door.name = created_name else door.name = base_name - + door.handle_multidoor() electronics.forceMove(door) qdel(src) return @@ -238,107 +243,107 @@ else icon_state = "door_as_[base_icon_state][state]" +/obj/structure/airlock_assembly/proc/get_airlock_path() + //For some reason multi_tile doors have different paths... can't say it isn't annoying + if (width > 1) + return "/obj/structure/machinery/door/airlock/multi_tile/almayer/[airlock_type][glass ? "" : "/solid"]" + return "/obj/structure/machinery/door/airlock/almayer/[airlock_type][glass ? "/glass" : ""]" + +/// Used for overloading proc in multi_tile +/obj/structure/airlock_assembly/proc/update_collision_box() + return + /obj/structure/airlock_assembly/airlock_assembly_com base_icon_state = "com" base_name = "Command Airlock" - airlock_type = "/command" + airlock_type = "command" /obj/structure/airlock_assembly/airlock_assembly_sec base_icon_state = "sec" base_name = "Security Airlock" - airlock_type = "/security" + airlock_type = "security" /obj/structure/airlock_assembly/airlock_assembly_eng base_icon_state = "eng" base_name = "Engineering Airlock" - airlock_type = "/engineering" + airlock_type = "engineering" /obj/structure/airlock_assembly/airlock_assembly_min base_icon_state = "min" base_name = "Mining Airlock" - airlock_type = "/mining" + airlock_type = "mining" /obj/structure/airlock_assembly/airlock_assembly_atmo base_icon_state = "atmo" base_name = "Atmospherics Airlock" - airlock_type = "/atmos" + airlock_type = "atmos" /obj/structure/airlock_assembly/airlock_assembly_research base_icon_state = "res" base_name = "Research Airlock" - airlock_type = "/research" + airlock_type = "research" /obj/structure/airlock_assembly/airlock_assembly_science base_icon_state = "sci" base_name = "Science Airlock" - airlock_type = "/science" + airlock_type = "science" /obj/structure/airlock_assembly/airlock_assembly_med base_icon_state = "med" base_name = "Medical Airlock" - airlock_type = "/medical" + airlock_type = "medical" /obj/structure/airlock_assembly/airlock_assembly_mai base_icon_state = "mai" base_name = "Maintenance Airlock" - airlock_type = "/maintenance" + airlock_type = "maintenance" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/airlock_assembly_ext base_icon_state = "ext" base_name = "External Airlock" - airlock_type = "/external" + airlock_type = "external" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/airlock_assembly_fre base_icon_state = "fre" base_name = "Freezer Airlock" - airlock_type = "/freezer" + airlock_type = "freezer" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/airlock_assembly_hatch base_icon_state = "hatch" base_name = "Airtight Hatch" - airlock_type = "/hatch" + airlock_type = "hatch" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/airlock_assembly_mhatch base_icon_state = "mhatch" base_name = "Maintenance Hatch" - airlock_type = "/maintenance_hatch" + airlock_type = "maintenance_hatch" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/airlock_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly base_icon_state = "highsec" base_name = "High Security Airlock" - airlock_type = "/highsecurity" + airlock_type = "highsecurity" glass = AIRLOCK_CANTGLASS /obj/structure/airlock_assembly/multi_tile icon = 'icons/obj/structures/doors/airlock_assembly2x1.dmi' - icon_state = "door_as_g0" - dir = EAST - var/width = 1 - -/*Temporary until we get sprites. - airlock_type = "/multi_tile/maint" - glass = 1*/ - base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1. - airlock_type = "/multi_tile/glass" - glass = AIRLOCK_CANTGLASS //To prevent bugs in deconstruction process. + icon_state = "door_as_0" + width = 2 /obj/structure/airlock_assembly/multi_tile/Initialize(mapload, ...) . = ..() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size + update_collision_box() update_icon() /obj/structure/airlock_assembly/multi_tile/Move() . = ..() + update_collision_box() + +/obj/structure/airlock_assembly/multi_tile/update_collision_box() if(dir in list(EAST, WEST)) bound_width = width * world.icon_size bound_height = world.icon_size diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 0ca2ccb1ddbc..5a72ec33ea2a 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -78,7 +78,7 @@ switch(dir) if(SOUTH) layer = ABOVE_MOB_LAYER - else if(NORTH) + if(NORTH) layer = initial(layer) - 0.01 else layer = initial(layer) diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm index ea10dc7256de..ae166dbbf985 100644 --- a/code/game/objects/structures/barricade/handrail.dm +++ b/code/game/objects/structures/barricade/handrail.dm @@ -24,7 +24,7 @@ switch(dir) if(SOUTH) layer = ABOVE_MOB_LAYER - else if(NORTH) + if(NORTH) layer = initial(layer) - 0.01 else layer = initial(layer) diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm index c71b2853ea07..becb0906e3c6 100644 --- a/code/game/objects/structures/bookcase.dm +++ b/code/game/objects/structures/bookcase.dm @@ -58,8 +58,6 @@ contents_explosion(severity) deconstruct(FALSE) return - else - return /obj/structure/bookcase/update_icon() if(contents.len < 5) 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 ffd993777644..1edac3a8f324 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 db20a738c8ed..4531a68c42dd 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 000000000000..acc43c302e6d --- /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 000000000000..487ffd546d8e --- /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/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 7848aaba4897..b000fd5733a2 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -51,8 +51,6 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/mask/gas(src) new /obj/item/storage/firstaid/o2(src) - if ("nothing") - // doot // teehee - Ah, tg coders... if ("delete") diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 7c9faaf1a027..9f0417ccb372 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -130,8 +130,6 @@ contents_explosion(severity) deconstruct(FALSE) return - else - return /obj/structure/closet/crate/alpha name = "alpha squad crate" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 9c1f46de50d5..b1e950dd18f0 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -72,6 +72,7 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down addtimer(CALLBACK(src, PROC_REF(burn_up)), spread_time + 5 SECONDS) /obj/structure/flora/proc/spread_fire() + SIGNAL_HANDLER for(var/D in cardinal) //Spread fire var/turf/T = get_step(src.loc, D) if(T) @@ -82,6 +83,7 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down new /obj/flamer_fire(T, create_cause_data("wildfire")) /obj/structure/flora/proc/burn_up() + SIGNAL_HANDLER new /obj/effect/decal/cleanable/dirt(loc) if(center) new /obj/effect/decal/cleanable/dirt(loc) //Produces more ash at the center @@ -717,7 +719,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/girders.dm b/code/game/objects/structures/girders.dm index e719359ab439..6cd6a5cd0300 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -173,6 +173,14 @@ return do_reinforced_wall(W, user) if(STATE_DISPLACED) if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) + var/turf/open/floor = loc + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("The girder must be secured on a proper surface!")) + return + var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in loc + if(tunnel) + to_chat(user, SPAN_WARNING("The girder cannot be secured on a tunnel!")) + return playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE("Now securing the girder...")) if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 38201e052c50..d2b3d36b5920 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -43,8 +43,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index d290925d4cdf..89bc3da6ab23 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -189,3 +189,126 @@ /obj/structure/computer3frame/laptop name = "laptop frame" + +// Dartboard +#define DOUBLE_BAND 2 +#define TRIPLE_BAND 3 + +/obj/structure/dartboard + name = "dartboard" + desc = "A dartboard, loosely secured." + icon = 'icons/obj/structures/props/props.dmi' + icon_state = "dart_board" + density = TRUE + unslashable = TRUE + +/obj/structure/dartboard/get_examine_text() + . = ..() + if(length(contents)) + var/is_are = "is" + if(length(contents) != 1) + is_are = "are" + + . += SPAN_NOTICE("There [is_are] [length(contents)] item\s embedded into [src].") + +/obj/structure/dartboard/initialize_pass_flags(datum/pass_flags_container/pass_flags) + ..() + if(pass_flags) + pass_flags.flags_can_pass_all = PASS_MOB_IS + +/obj/structure/dartboard/get_projectile_hit_boolean(obj/projectile/projectile) + . = ..() + visible_message(SPAN_DANGER("[projectile] hits [src], collapsing it!")) + collapse() + +/obj/structure/dartboard/proc/flush_contents() + for(var/atom/movable/embedded_items as anything in contents) + embedded_items.forceMove(loc) + +/obj/structure/dartboard/proc/collapse() + playsound(src, 'sound/effects/thud1.ogg', 50) + new /obj/item/dartboard/(loc) + qdel(src) + +/obj/structure/dartboard/attack_hand(mob/user) + if(length(contents)) + user.visible_message(SPAN_NOTICE("[user] starts recovering items from [src]..."), SPAN_NOTICE("You start recovering items from [src]...")) + if(do_after(user, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, user, INTERRUPT_MOVED, BUSY_ICON_GENERIC)) + flush_contents() + else + to_chat(user, SPAN_WARNING("[src] has nothing embedded!")) + +/obj/structure/dartboard/Destroy() + flush_contents() + . = ..() + +/obj/structure/dartboard/hitby(obj/item/thrown_item) + if(thrown_item.sharp != IS_SHARP_ITEM_ACCURATE && !istype(thrown_item, /obj/item/weapon/dart)) + visible_message(SPAN_DANGER("[thrown_item] hits [src], collapsing it!")) + collapse() + return + + contents += thrown_item + playsound(src, 'sound/weapons/tablehit1.ogg', 50) + var/score = rand(1,21) + if(score == 21) + visible_message(SPAN_DANGER("[thrown_item] embeds into [src], striking the bullseye! 50 points.")) + return + + var/band = "single" + var/band_number = rand(1,3) + score *= band_number + switch(band_number) + if(DOUBLE_BAND) + band = "double" + if(TRIPLE_BAND) + band = "triple" + visible_message(SPAN_DANGER("[thrown_item] embeds into [src], striking [band] for [score] point\s.")) + +/obj/structure/dartboard/attackby(obj/item/item, mob/user) + user.visible_message(SPAN_DANGER("[user] hits [src] with [item], collapsing it!"), SPAN_DANGER("You collapse [src] with [item]!")) + collapse() + +/obj/structure/dartboard/MouseDrop(over_object, src_location, over_location) + . = ..() + if(over_object != usr || !Adjacent(usr)) + return + + if(!ishuman(usr)) + return + + visible_message(SPAN_NOTICE("[usr] unsecures [src].")) + var/obj/item/dartboard/unsecured_board = new(loc) + usr.put_in_hands(unsecured_board) + qdel(src) + +/obj/item/dartboard + name = "dartboard" + desc = "A dartboard for darts." + icon = 'icons/obj/structures/props/props.dmi' + icon_state = "dart_board" + +/obj/item/dartboard/attack_self(mob/user) + . = ..() + + var/turf_ahead = get_step(user, user.dir) + if(!istype(turf_ahead, /turf/closed)) + to_chat(user, SPAN_WARNING("[src] needs a wall to be secured to!")) + return + + var/obj/structure/dartboard/secured_board = new(user.loc) + switch(user.dir) + if(NORTH) + secured_board.pixel_y = 32 + if(EAST) + secured_board.pixel_x = 32 + if(SOUTH) + secured_board.pixel_y = -32 + if(WEST) + secured_board.pixel_x = -32 + + to_chat(user, SPAN_NOTICE("You secure [secured_board] to [turf_ahead].")) + qdel(src) + +#undef DOUBLE_BAND +#undef TRIPLE_BAND diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 9eea571961f7..bd5610487ea0 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -810,8 +810,10 @@ var/obj/item/stack/sheet/wood/fuel = attacking_item if(remaining_fuel >= initial(remaining_fuel)) to_chat(user, SPAN_NOTICE("You cannot fuel [src] further.")) + return if(!fuel.use(1)) to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src].")) + return visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel].")) remaining_fuel++ diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 7dc6d883a2d5..6471dfa21520 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -119,8 +119,6 @@ if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) deconstruct(FALSE) return - else - return /obj/structure/reagent_dispensers/attack_hand() if(!reagents || reagents.locked) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 87e713ad0af8..011fa2a17f48 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -222,3 +222,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/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index fbd6920875ad..adabf0c54141 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -17,6 +17,7 @@ S.desc = desc S.icon_state = icon_state S.sign_state = icon_state + S.icon = icon deconstruct(FALSE) else ..() @@ -45,6 +46,7 @@ S.name = name S.desc = desc S.icon_state = sign_state + S.icon = icon to_chat(user, "You fasten \the [S] with your [tool].") qdel(src) else ..() @@ -568,7 +570,7 @@ /obj/structure/sign/ROsign name = "\improper USCM Requisitions Office Guidelines" - desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cyrosleep underwear is non-permissible.\n 3. The Requsitions Officer has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard." + desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard." icon_state = "roplaque" /obj/structure/sign/prop1 @@ -592,9 +594,3 @@ desc = "An unbelievably creepy cat clock that surveys the room with every tick and every tock." icon = 'icons/obj/structures/props/catclock.dmi' icon_state = "cat_clock_motion" - -/obj/structure/sign/dartboard - name = "dartboard" - desc = "A dartboard, secured with a nail and a string. It has bullet holes and knife stab marks over and around it." - icon = 'icons/obj/structures/props/props.dmi' - icon_state = "dart_board" diff --git a/code/game/objects/structures/surface.dm b/code/game/objects/structures/surface.dm index 3a2dbd3e8d5c..efc69002424f 100644 --- a/code/game/objects/structures/surface.dm +++ b/code/game/objects/structures/surface.dm @@ -61,8 +61,7 @@ draw_item_overlays() /obj/structure/surface/proc/detach_item(obj/item/O) - O.pixel_x = initial(O.pixel_x) - O.pixel_y = initial(O.pixel_y) + O.scatter_item() UnregisterSignal(O, COMSIG_ATOM_DECORATED) draw_item_overlays() return diff --git a/code/game/runtimes.dm b/code/game/runtimes.dm index 1332309168a3..2cdc955aa426 100644 --- a/code/game/runtimes.dm +++ b/code/game/runtimes.dm @@ -11,7 +11,6 @@ GLOBAL_REAL(stui_init_runtimes, /list) //! Shorthand of Static Initializer errors only, for use in STUI GLOBAL_REAL(full_init_runtimes, /list) //! Full text of all Static Initializer + World Init errors, for log backfilling GLOBAL_REAL_VAR(runtime_logging_ready) //! Truthy when init is done and we don't need these shenanigans anymore -GLOBAL_REAL_VAR(init_runtimes_count) //! Count of runtimes that occured before logging is ready, for in-game reporting // Deduplication of errors via hash to reduce spamming GLOBAL_REAL(runtime_hashes, /list) @@ -24,8 +23,6 @@ GLOBAL_REAL_VAR(total_runtimes) if(!total_runtimes) total_runtimes = 0 total_runtimes += 1 - if(!init_runtimes_count) - init_runtimes_count = 0 if(!stui_init_runtimes) stui_init_runtimes = list() if(!full_init_runtimes) @@ -33,7 +30,6 @@ GLOBAL_REAL_VAR(total_runtimes) // If this occured during early init, we store the full error to write it to world.log when it's available if(!runtime_logging_ready) - init_runtimes_count += 1 full_init_runtimes += E.desc // Runtime was already reported once, dedup it for STUI diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 3d774cedc616..e8f40c1d52b3 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -1020,7 +1020,6 @@ var/datum/controller/supply/supply_controller = new() to_chat(usr, SPAN_DANGER("Current retrieval load has reached maximum capacity.")) return - var/datum/ares_link/link = GLOB.ares_link for(var/i=1, i<=supply_controller.requestlist.len, i++) var/datum/supply_order/SO = supply_controller.requestlist[i] if(SO.ordernum == ordernum) @@ -1046,7 +1045,7 @@ var/datum/controller/supply/supply_controller = new() pack_source = "Unknown" if(prob(90)) pack_name = "Unknown" - link.log_ares_requisition(pack_source, pack_name, usr.name) + log_ares_requisition(pack_source, pack_name, usr.name) else temp = "Not enough money left.
" temp += "
Back Main Menu" @@ -1252,7 +1251,7 @@ var/datum/controller/supply/supply_controller = new() /datum/controller/supply/proc/black_market_investigation() black_market_heat = -1 - SSticker.mode.get_specific_call("Inspection - Colonial Marshal Ledger Investigation Team", TRUE, TRUE, FALSE) + SSticker.mode.get_specific_call("Inspection - Colonial Marshal Ledger Investigation Team", TRUE, TRUE) log_game("Black Market Inspection auto-triggered.") /obj/structure/machinery/computer/supplycomp/proc/is_buyable(datum/supply_packs/supply_pack) diff --git a/code/game/turfs/light.dm b/code/game/turfs/light.dm index 219e79e93ef2..e8b7038bcb51 100644 --- a/code/game/turfs/light.dm +++ b/code/game/turfs/light.dm @@ -1,9 +1,21 @@ +#define LIGHT_FLOOR_COLOR_BLUE 0 +#define LIGHT_FLOOR_COLOR_RED 1 +#define LIGHT_FLOOR_COLOR_GREEN 2 +#define LIGHT_FLOOR_COLOR_YELLOW 3 +#define LIGHT_FLOOR_COLOR_PURPLE 4 +#define LIGHT_FLOOR_COLOR_WHITE 5 + /turf/open/floor/light name = "light floor" desc = "Beware of breakdancing on these tiles, glass shards embedded in the head is not a fun time." + icon_state = "light_on" tile_type = /obj/item/stack/tile/light var/on = TRUE - var/state = 0 + var/state = LIGHT_FLOOR_COLOR_BLUE + +/turf/open/floor/light/get_examine_text(mob/user) + . = ..() + . += "[src] is [broken ? "broken, and requires a replacement lightbulb":"[on ? "on" : "off"]"]." /turf/open/floor/light/is_light_floor() return TRUE @@ -12,22 +24,22 @@ . = ..() if(on && !broken) //manages color, I feel like this switch is a sin. switch(state) - if(0) + if(LIGHT_FLOOR_COLOR_BLUE) icon_state = "light_on" set_light(5) - if(1) + if(LIGHT_FLOOR_COLOR_RED) icon_state = "light_on-r" set_light(5) - if(2) + if(LIGHT_FLOOR_COLOR_GREEN) icon_state = "light_on-g" set_light(5) - if(3) + if(LIGHT_FLOOR_COLOR_YELLOW) icon_state = "light_on-y" set_light(5) - if(4) + if(LIGHT_FLOOR_COLOR_PURPLE) icon_state = "light_on-p" set_light(5) - if(5,-1) + if(LIGHT_FLOOR_COLOR_WHITE,-1) //change this later icon_state = "light_on-w" set_light(5) state = -1 @@ -84,3 +96,68 @@ broken = TRUE update_icon() return XENO_ATTACK_ACTION + +/turf/open/floor/light/red + icon_state = "light_on-r" + state = LIGHT_FLOOR_COLOR_RED + +/turf/open/floor/light/green + icon_state = "light_on-g" + state = LIGHT_FLOOR_COLOR_GREEN + +/turf/open/floor/light/yellow + icon_state = "light_on-y" + state = LIGHT_FLOOR_COLOR_YELLOW + +/turf/open/floor/light/purple + icon_state = "light_on-p" + state = LIGHT_FLOOR_COLOR_PURPLE + +/turf/open/floor/light/white + icon_state = "light_on-w" + state = LIGHT_FLOOR_COLOR_WHITE + +/turf/open/floor/light/off + icon_state = "light_off" + on = FALSE + +/turf/open/floor/light/off/red + state = LIGHT_FLOOR_COLOR_RED + +/turf/open/floor/light/off/green + state = LIGHT_FLOOR_COLOR_GREEN + +/turf/open/floor/light/off/yellow + state = LIGHT_FLOOR_COLOR_YELLOW + +/turf/open/floor/light/off/purple + state = LIGHT_FLOOR_COLOR_PURPLE + +/turf/open/floor/light/off/white + state = LIGHT_FLOOR_COLOR_WHITE + +/turf/open/floor/light/broken + icon_state = "light_broken" + broken = TRUE + +/turf/open/floor/light/broken/red + state = LIGHT_FLOOR_COLOR_RED + +/turf/open/floor/light/broken/green + state = LIGHT_FLOOR_COLOR_GREEN + +/turf/open/floor/light/broken/yellow + state = LIGHT_FLOOR_COLOR_YELLOW + +/turf/open/floor/light/broken/purple + state = LIGHT_FLOOR_COLOR_PURPLE + +/turf/open/floor/light/broken/white + state = LIGHT_FLOOR_COLOR_WHITE + +#undef LIGHT_FLOOR_COLOR_BLUE +#undef LIGHT_FLOOR_COLOR_RED +#undef LIGHT_FLOOR_COLOR_GREEN +#undef LIGHT_FLOOR_COLOR_YELLOW +#undef LIGHT_FLOOR_COLOR_PURPLE +#undef LIGHT_FLOOR_COLOR_WHITE diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index a4781e1a6609..93eb45c3b79c 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -185,6 +185,7 @@ name = "cave" icon = 'icons/turf/floors/bigred.dmi' icon_state = "mars_cave_1" + is_groundmap_turf = TRUE /turf/open/mars_cave/Initialize(mapload, ...) @@ -283,6 +284,7 @@ name = "ground dirt" icon = 'icons/turf/ground_map.dmi' icon_state = "desert" + is_groundmap_turf = TRUE /turf/open/gm/attackby(obj/item/I, mob/user) @@ -646,6 +648,7 @@ baseturfs = /turf/open/gm/riverdeep supports_surgery = FALSE minimap_color = MINIMAP_WATER + is_groundmap_turf = FALSE // Not real ground /turf/open/gm/riverdeep/Initialize(mapload, ...) @@ -724,6 +727,7 @@ allow_construction = FALSE var/bushes_spawn = 1 var/plants_spawn = 1 + is_groundmap_turf = TRUE name = "wet grass" desc = "Thick, long, wet grass." icon = 'icons/turf/floors/jungle.dmi' diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 22979858ce62..1b4091eb2aab 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -24,8 +24,8 @@ /obj/structure/girder, /obj/structure/machinery/door, /obj/structure/machinery/cm_vending/sorted/attachments/blend, - /obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend, - /obj/structure/machinery/cm_vending/sorted/cargo_guns/blend, + /obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, + /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, ) /turf/closed/wall/almayer/update_icon() diff --git a/code/game/verbs/records.dm b/code/game/verbs/records.dm index f09de72da2e6..18ed35ee6321 100644 --- a/code/game/verbs/records.dm +++ b/code/game/verbs/records.dm @@ -143,7 +143,7 @@ dat += "" var/color = "#008800" - var/add_dat = "Add Admin Note
Add Confidential Admin Note
" + var/add_dat = "Add Admin Note
Add Confidential Admin Note
" switch(note_category) if(NOTE_MERIT) color = "#9e3dff" diff --git a/code/game/world.dm b/code/game/world.dm index fce40ca468ae..f5388ed6fd52 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -71,8 +71,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt") RoleAuthority = new /datum/authority/branch/role() to_world(SPAN_DANGER("\b Job setup complete")) - if(!EvacuationAuthority) EvacuationAuthority = new - initiate_minimap_icons() change_tick_lag(CONFIG_GET(number/ticklag)) @@ -91,8 +89,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)) @@ -174,11 +172,6 @@ var/world_topic_spam_protect_time = world.timeofday response["response"] = "Payload too large" return json_encode(response) - if(SSfail_to_topic?.IsRateLimited(addr)) - response["statuscode"] = 429 - response["response"] = "Rate limited" - return json_encode(response) - var/logging = CONFIG_GET(flag/log_world_topic) var/topic_decoded = rustg_url_decode(T) if(!rustg_json_is_valid(topic_decoded)) diff --git a/code/global.dm b/code/global.dm index bdde529a9af8..e329cbdd00d5 100644 --- a/code/global.dm +++ b/code/global.dm @@ -153,14 +153,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/admin/player_panel/actions/antag.dm b/code/modules/admin/player_panel/actions/antag.dm index b3b62243c812..b1c2da6be123 100644 --- a/code/modules/admin/player_panel/actions/antag.dm +++ b/code/modules/admin/player_panel/actions/antag.dm @@ -56,9 +56,8 @@ if(params["leader"]) preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist/leader] - - preset.load_race(H, params["hivenumber"]) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, params["hivenumber"]) var/title = params["leader"]? "xeno cultist leader" : "cultist" diff --git a/code/modules/admin/player_panel/player_panel.dm b/code/modules/admin/player_panel/player_panel.dm index 12686e683521..4b79c8c91569 100644 --- a/code/modules/admin/player_panel/player_panel.dm +++ b/code/modules/admin/player_panel/player_panel.dm @@ -389,15 +389,15 @@ dat += "Round Duration: [round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]
" if(check_rights(R_DEBUG, 0)) - dat += "
VV Evacuation Controller
" dat += "VV Shuttle Controller

" if(check_rights(R_MOD, 0)) - dat += "Evacuation: " - switch(EvacuationAuthority.evac_status) - if(EVACUATION_STATUS_STANDING_BY) dat += "STANDING BY" - if(EVACUATION_STATUS_INITIATING) dat += "IN PROGRESS: [EvacuationAuthority.get_status_panel_eta()]" - if(EVACUATION_STATUS_COMPLETE) dat += "COMPLETE" + dat += "Evacuation Goals: " + switch(SShijack.evac_status) + if(EVACUATION_STATUS_NOT_INITIATED) + dat += "STANDING BY" + if(EVACUATION_STATUS_INITIATED) + dat += "IN PROGRESS" dat += "
" dat += "Initiate Evacuation
" @@ -405,20 +405,6 @@ dat += "Toggle Evacuation Permission (does not affect evac in progress)
" if(check_rights(R_ADMIN, 0)) dat += "Force Evacuation Now
" - if(check_rights(R_ADMIN, 0)) - dat += "Self-Destruct: " - switch(EvacuationAuthority.dest_status) - if(NUKE_EXPLOSION_INACTIVE) dat += "INACTIVE" - if(NUKE_EXPLOSION_ACTIVE) dat += "ACTIVE" - if(NUKE_EXPLOSION_IN_PROGRESS) dat += "IN PROGRESS" - if(NUKE_EXPLOSION_FINISHED, NUKE_EXPLOSION_GROUND_FINISHED) dat += "FINISHED" - dat += "
" - - dat += "Unlock Self-Destruct control panel for humans
" - dat += "Lock Self-Destruct control panel for humans
" - dat += "Destruct the [MAIN_SHIP_NAME] NOW
" - dat += "Toggle Self-Destruct Permission (does not affect evac in progress)
" - dat += "
[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]
" dat += "" show_browser(usr, dat, "Round Status", "roundstatus", "size=600x500") diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index a5975bb02274..fcc604c9cfa8 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -218,14 +218,17 @@ if(!istype(chosen_ert)) return - var/quiet_launch = tgui_alert(usr, "Would you like to announce the distress beacon to the server population? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS) - if(!quiet_launch) - qdel(chosen_ert) - return - if(quiet_launch == "No") - quiet_launch = TRUE - if (quiet_launch == "Yes") - quiet_launch = FALSE + var/launch_broadcast = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS) + if(launch_broadcast == "Yes") + launch_broadcast = TRUE + else + launch_broadcast = FALSE + + var/announce_receipt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS) + if(announce_receipt == "Yes") + announce_receipt = TRUE + else + announce_receipt = FALSE var/turf/override_spawn_loc var/prompt = tgui_alert(usr, "Spawn at their assigned spawn, or at your location?", "Spawnpoint Selection", list("Spawn", "Current Location"), 0) @@ -235,7 +238,7 @@ if(prompt == "Current Location") override_spawn_loc = get_turf(usr) - chosen_ert.activate(quiet_launch = quiet_launch, announce = !quiet_launch, override_spawn_loc = override_spawn_loc) + chosen_ert.activate(quiet_launch = launch_broadcast, announce_incoming = announce_receipt, override_spawn_loc = override_spawn_loc) message_admins("[key_name_admin(usr)] admin-called a [choice == "Randomize" ? "randomized ":""]distress beacon: [chosen_ert.name]") @@ -247,7 +250,7 @@ if(!SSticker.mode || !check_rights(R_ADMIN)) return set_security_level(SEC_LEVEL_RED) - EvacuationAuthority.initiate_evacuation() + SShijack.initiate_evacuation() message_admins("[key_name_admin(usr)] forced an emergency evacuation.") @@ -258,7 +261,7 @@ if(!SSticker.mode || !check_rights(R_ADMIN)) return - EvacuationAuthority.cancel_evacuation() + SShijack.cancel_evacuation() message_admins("[key_name_admin(usr)] canceled an emergency evacuation.") @@ -322,7 +325,7 @@ if(!admin_holder) return - var/list/options = list("Weyland-Yutani", "High Command", "Provost", "Press", "Other", "Cancel") + var/list/options = list("Weyland-Yutani", "High Command", "Provost", "Press", "CMB", "Other", "Cancel") var/answer = tgui_input_list(src, "Which kind of faxes would you like to see?", "Faxes", options) switch(answer) if("Weyland-Yutani") @@ -597,9 +600,9 @@ return FALSE var/datum/ares_link/link = GLOB.ares_link - if(link.p_apollo.inoperable()) + if(link.processor_apollo.inoperable()) var/prompt = tgui_alert(src, "ARES APOLLO processor is offline or destroyed, send the message anyways?", "Choose.", list("Yes", "No"), 20 SECONDS) - if(prompt == "No") + if(prompt != "Yes") to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It's APOLLO processor may be offline or destroyed.")) return FALSE @@ -931,13 +934,8 @@ message_admins("[key_name(usr)] has fired \an [warhead.name] at ([target.x],[target.y],[target.z]).") warhead.warhead_impact(target) - if(istype(warhead, /obj/structure/ob_ammo/warhead/cluster)) - // so the user's screen can shake for the duration of the cluster, otherwise we get a runtime. - QDEL_IN(warhead, OB_CLUSTER_DURATION) - else - QDEL_IN(warhead, OB_CRASHING_DOWN) else - warhead.loc = target + warhead.forceMove(target) /client/proc/change_taskbar_icon() set name = "Set Taskbar Icon" diff --git a/code/modules/admin/tabs/server_tab.dm b/code/modules/admin/tabs/server_tab.dm index 6e5ded23206a..84c9426dfa3f 100644 --- a/code/modules/admin/tabs/server_tab.dm +++ b/code/modules/admin/tabs/server_tab.dm @@ -6,10 +6,6 @@ if (!usr.client.admin_holder || !(usr.client.admin_holder.rights & R_MOD)) return - if(!check_rights(R_DEBUG, FALSE) && SSticker.current_state != GAME_STATE_FINISHED) - to_chat(usr, "You can't restart the world until the round has ended!") - return - var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel") if(confirm == "Cancel") return diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index bb7755aa41b0..d60377123c49 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -131,50 +131,20 @@ if(href_list["evac_authority"]) switch(href_list["evac_authority"]) if("init_evac") - if(!EvacuationAuthority.initiate_evacuation()) + if(!SShijack.initiate_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation right now!")) else message_admins("[key_name_admin(usr)] called an evacuation.") if("cancel_evac") - if(!EvacuationAuthority.cancel_evacuation()) + if(!SShijack.cancel_evacuation()) to_chat(usr, SPAN_WARNING("You are unable to cancel an evacuation right now!")) else message_admins("[key_name_admin(usr)] canceled an evacuation.") if("toggle_evac") - EvacuationAuthority.flags_scuttle ^= FLAGS_EVACUATION_DENY - message_admins("[key_name_admin(usr)] has [EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY ? "forbidden" : "allowed"] ship-wide evacuation.") - - if("force_evac") - if(!EvacuationAuthority.begin_launch()) - to_chat(usr, SPAN_WARNING("You are unable to launch the pods directly right now!")) - else - message_admins("[key_name_admin(usr)] force-launched the escape pods.") - - if("init_dest") - if(!EvacuationAuthority.enable_self_destruct()) - to_chat(usr, SPAN_WARNING("You are unable to authorize the self-destruct right now!")) - else - message_admins("[key_name_admin(usr)] force-enabled the self-destruct system.") - - if("cancel_dest") - if(!EvacuationAuthority.cancel_self_destruct(1)) - to_chat(usr, SPAN_WARNING("You are unable to cancel the self-destruct right now!")) - else - message_admins("[key_name_admin(usr)] canceled the self-destruct system.") - - if("use_dest") - - var/confirm = alert("Are you sure you want to self-destruct the Almayer?", "Self-Destruct", "Yes", "Cancel") - if(confirm != "Yes") - return - message_admins("[key_name_admin(usr)] forced the self-destrust system, destroying the [MAIN_SHIP_NAME].") - EvacuationAuthority.trigger_self_destruct() - - if("toggle_dest") - EvacuationAuthority.flags_scuttle ^= FLAGS_SELF_DESTRUCT_DENY - message_admins("[key_name_admin(usr)] has [EvacuationAuthority.flags_scuttle & FLAGS_SELF_DESTRUCT_DENY ? "forbidden" : "allowed"] the self-destruct system.") + SShijack.evac_admin_denied = !SShijack.evac_admin_denied + message_admins("[key_name_admin(usr)] has [SShijack.evac_admin_denied ? "forbidden" : "allowed"] ship-wide evacuation.") //====================================================== //====================================================== @@ -336,86 +306,6 @@ /////////////////////////////////////new ban stuff - else if(href_list["jobban2"]) -// if(!check_rights(R_BAN)) return - /* - var/mob/M = locate(href_list["jobban2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") - return - if(!RoleAuthority) - to_chat(usr, "The Role Authority is not set up!") - return - - var/datum/entity/player/P = get_player_from_key(M.ckey) - - var/dat = "" - var/body - var/jobs = "" - - /***********************************WARNING!************************************ - The jobban stuff looks mangled and disgusting - But it looks beautiful in-game - -Nodrak - ************************************WARNING!***********************************/ -//Regular jobs - //Command (Blue) - jobs += generate_job_ban_list(M, ROLES_CIC, "CIC", "ddddff") - jobs += "
" - // SUPPORT - jobs += generate_job_ban_list(M, ROLES_AUXIL_SUPPORT, "Support", "ccccff") - jobs += "
" - // MPs - jobs += generate_job_ban_list(M, ROLES_POLICE, "Police", "ffdddd") - jobs += "
" - //Engineering (Yellow) - jobs += generate_job_ban_list(M, ROLES_ENGINEERING, "Engineering", "fff5cc") - jobs += "
" - //Cargo (Yellow) //Copy paste, yada, yada. Hopefully Snail can rework this in the future. - jobs += generate_job_ban_list(M, ROLES_REQUISITION, "Requisition", "fff5cc") - jobs += "
" - //Medical (White) - jobs += generate_job_ban_list(M, ROLES_MEDICAL, "Medical", "ffeef0") - jobs += "
" - //Marines - jobs += generate_job_ban_list(M, ROLES_MARINES, "Marines", "ffeeee") - jobs += "
" - // MISC - jobs += generate_job_ban_list(M, ROLES_MISC, "Misc", "aaee55") - jobs += "
" - // Xenos (Orange) - jobs += generate_job_ban_list(M, ROLES_XENO, "Xenos", "a268b1") - jobs += "
" - //Extra (Orange) - var/isbanned_dept = jobban_isbanned(M, "Syndicate", P) - jobs += "" - jobs += "" - - //ERT - if(jobban_isbanned(M, "Emergency Response Team", P) || isbanned_dept) - jobs += "" - else - jobs += "" - - //Survivor - if(jobban_isbanned(M, "Survivor", P) || isbanned_dept) - jobs += "" - else - jobs += "" - - if(jobban_isbanned(M, "Agent", P) || isbanned_dept) - jobs += "" - else - jobs += "" - - body = "[jobs]" - dat = "[body]" - show_browser(usr, dat, "Job-Ban Panel: [M.name]", "jobban2", "size=800x490") - return*/ // DEPRECATED //JOBBAN'S INNARDS else if(href_list["jobban3"]) if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN)) return @@ -697,7 +587,6 @@ to_world(SPAN_NOTICE("The mode is now: [GLOB.master_mode]!")) Game() // updates the main game menu SSticker.save_mode(GLOB.master_mode) - .(href, list("c_mode"=1)) else if(href_list["f_secret2"]) @@ -836,14 +725,14 @@ if(href_list["makecultist"]) var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] - preset.load_race(H, hive.hivenumber) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, hive.hivenumber) message_admins("[key_name_admin(usr)] has made [key_name_admin(H)] into a cultist for [hive.name].") else if(href_list["makecultistleader"]) var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist/leader] - preset.load_race(H, hive.hivenumber) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, hive.hivenumber) message_admins("[key_name_admin(usr)] has made [key_name_admin(H)] into a cultist leader for [hive.name].") H.faction = hive.internal_faction @@ -1243,7 +1132,7 @@ for(var/client/X in GLOB.admins) if((R_ADMIN|R_MOD) & X.admin_holder.rights) to_chat(X, SPAN_STAFF_IC("ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"")) - to_chat(H, SPAN_DANGER("You hear something crackle in your headset before a voice speaks, please stand by for a message from USCM:\" \blue \"[input]\"")) + to_chat(H, SPAN_DANGER("You hear something crackle in your headset before a voice speaks, please stand by for a message:\" \blue \"[input]\"")) else if(href_list["SyndicateReply"]) var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) @@ -1310,11 +1199,10 @@ if(send_choice != "Send") return GLOB.fax_contents += fax_message // save a copy - - GLOB.USCMFaxes.Add("\[view reply at [world.timeofday]\]") - var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null + GLOB.USCMFaxes.Add("\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]") + var/msg_ghost = SPAN_NOTICE("PRESS REPLY: ") msg_ghost += "Transmitting '[customname]' via secure connection ... " msg_ghost += "view message" @@ -1393,10 +1281,10 @@ return GLOB.fax_contents += fax_message // save a copy - GLOB.USCMFaxes.Add("\[view reply at [world.timeofday]\]") - var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null + GLOB.USCMFaxes.Add("\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]") + var/msg_ghost = SPAN_NOTICE("USCM FAX REPLY: ") msg_ghost += "Transmitting '[customname]' via secure connection ... " msg_ghost += "view message" @@ -1472,12 +1360,12 @@ return GLOB.fax_contents += fax_message // save a copy - GLOB.WYFaxes.Add("\[view reply at [world.timeofday]\]") //Add replies so that mods know what the hell is goin on with the RP - var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null if(!customname) return + GLOB.WYFaxes.Add("\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]") //Add replies so that mods know what the hell is goin on with the RP + var/msg_ghost = SPAN_NOTICE("WEYLAND-YUTANI FAX REPLY: ") msg_ghost += "Transmitting '[customname]' via secure connection ... " msg_ghost += "view message" @@ -1554,12 +1442,12 @@ return GLOB.fax_contents += fax_message // save a copy - GLOB.CMBFaxes.Add("\[view reply at [world.timeofday]\]") //Add replies so that mods know what the hell is goin on with the RP - var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null if(!customname) return + GLOB.CMBFaxes.Add("\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]") //Add replies so that mods know what the hell is goin on with the RP + var/msg_ghost = SPAN_NOTICE("COLONIAL MARSHAL BUREAU FAX REPLY: ") msg_ghost += "Transmitting '[customname]' via secure connection ... " msg_ghost += "view message" @@ -1904,16 +1792,18 @@ addtimer(CALLBACK(src, PROC_REF(accept_ert), usr, locate(href_list["distress"])), 10 SECONDS) //unanswered_distress -= ref_person - if(href_list["distress_pmc"]) //Wey-Yu specific PMC distress signal for chem retrieval ERT + if(href_list["distress_handheld"]) //Prepares to call and logs accepted handheld distress beacons + var/mob/ref_person = href_list["distress_handheld"] + var/ert_name = href_list["ert_name"] distress_cancel = FALSE - message_admins("[key_name_admin(usr)] has opted to SEND the distress beacon! Launching in 10 seconds... (CANCEL)") - addtimer(CALLBACK(src, PROC_REF(accept_pmc_ert), usr, locate(href_list["distress"])), 10 SECONDS) + message_admins("[key_name_admin(usr)] has opted to SEND [ert_name]! Launching in 10 seconds... (CANCEL)") + addtimer(CALLBACK(src, PROC_REF(accept_handheld_ert), usr, ref_person, ert_name), 10 SECONDS) - if(href_list["ccdeny_pmc"]) // CentComm-deny. The distress call is denied, without any further conditions - var/mob/ref_person = locate(href_list["ccdeny_pmc"]) + if(href_list["deny_distress_handheld"]) //Logs denied handheld distress beacons + var/mob/ref_person = href_list["deny_distress_handheld"] to_chat(ref_person, "The distress signal has not received a response.") log_game("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]") - message_admins("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]", 1) + message_admins("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]") if(href_list["destroyship"]) //Distress Beacon, sends a random distress beacon when pressed destroy_cancel = FALSE @@ -1948,7 +1838,7 @@ supply_controller.shoppinglist += new_order //Can no longer request a nuke - GLOB.ares_link.interface.nuke_available = FALSE + GLOB.ares_datacore.nuke_available = FALSE marine_announcement("A nuclear device has been authorized by High Command and will be delivered to requisitions via ASRS.", "NUCLEAR ORDNANCE AUTHORIZED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN) log_game("[key_name_admin(usr)] has authorized a [nuketype], requested by [key_name_admin(ref_person)]") @@ -2092,13 +1982,14 @@ log_game("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]") -/datum/admins/proc/accept_pmc_ert(mob/approver, mob/ref_person) +///Handles calling the ERT sent by handheld distress beacons +/datum/admins/proc/accept_handheld_ert(mob/approver, mob/ref_person, ert_called) if(distress_cancel) return distress_cancel = TRUE - SSticker.mode.get_specific_call("Weyland-Yutani PMC (Chemical Investigation Squad)", TRUE, FALSE, FALSE) - log_game("[key_name_admin(approver)] has sent a PMC distress beacon, requested by [key_name_admin(ref_person)]") - message_admins("[key_name_admin(approver)] has sent a PMC distress beacon, requested by [key_name_admin(ref_person)]") + SSticker.mode.get_specific_call("[ert_called]", TRUE, FALSE) + log_game("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]") + message_admins("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]") /datum/admins/proc/generate_job_ban_list(mob/M, datum/entity/player/P, list/roles, department, color = "ccccff") var/counter = 0 diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm index 45d826668d4b..c38f715d93bf 100644 --- a/code/modules/admin/topic/topic_events.dm +++ b/code/modules/admin/topic/topic_events.dm @@ -206,7 +206,19 @@ em_call.players_to_offer = humans em_call.owner = owner - em_call.activate(announce = FALSE) + var/launch_broadcast = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS) + if(launch_broadcast == "Yes") + launch_broadcast = TRUE + else + launch_broadcast = FALSE + + var/announce_receipt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS) + if(announce_receipt == "Yes") + announce_receipt = TRUE + else + announce_receipt = FALSE + + em_call.activate(launch_broadcast, announce_receipt) message_admins("[key_name_admin(usr)] created [humans_to_spawn] humans as [job_name] at [get_area(initial_spot)]") @@ -284,7 +296,19 @@ em_call.players_to_offer = xenos em_call.owner = owner - em_call.activate(announce = FALSE) + var/launch_broadcast = tgui_alert(usr, "Would you like to broadcast the beacon launch? This will reveal the distress beacon to all players.", "Announce distress beacon?", list("Yes", "No"), 20 SECONDS) + if(launch_broadcast == "Yes") + launch_broadcast = TRUE + else + launch_broadcast = FALSE + + var/announce_receipt = tgui_alert(usr, "Would you like to announce the beacon received message? This will reveal the distress beacon to all players.", "Announce beacon received?", list("Yes", "No"), 20 SECONDS) + if(announce_receipt == "Yes") + announce_receipt = TRUE + else + announce_receipt = FALSE + + em_call.activate(launch_broadcast, announce_receipt) message_admins("[key_name_admin(usr)] created [xenos_to_spawn] xenos as [xeno_caste] at [get_area(initial_spot)]") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 758fd2327e77..5f10b8d24d22 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -753,6 +753,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) // /client/proc/giveadminhelpverb() + if(!src) + return add_verb(src, /client/verb/adminhelp) deltimer(adminhelptimerid) adminhelptimerid = 0 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 0297145c7e8d..a7ee69469f1d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -329,7 +329,7 @@ set desc = "For scheduler debugging" var/list/individual_counts = list() - for(var/datum/disease/M in active_diseases) + for(var/datum/disease/M in SSdisease.all_diseases) individual_counts["[M.type]"]++ for(var/mob/M in SShuman.processable_human_list) individual_counts["[M.type]"]++ diff --git a/code/modules/admin/verbs/freeforghosts.dm b/code/modules/admin/verbs/freeforghosts.dm index 24c261ee18f3..4bf5549f30f0 100644 --- a/code/modules/admin/verbs/freeforghosts.dm +++ b/code/modules/admin/verbs/freeforghosts.dm @@ -20,7 +20,7 @@ if(mind || client) ghostize(FALSE) - GLOB.freed_mob_list |= WEAKREF(src) + GLOB.freed_mob_list |= src if(!notify) return diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 4809d9b2e6ee..351d281e1881 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -164,7 +164,7 @@ if(!H.get_type_in_ears(/obj/item/device/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") return - to_chat(H, SPAN_DANGER("Message received through headset. [message_option] Transmission \"[msg]\"")) + to_chat(H, SPAN_ANNOUNCEMENT_HEADER_BLUE("Message received through headset. [message_option] Transmission \"[msg]\"")) var/message = WRAP_STAFF_LOG(usr, SPAN_STAFF_IC("subtle messaged [key_name(M)] as [message_option], saying \"[msg]\" in [get_area(M)] ([M.x],[M.y],[M.z]).")) message_admins(message, M.x, M.y, M.z) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index d5d44a047947..d1e7f83dacb1 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -321,7 +321,7 @@ I = icon(icon_file, icon_state, SOUTH) var/c = initial(item.color) if (!isnull(c) && c != "#FFFFFF") - I.Blend(initial(c), ICON_MULTIPLY) + I.Blend(c, ICON_MULTIPLY) else if (ispath(k, /obj/effect/essentials_set)) var/obj/effect/essentials_set/es_set = new k() diff --git a/code/modules/character_traits/biology_traits.dm b/code/modules/character_traits/biology_traits.dm index 87fb0b70ec36..a269aabede9f 100644 --- a/code/modules/character_traits/biology_traits.dm +++ b/code/modules/character_traits/biology_traits.dm @@ -85,14 +85,14 @@ /datum/character_trait/biology/bad_leg/New() . = ..() // Not on definition as several lists are added - inapplicable_roles = list(JOB_NURSE, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CARGO_TECH, JOB_MARINE) + JOB_SQUAD_ROLES_LIST + JOB_MARINE_RAIDER_ROLES_LIST + JOB_ERT_GRUNT_LIST + inapplicable_roles = list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL, JOB_ORDNANCE_TECH, JOB_MARINE) + JOB_SQUAD_ROLES_LIST + JOB_MARINE_RAIDER_ROLES_LIST + JOB_ERT_GRUNT_LIST bad_cane_roles = list(JOB_SURVIVOR, JOB_STOWAWAY) fancy_cane_roles = list(JOB_CO_SURVIVOR, CORPORATE_SURVIVOR, JOB_CMO, JOB_CORPORATE_LIAISON, JOB_SEA, JOB_CHIEF_ENGINEER) + JOB_COMMAND_ROLES_LIST inapplicable_species = list(SPECIES_SYNTHETIC, SPECIES_YAUTJA) /datum/character_trait/biology/bad_leg/apply_trait(mob/living/carbon/human/target, datum/equipment_preset/preset) if(target.job in inapplicable_roles) - to_chat(target, SPAN_WARNING("Your office is too combat-geared or starter for you to be able to recieve the bad leg trait.")) + to_chat(target, SPAN_WARNING("Your office is too combat-geared for you to be able to recieve the bad leg trait.")) return if(target.species.group in inapplicable_species) to_chat(target, SPAN_WARNING("Your species is too sophisticated for you be able to recieve the bad leg trait.")) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 604e443541d4..d44e2e7ff986 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -145,7 +145,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if(!receiver_client) to_chat(src, SPAN_WARNING("The person you were attempting to PM has gone offline!")) return - if(unansweredAhelps[receiver_client.computer_id]) unansweredAhelps.Remove(receiver_client.computer_id) cmd_admin_pm(receiver_client, null) return else if(href_list["FaxView"]) @@ -337,13 +336,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning fps = prefs.fps - xeno_prefix = prefs.xeno_prefix - xeno_postfix = prefs.xeno_postfix - xeno_name_ban = prefs.xeno_name_ban - if(!xeno_prefix || xeno_name_ban) - xeno_prefix = "XX" - if(!xeno_postfix || xeno_name_ban) - xeno_postfix = "" + + load_xeno_name() human_name_ban = prefs.human_name_ban @@ -479,7 +473,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( GLOB.clients -= src SSping.currentrun -= src - unansweredAhelps?.Remove(computer_id) log_access("Logout: [key_name(src)]") if(CLIENT_IS_STAFF(src)) message_admins("Admin logout: [key_name(src)]") @@ -797,3 +790,12 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if(admin_holder) admin_holder.particle_test = new /datum/particle_editor(in_atom) admin_holder.particle_test.tgui_interact(mob) + +/client/proc/load_xeno_name() + xeno_prefix = prefs.xeno_prefix + xeno_postfix = prefs.xeno_postfix + xeno_name_ban = prefs.xeno_name_ban + if(!xeno_prefix || xeno_name_ban) + xeno_prefix = "XX" + if(!xeno_postfix || xeno_name_ban) + xeno_postfix = "" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 84a35163339b..04b82628e3c6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1409,17 +1409,16 @@ var/const/MAX_SAVE_SLOTS = 10 if(length(new_xeno_prefix)==0) xeno_prefix = "XX" + owner.load_xeno_name() else var/all_ok = TRUE for(var/i=1, i<=length(new_xeno_prefix), i++) var/ascii_char = text2ascii(new_xeno_prefix,i) - switch(ascii_char) - // A .. Z - if(65 to 90) //Uppercase Letters will work - else - all_ok = FALSE //everything else - won't + if(ascii_char < 65 || ascii_char > 90) + all_ok = FALSE //everything else - won't if(all_ok) xeno_prefix = new_xeno_prefix + owner.load_xeno_name() else to_chat(user, "Invalid Xeno Prefix. Your Prefix can contain either single letter or two letters.") @@ -1444,6 +1443,7 @@ var/const/MAX_SAVE_SLOTS = 10 return else if(length(new_xeno_postfix)==0) xeno_postfix = "" + owner.load_xeno_name() else var/all_ok = TRUE var/first_char = TRUE @@ -1469,6 +1469,7 @@ var/const/MAX_SAVE_SLOTS = 10 first_char = FALSE if(all_ok) xeno_postfix = new_xeno_postfix + owner.load_xeno_name() else to_chat(user, "Invalid Xeno Postfix. Your Postfix can contain single letter and an optional digit after it.") @@ -1696,6 +1697,11 @@ var/const/MAX_SAVE_SLOTS = 10 if("origin") var/choice = tgui_input_list(user, "Please choose your character's origin.", "Origin Selection", GLOB.player_origins) + var/datum/origin/picked_choice = GLOB.origins[choice] + if(!picked_choice) + return + if(tgui_alert(user, "You've selected [picked_choice.name]. [picked_choice.desc]", "Selected Origin", list("Confirm", "Cancel")) == "Cancel") + return if(choice) origin = choice diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index c6c06a123b2e..4b937b0135b3 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,21 @@ var/global/list/gear_datums_by_name = list() /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 b03132c15d2b..bffbda9f538a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -335,10 +335,44 @@ 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 + var/allowed = FALSE + for(var/allowed_item in items_allowed) + if(istype(attacking_item, allowed_item)) + allowed = TRUE + break + if(!allowed) + return + 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 +380,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/glasses/night.dm b/code/modules/clothing/glasses/night.dm index afb711c3ca15..2a3780832e2a 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -187,7 +187,7 @@ if(target) var/obj/item/clothing/glasses/night/m56_goggles/G = target G.set_far_sight(owner, !G.far_sight) - to_chat(owner, SPAN_NOTICE("You [G.far_sight ? "enable" : "disable"] \the [src]'s far sight system.")) + to_chat(owner, SPAN_NOTICE("You [G.far_sight ? "enable" : "disable"] \the [G]'s far sight system.")) /datum/action/item_action/m56_goggles/far_sight/update_button_icon() if(!target) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 15c596f9f6e1..9a3e9fd5bb08 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -53,6 +53,14 @@ item_state = "brown" adopts_squad_color = FALSE +/obj/item/clothing/gloves/marine/medical + name = "marine medical combat gloves" + desc = "Standard issue marine sterile gloves, offers regular protection whilst offering the user a better grip when performing medical work." + icon_state = "latex" + item_state = "lgloves" + adopts_squad_color = FALSE + + /obj/item/clothing/gloves/marine/officer name = "officer gloves" desc = "Shiny and impressive. They look expensive." diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index f16b6ff42c9d..ac4eb485c111 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) @@ -308,8 +314,8 @@ /obj/item/clothing/head/cmcap/get_mob_overlay(mob/user_mob, slot) var/image/return_image = ..() - if(!slot == WEAR_HEAD) - return + if(slot != WEAR_HEAD) + return return_image if(length(pockets.contents) && (flags_marine_hat & HAT_GARB_OVERLAY)) for(var/obj/garb_object in pockets.contents) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index da0f58088858..45ee972e7091 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -217,6 +217,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/storage/fancy/cigarettes/arcturian_ace = "helmet_cig_aapack", /obj/item/storage/fancy/cigarettes/lucky_strikes_4 = "hat_cig_ls_mre", /obj/item/storage/fancy/cigar/matchbook = "helmet_matches_mre", + /obj/item/clothing/mask/cigarette/cigar = "helmet_cig_cig", + /obj/item/clothing/mask/electronic_cigarette = "helmet_cig_cig", // CARDS /obj/item/toy/deck = "helmet_card_deck", @@ -278,6 +280,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 +300,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", @@ -333,7 +339,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 6c69c750fe37..b5ec4f3ab924 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 fc11a74a695d..4d576d14497a 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 d969587e32e5..2c023fed2ed7 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, ) @@ -423,7 +423,7 @@ return var/obj/item/weapon/gun/W = usr.get_active_hand() if (W.w_class > SIZE_MEDIUM) - to_chat(usr, SPAN_DANGER("This gun won't fit in \the belt!")) + to_chat(usr, SPAN_DANGER("This gun won't fit in the belt!")) return holstered = usr.get_active_hand() usr.drop_held_item() diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index e375502f5435..e736ce18a129 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, @@ -1635,47 +1635,47 @@ //=======================================================================\\ /obj/item/clothing/suit/storage/marine/MP/provost - name = "\improper M3 pattern Provost armor" - desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon_state = "pvlight" - item_state_slots = list(WEAR_JACKET = "pvlight") - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - w_class = SIZE_MEDIUM - -/obj/item/clothing/suit/storage/marine/MP/provost/enforcer name = "\improper M3 pattern Provost armor" desc = "A standard Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." icon_state = "pvmedium" item_state_slots = list(WEAR_JACKET = "pvmedium") - slowdown = SLOWDOWN_ARMOR_MEDIUM - armor_melee = CLOTHING_ARMOR_MEDIUM + slowdown = SLOWDOWN_ARMOR_LIGHT armor_bullet = CLOTHING_ARMOR_MEDIUM armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_bio = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUM + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + storage_slots = 3 /obj/item/clothing/suit/storage/marine/MP/provost/tml name = "\improper M3 pattern Senior Provost armor" + desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." icon_state = "pvleader" item_state_slots = list(WEAR_JACKET = "pvleader") - desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - - slowdown = SLOWDOWN_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH /obj/item/clothing/suit/storage/marine/MP/provost/marshal + name = "\improper M5 pattern Provost Marshal armor" + desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field." icon_state = "pvmarshal" item_state_slots = list(WEAR_JACKET = "pvmarshal") - name = "\improper M3 pattern Provost Marshal armor" - desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field." + w_class = SIZE_MEDIUM + storage_slots = 4 + +/obj/item/clothing/suit/storage/marine/MP/provost/light + name = "\improper M3 pattern Provost light armor" + desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon_state = "pvlight" + item_state_slots = list(WEAR_JACKET = "pvlight") + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT -/obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief - name = "\improper M3 pattern Provost Chief Marshal armor" +/obj/item/clothing/suit/storage/marine/MP/provost/light/flexi + name = "\improper M3 pattern Provost flexi-armor" + desc = "A flexible and easy to store M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + w_class = SIZE_MEDIUM + icon_state = "pvlight_2" + item_state_slots = list(WEAR_JACKET = "pvlight_2") + storage_slots = 2 //================//UNITED AMERICAS ALLIED COMMAND\\=====================\\ //=======================================================================\\ @@ -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/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index d6781147a092..73d7e0981859 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -235,31 +235,23 @@ //=========================//PROVOST\\================================\\ //=======================================================================\\ + /obj/item/clothing/suit/storage/jacket/marine/provost - name = "\improper Provost Coat" - desc = "The crisp coat of a Provost Officer." + name = "\improper Provost Jacket" + desc = "A crisp jacket with the Provost sigil." + icon_state = "provost_jacket" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - icon_state = "provost_coat" valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR) -/obj/item/clothing/suit/storage/jacket/marine/provost/advisor - name = "\improper Provost Advisor Jacket" - desc = "The crisp jacket of a Provost Advisor." - icon_state = "provost_jacket" - -/obj/item/clothing/suit/storage/jacket/marine/provost/inspector - name = "\improper Provost Inspector Jacket" - desc = "The crisp jacket of a Provost Inspector." - icon_state = "provost_jacket" +/obj/item/clothing/suit/storage/jacket/marine/provost/coat + name = "\improper Provost Coat" + desc = "The crisp coat of a Provost Officer." + icon_state = "provost_coat" -/obj/item/clothing/suit/storage/jacket/marine/provost/marshal - name = "\improper Provost Marshal Jacket" - desc = "The crisp jacket of a Provost Marshal." - icon_state = "provost_jacket" +/obj/item/clothing/suit/storage/jacket/marine/provost/coat/marshal + name = "\improper Provost Marshal Coat" + icon_state = "provost_coat_marshal" -/obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief - name = "\improper Provost Chief Marshal Jacket" - desc = "The crisp jacket of the Provost Chief Marshal." //=========================//DRESS BLUES\\================================\\ //=======================================================================\\ diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index d9d8d7da45b7..847652636e75 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -374,41 +374,17 @@ min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT -/obj/item/clothing/under/marine/mp/provost/enforcer - name = "\improper Provost Enforcer Uniform" - desc = "The crisp uniform of a Provost Enforcer." - -/obj/item/clothing/under/marine/mp/provost/tml - name = "\improper Provost Team Leader Uniform" - desc = "The crisp uniform of a Provost Team Leader." - icon_state = "warden_jumpsuit" - worn_state = "warden_jumpsuit" - -/obj/item/clothing/under/marine/mp/provost/advisor - name = "\improper Provost Advisor Uniform" - desc = "The crisp uniform of a Provost Advisor." - icon_state = "warden_jumpsuit" - worn_state = "warden_jumpsuit" - -/obj/item/clothing/under/marine/mp/provost/inspector - name = "\improper Provost Inspector Uniform" - desc = "The crisp uniform of a Provost Inspector." - icon_state = "warden_jumpsuit" - worn_state = "warden_jumpsuit" +/obj/item/clothing/under/marine/mp/provost/senior + name = "\improper Provost Senior Uniform" + desc = "The crisp uniform of a senior member of the Provost Office." + icon_state = "provost_tml" + worn_state = "provost_tml" /obj/item/clothing/under/marine/mp/provost/marshal name = "\improper Provost Marshal Uniform" desc = "The crisp uniform of a Provost Marshal." - icon_state = "WO_jumpsuit" - worn_state = "WO_jumpsuit" - -/obj/item/clothing/under/marine/mp/provost/marshal/sector - name = "\improper Provost Sector Marshal Uniform" - desc = "The crisp uniform of a Provost Sector Marshal." - -/obj/item/clothing/under/marine/mp/provost/marshal/chief - name = "\improper Provost Chief Marshal Uniform" - desc = "The crisp uniform of the Provost Chief Marshal." + icon_state = "provost_marshal" + worn_state = "provost_marshal" //==================//UNITED AMERICAS ALLIED COMMAND\\===================\\ //=======================================================================\\ @@ -605,7 +581,7 @@ worn_state = "freelancer_uniform" min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT has_sensor = UNIFORM_NO_SENSORS - suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer) + suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/utility_vest) //=========================//Dutch Dozen\\================================\\ diff --git a/code/modules/cm_aliens/structures/special/hive_cluster.dm b/code/modules/cm_aliens/structures/special/hive_cluster.dm index ac92ee5055b1..6ebcb70493d5 100644 --- a/code/modules/cm_aliens/structures/special/hive_cluster.dm +++ b/code/modules/cm_aliens/structures/special/hive_cluster.dm @@ -23,9 +23,15 @@ /obj/effect/alien/resin/special/cluster/Initialize(mapload, hive_ref) . = ..() node = place_node() + update_minimap_icon() + +/obj/effect/alien/resin/special/cluster/proc/update_minimap_icon() + SSminimaps.remove_marker(src) + SSminimaps.add_marker(src, z, MINIMAP_FLAG_XENO, "cluster") /obj/effect/alien/resin/special/cluster/Destroy() QDEL_NULL(node) + SSminimaps.remove_marker(src) return ..() /obj/effect/alien/resin/special/cluster/attack_alien(mob/living/carbon/xenomorph/M) diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index a0db75b365b5..62a7417c57f8 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -248,7 +248,7 @@ /obj/effect/alien/resin/special/pylon/core/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "core[health < (initial(health) * 0.5) ? "_warn" : "_passive"]") + SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "core") /obj/effect/alien/resin/special/pylon/core/process() . = ..() @@ -284,7 +284,7 @@ linked_hive.stored_larva++ linked_hive.hijack_burrowed_left-- if(GLOB.xeno_queue_candidate_count < 1 + count_spawned) - notify_ghosts(header = "Claim Xeno", message = "The Hive has gained another burrowed larva! Click to take it.", source = src, action = NOTIFY_JOIN_XENO, enter_link = "join_xeno") + notify_ghosts(header = "Claim Xeno", message = "The Hive has gained another burrowed larva! Click to take it.", source = src, action = NOTIFY_JOIN_XENO, enter_link = "join_xeno=1") if(surge_cooldown > 30 SECONDS) //mostly for sanity purposes surge_cooldown = surge_cooldown - surge_incremental_reduction //ramps up over time if(linked_hive.hijack_burrowed_left < 1) diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index eb4fc3cd6f09..736d4f947450 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -196,7 +196,7 @@ var/parent_type = /obj/effect/alien/weeds/node if(weed_strength >= WEED_LEVEL_HIVE) parent_type = /obj/effect/alien/weeds/node/pylon - + var/obj/effect/alien/weeds/node/found = locate(parent_type) in orange(node_range, get_turf(src)) if(found) found.add_child(src) diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 1c7281114c01..e8eb3f75ae60 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -126,6 +126,9 @@ /obj/item/storage/backpack/marine/fluff xeno_types = null +/obj/item/storage/backpack/marine/satchel/fluff + xeno_types = null + /obj/item/clothing/gloves/marine/fluff //MARINE GLOVES TEMPLATE name = "ITEM NAME" desc = "ITEM DESCRIPTION. DONOR ITEM" //Add UNIQUE if Unique @@ -211,10 +214,10 @@ item_state = "armor_reflec" /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Armor" + name = "juggernaut armor" desc = "Some fancy looking armor. DONOR ITEM" - icon_state = "rig-syndi" - item_state = "syndie_hardsuit" + icon_state = "skinnerarmor" + item_state = "skinnerarmor" /obj/item/clothing/suit/storage/marine/fluff/penguin //CKEY=tophatpenguin name = "Trenchcoat" @@ -589,8 +592,8 @@ flags_inv_hide = HIDEEARS|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Helmet" - icon_state = "rig0-syndi" + name = "juggernaut helmet" + icon_state = "skinnerhelmet" desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM" /obj/item/clothing/head/helmet/marine/fluff/tristan //CKEY=tristan63 @@ -613,13 +616,6 @@ flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR -/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Helmet" - icon_state = "ncrhelmet" - desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM" - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR - /obj/item/clothing/head/helmet/marine/fluff/sadokist //CKEY=sadokist name = "Tanya's Beret" desc = "A bright red beret, owned by Tanya Edenia." @@ -1366,6 +1362,13 @@ icon_state = "securitypack" item_state = "securitypack" +/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) + name = "tactical radiopack" + desc = "A Radio backpack for use with the Juggernaut armor. DONOR ITEM" + icon_state = "skinnerpack" + item_state = "securitypack" + has_gamemode_skin = FALSE //same sprite for all gamemodes. + /obj/item/clothing/glasses/fluff/alexwarhammer name = "Black Jack's Dank Shades" desc = "+20 Badass points. Donor item" diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm index 6c8347f3280e..01acf638c2cd 100644 --- a/code/modules/cm_marines/Donator_Kits.dm +++ b/code/modules/cm_marines/Donator_Kits.dm @@ -427,7 +427,7 @@ donor_key = "sasoperative" kit_variant = "Juggernaut" donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt, + /obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut, /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut, /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut, ) diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm index cdb162cddfa3..8c8cab302e19 100644 --- a/code/modules/cm_marines/anti_air.dm +++ b/code/modules/cm_marines/anti_air.dm @@ -102,7 +102,6 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon if(!almayer_aa_cannon) return - var/datum/ares_link/link = GLOB.ares_link switch(action) if("protect") almayer_aa_cannon.protecting_section = params["section_id"] @@ -110,12 +109,12 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon almayer_aa_cannon.protecting_section = "" return message_admins("[key_name(usr)] has set the AA to [html_encode(almayer_aa_cannon.protecting_section)].") - link.log_ares_antiair("[usr] Set AA to cover [html_encode(almayer_aa_cannon.protecting_section)].") + log_ares_antiair("[usr] Set AA to cover [html_encode(almayer_aa_cannon.protecting_section)].") . = TRUE if("deactivate") almayer_aa_cannon.protecting_section = "" message_admins("[key_name(usr)] has deactivated the AA cannon.") - link.log_ares_antiair("[usr] Deactivated Anti Air systems.") + log_ares_antiair("[usr] Deactivated Anti Air systems.") . = TRUE add_fingerprint(usr) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 223cb29a6ab8..851b91ea3e1a 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -508,42 +508,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 507d6140666d..8ab83116f605 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -9,6 +9,7 @@ can_hold = list()//define on a per case basis for the original firearm. foldable = TRUE foldable = /obj/item/stack/sheet/mineral/plastic//it makes sense + ground_offset_y = 5 /obj/item/storage/box/guncase/update_icon() if(LAZYLEN(contents)) @@ -80,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/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 43cf733adb75..4a7864dbe0f5 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -274,12 +274,12 @@ slowdown = 1 can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. foldable = TRUE + ground_offset_x = 5 + ground_offset_y = 5 var/pro_case_overlay /obj/item/storage/box/kit/Initialize() . = ..() - pixel_x = rand(-5, 5) - pixel_y = rand(-5, 5) if(pro_case_overlay) overlays += image('icons/obj/items/storage.dmi', "+[pro_case_overlay]") diff --git a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm index 7fd05322f1c7..45b3a6859d4a 100644 --- a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm +++ b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm @@ -6,11 +6,9 @@ w_class = SIZE_HUGE flags_atom = FPRINT|CONDUCT var/datum/cause_data/cause_data + ground_offset_x = 7 + ground_offset_y = 6 -/obj/item/mortar_shell/Initialize(mapload, ...) - . = ..() - pixel_y = rand(-6, 6) - pixel_x = rand(-7, 7) /obj/item/mortar_shell/Destroy() . = ..() diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 8d80f80860f3..edcb5a836b5d 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -171,6 +171,9 @@ var/list/ob_type_fuel_requirements flick("OBC_chambering",src) + + + playsound(loc, 'sound/machines/hydraulics_2.ogg', 40, 1) ob_cannon_busy = TRUE @@ -178,14 +181,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) @@ -203,29 +221,35 @@ 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 + 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]'") - 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/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 - tray.warhead.warhead_impact(target) + var/obj/structure/ob_ammo/warhead/warhead = tray.warhead + tray.warhead = null + warhead.moveToNullspace() + warhead.warhead_impact(target) sleep(OB_CRASHING_DOWN) ob_cannon_busy = FALSE - chambered_tray = FALSE tray.fuel_amt = 0 - QDEL_NULL(tray.warhead) tray.update_icon() update_icon() @@ -357,6 +381,9 @@ var/list/ob_type_fuel_requirements var/max_shake_factor var/max_knockdown_time + // Note that the warhead should be cleared of location by the firing proc, + // then auto-delete at the end of the warhead_impact implementation + /obj/structure/ob_ammo/warhead/proc/warhead_impact(turf/target) // make damn sure everyone hears it playsound(target, 'sound/weapons/gun_orbital_travel.ogg', 100, 1, 75) @@ -366,7 +393,7 @@ var/list/ob_type_fuel_requirements message_admins(FONT_SIZE_XL("CLICK TO CANCEL THIS OB")) var/relative_dir - for(var/mob/M in range(30, target)) + for(var/mob/M in urange(30, target)) if(get_turf(M) == target) relative_dir = 0 else @@ -377,7 +404,7 @@ var/list/ob_type_fuel_requirements ) sleep(OB_TRAVEL_TIMING/3) - for(var/mob/M in range(25, target)) + for(var/mob/M in urange(25, target)) if(get_turf(M) == target) relative_dir = 0 else @@ -388,7 +415,7 @@ var/list/ob_type_fuel_requirements ) sleep(OB_TRAVEL_TIMING/3) - for(var/mob/M in range(15, target)) + for(var/mob/M in urange(15, target)) M.show_message( \ SPAN_HIGHDANGER("OH GOD THE SKY WILL EXPLODE!!!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU SHOULDN'T BE HERE!"), SHOW_MESSAGE_AUDIBLE \ @@ -455,6 +482,7 @@ var/list/ob_type_fuel_requirements handle_ob_shake(target) sleep(double_explosion_delay) cell_explosion(target, standard_power, standard_falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data) + qdel(src) return // Checks turf around the target @@ -464,8 +492,11 @@ var/list/ob_type_fuel_requirements handle_ob_shake(target) sleep(double_explosion_delay) cell_explosion(target, standard_power, standard_falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data) + qdel(src) return + qdel(src) + /obj/structure/ob_ammo/warhead/incendiary name = "\improper Incendiary orbital warhead" warhead_kind = "incendiary" @@ -497,6 +528,7 @@ var/list/ob_type_fuel_requirements sleep(clear_delay) fire_spread(target, cause_data, distance, fire_level, burn_level, fire_color, fire_type, TURF_PROTECTION_OB) + qdel(src) /obj/structure/ob_ammo/warhead/cluster name = "\improper Cluster orbital warhead" @@ -529,12 +561,16 @@ var/list/ob_type_fuel_requirements for(var/i = 1 to total_amount) for(var/k = 1 to instant_amount) - var/turf/U = pick(turf_list) - if(protected_by_pylon(TURF_PROTECTION_OB, U)) //If the turf somehow gained OB protection while the cluster was firing + var/turf/selected_turf = pick(turf_list) + if(protected_by_pylon(TURF_PROTECTION_OB, selected_turf)) + continue + var/area/selected_area = get_area(selected_turf) + if(CEILING_IS_PROTECTED(selected_area?.ceiling, CEILING_PROTECTION_TIER_4)) continue - fire_in_a_hole(U) + fire_in_a_hole(selected_turf) sleep(delay_between_clusters) + QDEL_IN(src, 5 SECONDS) // Leave time for last handle_ob_shake below /obj/structure/ob_ammo/warhead/cluster/proc/fire_in_a_hole(turf/loc) new /obj/effect/overlay/temp/blinking_laser (loc) @@ -546,8 +582,8 @@ var/list/ob_type_fuel_requirements icon_state = "ob_fuel" is_solid_fuel = 1 -/obj/structure/ob_ammo/ob_fuel/New() - ..() +/obj/structure/ob_ammo/ob_fuel/Initialize() + . = ..() pixel_x = rand(-5,5) pixel_y = rand(-5,5) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 797a3bb7ec96..c26bd14fab81 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -779,7 +779,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) @@ -790,23 +790,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. - GLOB.ares_link.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 5fa83d1fa06b..b450f5f02841 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -51,9 +51,8 @@ var/rounds = 0 // How many rounds are in the weapon. This is useful if we break down our guns. var/has_mount = FALSE // Indicates whether the M56D will come with its folding mount already attached -/obj/item/device/m56d_gun/New() - ..() - +/obj/item/device/m56d_gun/Initialize(mapload, ...) + . = ..() update_icon() /obj/item/device/m56d_gun/get_examine_text(mob/user) //Let us see how much ammo we got in this thing. @@ -475,8 +474,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 +511,15 @@ 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) - . = ..() + ammo = null + 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 f9ae1af26936..80b4d42c16e2 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 50a2800ef855..8ea0f2abb51a 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/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 272882779d57..c10d148a2136 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -116,6 +116,9 @@ var/mob/living/carbon/human/human_owner = owner var/turf/wearer_turf = get_turf(owner) SSminimaps.remove_marker(owner) + if(!wearer_turf) + return + if(!isyautja(owner)) if(owner.stat >= DEAD) if(human_owner.undefibbable) diff --git a/code/modules/cm_tech/implements/railgun.dm b/code/modules/cm_tech/implements/railgun.dm index bef2f3d656ab..ebff2ac57ec3 100644 --- a/code/modules/cm_tech/implements/railgun.dm +++ b/code/modules/cm_tech/implements/railgun.dm @@ -88,13 +88,13 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) RegisterSignal(eye, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(check_and_set_zlevel)) RegisterSignal(eye, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_operator)) -/obj/structure/machinery/computer/railgun/proc/check_and_set_zlevel(mob/hologram/railgun/H, turf/NewLoc, direction) +/obj/structure/machinery/computer/railgun/proc/check_and_set_zlevel(mob/hologram/railgun/hologram, turf/NewLoc, direction) SIGNAL_HANDLER if(!start_location) start_location = GLOB.railgun_eye_location.get_turf_from_coord() - if(!NewLoc || (NewLoc.z != target_z && H.z != target_z)) - H.loc = start_location + if(!NewLoc || (NewLoc.z != target_z && hologram.z != target_z)) + hologram.forceMove(start_location) return COMPONENT_OVERRIDE_MOVE /obj/structure/machinery/computer/railgun/proc/can_fire(mob/living/carbon/human/H, turf/T) diff --git a/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm b/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm index d6c849e883af..16f0f26576a3 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm @@ -21,4 +21,4 @@ /datum/tech/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcement (Spec)", TRUE, FALSE, FALSE, announce_dispatch_message = FALSE) + SSticker.mode.get_specific_call("Marine Cryo Reinforcement (Spec)", TRUE, FALSE) diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index 575ffe67b85b..49b4eea8f525 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -23,4 +23,4 @@ /datum/tech/repeatable/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Tech)", TRUE, FALSE, FALSE, announce_dispatch_message = FALSE) + SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Tech)", TRUE, FALSE) diff --git a/code/modules/decorators/halloween.dm b/code/modules/decorators/halloween.dm deleted file mode 100644 index af19d80bbb23..000000000000 --- a/code/modules/decorators/halloween.dm +++ /dev/null @@ -1,63 +0,0 @@ -/datum/decorator/halloween - priority = DECORATOR_MONTH_SPECIFIC - -/datum/decorator/halloween/is_active_decor() - return (get_event_progress() != -1) - -/datum/decorator/halloween/proc/get_event_progress() - . = -1 - var/cur_day = text2num(time2text(world.timeofday, "DD")) - var/cur_mon = text2num(time2text(world.timeofday, "MM")) - if(cur_mon == 10) - return min(0, 31 - cur_day) - if(cur_mon == 11 && cur_day < 4) - return 0 - -/// Cobweb decorator: adds more and more cobwebs as you go through the month -/datum/decorator/halloween/cobwebs - /// How much prob() chance to put a cobweb during halloween proper - var/base_chance = 25 - /// How much to remove per day before date - var/ramp_chance = 0.3 - /// How much to scale cobwebs alpha down per day (1 - ramp_scale * days, affects alpha & size) - var/ramp_scale = 0.01 - /// Extra randomness removed onto scale before full blown halloween - var/scale_rand = 0.3 - -/datum/decorator/halloween/cobwebs/decorate(turf/closed/wall/almayer/T) - var/static/list/order = list(NORTHWEST, SOUTHEAST, NORTHEAST, SOUTHWEST) // Ordering of wall_connections - if(length(T.wall_connections) < 4) - return - - var/event_progress = get_event_progress() - var/placement_chance = base_chance - (event_progress * ramp_chance) - for(var/i = 1 to 4) - var/diag = order[i] - if(T.wall_connections[i] != "5") // CORNER_CLOCKWISE | CORNER_COUNTERCLOCKWISE as string - don't ask me - continue - if(!prob(placement_chance)) - continue - - // Skip this if this corner is result of a door connection (mostly for Almayer shutters) - var/valid = TRUE - for(var/a_cardinal in cardinal) - var/cardinal_dir = diag & a_cardinal - if(!a_cardinal) // We check cardinals contributing to that diagonal - continue - var/turf/target = get_step(T, cardinal_dir) - if(locate(/obj/structure/machinery/door) in target) - valid = FALSE - break - - if(valid) // Actually place cobweb - var/turf/target = get_step(T, diag) - if(istype(target, /turf/open)) - var/scale = 1 - ramp_scale * event_progress - scale -= scale_rand * rand() - new /obj/effect/decal/cleanable/cobweb2/dynamic(target, diag, scale) - -/// Ship specific cobweb decorator -/datum/decorator/halloween/cobwebs/ship - -/datum/decorator/halloween/cobwebs/ship/get_decor_types() - return typesof(/turf/closed/wall/almayer) diff --git a/code/modules/defenses/defenses.dm b/code/modules/defenses/defenses.dm index d2c5e63fee29..b39128b1a8bc 100644 --- a/code/modules/defenses/defenses.dm +++ b/code/modules/defenses/defenses.dm @@ -147,12 +147,12 @@ /obj/structure/machinery/defenses/start_processing() if(!machine_processing) machine_processing = TRUE - fast_machines += src + START_PROCESSING(SSdefprocess, src) /obj/structure/machinery/defenses/stop_processing() if(machine_processing) machine_processing = FALSE - fast_machines -= src + STOP_PROCESSING(SSdefprocess, src) /obj/structure/machinery/defenses/proc/earn_kill() kills++ diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 10d1b16dd9c3..999df7c22579 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -526,6 +526,10 @@ choice_categories[SENTRY_CATEGORY_IFF] = list(FACTION_COLONY, FACTION_WEYLAND) selected_categories[SENTRY_CATEGORY_IFF] = FACTION_COLONY +/obj/structure/machinery/defenses/sentry/premade/deployable/almayer + fire_delay = 4 + omni_directional = TRUE + //the turret inside the shuttle sentry deployment system /obj/structure/machinery/defenses/sentry/premade/dropship density = TRUE diff --git a/code/modules/desert_dam/filtration/consoles.dm b/code/modules/desert_dam/filtration/consoles.dm index 038b96eb4713..8c2814fafde7 100644 --- a/code/modules/desert_dam/filtration/consoles.dm +++ b/code/modules/desert_dam/filtration/consoles.dm @@ -35,8 +35,6 @@ var/global/river_activated = FALSE if (prob(10)) get_broken() return - else - return /obj/structure/machinery/filtration/console/proc/get_broken() if(damaged) diff --git a/code/modules/desert_dam/filtration/filtration.dm b/code/modules/desert_dam/filtration/filtration.dm index d35ee7c3eaef..6c079f3dcd60 100644 --- a/code/modules/desert_dam/filtration/filtration.dm +++ b/code/modules/desert_dam/filtration/filtration.dm @@ -136,7 +136,7 @@ var/global/east_riverstart = 0 else return - if(ismob(A)) + if(isliving(A)) var/mob/living/M = A // Inside a xeno for example diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index bba80f85762a..ad09eaf3fa09 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -87,7 +87,7 @@ /obj/item/spacecash/bundle/attack_self(mob/user) ..() var/oldloc = loc - var/amount = tgui_input_number(user, "How many dollars do you want to take? (0 to [src.worth])", "Take Money", 20, src.worth, 0) + var/amount = tgui_input_number(user, "How many dollars do you want to take? (0 to [src.worth])", "Take Money", 0, src.worth, 0) amount = round(Clamp(amount, 0, src.worth)) if(amount == 0) return diff --git a/code/modules/flufftext/Chinese.dm b/code/modules/flufftext/Chinese.dm index 36da1d307a5b..6b19dd61fcf5 100644 --- a/code/modules/flufftext/Chinese.dm +++ b/code/modules/flufftext/Chinese.dm @@ -62,12 +62,12 @@ //remove complex/simple -u- glide final_syllables if(initial.initial_sound_flags & SIMPLE_U_ONLY) for(var/datum/chinese_sound/final_syllable/final_syllable as anything in possible_final_syllables) - if(initial(initial(final_syllable.vowel_class)) == VOWEL_CLASS_BACK_CLOSE) + if(initial(final_syllable.vowel_class) == VOWEL_CLASS_BACK_CLOSE) possible_final_syllables -= final_syllable possible_final_syllables += /datum/chinese_sound/final_syllable/u else if(initial.initial_sound_flags & HALF_U) for(var/datum/chinese_sound/final_syllable/final_syllable as anything in possible_final_syllables) - if(initial(initial(final_syllable.vowel_class)) == VOWEL_CLASS_BACK_CLOSE && initial(final_syllable.final_syllable_sound_flags) & U_GROUP_FULL) + if(initial(final_syllable.vowel_class) == VOWEL_CLASS_BACK_CLOSE && initial(final_syllable.final_syllable_sound_flags) & U_GROUP_FULL) possible_final_syllables -= final_syllable //check for if the sound is alveolo-palatal or sibilant/retroflex - then remove or keep front close vowels accordingly diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 111ce38a6762..6bd7a52c96be 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/clf.dm b/code/modules/gear_presets/clf.dm index 39a7b648b999..9afc89ab65c6 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -181,7 +181,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/low_grade_full, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_R_STORE) @@ -377,7 +377,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -462,7 +462,7 @@ //standard backpack stuff new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) //specialist backpack stuff new_human.equip_to_slot_or_del(new /obj/item/prop/folded_anti_tank_sadar(new_human), WEAR_IN_BACK) @@ -591,7 +591,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) @@ -843,7 +843,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 867669463569..578681979115 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -185,7 +185,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/cmb, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) @@ -547,8 +547,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - new_human.back.pickup() - //Anchorpoint Station Corpsman /datum/equipment_preset/uscm/cmb/medic name = "USCM Anchorpoint Station Corpsman" diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 9a4497e071ed..0436772a0590 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -87,7 +87,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -192,7 +192,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) //backpack and stuff in it new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -244,7 +244,7 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) @@ -339,7 +339,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -468,7 +468,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -574,7 +574,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) //backpack and stuff in it new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -627,7 +627,7 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) @@ -724,7 +724,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index f0ad6f85a8b4..70f4e2206002 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -891,7 +891,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) @@ -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/dutch.dm b/code/modules/gear_presets/dutch.dm index a88d282b1e91..c83e8384f57a 100644 --- a/code/modules/gear_presets/dutch.dm +++ b/code/modules/gear_presets/dutch.dm @@ -47,7 +47,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/dutch(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(new_human), WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_ACCESSORY) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index e3511722af36..23350768a692 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 837af5ac6677..0308c8d9e3cb 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -112,7 +112,7 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, WEAR_IN_BACK) @@ -122,11 +122,11 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/upp, WEAR_R_STORE) spawn_merc_weapon(new_human) //backpack stuff - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -295,7 +295,7 @@ //backpack and stuff in it new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/hefa, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) @@ -332,7 +332,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) //backpack and stuff in it new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/phosphorus, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) @@ -391,7 +391,7 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) //gun spawn_merc_elite_weapon(new_human, 9, 100, 0) //only shotguns @@ -475,7 +475,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/phosphorus/upp, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/elite_merc, WEAR_IN_BACK) //gun spawn_merc_elite_weapon(new_human, 7, 25, 1) //lower shotgun chance, but not zero @@ -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/pmc.dm b/code/modules/gear_presets/pmc.dm index 1e8baa9182cf..127731656220 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -441,7 +441,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -619,7 +619,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -1119,7 +1119,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/sniper/elite, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) @@ -1593,7 +1593,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -1992,7 +1992,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 373c41df49d8..c990f19fdb27 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -89,7 +89,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) @@ -143,7 +143,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) @@ -187,7 +187,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/shotgun, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt/rmc, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BELT) @@ -229,7 +229,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) @@ -277,7 +277,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) @@ -326,7 +326,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm b/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm index f9af043aac62..daa3a8ec019b 100644 --- a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm +++ b/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm @@ -17,10 +17,10 @@ assignment = "New Varadero Medical Technician" /datum/equipment_preset/survivor/doctor/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/utility(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) ..() /datum/equipment_preset/survivor/scientist/nv @@ -28,13 +28,14 @@ assignment = "New Varadero Researcher" /datum/equipment_preset/survivor/scientist/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/purple(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) ..() /datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv @@ -51,15 +52,16 @@ ..() /datum/equipment_preset/survivor/trucker/nv - name = "Survivor - New Varadero Vehicle Operator" - assignment = "New Varadero Vehicle Operator" + name = "Survivor - New Varadero Cargo Technician" + assignment = "New Varadero Cargo Technician" /datum/equipment_preset/survivor/trucker/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/tan(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/tech(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS) ..() /datum/equipment_preset/survivor/engineer/nv @@ -67,11 +69,11 @@ assignment = "New Varadero Engineer" /datum/equipment_preset/survivor/engineer/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/blue(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/dblue(new_human), WEAR_HEAD) ..() /datum/equipment_preset/survivor/chaplain/nv diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index c5c85a0a7441..35a9b8e5eaba 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -6,12 +6,26 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND assignment = "Weyland-Yutani PMC" faction = FACTION_SURVIVOR - faction_group = list(FACTION_SURVIVOR) + faction_group = list(FACTION_WY, FACTION_SURVIVOR) paygrade = "PMC-OP" idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND) + access = list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_RESEARCH, + ACCESS_WY_ARMORY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) /datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) @@ -77,12 +91,17 @@ access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, - ACCESS_WY_LEADERSHIP, + ACCESS_WY_MEDICAL, ACCESS_WY_SECURITY, - ACCESS_WY_EXEC, ACCESS_WY_RESEARCH, - ACCESS_WY_ENGINEERING, - ACCESS_WY_MEDICAL, + ACCESS_WY_ARMORY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, ACCESS_ILLEGAL_PIRATE, ) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) @@ -95,11 +114,12 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) add_pmc_survivor_weapon(new_human) @@ -110,8 +130,22 @@ /datum/equipment_preset/synth/survivor/pmc name = "Survivor - Synthetic - PMC Support Synth" faction = FACTION_SURVIVOR - faction_group = list(FACTION_SURVIVOR) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND) + faction_group = list(FACTION_WY, FACTION_SURVIVOR) + access = list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_RESEARCH, + ACCESS_WY_ARMORY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) idtype = /obj/item/card/id/pmc assignment = JOB_PMC_SYNTH rank = JOB_PMC_SYNTH @@ -122,15 +156,16 @@ /datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/scalpel/manager, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/weylandyutani, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm index 147e40a24314..c1ca81683c4b 100644 --- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm @@ -64,7 +64,7 @@ //crashlanding-upp-bar.dmm /datum/equipment_preset/survivor/upp/sapper name = "Survivor - UPP Sapper" - paygrade = "UE3S" + paygrade = "UE3" assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI skills = /datum/skills/military/survivor/upp_sapper @@ -92,7 +92,7 @@ //crashlanding-upp-bar.dmm /datum/equipment_preset/survivor/upp/medic name = "Survivor - UPP Medic" - paygrade = "UE3M" + paygrade = "UE3" assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC skills = /datum/skills/military/survivor/upp_medic @@ -166,8 +166,8 @@ name = "Survivor - Synthetic - UPP Synth" flags = EQUIPMENT_PRESET_EXTRA languages = ALL_SYNTH_LANGUAGES_UPP - assignment = JOB_UPP_COMBAT_SYNTH - rank = JOB_UPP_COMBAT_SYNTH + assignment = JOB_UPP_SUPPORT_SYNTH + rank = JOB_UPP_SUPPORT_SYNTH faction = FACTION_UPP faction_group = list(FACTION_UPP, FACTION_SURVIVOR) skills = /datum/skills/colonial_synthetic diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index dc5d3b7217c8..9ac7950b7246 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -143,6 +143,14 @@ . = ..() access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research +/datum/equipment_preset/synth/survivor/pmc/New() + . = ..() + access = get_access(ACCESS_LIST_WY_PMC) + +/datum/equipment_preset/synth/survivor/wy/New() + . = ..() + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access + /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment] @@ -296,11 +304,28 @@ WEAR_L_HAND = /obj/item/storage/large_holster/machete/full ) +/datum/equipment_preset/synth/survivor/freelancer_synth + name = "Survivor - Synthetic - Freelancer Synth" + equipment_to_spawn = list( + WEAR_HEAD = /obj/item/clothing/head/welding, + WEAR_FACE = /obj/item/clothing/mask/rebreather/scarf, + WEAR_BODY = /obj/item/clothing/under/marine/veteran/freelancer, + WEAR_BACK = /obj/item/storage/backpack/lightpack, + WEAR_IN_BACK = /obj/item/tool/weldpack/minitank, + WEAR_JACKET = /obj/item/clothing/suit/storage/utility_vest, + WEAR_IN_JACKET = /obj/item/explosive/grenade/smokebomb, + WEAR_WAIST = /obj/item/storage/belt/marine, + WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran, + WEAR_R_HAND = /obj/item/storage/pouch/flare/full, + WEAR_FEET = /obj/item/clothing/shoes/marine/upp, + WEAR_L_HAND = /obj/item/storage/large_holster/katana/full + ) + /datum/equipment_preset/synth/survivor/trucker_synth name = "Survivor - Synthetic - Trucker Synth" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/soft/ferret, - WEAR_BODY = /obj/item/clothing/under/colonist, + WEAR_BODY = /obj/item/clothing/under/rank/synthetic/frontier, WEAR_BACK = /obj/item/storage/backpack/satchel/norm, WEAR_IN_BACK = /obj/item/pamphlet/skill/powerloader, WEAR_R_HAND = /obj/item/tool/weldingtool/hugetank, @@ -355,6 +380,7 @@ WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited, WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud, WEAR_BODY = /obj/item/clothing/under/CM_uniform, + WEAR_ACCESSORY = /obj/item/clothing/accessory/holobadge/cord, WEAR_BACK = /obj/item/storage/backpack/satchel/sec, WEAR_IN_BACK = /obj/item/device/camera, WEAR_IN_BACK = /obj/item/device/taperecorder, @@ -369,7 +395,7 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/synth/survivor/security_synth +/datum/equipment_preset/synth/survivor/wy/security_synth name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl role_comm_title = "WY Syn" @@ -390,7 +416,7 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/synth/survivor/protection_synth +/datum/equipment_preset/synth/survivor/wy/protection_synth name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc role_comm_title = "WY Syn" @@ -414,7 +440,7 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/synth/survivor/corporate_synth +/datum/equipment_preset/synth/survivor/wy/corporate_synth name = "Survivor - Synthetic - Corporate Clerical Synth" idtype = /obj/item/card/id/data role_comm_title = "WY Syn" @@ -483,7 +509,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) @@ -492,13 +519,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) @@ -525,11 +552,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/upp.dm b/code/modules/gear_presets/upp.dm index 1322cd79c4f3..2d5876fe9af8 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -331,7 +331,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -2743,7 +2743,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -3139,7 +3139,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), @@ -3568,7 +3568,7 @@ list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), - list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular, null, VENDOR_ITEM_REGULAR), + list("Firstaid Kit", 5, /obj/item/storage/firstaid/regular/response, null, VENDOR_ITEM_REGULAR), list("Fire Firstaid Kit", 6, /obj/item/storage/firstaid/fire, null, VENDOR_ITEM_REGULAR), list("Toxin Firstaid Kit", 6, /obj/item/storage/firstaid/toxin, null, VENDOR_ITEM_REGULAR), list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index ec0195e928c5..58567133f739 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -464,6 +464,9 @@ minimap_icon = "private" +/datum/equipment_preset/uscm/private_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/private_equipped/load_rank(mob/living/carbon/human/new_human) if(new_human.client) if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) @@ -500,6 +503,9 @@ name = "USCM Squad Leader (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER @@ -539,6 +545,9 @@ name = "USCM Squad Smartgunner (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN @@ -573,6 +582,9 @@ name = "USCM Squad Combat Technician (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI @@ -616,6 +628,9 @@ name = "USCM Squad Hospital Corpsman (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC @@ -667,6 +682,9 @@ name = "USCM Squad Weapons Specialist (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST @@ -734,6 +752,9 @@ name = "USCM Fireteam Leader (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE +/datum/equipment_preset/uscm/tl_equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = JOB_SQUAD_TEAM_LEADER rank = JOB_SQUAD_TEAM_LEADER @@ -759,8 +780,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) - new_human.back.pickup() - /datum/equipment_preset/uscm/tl_equipped/cryo name = "USCM Cryo Fireteam Leader (Equipped)" auto_squad_name = SQUAD_MARINE_CRYO diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 80520eb05e9a..5f7c40c016e0 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -206,11 +206,11 @@ back_item = /obj/item/storage/backpack/security new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/enforcer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/enforcer(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human), WEAR_JACKET) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else @@ -221,7 +221,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/slug(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) @@ -248,7 +248,7 @@ back_item = /obj/item/storage/backpack/security new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/tml(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/senior(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) @@ -264,7 +264,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/box/nade_box/tear_gas(new_human), WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) @@ -275,44 +275,8 @@ new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE) - -/datum/equipment_preset/uscm_event/provost/advisor - name = "Provost Advisor (ME6)" - skills = /datum/skills/CMP - - assignment = JOB_PROVOST_ADVISOR - rank = "Provost Advisor" - paygrade = "ME6" - role_comm_title = "PvA" - flags = EQUIPMENT_PRESET_EXTRA - -/datum/equipment_preset/uscm_event/provost/advisor/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/advisor(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/advisor(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) - /datum/equipment_preset/uscm_event/provost/inspector name = "Provost Inspector (PvI)" - skills = /datum/skills/CMP assignment = JOB_PROVOST_INSPECTOR rank = "Provost Inspector" @@ -326,11 +290,11 @@ back_item = /obj/item/storage/backpack/security new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/inspector(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/senior(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/inspector(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost(new_human), WEAR_JACKET) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else @@ -339,11 +303,19 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) +/datum/equipment_preset/uscm_event/provost/inspector/advisor + name = "Provost Advisor (ME6)" + + assignment = JOB_PROVOST_ADVISOR + rank = "Provost Advisor" + paygrade = "ME6" + role_comm_title = "PvA" + flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/uscm_event/provost/marshal name = "Provost Marshal (MO6)" @@ -366,7 +338,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/coat/marshal(new_human), WEAR_JACKET) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else @@ -377,70 +349,24 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK) - /datum/equipment_preset/uscm_event/provost/marshal/sector name = "Provost Sector Marshal (MO7)" minimum_age = 50 - skills = /datum/skills/general assignment = JOB_PROVOST_SMARSHAL rank = "Provost Sector Marshal" paygrade = "MO7" role_comm_title = "PvSM" -/datum/equipment_preset/uscm_event/provost/marshal/sector/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK) - - /datum/equipment_preset/uscm_event/provost/marshal/chief name = "Provost Chief Marshal (PvCM)" minimum_age = 60 - skills = /datum/skills/general assignment = JOB_PROVOST_CMARSHAL rank = "Provost Chief Marshal" paygrade = "PvCM" role_comm_title = "PvCM" -/datum/equipment_preset/uscm_event/provost/marshal/chief/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal/chief(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief(new_human), WEAR_JACKET) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief(new_human.back), WEAR_IN_BACK) - /*****************************************************************************************************/ /datum/equipment_preset/uscm_event/uaac/tis diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 4c383cfed6d9..d34137a1c36b 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -458,7 +458,6 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND) if(kit) new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index c330bbc76502..acc795dc6882 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 @@ -281,7 +281,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -766,7 +766,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) diff --git a/code/modules/holidays/halloween/decorators.dm b/code/modules/holidays/halloween/decorators.dm new file mode 100644 index 000000000000..b25d6ff6b957 --- /dev/null +++ b/code/modules/holidays/halloween/decorators.dm @@ -0,0 +1,108 @@ +/datum/game_decorator/halloween + +/datum/game_decorator/halloween/is_active_decor() + return (get_days_remaining() != -1) + +/// Get the number of days remaining to event, or -1 if not applicable +/datum/game_decorator/halloween/proc/get_days_remaining() + . = -1 + var/cur_day = text2num(time2text(world.timeofday, "DD")) + var/cur_mon = text2num(time2text(world.timeofday, "MM")) + if(cur_mon == 10) + return max(0, 31 - cur_day) + if(cur_mon == 11 && cur_day < 4) + return 0 + +/// Pumpkins decorator: adds patches of carvable/wearable pumpkins around the ground level +/datum/game_decorator/halloween/pumpkins + var/pumpkin_count = 60 //! Amount of pumpkins to place + var/pumpkin_count_decrease = 1 //! Amount of pumpkins to remove per day to halloween + var/pumpkin_prob_corruption = 20 + var/pumpkin_prob_decrease = 0.5 //! Chance reduction per day before halloween + var/exclusion_range = 10 + +/datum/game_decorator/halloween/pumpkins/decorate() + var/list/turf/valid_turfs = list() + var/list/ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) + for(var/ground_z in ground_levels) + var/list/turf/all_turfs = block(locate(1, 1, ground_z), locate(world.maxx, world.maxy, ground_z)) + for(var/turf/open/turf in all_turfs) + if(turf.is_groundmap_turf) + var/valid = TRUE + for(var/atom/movable/movable as anything in turf.contents) + if(movable.density && movable.can_block_movement) + valid = FALSE + break + if(valid) + valid_turfs += turf + CHECK_TICK + + var/list/turf/picked_turfs = list() + for(var/step in 1 to (pumpkin_count - pumpkin_count_decrease * get_days_remaining())) + if(!length(valid_turfs)) + break + var/turf/considered_turf = pick(valid_turfs) + var/x_min = max(1, considered_turf.x - exclusion_range) + var/y_min = max(1, considered_turf.y - exclusion_range) + var/x_max = min(world.maxx, considered_turf.x + exclusion_range) + var/y_max = min(world.maxy, considered_turf.y + exclusion_range) + var/list/turf/denied_turfs = block(locate(x_min, y_min, considered_turf.z), locate(x_max, y_max, considered_turf.z)) + valid_turfs -= denied_turfs + picked_turfs += considered_turf + + var/corruption_chance = pumpkin_prob_corruption - (get_days_remaining() * pumpkin_prob_decrease) + for(var/turf/target in picked_turfs) + if(prob(corruption_chance)) + new /obj/structure/pumpkin_patch/corrupted(target) + else + new /obj/structure/pumpkin_patch(target) + +/// Cobweb decorator: adds more and more cobwebs as you go through the month +/datum/game_decorator/halloween/cobwebs + /// How much prob() chance to put a cobweb during halloween proper + var/base_chance = 25 + /// How much to remove per day before date + var/ramp_chance = 0.5 + /// How much to scale cobwebs alpha down per day (1 - ramp_scale * days, affects alpha & size) + var/ramp_scale = 0.01 + /// Extra randomness removed onto scale before full blown halloween + var/scale_rand = 0.3 + +/datum/game_decorator/halloween/cobwebs/decorate() + for(var/turf/closed/wall/almayer/turf in world) + if(is_mainship_level(turf.z)) + decorate_turf(turf) + CHECK_TICK + +/datum/game_decorator/halloween/cobwebs/proc/decorate_turf(turf/closed/wall/almayer/turf) + var/static/list/order = list(NORTHWEST, SOUTHEAST, NORTHEAST, SOUTHWEST) // Ordering of wall_connections + if(length(turf.wall_connections) < 4) + return + + var/event_progress = get_days_remaining() + var/placement_chance = base_chance - (event_progress * ramp_chance) + for(var/i = 1 to 4) + var/diag = order[i] + if(turf.wall_connections[i] != "5") // CORNER_CLOCKWISE | CORNER_COUNTERCLOCKWISE as string - don't ask me + continue + if(!prob(placement_chance)) + continue + + // Skip this if this corner is result of a door connection (mostly for Almayer shutters) + var/valid = TRUE + for(var/a_cardinal in cardinal) + var/cardinal_dir = diag & a_cardinal + if(!a_cardinal) // We check cardinals contributing to that diagonal + continue + var/turf/target = get_step(turf, cardinal_dir) + if(locate(/obj/structure/machinery/door) in target) + valid = FALSE + break + + if(valid) // Actually place cobweb + var/turf/target = get_step(turf, diag) + if(istype(target, /turf/open)) + var/scale = 1 - ramp_scale * event_progress + scale -= scale_rand * rand() + new /obj/effect/decal/cleanable/cobweb2/dynamic(target, diag, scale) + diff --git a/code/modules/holidays/halloween/pumpkins/patches.dm b/code/modules/holidays/halloween/pumpkins/patches.dm new file mode 100644 index 000000000000..b84ba24ef4e6 --- /dev/null +++ b/code/modules/holidays/halloween/pumpkins/patches.dm @@ -0,0 +1,65 @@ +/// Patches of pumpkins spawned at roundstart from where marines can get their carvable pumpkins +/obj/structure/pumpkin_patch + icon = 'icons/misc/events/pumpkins.dmi' + name = "patch of pumpkins" + var/empty_name = "\proper vines" + + can_block_movement = FALSE + unslashable = TRUE + health = 400 // To avoid explosions and stray gunfire destroying them too easily + layer = LOWER_ITEM_LAYER + + var/has_vines = TRUE //! Whether there's still vines to display or not + var/pumpkin_count = 3 //! Amount of pumpkins currently in the patch + var/icon_prefix //! Prefix to prepend to icon states, for corrupted pumpkins + var/pumpkin_type = /obj/item/clothing/head/pumpkin + +/obj/structure/pumpkin_patch/Initialize(mapload, ...) + . = ..() + update_icon() + +/obj/structure/pumpkin_patch/update_icon() + overlays?.Cut() + . = ..() + switch(pumpkin_count) + if(3) icon_state = "[icon_prefix]pumpkins_full" + if(2) icon_state = "[icon_prefix]pumpkins_half" + if(1) icon_state = "[icon_prefix]pumpkin" + else icon_state = "empty" + if(has_vines) + overlays += image(icon, loc, "[icon_prefix]vines") + +/obj/structure/pumpkin_patch/attack_hand(mob/user) + if(pumpkin_count < 1) + to_chat(user, SPAN_WARNING("No more pumpkins here...")) + return + if(!user.get_active_hand()) //if active hand is empty + pumpkin_count-- + var/obj/item/clothing/head/pumpkin/pumpkin = new pumpkin_type(loc) + user.put_in_hands(pumpkin) + playsound(loc, 'sound/effects/vegetation_hit.ogg', 25, 1) + update_icon() + if(pumpkin_count < 1) + if(!has_vines) + qdel(src) + else + name = empty_name + return + return ..() + +/obj/structure/pumpkin_patch/attackby(obj/item/tool, mob/user) + if(has_vines && (tool.sharp == IS_SHARP_ITEM_ACCURATE || tool.sharp == IS_SHARP_ITEM_BIG)) + to_chat(user, SPAN_NOTICE("You cut down the vines.")) + playsound(loc, "alien_resin_break", 25) + has_vines = FALSE + update_icon() + if(pumpkin_count < 1 && !has_vines) + qdel(src) + return + return ..() + +/obj/structure/pumpkin_patch/corrupted + icon_prefix = "cor_" + name = "patch of corrupted pumpkins" + empty_name = "\proper corrupted vines" + pumpkin_type = /obj/item/clothing/head/pumpkin/corrupted diff --git a/code/modules/holidays/halloween/pumpkins/wearable.dm b/code/modules/holidays/halloween/pumpkins/wearable.dm new file mode 100644 index 000000000000..74db2b4c85ef --- /dev/null +++ b/code/modules/holidays/halloween/pumpkins/wearable.dm @@ -0,0 +1,72 @@ +/// Carved Pumpkin from the Halloween event +/obj/item/clothing/head/pumpkin + name = "pumpkin" + icon = 'icons/misc/events/pumpkins.dmi' + item_icons = list( + WEAR_HEAD = 'icons/misc/events/pumpkins.dmi', + ) + desc = "An ominous looking pumpkin. Would look pretty spooky if worn on your head..." + w_class = SIZE_MEDIUM + flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_EYES + flags_inventory = COVEREYES|BLOCKSHARPOBJ|COVERMOUTH + flags_cold_protection = BODY_FLAG_HEAD + flags_heat_protection = BODY_FLAG_HEAD + min_cold_protection_temperature = HELMET_MIN_COLD_PROT + max_heat_protection_temperature = HELMET_MAX_HEAT_PROT + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + health = 5 + force = 15 + var/prefix = "" //! Icon state prefix for corrupted pumpkin variants + var/carved_icon = "" //! Currently carved pumpkin overlay + var/carvable_icons = list("smile", "cheeky", "bugeyes", "upside_down_smile", "skelly", "ff") + +/obj/item/clothing/head/pumpkin/Initialize(mapload, ...) + . = ..() + update_icon() + +/obj/item/clothing/head/pumpkin/update_icon() + . = ..() + if(carved_icon) + icon_state = "[prefix]pumpkin_carved" + else + icon_state = "[prefix]pumpkin" + item_state_slots = list( + WEAR_HEAD = "[prefix]pumpkin_onmob", + ) + +/obj/item/clothing/head/pumpkin/mob_can_equip(mob/user, slot, disable_warning) + if(slot == WEAR_HEAD && !carved_icon) + to_chat(user, SPAN_WARNING("You can't put on a full pumpkin! Empty and carve it with a sharp object first.")) + return FALSE + . = ..() + +/obj/item/clothing/head/pumpkin/attackby(obj/item/tool, mob/user) + if(!carved_icon && (tool.sharp == IS_SHARP_ITEM_ACCURATE || tool.sharp == IS_SHARP_ITEM_BIG)) + var/choice = tgui_input_list(user, "Select the pattern to carve on your pumpkin!", "Pumpkin Carving", carvable_icons) + if(choice) + playsound(loc, 'sound/effects/vegetation_hit.ogg', 25, 1) + carved_icon = choice + name = "carved pumpkin" + update_icon() + else + return ..() + +/obj/item/clothing/head/pumpkin/get_mob_overlay(mob/user_mob, slot) + var/image/pumpkin = ..() + if(carved_icon && slot == WEAR_HEAD) + var/image/overlay = overlay_image(icon, "[prefix]pumpkin_[carved_icon]") + pumpkin.overlays += overlay + return pumpkin + +/obj/item/clothing/head/pumpkin/corrupted + name = "corrupted pumpkin" + prefix = "cor_" + carvable_icons = list("cry", "sob", "sad", "why", "spooky", "ff") diff --git a/code/modules/hydroponics/botany_disks.dm b/code/modules/hydroponics/botany_disks.dm index fda43b6f164e..602003b19ccc 100644 --- a/code/modules/hydroponics/botany_disks.dm +++ b/code/modules/hydroponics/botany_disks.dm @@ -4,14 +4,12 @@ icon = 'icons/obj/items/disk.dmi' icon_state = "botanydisk" w_class = SIZE_TINY + ground_offset_x = 5 + ground_offset_y = 5 var/list/genes = list() var/genesource = "unknown" -/obj/item/disk/botany/Initialize() - . = ..() - pixel_x = rand(-5,5) - pixel_y = rand(-5,5) /obj/item/disk/botany/attack_self(mob/user) ..() diff --git a/code/modules/law/law.dm b/code/modules/law/law.dm index 7d5906047021..20245beda35d 100644 --- a/code/modules/law/law.dm +++ b/code/modules/law/law.dm @@ -13,13 +13,14 @@ var/special_punishment = "" //This is for special punishments //These are bitflags to indicate the type of crime it is. -#define OPTIONAL_CRIME 1 -#define MINOR_CRIME 2 -#define MAJOR_CRIME 4 -#define CAPITAL_CRIME 8 +#define OPTIONAL_CRIME (1<<0) +#define MINOR_CRIME (1<<1) +#define MAJOR_CRIME (1<<2) +#define CAPITAL_CRIME (1<<3) +#define PRECAUTIONARY_CHARGE (1<<4) //These are bitflags for special punishments -#define PERMABRIG 1 -#define DOUBLE_TIME 2 -#define SAME_AS_ACCUSED 4 -#define DEMOTION 8 +#define PERMABRIG (1<<0) +#define DOUBLE_TIME (1<<1) +#define SAME_AS_ACCUSED (1<<2) +#define DEMOTION (1<<3) diff --git a/code/modules/law/laws/capital_crime.dm b/code/modules/law/laws/capital_crime.dm index 8329374e91db..687c483c6593 100644 --- a/code/modules/law/laws/capital_crime.dm +++ b/code/modules/law/laws/capital_crime.dm @@ -10,10 +10,6 @@ name = "Desertion" desc = "Refusing to carry out the duties essential to one’s post or abandoning post unauthorized, without intent to return. (Retreating from the planet when the FOB is breached is not Desertion, refusing to return when ordered is)." -/datum/law/capital_law/insanity - name = "Insanity" - desc = "Acting in such a manner which makes the offender not sound clear of mind. The CMO or Synthetic can declare insanity on a Marine if the Marine is believed to not be of sound mind. The Marine once cleared to be of sound mind may be released from this particular charge." - /datum/law/capital_law/jailbreak_escape name = "Jailbreak/Escape" desc = "To escape, assist in an escape, attempt escape, or be willfully and knowingly broken out." @@ -30,7 +26,3 @@ /datum/law/capital_law/crimes_against_humanity name = "Crimes against Humanity" desc = "To engage in actions that violate human rights or otherwise are heinous acts against humans. Examples are torture, cannibalism and forced infection with Xenomorph larva." - -/datum/law/capital_law/prisoner_of_war - name = "Prisoner of War" - desc = "Being a member of a currently hostile faction to the USCM." diff --git a/code/modules/law/laws/precautionary_charge.dm b/code/modules/law/laws/precautionary_charge.dm new file mode 100644 index 000000000000..c06cd6ca5287 --- /dev/null +++ b/code/modules/law/laws/precautionary_charge.dm @@ -0,0 +1,18 @@ +/datum/law/precautionary_charge + severity = PRECAUTIONARY_CHARGE + brig_time = PERMABRIG_SENTENCE + special_punishment = "Not inclusive for execution criteria." + +/datum/law/precautionary_charge/discretionary_arrest + name = "Discretionary Detainment" + desc = "A discretionary charge used by Commanding Officers to detain personnel for any reason, for the safety and benefit of the operation or security. The duration of this charge is variable and may be pardoned/lifted at any time by the Commanding Officer." + special_punishment = "Not inclusive for execution criteria. May only be appealed to the Acting Commander or Provost/USCM HC." + +/datum/law/precautionary_charge/insanity + name = "Insanity" + desc = "Acting in such a manner which makes the offender not sound clear of mind. The CMO or Synthetic can declare insanity on a Marine if the Marine is believed to not be of sound mind. The Marine once cleared to be of sound mind may be released from this particular charge." + +/datum/law/precautionary_charge/prisoner_of_war + name = "Prisoner of War" + desc = "Being a member of a legitimate and recognised faction currently hostile to the USCM." + special_punishment = "Execution is forbidden barring exceptional circumstances." diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm index 7746e90d960d..695ec604631e 100644 --- a/code/modules/mentor/mentorhelp.dm +++ b/code/modules/mentor/mentorhelp.dm @@ -169,10 +169,7 @@ if(sender == author) message_title = "MentorHelp" // If there's a mentor, let them mark it. If not, let them unmark it - if(mentor) - message_sender_options = " (Unmark" - else - message_sender_options = " (Mark" + message_sender_options = " (Mark/Unmark" message_sender_options += " | Close | AutoResponse)" var/message_header = SPAN_MENTORHELP("[message_title] from [message_sender_key]:[message_sender_options]
") @@ -274,9 +271,10 @@ if("autorespond") autoresponse(C) if("mark") - mark(C) - if("unmark") - unmark(C) + if(!mentor) + mark(C) + else + unmark(C) if("close") if(C == author || C == mentor || CLIENT_IS_STAFF(C)) close(C) @@ -327,7 +325,7 @@ var/msg = SPAN_MENTORSAY("Autoresponse:[choice]") switch(choice) if("L: Discord") - msg += "You can join our Discord server by using this link!" + msg += "You can join our Discord server by using this link!" if("L: Xeno Quickstart Guide") msg += "Your answer can be found on the Xeno Quickstart Guide on our wiki. Check it out here." if("L: Marine Quickstart Guide") diff --git a/code/modules/mob/camera/imaginary_friend.dm b/code/modules/mob/camera/imaginary_friend.dm index 3d6d5d5a0aa2..5d205dd17e4f 100644 --- a/code/modules/mob/camera/imaginary_friend.dm +++ b/code/modules/mob/camera/imaginary_friend.dm @@ -261,7 +261,7 @@ icon = friend_image mouse_opacity = MOUSE_OPACITY_ICON var/mob/ghost = ..() - if(ghost.mind) + if(ghost?.mind) ghost.mind.original = aghosted_original_mob return ghost diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index c97b7464117e..e4e1e3f08cea 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -327,10 +327,11 @@ if(observe_target_mob) clean_observe_target() -/mob/dead/observer/Destroy() +/mob/dead/observer/Destroy(force) + GLOB.observer_list -= src QDEL_NULL(orbit_menu) QDEL_NULL(last_health_display) - GLOB.observer_list -= src + QDEL_NULL(minimap) following = null observe_target_mob = null observe_target_client = null @@ -1033,13 +1034,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return var/list/mobs_by_role = list() // the list the mobs are assigned to first, for sorting purposes - for(var/datum/weakref/ref as anything in GLOB.freed_mob_list) - var/mob/living/resolved_mob = ref.resolve() - var/role_name = resolved_mob.get_role_name() + for(var/mob/freed_mob as anything in GLOB.freed_mob_list) + var/role_name = freed_mob.get_role_name() if(!role_name) role_name = "No Role" LAZYINITLIST(mobs_by_role[role_name]) - mobs_by_role[role_name] += resolved_mob + mobs_by_role[role_name] += freed_mob var/list/freed_mob_choices = list() // the list we'll be choosing from for(var/role in mobs_by_role) @@ -1055,18 +1055,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp handle_joining_as_freed_mob(L) /mob/dead/proc/handle_joining_as_freed_mob(mob/living/freed_mob) - if(!freed_mob || !(WEAKREF(freed_mob) in GLOB.freed_mob_list)) - return - - if(!istype(freed_mob)) + if(!istype(freed_mob) || !(freed_mob in GLOB.freed_mob_list)) return if(QDELETED(freed_mob) || freed_mob.client) - GLOB.freed_mob_list -= WEAKREF(freed_mob) + GLOB.freed_mob_list -= freed_mob to_chat(src, SPAN_WARNING("Something went wrong.")) return - GLOB.freed_mob_list -= WEAKREF(freed_mob) + GLOB.freed_mob_list -= freed_mob mind.transfer_to(freed_mob, TRUE) /mob/dead/verb/join_as_hellhound() @@ -1225,10 +1222,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else . += "Hijack Over" - if(EvacuationAuthority) - var/eta_status = EvacuationAuthority.get_status_panel_eta() + if(SShijack) + var/eta_status = SShijack.get_evac_eta() if(eta_status) - . += "Evacuation: [eta_status]" + . += "Evacuation Goal: [eta_status]" + + if(SShijack.sd_unlocked) + . += "Self Destruct Goal: [SShijack.get_sd_eta()]" if(client.prefs?.be_special & BE_ALIEN_AFTER_DEATH) if(larva_queue_cached_message) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 933e9490d39e..5ce40810e0b2 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/exercise.dm b/code/modules/mob/living/carbon/human/exercise.dm index 7a83fd2886e3..3a2976da9130 100644 --- a/code/modules/mob/living/carbon/human/exercise.dm +++ b/code/modules/mob/living/carbon/human/exercise.dm @@ -102,7 +102,7 @@ Verbs related to getting fucking jacked, bro //humans have 100 stamina //default loss per pushup = 5 stamina var/stamina_loss = 5 - if(issynth(src)) + if(!skills || issynth(src)) return 0 switch(skills.get_skill_level(SKILL_ENDURANCE)) if(SKILL_ENDURANCE_NONE) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3caca1c5f4f5..24327594712a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -125,10 +125,12 @@ if(marksman_aura) . += "Active Order: FOCUS" - if(EvacuationAuthority) - var/eta_status = EvacuationAuthority.get_status_panel_eta() + if(SShijack) + var/eta_status = SShijack.get_evac_eta() if(eta_status) - . += "Evacuation: [eta_status]" + . += "Evacuation Goals: [eta_status]" + if(SShijack.sd_unlocked) + . += "Self Destruct Status: [SShijack.get_sd_eta()]" /mob/living/carbon/human/ex_act(severity, direction, datum/cause_data/cause_data) if(lying) diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm index 502dd77a063d..fda4cea20ad1 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -414,8 +414,8 @@ CULT return var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] - preset.load_race(chosen, H.hivenumber) - preset.load_status(chosen) + preset.load_race(chosen) + preset.load_status(chosen, H.hivenumber) to_chat(chosen, SPAN_ROLE_HEADER("You are now a Xeno Cultist!")) to_chat(chosen, SPAN_ROLE_BODY("Worship the Xenomorphs and listen to the Cult Leader for orders. The Cult Leader is typically the person who transformed you. Do not kill anyone unless you are wearing your black robes, you may defend yourself.")) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index e4ed65107f03..1a906dfa5c11 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -4,7 +4,8 @@ recalculate_move_delay = FALSE if(interactee)// moving stops any kind of interaction - unset_interaction() + if(!(SEND_SIGNAL(src, COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION) & COMPONENT_HUMAN_MOVEMENT_KEEP_USING)) + unset_interaction() if(species.slowdown) . += species.slowdown diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 45fb65771069..b86a6a625f57 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/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 4b86c827a069..28e45dcb2f5e 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -132,7 +132,6 @@ for(var/message_mode in parsed["modes"]) var/list/obj/item/used_radios = list() switch(message_mode) - if(MESSAGE_MODE_LOCAL) if(RADIO_MODE_WHISPER) whisper_say(message, speaking, alt_name) return @@ -142,9 +141,10 @@ used_radios += I break // remove this if we EVER have two different intercomms with DIFFERENT frequencies IN ONE ROOM else - var/earpiece = get_type_in_ears(/obj/item/device/radio) - if(earpiece) - used_radios += earpiece + if(message_mode != MESSAGE_MODE_LOCAL) + var/earpiece = get_type_in_ears(/obj/item/device/radio) + if(earpiece) + used_radios += earpiece var/sound/speech_sound var/sound_vol diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index f6487d1faf1c..3f415d8d3007 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -133,10 +133,10 @@ return /datum/species/proc/create_organs(mob/living/carbon/human/H) //Handles creation of mob organs and limbs. - for(var/L in H.limbs) //In case of pre-existing limbs/organs, we remove the old ones. - qdel(L) - H.internal_organs = list() - H.internal_organs_by_name = list() + //In case of pre-existing limbs/organs, we remove the old ones. + QDEL_LIST(H.limbs) + QDEL_LIST(H.internal_organs) + H.internal_organs_by_name.Cut() //This is a basic humanoid limb setup. var/obj/limb/chest/C = new(H, null, H) diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index eb5a629760ee..0a6e0ff2ca26 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -207,9 +207,9 @@ if(msg) log_say("PsychicWhisper: [key_name(X)]->[M.key] : [msg]") if(!istype(M, /mob/living/carbon/xenomorph)) - to_chat(M, SPAN_XENO("You hear a strange, alien voice in your head. \"[msg]\"")) + to_chat(M, SPAN_XENOQUEEN("You hear a strange, alien voice in your head. \"[msg]\"")) else - to_chat(M, SPAN_XENO("You hear the voice of [X] resonate in your head. \"[msg]\"")) + to_chat(M, SPAN_XENOQUEEN("You hear the voice of [X] resonate in your head. \"[msg]\"")) to_chat(X, SPAN_XENONOTICE("You said: \"[msg]\" to [M]")) return ..() @@ -234,9 +234,9 @@ continue target_list += possible_target if(!istype(possible_target, /mob/living/carbon/xenomorph)) - to_chat(possible_target, SPAN_XENO("You hear a strange, alien voice in your head. \"[msg]\"")) + to_chat(possible_target, SPAN_XENOQUEEN("You hear a strange, alien voice in your head. \"[msg]\"")) else - to_chat(possible_target, SPAN_XENO("You hear the voice of [X] resonate in your head. \"[msg]\"")) + to_chat(possible_target, SPAN_XENOQUEEN("You hear the voice of [X] resonate in your head. \"[msg]\"")) if(!length(target_list)) return var/targetstring = english_list(target_list) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 2a3ff577a245..d253d8bc0771 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -287,7 +287,7 @@ victim.pain.apply_pain(PAIN_CHESTBURST_STRONG) //ow that really hurts larvie! var/message = SPAN_HIGHDANGER( pick("IT'S IN YOUR INSIDES!", "IT'S GNAWING YOU!", "MAKE IT STOP!", "YOU ARE GOING TO DIE!", "IT'S TEARING YOU APART!")) to_chat(victim, message) - addtimer(CALLBACK(src, PROC_REF(cause_unbearable_pain), victim), rand(1, 3) SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(cause_unbearable_pain), victim), rand(1, 3) SECONDS, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) /mob/living/carbon/xenomorph/larva/proc/chest_burst(mob/living/carbon/victim) set waitfor = 0 diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index fa9036bd8305..3fd8e53024d5 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -357,8 +357,8 @@ /mob/living/carbon/xenomorph/proc/pounced_turf(turf/T) if(!T.density) - for(var/mob/M in T) - pounced_mob(M) + for(var/mob/living/mob in T) + pounced_mob(mob) break else turf_launch_collision(T) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 5cff90dd408a..8dea22e7165f 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -1073,7 +1073,7 @@ if(length(resin_build_order)) selected_resin = resin_build_order[1] -/mob/living/carbon/xenomorph/ghostize(can_reenter_corpse = TRUE) +/mob/living/carbon/xenomorph/ghostize(can_reenter_corpse = TRUE, aghosted = FALSE) . = ..() if(. && !can_reenter_corpse && stat != DEAD && !QDELETED(src) && !is_admin_level(z)) handle_ghost_message() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index af8f33cf1c76..705837699275 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -135,7 +135,7 @@ if(istype(O, /obj/vehicle/multitile)) var/obj/vehicle/multitile/R = O - R.take_damage_type((1 / A.acid_strength) * 40, "acid", src) + R.take_damage_type(40 / A.acid_delay, "acid", src) visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at \the [O]. It sizzles under the bubbling mess of acid!"), \ SPAN_XENOWARNING("You vomit globs of vile stuff at [O]. It sizzles under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 3975a229bbc1..e926349af60d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -1,74 +1,76 @@ -/datum/action/xeno_action/activable/pierce/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/activable/pierce/use_ability(atom/targetted_atom) + var/mob/living/carbon/xenomorph/source_xeno = owner if (!action_cooldown_check()) return - if (!X.check_state()) + if (!source_xeno.check_state()) return - if(!A || A.layer >= FLY_LAYER || !isturf(X.loc)) + if(!targetted_atom || targetted_atom.layer >= FLY_LAYER || !isturf(source_xeno.loc)) return if (!check_and_use_plasma_owner()) return + //X = xeno user, A = target atom + var/list/turf/target_turfs = getline2(source_xeno, targetted_atom, include_from_atom = FALSE) + var/length_of_line = LAZYLEN(target_turfs) + if(length_of_line > 3) + target_turfs = target_turfs.Copy(1, 4) + // Get list of target mobs var/list/target_mobs = list() + var/blocked = FALSE - - var/list/target_turfs = list() - var/facing = Get_Compass_Dir(X, A) - var/turf/T = X.loc - var/turf/temp = X.loc - - for(var/x in 0 to 2) - temp = get_step(T, facing) - if(!temp || temp.density || temp.opacity) - break - - var/blocked = FALSE - for(var/obj/structure/S in temp) - if(istype(S, /obj/structure/window/framed)) - var/obj/structure/window/framed/W = S - if(!W.unslashable) - W.deconstruct(disassembled = FALSE) - - if(S.opacity) - blocked = TRUE - break + for(var/turf/path_turf as anything in target_turfs) if(blocked) break + //Check for walls etc and stop if we encounter one + if(path_turf.density) + break - T = temp - target_turfs += T - - for(var/turf/target_turf in target_turfs) - for(var/mob/living/carbon/H in target_turf) - if (!isxeno_human(H) || X.can_not_harm(H)) - continue - - if(!(H in target_mobs)) - target_mobs += H - - X.visible_message(SPAN_XENODANGER("[X] slashes its claws through the area in front of it!"), SPAN_XENODANGER("You slash your claws through the area in front of you!")) - X.animation_attack_on(A, 15) - - X.emote("roar") - - // Loop through our turfs, finding any humans there and dealing damage to them - for (var/mob/living/carbon/H in target_mobs) - if (!isxeno_human(H) || X.can_not_harm(H)) + //Check for structures such as doors + for(var/atom/path_content as anything in path_turf.contents) + if(isobj(path_content)) + var/obj/object = path_content + //If we shouldn't be able to pass through it then stop at this turf + if(object.density && !object.throwpass) + blocked = TRUE + break + + if(istype(object, /obj/structure/window/framed)) + var/obj/structure/window/framed/framed_window = object + if(!framed_window.unslashable) + framed_window.deconstruct(disassembled = FALSE) + + //Check for mobs and add them to our target list for damage + if(iscarbon(path_content)) + var/mob/living/carbon/mob_to_act = path_content + if(!isxeno_human(mob_to_act) || source_xeno.can_not_harm(mob_to_act)) + continue + + if(!(mob_to_act in target_mobs)) + target_mobs += mob_to_act + + source_xeno.visible_message(SPAN_XENODANGER("[source_xeno] slashes its tail through the area in front of it!"), SPAN_XENODANGER("You slash your tail through the area in front of you!")) + source_xeno.animation_attack_on(targetted_atom, 15) + + source_xeno.emote("roar") + + // Loop through our mob list, finding any humans there and dealing damage to them + for (var/mob/living/carbon/current_mob in target_mobs) + if (!isxeno_human(current_mob) || source_xeno.can_not_harm(current_mob)) continue - if (H.stat == DEAD) + if (current_mob.stat == DEAD) continue - X.flick_attack_overlay(H, "slash") - H.apply_armoured_damage(get_xeno_damage_slash(H, damage), ARMOR_MELEE, BRUTE, null, 20) + current_mob.flick_attack_overlay(current_mob, "slash") + current_mob.apply_armoured_damage(get_xeno_damage_slash(current_mob, damage), ARMOR_MELEE, BRUTE, null, 20) if (target_mobs.len >= shield_regen_threshold) - if (X.mutation_type == PRAETORIAN_VANGUARD) - var/datum/behavior_delegate/praetorian_vanguard/BD = X.behavior_delegate + if (source_xeno.mutation_type == PRAETORIAN_VANGUARD) + var/datum/behavior_delegate/praetorian_vanguard/BD = source_xeno.behavior_delegate if (istype(BD)) BD.regen_shield() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm index 708334d31a96..9a29e2cb6da0 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm @@ -130,7 +130,7 @@ if(istype(O, /obj/vehicle/multitile)) var/obj/vehicle/multitile/R = O - R.take_damage_type((1 / A.acid_strength) * 20, "acid", src) + R.take_damage_type(20 / A.acid_delay, "acid", src) visible_message(SPAN_XENOWARNING("[src] vomits globs of vile stuff at \the [O]. It sizzles under the bubbling mess of acid!"), \ SPAN_XENOWARNING("You vomit globs of vile stuff at [O]. It sizzles under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index d81413b68651..0374b21c6f36 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -124,8 +124,7 @@ // Tell the marines where the last one is. var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = "Bioscan complete.\n\nSensors indicate one remaining unknown lifeform signature in [get_area(X)]." - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_bioscan(name, input) + log_ares_bioscan(name, input) marine_announcement(input, name, 'sound/AI/bioscan.ogg', logging = ARES_LOG_NONE) // Tell the xeno she is the last one. if(X.client) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index b739425346be..79f73631c7b1 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -279,7 +279,6 @@ var/allowed_nest_distance = 15 //How far away do we allow nests from an ovied Queen. Default 15 tiles. var/obj/effect/alien/resin/special/pylon/core/hive_location = null //Set to ref every time a core is built, for defining the hive location var/crystal_stored = 0 //How much stockpiled material is stored for the hive to use. - var/xenocon_points = 0 //Xeno version of DEFCON var/datum/mutator_set/hive_mutators/mutators = new var/tier_slot_multiplier = 1 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index b0f08acc33fa..bccd74036658 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -83,10 +83,10 @@ // this function displays the shuttles ETA in the status panel if the shuttle has been called /mob/living/silicon/proc/show_emergency_shuttle_eta() - if(EvacuationAuthority) - var/eta_status = EvacuationAuthority.get_status_panel_eta() + if(SShijack) + var/eta_status = SShijack.get_evac_eta() if(eta_status) - stat(null, "Evacuation: [eta_status]") + stat(null, "Evacuation Goal: [eta_status]") // this function displays the stations manifest in a separate window diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 58933b8ca312..56951097a12c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -28,7 +28,7 @@ //TODO: Integrate defence zones and targeting body parts with the actual organ system, move these into organ definitions. -//The base miss chance for the different defence zones +/// The base miss chance for the different defence zones var/list/global/base_miss_chance = list( "head" = 10, "chest" = 0, @@ -576,12 +576,14 @@ var/global/list/limb_types_by_name = list( var/iheight = source_icon.Height() var/iwidth = source_icon.Width() var/higher_power = (iheight > iwidth) ? iheight : iwidth + alert_overlay.pixel_y = initial(source.pixel_y) + alert_overlay.pixel_x = initial(source.pixel_x) if(higher_power > 32) var/diff = 32 / higher_power alert_overlay.transform = alert_overlay.transform.Scale(diff, diff) if(higher_power > 48) - alert_overlay.pixel_y = -(iheight / 2) * diff - alert_overlay.pixel_x = -(iwidth / 2) * diff + alert_overlay.pixel_y = -(iheight * 0.5) * diff + alert_overlay.pixel_x = -(iwidth * 0.5) * diff alert_overlay.layer = FLOAT_LAYER diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index c3266982b20d..64253fbac5df 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -187,7 +187,7 @@ return //now crawl mob.crawling = TRUE - if(!do_after(mob, 3 SECONDS, INTERRUPT_MOVED|INTERRUPT_UNCONSCIOUS|INTERRUPT_STUNNED|INTERRUPT_RESIST|INTERRUPT_CHANGED_LYING, BUSY_ICON_GENERIC)) + if(!do_after(mob, 1 SECONDS, INTERRUPT_MOVED|INTERRUPT_UNCONSCIOUS|INTERRUPT_STUNNED|INTERRUPT_RESIST|INTERRUPT_CHANGED_LYING, NO_BUSY_ICON)) mob.crawling = FALSE next_movement = world.time + MINIMAL_MOVEMENT_INTERVAL mob.move_intentionally = FALSE diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d18754221c8a..ff9d9f6218ff 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -34,8 +34,8 @@ return var/tempnumber = rand(1, 999) - var/postfix_text = (client.prefs && client.prefs.xeno_postfix) ? ("-"+client.prefs.xeno_postfix) : "" - var/prefix_text = (client.prefs && client.prefs.xeno_prefix) ? client.prefs.xeno_prefix : "XX" + var/postfix_text = (client.xeno_postfix) ? ("-"+client.xeno_postfix) : "" + var/prefix_text = (client.xeno_prefix) ? client.xeno_prefix : "XX" var/xeno_text = "[prefix_text]-[tempnumber][postfix_text]" var/round_start = !SSticker || !SSticker.mode || SSticker.current_state <= GAME_STATE_PREGAME @@ -249,8 +249,8 @@ RoleAuthority.equip_role(character, player_rank, late_join = TRUE) EquipCustomItems(character) - if((security_level > SEC_LEVEL_BLUE || EvacuationAuthority.evac_status) && player_rank.gets_emergency_kit) - to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[EvacuationAuthority.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'.")) + if((security_level > SEC_LEVEL_BLUE || SShijack.hijack_status) && player_rank.gets_emergency_kit) + to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[SShijack.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'.")) character.put_in_hands(new /obj/item/storage/box/kit/cryo_self_defense(character.loc)) GLOB.data_core.manifest_inject(character) @@ -297,10 +297,10 @@ var/dat = "
" dat += "Round Duration: [round(hours)]h [round(mins)]m
" - if(EvacuationAuthority) - switch(EvacuationAuthority.evac_status) - if(EVACUATION_STATUS_INITIATING) dat += "The [MAIN_SHIP_NAME] is being evacuated.
" - if(EVACUATION_STATUS_COMPLETE) dat += "The [MAIN_SHIP_NAME] has undergone evacuation.
" + if(SShijack) + switch(SShijack.evac_status) + if(EVACUATION_STATUS_INITIATED) + dat += "The [MAIN_SHIP_NAME] is being evacuated.
" dat += "Choose from the following open positions:
" var/roles_show = FLAG_SHOW_ALL_JOBS diff --git a/code/modules/mob/new_player/sprite_accessories/hair.dm b/code/modules/mob/new_player/sprite_accessories/hair.dm index 0a112cadb11b..3dfe8bebd5af 100644 --- a/code/modules/mob/new_player/sprite_accessories/hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/hair.dm @@ -734,3 +734,24 @@ /datum/sprite_accessory/hair/croft name = "Croft" icon_state = "hair_croft" + +/datum/sprite_accessory/hair/aviator + name = "Aviator" + icon_state = "hair_aviator" + +/datum/sprite_accessory/hair/gantleponytail + name = "Gentle Ponytail" + icon_state = "hair_gantleponytail" + gender = FEMALE + +/datum/sprite_accessory/hair/edgar + name = "Edgar" + icon_state = "hair_edgar" + +/datum/sprite_accessory/hair/emobun + name = "Emo Little Bun" + icon_state = "hair_emobun" + +/datum/sprite_accessory/hair/taper + name = "Taper" + icon_state = "hair_taper" diff --git a/code/modules/objectives/data_retrieval.dm b/code/modules/objectives/data_retrieval.dm index 955d2cc8e63e..01689a18d081 100644 --- a/code/modules/objectives/data_retrieval.dm +++ b/code/modules/objectives/data_retrieval.dm @@ -177,6 +177,8 @@ var/datum/cm_objective/retrieve_item/document/retrieve_objective var/display_color = "white" var/disk_color = "White" + ground_offset_x = 9 + ground_offset_y = 8 /obj/item/disk/objective/Initialize(mapload, ...) . = ..() @@ -210,8 +212,6 @@ name = "[disk_color] computer disk [label]" objective = new /datum/cm_objective/retrieve_data/disk(src) retrieve_objective = new /datum/cm_objective/retrieve_item/document(src) - pixel_y = rand(-8, 8) - pixel_x = rand(-9, 9) w_class = SIZE_TINY /obj/item/disk/objective/Destroy() diff --git a/code/modules/objectives/documents.dm b/code/modules/objectives/documents.dm index 14bef02245f0..5c6041a406c2 100644 --- a/code/modules/objectives/documents.dm +++ b/code/modules/objectives/documents.dm @@ -122,6 +122,8 @@ unacidable = TRUE indestructible = 1 is_objective = TRUE + ground_offset_x = 9 + ground_offset_y = 8 var/label // label on the document var/renamed = FALSE //Once someone reads a document the item gets renamed based on the objective they are linked to) @@ -131,8 +133,6 @@ objective = new objective_type(src) retrieve_objective = new /datum/cm_objective/retrieve_item/document(src) LAZYADD(objective.enables_objectives, retrieve_objective) - pixel_y = rand(-8, 8) - pixel_x = rand(-9, 9) /obj/item/document_objective/Destroy() qdel(objective) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 71d1090b20e0..e18c1ce3c2e7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -19,6 +19,8 @@ flags_equip_slot = SLOT_HEAD flags_armor_protection = BODY_FLAG_HEAD attack_verb = list("bapped") + ground_offset_x = 9 + ground_offset_y = 8 var/info //What's actually written on the paper. var/info_links //A different version of the paper which includes html links at fields and EOF @@ -42,8 +44,6 @@ /obj/item/paper/Initialize(mapload, photo_list) . = ..() - pixel_y = rand(-8, 8) - pixel_x = rand(-9, 9) stamps = "" src.photo_list = photo_list @@ -382,9 +382,6 @@ /obj/item/paper/attackby(obj/item/P, mob/user) ..() - var/clown = 0 - if(user.mind && (user.job == "Clown")) - clown = 1 if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo)) if (istype(P, /obj/item/paper/carbon)) @@ -424,6 +421,7 @@ return stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." + playsound(src, 'sound/effects/alien_footstep_medium3.ogg', 20, TRUE, 6) var/image/stampoverlay = image('icons/obj/items/paper.dmi') var/x @@ -439,11 +437,6 @@ stampoverlay.pixel_x = x stampoverlay.pixel_y = y - if(istype(P, /obj/item/tool/stamp/clown)) - if(!clown) - to_chat(user, SPAN_NOTICE("You are totally unable to use the stamp. HONK!")) - return - if(!ico) ico = new ico += "paper_[P.icon_state]" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 521045a56717..eafbb3c12c8a 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -23,8 +23,7 @@ /obj/item/paper_bin/MouseDrop(atom/over_object) if(over_object == usr && ishuman(usr) && !usr.is_mob_restrained() && !usr.stat && (loc == usr || in_range(src, usr))) if(!usr.get_active_hand()) //if active hand is empty - attack_hand(usr, 1, 1) - + usr.put_in_hands(src) return /obj/item/paper_bin/attack_hand(mob/user) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 70d6bf3898a6..b47f630974e6 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -82,8 +82,6 @@ p.update_icon() p.icon_state = "paper_words" p.name = bundle.name - p.pixel_y = rand(-8, 8) - p.pixel_x = rand(-9, 9) sleep(15*j) updateUsrDialog() else if(href_list["remove"]) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index e004715f326a..dbd490792e8f 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -175,81 +175,110 @@ res.Scale(size*32, size*32) // Initialize the photograph to black. res.Blend("#000", ICON_OVERLAY) + CHECK_TICK - var/atoms[] = list() - for(var/turf/the_turf in turfs) - // Add outselves to the list of stuff to draw + var/pixel_size = world.icon_size + var/radius = (size - 1) * 0.5 + var/center_offset = radius * pixel_size + 1 + var/x_min = center.x - radius + var/x_max = center.x + radius + var/y_min = center.y - radius + var/y_max = center.y + radius + + var/list/atoms = list() + for(var/turf/the_turf as anything in turfs) + // Add ourselves to the list of stuff to draw atoms.Add(the_turf); + // As well as anything that isn't invisible. - for(var/atom/A in the_turf) - if(A.invisibility) continue - atoms.Add(A) + for(var/atom/cur_atom as anything in the_turf) + if(!cur_atom || cur_atom.invisibility) + continue + atoms.Add(cur_atom) // Sort the atoms into their layers var/list/sorted = sort_atoms_by_layer(atoms) - var/center_offset = (size-1)/2 * 32 + 1 - for(var/i; i <= sorted.len; i++) - var/atom/A = sorted[i] - if(A) - var/icon/IM = getFlatIcon(A)//build_composite_icon(A) - - // If what we got back is actually a picture, draw it. - if(istype(IM, /icon)) - // Check if we're looking at a mob that's lying down - if(istype(A, /mob/living)) - var/mob/living/L = A - if(!istype(L, /mob/living/carbon/xenomorph)) //xenos don't use icon rotatin for lying. - if(L.lying) - // If they are, apply that effect to their picture. - IM.BecomeLying() - // Calculate where we are relative to the center of the photo - var/xoff = (A.x - center.x) * 32 + center_offset - var/yoff = (A.y - center.y) * 32 + center_offset - if (istype(A,/atom/movable)) - xoff+=A:step_x - yoff+=A:step_y - res.Blend(IM, blendMode2iconMode(A.blend_mode), A.pixel_x + xoff, A.pixel_y + yoff) + for(var/atom/cur_atom as anything in sorted) + if(QDELETED(cur_atom)) + continue + + if(cur_atom.x < x_min || cur_atom.x > x_max || cur_atom.y < y_min || cur_atom.y > y_max) + // they managed to move out of frame with all this CHECK_TICK... + continue + + var/icon/cur_icon = getFlatIcon(cur_atom)//build_composite_icon(cur_atom) + + // If what we got back is actually a picture, draw it. + if(istype(cur_icon, /icon)) + // Check if we're looking at a mob that's lying down + if(istype(cur_atom, /mob/living)) + var/mob/living/cur_mob = cur_atom + if(!isxeno(cur_mob) && cur_mob.lying) //xenos don't use icon rotatin for lying. + cur_icon.BecomeLying() + + // Calculate where we are relative to the center of the photo + var/xoff = (cur_atom.x - center.x) * pixel_size + center_offset + var/yoff = (cur_atom.y - center.y) * pixel_size + center_offset + if(istype(cur_atom, /atom/movable)) + xoff += cur_atom:step_x + yoff += cur_atom:step_y + res.Blend(cur_icon, blendMode2iconMode(cur_atom.blend_mode), cur_atom.pixel_x + xoff, cur_atom.pixel_y + yoff) + + CHECK_TICK // Lastly, render any contained effects on top. for(var/turf/the_turf as anything in turfs) // Calculate where we are relative to the center of the photo - var/xoff = (the_turf.x - center.x) * 32 + center_offset - var/yoff = (the_turf.y - center.y) * 32 + center_offset - var/image/IM = getFlatIcon(the_turf.loc) - if(IM) - res.Blend(IM, blendMode2iconMode(the_turf.blend_mode),xoff,yoff) + var/xoff = (the_turf.x - center.x) * pixel_size + center_offset + var/yoff = (the_turf.y - center.y) * pixel_size + center_offset + var/image/cur_icon = getFlatIcon(the_turf.loc) + CHECK_TICK + + if(cur_icon) + res.Blend(cur_icon, blendMode2iconMode(the_turf.blend_mode), xoff, yoff) + CHECK_TICK return res +/obj/item/device/camera/proc/get_mob_descriptions(turf/the_turf, existing_descripion) + var/mob_detail = existing_descripion + for(var/mob/living/carbon/cur_carbon in the_turf) + if(cur_carbon.invisibility) + continue -/obj/item/device/camera/proc/get_mobs(turf/the_turf as turf) - var/mob_detail - for(var/mob/living/carbon/A in the_turf) - if(A.invisibility) continue var/holding = null - if(A.l_hand || A.r_hand) - if(A.l_hand) holding = "They are holding \a [A.l_hand]" - if(A.r_hand) + if(cur_carbon.l_hand || cur_carbon.r_hand) + if(cur_carbon.l_hand) + holding = "They are holding \a [cur_carbon.l_hand]" + if(cur_carbon.r_hand) if(holding) - holding += " and \a [A.r_hand]" + holding += " and \a [cur_carbon.r_hand]" else - holding = "They are holding \a [A.r_hand]" + holding = "They are holding \a [cur_carbon.r_hand]" + + var/hurt = "" + if(cur_carbon.health < 75) + hurt = prob(25) ? " - they look hurt" : " - [cur_carbon] looks hurt" if(!mob_detail) - mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]. " + mob_detail = "You can see [cur_carbon] in the photo[hurt].[holding ? " [holding]" : "."]." else - mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]." + mob_detail += " You [prob(50) ? "can" : "also"] see [cur_carbon] in the photo[hurt].[holding ? " [holding]" : "."]." return mob_detail /obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) - if(!on || !pictures_left || ismob(target.loc) || isstorage(target.loc)) return - if(user.contains(target) || istype(target, /atom/movable/screen)) return - captureimage(target, user, flag) + if(!on || !pictures_left || ismob(target.loc) || isstorage(target.loc)) + return + if(user.contains(target) || istype(target, /atom/movable/screen)) + return playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 15, 1) pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." to_chat(user, SPAN_NOTICE("[pictures_left] photos left.")) + + captureimage(target, user, flag) + icon_state = icon_off on = 0 spawn(64) @@ -257,37 +286,46 @@ on = 1 /obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag) - var/mobs = "" + var/mob_descriptions = "" var/radius = (size-1)*0.5 var/list/turf/turfs = RANGE_TURFS(radius, target) & view(world_view_size + radius, user.client) - for(var/turf/T as anything in turfs) - mobs += get_mobs(T) - var/datum/picture/P = createpicture(target, user, turfs, mobs, flag) - printpicture(user, P) + for(var/turf/the_turf as anything in turfs) + mob_descriptions = get_mob_descriptions(the_turf, mob_descriptions) + var/datum/picture/the_picture = createpicture(target, user, turfs, mob_descriptions, flag) -/obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag) + if(QDELETED(user)) + return + + printpicture(user, the_picture) + +/obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, description, flag) var/icon/photoimage = get_icon(turfs, target) + if(!description) + description = "A very scenic photo" + var/icon/small_img = icon(photoimage) var/icon/tiny_img = icon(photoimage) - var/icon/ic = icon('icons/obj/items/items.dmi',"photo") - var/icon/pc = icon('icons/obj/items/paper.dmi', "photo") + var/icon/item_icon = icon('icons/obj/items/items.dmi',"photo") + var/icon/paper_icon = icon('icons/obj/items/paper.dmi', "photo") small_img.Scale(8, 8) tiny_img.Scale(4, 4) - ic.Blend(small_img,ICON_OVERLAY, 10, 13) - pc.Blend(tiny_img,ICON_OVERLAY, 12, 19) - - var/datum/picture/P = new() - P.fields["author"] = user - P.fields["icon"] = ic - P.fields["tiny"] = pc - P.fields["img"] = photoimage - P.fields["desc"] = mobs - P.fields["pixel_x"] = rand(-10, 10) - P.fields["pixel_y"] = rand(-10, 10) - P.fields["size"] = size - - return P + item_icon.Blend(small_img, ICON_OVERLAY, 10, 13) + CHECK_TICK + paper_icon.Blend(tiny_img, ICON_OVERLAY, 12, 19) + CHECK_TICK + + var/datum/picture/the_picture = new() + the_picture.fields["author"] = user + the_picture.fields["icon"] = item_icon + the_picture.fields["tiny"] = paper_icon + the_picture.fields["img"] = photoimage + the_picture.fields["desc"] = description + the_picture.fields["pixel_x"] = rand(-10, 10) + the_picture.fields["pixel_y"] = rand(-10, 10) + the_picture.fields["size"] = size + + return the_picture /obj/item/device/camera/proc/printpicture(mob/user, datum/picture/P) var/obj/item/photo/Photo = new/obj/item/photo() diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index 831923415453..df8a7d7bdd76 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -85,6 +85,8 @@ var/handful = "shells" //used for 'magazine' boxes that give handfuls to determine what kind for the sprite can_explode = TRUE limit_per_tile = 2 + ground_offset_x = 5 + ground_offset_y = 5 /obj/item/ammo_box/magazine/empty empty = TRUE @@ -102,8 +104,6 @@ while(i < num_of_magazines) contents += new magazine_type(src) i++ - pixel_x = rand(-5, 5) - pixel_y = rand(-5, 5) update_icon() /obj/item/ammo_box/magazine/update_icon() diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm deleted file mode 100644 index 783b982f10bd..000000000000 --- a/code/modules/projectiles/ammo_datums.dm +++ /dev/null @@ -1,3447 +0,0 @@ -/datum/ammo - var/name = "generic bullet" - var/headshot_state = null //Icon state when a human is permanently killed with it by execution/suicide. - var/icon = 'icons/obj/items/weapons/projectiles.dmi' - var/icon_state = "bullet" - var/ping = "ping_b" //The icon that is displayed when the bullet bounces off something. - var/sound_hit //When it deals damage. - var/sound_armor //When it's blocked by human armor. - var/sound_miss //When it misses someone. - var/sound_bounce //When it bounces off something. - var/sound_shield_hit //When the bullet is absorbed by a xeno_shield - - var/accurate_range_min = 0 // Snipers use this to simulate poor accuracy at close ranges - var/scatter = 0 // How much the ammo scatters when burst fired, added to gun scatter, along with other mods - var/stamina_damage = 0 - var/damage = 0 // This is the base damage of the bullet as it is fired - var/damage_type = BRUTE // BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here - var/penetration = 0 // How much armor it ignores before calculations take place - var/shrapnel_chance = 0 // The % chance it will imbed in a human - var/shrapnel_type = 0 // The shrapnel type the ammo will embed, if the chance rolls - var/bonus_projectiles_type // Type path of the extra projectiles - var/bonus_projectiles_amount = 0 // How many extra projectiles it shoots out. Works kind of like firing on burst, but all of the projectiles travel together - var/debilitate[] = null // Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony - var/pen_armor_punch = 0.5 // how much armor breaking will be done per point of penetration. This is for weapons that penetrate with their shape (like needle bullets) - var/damage_armor_punch = 0.5 // how much armor breaking is done by sheer weapon force. This is for big blunt weapons - var/sound_override = null // if we should play a special sound when firing. - var/flags_ammo_behavior = NO_FLAGS - - var/accuracy = HIT_ACCURACY_TIER_1 // This is added to the bullet's base accuracy. - var/accuracy_var_low = PROJECTILE_VARIANCE_TIER_9 // How much the accuracy varies when fired. // This REDUCES the lower bound of accuracy variance by 2%, to 96%. - var/accuracy_var_high = PROJECTILE_VARIANCE_TIER_9 // This INCREASES the upper bound of accuracy variance by 2%, to 107%. - var/accurate_range = 6 // For most guns, this is where the bullet dramatically looses accuracy. Not for snipers though. - var/max_range = 22 // This will de-increment a counter on the bullet. - var/damage_var_low = PROJECTILE_VARIANCE_TIER_9 // Same as with accuracy variance. - var/damage_var_high = PROJECTILE_VARIANCE_TIER_9 // This INCREASES the upper bound of damage variance by 2%, to 107%. - var/damage_falloff = DAMAGE_FALLOFF_TIER_10 // How much damage the bullet loses per turf traveled after the effective range - var/damage_buildup = DAMAGE_BUILDUP_TIER_1 // How much damage the bullet loses per turf away before the effective range - var/effective_range_min = EFFECTIVE_RANGE_OFF //What minimum range the ammo deals full damage, builds up the closer you get. 0 for no minimum. Added onto gun range as a modifier. - var/effective_range_max = EFFECTIVE_RANGE_OFF //What maximum range the ammo deals full damage, tapers off using damage_falloff after hitting this value. 0 for no maximum. Added onto gun range as a modifier. - var/shell_speed = AMMO_SPEED_TIER_1 // How fast the projectile moves. - - var/handful_type = /obj/item/ammo_magazine/handful - var/handful_color - var/handful_state = "bullet" //custom handful sprite, for shotgun shells or etc. - var/multiple_handful_name //so handfuls say 'buckshot shells' not 'shell' - - /// Does this apply xenomorph behaviour delegate? - var/apply_delegate = TRUE - - /// An assoc list in the format list(/datum/element/bullet_trait_to_give = list(...args)) - /// that will be given to a projectile with the current ammo datum - var/list/list/traits_to_give - - var/flamer_reagent_type = /datum/reagent/napalm/ut - - /// The flicker that plays when a bullet hits a target. Usually red. Can be nulled so it doesn't show up at all. - var/hit_effect_color = "#FF0000" - -/datum/ammo/New() - set_bullet_traits() - -/datum/ammo/proc/on_bullet_generation(obj/projectile/generated_projectile, mob/bullet_generator) //NOT used on New(), applied to the projectiles. - return - -/// Populate traits_to_give in this proc -/datum/ammo/proc/set_bullet_traits() - return - -/datum/ammo/can_vv_modify() - return FALSE - -/datum/ammo/proc/do_at_half_range(obj/projectile/P) - SHOULD_NOT_SLEEP(TRUE) - return - -/datum/ammo/proc/on_embed(mob/embedded_mob, obj/limb/target_organ) - return - -/datum/ammo/proc/do_at_max_range(obj/projectile/P) - SHOULD_NOT_SLEEP(TRUE) - return - -/datum/ammo/proc/on_shield_block(mob/M, obj/projectile/P) //Does it do something special when shield blocked? Ie. a flare or grenade that still blows up. - return - -/datum/ammo/proc/on_hit_turf(turf/T, obj/projectile/P) //Special effects when hitting dense turfs. - SHOULD_NOT_SLEEP(TRUE) - return - -/datum/ammo/proc/on_hit_mob(mob/M, obj/projectile/P, mob/user) //Special effects when hitting mobs. - SHOULD_NOT_SLEEP(TRUE) - return - -///Special effects when pointblanking mobs. Ultimately called from /living/attackby(). Return TRUE to end the PB attempt. -/datum/ammo/proc/on_pointblank(mob/living/L, obj/projectile/P, mob/living/user, obj/item/weapon/gun/fired_from) - return - -/datum/ammo/proc/on_hit_obj(obj/O, obj/projectile/P) //Special effects when hitting objects. - SHOULD_NOT_SLEEP(TRUE) - return - -/datum/ammo/proc/on_near_target(turf/T, obj/projectile/P) //Special effects when passing near something. Range of things that triggers it is controlled by other ammo flags. - return 0 //return 0 means it flies even after being near something. Return 1 means it stops - -/datum/ammo/proc/knockback(mob/living/living_mob, obj/projectile/fired_projectile, max_range = 2) - if(!living_mob || living_mob == fired_projectile.firer) - return - if(fired_projectile.distance_travelled > max_range || living_mob.lying) - return //Two tiles away or more, basically. - - if(living_mob.mob_size >= MOB_SIZE_BIG) - return //Big xenos are not affected. - - shake_camera(living_mob, 3, 4) - knockback_effects(living_mob, fired_projectile) - slam_back(living_mob, fired_projectile) - -/datum/ammo/proc/slam_back(mob/living/living_mob, obj/projectile/fired_projectile) - //Either knockback or slam them into an obstacle. - var/direction = Get_Compass_Dir(fired_projectile.z ? fired_projectile : fired_projectile.firer, living_mob) //More precise than get_dir. - if(!direction) //Same tile. - return - if(!step(living_mob, direction)) - living_mob.animation_attack_on(get_step(living_mob, direction)) - playsound(living_mob.loc, "punch", 25, 1) - living_mob.visible_message(SPAN_DANGER("[living_mob] slams into an obstacle!"), - isxeno(living_mob) ? SPAN_XENODANGER("You slam into an obstacle!") : SPAN_HIGHDANGER("You slam into an obstacle!"), null, 4, CHAT_TYPE_TAKING_HIT) - living_mob.apply_damage(MELEE_FORCE_TIER_2) - -///The applied effects for knockback(), overwrite to change slow/stun amounts for different ammo datums -/datum/ammo/proc/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) - if(iscarbonsizexeno(living_mob)) - var/mob/living/carbon/xenomorph/target = living_mob - target.apply_effect(0.7, WEAKEN) // 0.9 seconds of stun, per agreement from Balance Team when switched from MC stuns to exact stuns - target.apply_effect(1, SUPERSLOW) - target.apply_effect(2, SLOW) - to_chat(target, SPAN_XENODANGER("You are shaken by the sudden impact!")) - else - living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) - -/datum/ammo/proc/pushback(mob/target_mob, obj/projectile/fired_projectile, max_range = 2) - if(!target_mob || target_mob == fired_projectile.firer || fired_projectile.distance_travelled > max_range || target_mob.lying) - return - - if(target_mob.mob_size >= MOB_SIZE_BIG) - return //too big to push - - to_chat(target_mob, isxeno(target_mob) ? SPAN_XENODANGER("You are pushed back by the sudden impact!") : SPAN_HIGHDANGER("You are pushed back by the sudden impact!"), null, 4, CHAT_TYPE_TAKING_HIT) - slam_back(target_mob, fired_projectile, max_range) - -/datum/ammo/proc/burst(atom/target, obj/projectile/P, damage_type = BRUTE, range = 1, damage_div = 2, show_message = SHOW_MESSAGE_VISIBLE) //damage_div says how much we divide damage - if(!target || !P) return - for(var/mob/living/carbon/M in orange(range,target)) - if(P.firer == M) - continue - if(show_message) - var/msg = "You are hit by backlash from \a [P.name]!" - M.visible_message(SPAN_DANGER("[M] is hit by backlash from \a [P.name]!"),isxeno(M) ? SPAN_XENODANGER("[msg]"):SPAN_HIGHDANGER("[msg]")) - var/damage = P.damage/damage_div - - var/mob/living/carbon/xenomorph/XNO = null - - if(isxeno(M)) - XNO = M - var/total_explosive_resistance = XNO.caste.xeno_explosion_resistance + XNO.armor_explosive_buff - damage = armor_damage_reduction(GLOB.xeno_explosive, damage, total_explosive_resistance , 60, 0, 0.5, XNO.armor_integrity) - var/armor_punch = armor_break_calculation(GLOB.xeno_explosive, damage, total_explosive_resistance, 60, 0, 0.5, XNO.armor_integrity) - XNO.apply_armorbreak(armor_punch) - - M.apply_damage(damage,damage_type) - - if(XNO && XNO.xeno_shields.len) - P.play_shielded_hit_effect(M) - else - P.play_hit_effect(M) - -/datum/ammo/proc/fire_bonus_projectiles(obj/projectile/original_P) - set waitfor = 0 - - var/turf/curloc = get_turf(original_P.shot_from) - var/initial_angle = Get_Angle(curloc, original_P.target_turf) - - for(var/i in 1 to bonus_projectiles_amount) //Want to run this for the number of bonus projectiles. - var/final_angle = initial_angle - - var/obj/projectile/P = new /obj/projectile(curloc, original_P.weapon_cause_data) - P.generate_bullet(GLOB.ammo_list[bonus_projectiles_type]) //No bonus damage or anything. - P.accuracy = round(P.accuracy * original_P.accuracy/initial(original_P.accuracy)) //if the gun changes the accuracy of the main projectile, it also affects the bonus ones. - original_P.give_bullet_traits(P) - - var/total_scatter_angle = P.scatter - final_angle += rand(-total_scatter_angle, total_scatter_angle) - var/turf/new_target = get_angle_target_turf(curloc, final_angle, 30) - - P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! - -/datum/ammo/proc/drop_flame(turf/T, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 - if(!istype(T)) - return - if(locate(/obj/flamer_fire) in T) - return - - var/datum/reagent/R = new flamer_reagent_type() - new /obj/flamer_fire(T, cause_data, R) - - -/* -//====== - Default Ammo -//====== -*/ -//Only when things screw up do we use this as a placeholder. -/datum/ammo/bullet - name = "default bullet" - icon_state = "bullet" - headshot_state = HEADSHOT_OVERLAY_LIGHT - flags_ammo_behavior = AMMO_BALLISTIC - sound_hit = "ballistic_hit" - sound_armor = "ballistic_armor" - sound_miss = "ballistic_miss" - sound_bounce = "ballistic_bounce" - sound_shield_hit = "ballistic_shield_hit" - - accurate_range_min = 0 - damage = 10 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_1 - shrapnel_type = /obj/item/shard/shrapnel - shell_speed = AMMO_SPEED_TIER_4 - -/datum/ammo/bullet/proc/handle_battlefield_execution(datum/ammo/firing_ammo, mob/living/hit_mob, obj/projectile/firing_projectile, mob/living/user, obj/item/weapon/gun/fired_from) - SIGNAL_HANDLER - - if(!user || hit_mob == user || user.zone_selected != "head" || user.a_intent != INTENT_HARM || !ishuman_strict(hit_mob)) - return - - if(!skillcheck(user, SKILL_EXECUTION, SKILL_EXECUTION_TRAINED)) - to_chat(user, SPAN_DANGER("You don't know how to execute someone correctly.")) - return - - var/mob/living/carbon/human/execution_target = hit_mob - - if(execution_target.status_flags & PERMANENTLY_DEAD) - to_chat(user, SPAN_DANGER("[execution_target] has already been executed!")) - return - - INVOKE_ASYNC(src, PROC_REF(attempt_battlefield_execution), src, execution_target, firing_projectile, user, fired_from) - - return COMPONENT_CANCEL_AMMO_POINT_BLANK - -/datum/ammo/bullet/proc/attempt_battlefield_execution(datum/ammo/firing_ammo, mob/living/carbon/human/execution_target, obj/projectile/firing_projectile, mob/living/user, obj/item/weapon/gun/fired_from) - user.affected_message(execution_target, - SPAN_HIGHDANGER("You aim \the [fired_from] at [execution_target]'s head!"), - SPAN_HIGHDANGER("[user] aims \the [fired_from] directly at your head!"), - SPAN_DANGER("[user] aims \the [fired_from] at [execution_target]'s head!")) - - user.next_move += 1.1 SECONDS //PB has no click delay; readding it here to prevent people accidentally queuing up multiple executions. - - if(!do_after(user, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE) || !user.Adjacent(execution_target)) - fired_from.delete_bullet(firing_projectile, TRUE) - return - - if(!(fired_from.flags_gun_features & GUN_SILENCED)) - playsound(user, fired_from.fire_sound, fired_from.firesound_volume, FALSE) - else - playsound(user, fired_from.fire_sound, 25, FALSE) - - shake_camera(user, 1, 2) - - execution_target.apply_damage(damage * 3, BRUTE, "head", no_limb_loss = TRUE, permanent_kill = TRUE) //Apply gobs of damage and make sure they can't be revived later... - execution_target.apply_damage(200, OXY) //...fill out the rest of their health bar with oxyloss... - execution_target.death(create_cause_data("execution", user)) //...make certain they're properly dead... - shake_camera(execution_target, 3, 4) - execution_target.update_headshot_overlay(headshot_state) //...and add a gory headshot overlay. - - execution_target.visible_message(SPAN_HIGHDANGER(uppertext("[execution_target] WAS EXECUTED!")), \ - SPAN_HIGHDANGER("You WERE EXECUTED!")) - - user.count_niche_stat(STATISTICS_NICHE_EXECUTION, 1, firing_projectile.weapon_cause_data?.cause_name) - - var/area/execution_area = get_area(execution_target) - - msg_admin_attack(FONT_SIZE_HUGE("[key_name(usr)] has battlefield executed [key_name(execution_target)] in [get_area(usr)] ([usr.loc.x],[usr.loc.y],[usr.loc.z])."), usr.loc.x, usr.loc.y, usr.loc.z) - log_attack("[key_name(usr)] battlefield executed [key_name(execution_target)] at [execution_area.name].") - - if(flags_ammo_behavior & AMMO_EXPLOSIVE) - execution_target.gib() - - -/* -//====== - Pistol Ammo -//====== -*/ - -// Used by M4A3, M4A3 Custom and B92FS -/datum/ammo/bullet/pistol - name = "pistol bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - accuracy = -HIT_ACCURACY_TIER_3 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - damage = 40 - penetration= ARMOR_PENETRATION_TIER_2 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/datum/ammo/bullet/pistol/tiny - name = "light pistol bullet" - -/datum/ammo/bullet/pistol/tranq - name = "tranquilizer bullet" - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST - stamina_damage = 30 - damage = 15 - -//2020 rebalance: is supposed to counter runners and lurkers, dealing high damage to the only castes with no armor. -//Limited by its lack of versatility and lower supply, so marines finally have an answer for flanker castes that isn't just buckshot. - -/datum/ammo/bullet/pistol/hollow - name = "hollowpoint pistol bullet" - - damage = 55 //hollowpoint is strong - penetration = 0 //hollowpoint can't pierce armor! - shrapnel_chance = SHRAPNEL_CHANCE_TIER_3 //hollowpoint causes shrapnel - -// Used by M4A3 AP and mod88 -/datum/ammo/bullet/pistol/ap - name = "armor-piercing pistol bullet" - - damage = 25 - accuracy = HIT_ACCURACY_TIER_2 - penetration= ARMOR_PENETRATION_TIER_8 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/datum/ammo/bullet/pistol/ap/penetrating - name = "wall-penetrating pistol bullet" - shrapnel_chance = 0 - - damage = 30 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/pistol/ap/penetrating/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/pistol/ap/toxin - name = "toxic pistol bullet" - var/acid_per_hit = 10 - var/organic_damage_mult = 3 - -/datum/ammo/bullet/pistol/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) - -/datum/ammo/bullet/pistol/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) - . = ..() - if(T.flags_turf & TURF_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/pistol/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) - . = ..() - if(O.flags_obj & OBJ_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/pistol/le - name = "armor-shredding pistol bullet" - - damage = 15 - penetration = ARMOR_PENETRATION_TIER_4 - pen_armor_punch = 3 - -/datum/ammo/bullet/pistol/rubber - name = "rubber pistol bullet" - sound_override = 'sound/weapons/gun_c99.ogg' - - damage = 0 - stamina_damage = 25 - shrapnel_chance = 0 - -// Reskinned rubber bullet used for the ES-4 CL pistol. -/datum/ammo/bullet/pistol/rubber/stun - name = "stun pistol bullet" - sound_override = null - -// Used by M1911, Deagle and KT-42 -/datum/ammo/bullet/pistol/heavy - name = "heavy pistol bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - accuracy = -HIT_ACCURACY_TIER_3 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - damage = 55 - penetration = ARMOR_PENETRATION_TIER_3 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/datum/ammo/bullet/pistol/heavy/super //Commander's variant - name = ".50 heavy pistol bullet" - damage = 60 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_6 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/pistol/heavy/super/highimpact - name = ".50 high-impact pistol bullet" - penetration = ARMOR_PENETRATION_TIER_1 - debilitate = list(0,1.5,0,0,0,1,0,0) - flags_ammo_behavior = AMMO_BALLISTIC - -/datum/ammo/bullet/pistol/heavy/super/highimpact/ap - name = ".50 high-impact armor piercing pistol bullet" - penetration = ARMOR_PENETRATION_TIER_10 - damage = 45 - -/datum/ammo/bullet/pistol/heavy/super/highimpact/upp - name = "high-impact pistol bullet" - sound_override = 'sound/weapons/gun_DE50.ogg' - penetration = ARMOR_PENETRATION_TIER_6 - debilitate = list(0,1.5,0,0,0,1,0,0) - flags_ammo_behavior = AMMO_BALLISTIC - -/datum/ammo/bullet/pistol/heavy/super/highimpact/New() - ..() - RegisterSignal(src, COMSIG_AMMO_POINT_BLANK, PROC_REF(handle_battlefield_execution)) - -/datum/ammo/bullet/pistol/heavy/super/highimpact/on_hit_mob(mob/M, obj/projectile/P) - knockback(M, P, 4) - -/datum/ammo/bullet/pistol/deagle - name = ".50 heavy pistol bullet" - damage = 45 - headshot_state = HEADSHOT_OVERLAY_HEAVY - accuracy = -HIT_ACCURACY_TIER_3 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - penetration = ARMOR_PENETRATION_TIER_6 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_5 - -/datum/ammo/bullet/pistol/incendiary - name = "incendiary pistol bullet" - damage_type = BURN - shrapnel_chance = 0 - flags_ammo_behavior = AMMO_BALLISTIC - - accuracy = HIT_ACCURACY_TIER_3 - damage = 20 - -/datum/ammo/bullet/pistol/incendiary/set_bullet_traits() - ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -// Used by the hipower -// I know that the 'high power' in the name is supposed to mean its 'impressive' magazine capacity -// but this is CM, half our guns have baffling misconceptions and mistakes (how do you grab the type-71?) so it's on-brand. -// maybe in the far flung future of 2280 someone screwed up the design. - -/datum/ammo/bullet/pistol/highpower - name = "high-powered pistol bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - accuracy = HIT_ACCURACY_TIER_3 - damage = 36 - penetration = ARMOR_PENETRATION_TIER_5 - damage_falloff = DAMAGE_FALLOFF_TIER_7 - -// Used by VP78 and Auto 9 -/datum/ammo/bullet/pistol/squash - name = "squash-head pistol bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - debilitate = list(0,0,0,0,0,0,0,2) - - accuracy = HIT_ACCURACY_TIER_4 - damage = 45 - penetration= ARMOR_PENETRATION_TIER_6 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - damage_falloff = DAMAGE_FALLOFF_TIER_6 //"VP78 - the only pistol viable as a primary."-Vampmare, probably. - -/datum/ammo/bullet/pistol/squash/toxin - name = "toxic squash-head pistol bullet" - var/acid_per_hit = 10 - var/organic_damage_mult = 3 - -/datum/ammo/bullet/pistol/squash/toxin/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) - -/datum/ammo/bullet/pistol/squash/toxin/on_hit_turf(turf/T, obj/projectile/P) - . = ..() - if(T.flags_turf & TURF_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/pistol/squash/toxin/on_hit_obj(obj/O, obj/projectile/P) - . = ..() - if(O.flags_obj & OBJ_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/pistol/squash/penetrating - name = "wall-penetrating squash-head pistol bullet" - shrapnel_chance = 0 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/pistol/squash/penetrating/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/pistol/squash/incendiary - name = "incendiary squash-head pistol bullet" - damage_type = BURN - shrapnel_chance = 0 - flags_ammo_behavior = AMMO_BALLISTIC - accuracy = HIT_ACCURACY_TIER_3 - damage = 35 - -/datum/ammo/bullet/pistol/squash/incendiary/set_bullet_traits() - ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - - -/datum/ammo/bullet/pistol/mankey - name = "live monkey" - icon_state = "monkey1" - ping = null //no bounce off. - damage_type = BURN - debilitate = list(4,4,0,0,0,0,0,0) - flags_ammo_behavior = AMMO_IGNORE_ARMOR - - damage = 15 - damage_var_high = PROJECTILE_VARIANCE_TIER_5 - shell_speed = AMMO_SPEED_TIER_2 - -/datum/ammo/bullet/pistol/mankey/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/pistol/mankey/on_hit_mob(mob/M,obj/projectile/P) - if(P && P.loc && !M.stat && !istype(M,/mob/living/carbon/human/monkey)) - P.visible_message(SPAN_DANGER("The [src] chimpers furiously!")) - new /mob/living/carbon/human/monkey(P.loc) - -/datum/ammo/bullet/pistol/smart - name = "smartpistol bullet" - flags_ammo_behavior = AMMO_BALLISTIC - - accuracy = HIT_ACCURACY_TIER_8 - damage = 30 - penetration = 20 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/* -//====== - Revolver Ammo -//====== -*/ - -/datum/ammo/bullet/revolver - name = "revolver bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - damage = 55 - penetration = ARMOR_PENETRATION_TIER_1 - accuracy = HIT_ACCURACY_TIER_1 - -/datum/ammo/bullet/revolver/marksman - name = "marksman revolver bullet" - - shrapnel_chance = 0 - damage_falloff = 0 - accurate_range = 12 - penetration = ARMOR_PENETRATION_TIER_7 - -/datum/ammo/bullet/revolver/heavy - name = "heavy revolver bullet" - - damage = 35 - penetration = ARMOR_PENETRATION_TIER_4 - accuracy = HIT_ACCURACY_TIER_3 - -/datum/ammo/bullet/revolver/heavy/on_hit_mob(mob/M, obj/projectile/P) - knockback(M, P, 4) - -/datum/ammo/bullet/revolver/incendiary - name = "incendiary revolver bullet" - damage = 40 - -/datum/ammo/bullet/revolver/incendiary/set_bullet_traits() - ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/revolver/marksman/toxin - name = "toxic revolver bullet" - var/acid_per_hit = 10 - var/organic_damage_mult = 3 - -/datum/ammo/bullet/revolver/marksman/toxin/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) - -/datum/ammo/bullet/revolver/marksman/toxin/on_hit_turf(turf/T, obj/projectile/P) - . = ..() - if(T.flags_turf & TURF_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/revolver/marksman/toxin/on_hit_obj(obj/O, obj/projectile/P) - . = ..() - if(O.flags_obj & OBJ_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/revolver/penetrating - name = "wall-penetrating revolver bullet" - shrapnel_chance = 0 - - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/revolver/penetrating/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/revolver/upp - name = "heavy revolver bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - penetration = ARMOR_PENETRATION_TIER_4 - damage = 70 - - -/datum/ammo/bullet/revolver/upp/shrapnel - name = "shrapnel shot" - headshot_state = HEADSHOT_OVERLAY_HEAVY //Gol-dang shotgun blow your fething head off. - debilitate = list(0,0,0,0,0,0,0,0) - icon_state = "shrapnelshot" - handful_state = "shrapnel" - bonus_projectiles_type = /datum/ammo/bullet/revolver/upp/shrapnel_bits - - max_range = 6 - damage = 40 // + TIER_4 * 3 - damage_falloff = DAMAGE_FALLOFF_TIER_7 - penetration = ARMOR_PENETRATION_TIER_8 - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 - shrapnel_chance = 100 - shrapnel_type = /obj/item/shard/shrapnel/upp - //roughly 90 or so damage with the additional shrapnel, around 130 in total with primary round - -/datum/ammo/bullet/revolver/upp/shrapnel/on_hit_mob(mob/M, obj/projectile/P) - pushback(M, P, 1) - -/datum/ammo/bullet/revolver/upp/shrapnel_bits - name = "small shrapnel" - icon_state = "shrapnelshot_bit" - - max_range = 6 - damage = 30 - penetration = ARMOR_PENETRATION_TIER_4 - scatter = SCATTER_AMOUNT_TIER_1 - bonus_projectiles_amount = 0 - shrapnel_type = /obj/item/shard/shrapnel/upp/bits - -/datum/ammo/bullet/revolver/small - name = "small revolver bullet" - headshot_state = HEADSHOT_OVERLAY_LIGHT - - damage = 45 - - penetration = ARMOR_PENETRATION_TIER_3 - -/datum/ammo/bullet/revolver/small/hollowpoint - name = "small hollowpoint revolver bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - damage = 75 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong - penetration = 0 - damage_falloff = DAMAGE_FALLOFF_TIER_6 - -/datum/ammo/bullet/revolver/mateba - name = ".454 heavy revolver bullet" - - damage = 60 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_6 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/revolver/mateba/highimpact - name = ".454 heavy high-impact revolver bullet" - debilitate = list(0,2,0,0,0,1,0,0) - penetration = ARMOR_PENETRATION_TIER_1 - flags_ammo_behavior = AMMO_BALLISTIC - -/datum/ammo/bullet/revolver/mateba/highimpact/ap - name = ".454 heavy high-impact armor piercing revolver bullet" - penetration = ARMOR_PENETRATION_TIER_10 - damage = 45 - -/datum/ammo/bullet/revolver/mateba/highimpact/New() - ..() - RegisterSignal(src, COMSIG_AMMO_POINT_BLANK, PROC_REF(handle_battlefield_execution)) - -/datum/ammo/bullet/revolver/mateba/highimpact/on_hit_mob(mob/M, obj/projectile/P) - knockback(M, P, 4) - -/datum/ammo/bullet/revolver/mateba/highimpact/explosive //if you ever put this in normal gameplay, i am going to scream - name = ".454 heavy explosive revolver bullet" - damage = 100 - damage_var_low = PROJECTILE_VARIANCE_TIER_10 - damage_var_high = PROJECTILE_VARIANCE_TIER_1 - penetration = ARMOR_PENETRATION_TIER_10 - flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_BALLISTIC - -/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_mob(mob/M, obj/projectile/P) - ..() - cell_explosion(get_turf(M), 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_obj(obj/O, obj/projectile/P) - ..() - cell_explosion(get_turf(O), 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/revolver/mateba/highimpact/explosive/on_hit_turf(turf/T, obj/projectile/P) - ..() - cell_explosion(T, 120, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/revolver/webley //Mateba round without the knockdown. - name = ".455 Webley bullet" - damage = 60 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_6 - penetration = ARMOR_PENETRATION_TIER_2 - -/* -//====== - SMG Ammo -//====== -*/ -//2020 SMG/ammo rebalance. default ammo actually has penetration so it can be useful, by 4khan: should be meh against t3s, better under 15 armor. Perfectly does this right now (oct 2020) -//has reduced falloff compared to the m39. this means it is best for kiting castes (mostly t2s and below admittedly) -//while the m39 ap is better for shredding them at close range, but has reduced velocity, so it's better for just running in and erasing armor-centric castes (defender, crusher) -// which i think is really interesting and good balance, giving both ammo types a reason to exist even against ravagers. -//i feel it is necessary to reflavor the default bullet, because otherwise, people won't be able to notice it has less falloff and faster bullet speed. even with a changelog, -//way too many people don't read the changelog, and after one or two months the changelog entry is all but archive, so there needs to be an ingame description of what the ammo does -//in comparison to armor-piercing rounds. - -/datum/ammo/bullet/smg - name = "submachinegun bullet" - damage = 34 - accurate_range = 4 - effective_range_max = 4 - penetration = ARMOR_PENETRATION_TIER_1 - shell_speed = AMMO_SPEED_TIER_6 - damage_falloff = DAMAGE_FALLOFF_TIER_5 - scatter = SCATTER_AMOUNT_TIER_6 - accuracy = HIT_ACCURACY_TIER_3 - -/datum/ammo/bullet/smg/m39 - name = "high-velocity submachinegun bullet" //i don't want all smgs to inherit 'high velocity' - -/datum/ammo/bullet/smg/ap - name = "armor-piercing submachinegun bullet" - - damage = 26 - penetration = ARMOR_PENETRATION_TIER_6 - shell_speed = AMMO_SPEED_TIER_4 - -/datum/ammo/bullet/smg/heap - name = "high-explosive armor-piercing submachinegun bullet" - - damage = 45 - headshot_state = HEADSHOT_OVERLAY_MEDIUM - penetration = ARMOR_PENETRATION_TIER_6 - shell_speed = AMMO_SPEED_TIER_4 - -/datum/ammo/bullet/smg/ap/toxin - name = "toxic submachinegun bullet" - var/acid_per_hit = 5 - var/organic_damage_mult = 3 - -/datum/ammo/bullet/smg/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) - -/datum/ammo/bullet/smg/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) - . = ..() - if(T.flags_turf & TURF_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/smg/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) - . = ..() - if(O.flags_obj & OBJ_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/smg/nail - name = "7x45mm plasteel nail" - icon_state = "nail-projectile" - - damage = 25 - penetration = ARMOR_PENETRATION_TIER_5 - damage_falloff = DAMAGE_FALLOFF_TIER_6 - accurate_range = 5 - shell_speed = AMMO_SPEED_TIER_4 - -/datum/ammo/bullet/smg/incendiary - name = "incendiary submachinegun bullet" - damage_type = BURN - shrapnel_chance = 0 - flags_ammo_behavior = AMMO_BALLISTIC - - damage = 25 - accuracy = -HIT_ACCURACY_TIER_2 - -/datum/ammo/bullet/smg/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/smg/ap/penetrating - name = "wall-penetrating submachinegun bullet" - shrapnel_chance = 0 - - damage = 30 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/smg/ap/penetrating/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/smg/le - name = "armor-shredding submachinegun bullet" - - scatter = SCATTER_AMOUNT_TIER_10 - damage = 20 - penetration = ARMOR_PENETRATION_TIER_4 - shell_speed = AMMO_SPEED_TIER_3 - damage_falloff = DAMAGE_FALLOFF_TIER_10 - pen_armor_punch = 4 - -/datum/ammo/bullet/smg/rubber - name = "rubber submachinegun bullet" - sound_override = 'sound/weapons/gun_c99.ogg' - - damage = 0 - stamina_damage = 10 - shrapnel_chance = 0 - -/datum/ammo/bullet/smg/mp27 - name = "simple submachinegun bullet" - damage = 40 - accurate_range = 5 - effective_range_max = 7 - penetration = 0 - shell_speed = AMMO_SPEED_TIER_6 - damage_falloff = DAMAGE_FALLOFF_TIER_6 - scatter = SCATTER_AMOUNT_TIER_6 - accuracy = HIT_ACCURACY_TIER_2 - -// less damage than the m39, but better falloff, range, and AP - -/datum/ammo/bullet/smg/ppsh - name = "crude submachinegun bullet" - damage = 26 - accurate_range = 7 - effective_range_max = 7 - penetration = ARMOR_PENETRATION_TIER_2 - damage_falloff = DAMAGE_FALLOFF_TIER_7 - scatter = SCATTER_AMOUNT_TIER_5 - -/datum/ammo/bullet/smg/pps43 - name = "simple submachinegun bullet" - damage = 35 - accurate_range = 7 - effective_range_max = 10 - penetration = ARMOR_PENETRATION_TIER_4 - damage_falloff = DAMAGE_FALLOFF_TIER_6 - scatter = SCATTER_AMOUNT_TIER_6 - -/* -//====== - Rifle Ammo -//====== -*/ - -/datum/ammo/bullet/rifle - name = "rifle bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - damage = 40 - penetration = ARMOR_PENETRATION_TIER_1 - accurate_range = 16 - accuracy = HIT_ACCURACY_TIER_4 - scatter = SCATTER_AMOUNT_TIER_10 - shell_speed = AMMO_SPEED_TIER_6 - effective_range_max = 7 - damage_falloff = DAMAGE_FALLOFF_TIER_7 - max_range = 24 //So S8 users don't have their bullets magically disappaer at 22 tiles (S8 can see 24 tiles) - -/datum/ammo/bullet/rifle/holo_target - name = "holo-targeting rifle bullet" - damage = 30 - var/holo_stacks = 10 - -/datum/ammo/bullet/rifle/holo_target/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) - -/datum/ammo/bullet/rifle/holo_target/hunting - name = "holo-targeting hunting bullet" - damage = 25 - holo_stacks = 15 - -/datum/ammo/bullet/rifle/explosive - name = "explosive rifle bullet" - - damage = 25 - accurate_range = 22 - accuracy = 0 - shell_speed = AMMO_SPEED_TIER_4 - damage_falloff = DAMAGE_FALLOFF_TIER_9 - -/datum/ammo/bullet/rifle/explosive/on_hit_mob(mob/M, obj/projectile/P) - cell_explosion(get_turf(M), 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/rifle/explosive/on_hit_obj(obj/O, obj/projectile/P) - cell_explosion(get_turf(O), 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/rifle/explosive/on_hit_turf(turf/T, obj/projectile/P) - if(T.density) - cell_explosion(T, 80, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, P.dir, P.weapon_cause_data) - -/datum/ammo/bullet/rifle/ap - name = "armor-piercing rifle bullet" - - damage = 30 - penetration = ARMOR_PENETRATION_TIER_8 - -// Basically AP but better. Focused at taking out armour temporarily -/datum/ammo/bullet/rifle/ap/toxin - name = "toxic rifle bullet" - var/acid_per_hit = 7 - var/organic_damage_mult = 3 - -/datum/ammo/bullet/rifle/ap/toxin/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/toxic_buildup, acid_per_hit) - -/datum/ammo/bullet/rifle/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) - . = ..() - if(T.flags_turf & TURF_ORGANIC) - P.damage *= organic_damage_mult - -/datum/ammo/bullet/rifle/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) - . = ..() - if(O.flags_obj & OBJ_ORGANIC) - P.damage *= organic_damage_mult - - -/datum/ammo/bullet/rifle/ap/penetrating - name = "wall-penetrating rifle bullet" - shrapnel_chance = 0 - - damage = 35 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/rifle/ap/penetrating/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/rifle/le - name = "armor-shredding rifle bullet" - - damage = 20 - penetration = ARMOR_PENETRATION_TIER_4 - pen_armor_punch = 5 - -/datum/ammo/bullet/rifle/heap - name = "high-explosive armor-piercing rifle bullet" - - headshot_state = HEADSHOT_OVERLAY_HEAVY - damage = 55//big damage, doesn't actually blow up because thats stupid. - penetration = ARMOR_PENETRATION_TIER_8 - -/datum/ammo/bullet/rifle/rubber - name = "rubber rifle bullet" - sound_override = 'sound/weapons/gun_c99.ogg' - - damage = 0 - stamina_damage = 15 - shrapnel_chance = 0 - -/datum/ammo/bullet/rifle/incendiary - name = "incendiary rifle bullet" - damage_type = BURN - shrapnel_chance = 0 - flags_ammo_behavior = AMMO_BALLISTIC - - damage = 30 - shell_speed = AMMO_SPEED_TIER_4 - accuracy = -HIT_ACCURACY_TIER_2 - damage_falloff = DAMAGE_FALLOFF_TIER_10 - -/datum/ammo/bullet/rifle/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/rifle/m4ra - name = "A19 high velocity bullet" - shrapnel_chance = 0 - damage_falloff = 0 - flags_ammo_behavior = AMMO_BALLISTIC - accurate_range_min = 4 - - damage = 55 - scatter = -SCATTER_AMOUNT_TIER_8 - penetration= ARMOR_PENETRATION_TIER_7 - shell_speed = AMMO_SPEED_TIER_6 - -/datum/ammo/bullet/rifle/m4ra/incendiary - name = "A19 high velocity incendiary bullet" - flags_ammo_behavior = AMMO_BALLISTIC - - damage = 40 - accuracy = HIT_ACCURACY_TIER_4 - scatter = -SCATTER_AMOUNT_TIER_8 - penetration= ARMOR_PENETRATION_TIER_5 - shell_speed = AMMO_SPEED_TIER_6 - -/datum/ammo/bullet/rifle/m4ra/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/rifle/m4ra/impact - name = "A19 high velocity impact bullet" - flags_ammo_behavior = AMMO_BALLISTIC - - damage = 40 - accuracy = -HIT_ACCURACY_TIER_2 - scatter = -SCATTER_AMOUNT_TIER_8 - penetration = ARMOR_PENETRATION_TIER_10 - shell_speed = AMMO_SPEED_TIER_6 - -/datum/ammo/bullet/rifle/m4ra/impact/on_hit_mob(mob/M, obj/projectile/P) - knockback(M, P, 32) // Can knockback basically at max range - -/datum/ammo/bullet/rifle/m4ra/impact/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) - if(iscarbonsizexeno(living_mob)) - var/mob/living/carbon/xenomorph/target = living_mob - to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) - target.apply_effect(0.5, WEAKEN) - target.apply_effect(2, SUPERSLOW) - target.apply_effect(5, SLOW) - else - if(!isyautja(living_mob)) //Not predators. - living_mob.apply_effect(1, SUPERSLOW) - living_mob.apply_effect(2, SLOW) - to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) - living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) - -/datum/ammo/bullet/rifle/mar40 - name = "heavy rifle bullet" - - damage = 55 - -/datum/ammo/bullet/rifle/type71 - name = "heavy rifle bullet" - - damage = 55 - penetration = ARMOR_PENETRATION_TIER_3 - -/datum/ammo/bullet/rifle/type71/ap - name = "heavy armor-piercing rifle bullet" - - damage = 40 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/rifle/type71/heap - name = "heavy high-explosive armor-piercing rifle bullet" - - headshot_state = HEADSHOT_OVERLAY_HEAVY - damage = 65 - penetration = ARMOR_PENETRATION_TIER_10 - -/* -//====== - Shotgun Ammo -//====== -*/ - -/datum/ammo/bullet/shotgun - headshot_state = HEADSHOT_OVERLAY_HEAVY - -/datum/ammo/bullet/shotgun/slug - name = "shotgun slug" - handful_state = "slug_shell" - - accurate_range = 6 - max_range = 8 - damage = 70 - penetration = ARMOR_PENETRATION_TIER_4 - damage_armor_punch = 2 - handful_state = "slug_shell" - -/datum/ammo/bullet/shotgun/slug/on_hit_mob(mob/M,obj/projectile/P) - knockback(M, P, 6) - -/datum/ammo/bullet/shotgun/slug/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) - if(iscarbonsizexeno(living_mob)) - var/mob/living/carbon/xenomorph/target = living_mob - to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) - target.apply_effect(0.5, WEAKEN) - target.apply_effect(1, SUPERSLOW) - target.apply_effect(3, SLOW) - else - if(!isyautja(living_mob)) //Not predators. - living_mob.apply_effect(1, SUPERSLOW) - living_mob.apply_effect(2, SLOW) - to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) - living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) - -/datum/ammo/bullet/shotgun/beanbag - name = "beanbag slug" - headshot_state = HEADSHOT_OVERLAY_LIGHT //It's not meant to kill people... but if you put it in your mouth, it will. - handful_state = "beanbag_slug" - icon_state = "beanbag" - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST - sound_override = 'sound/weapons/gun_shotgun_riot.ogg' - - max_range = 12 - shrapnel_chance = 0 - damage = 0 - stamina_damage = 45 - accuracy = HIT_ACCURACY_TIER_3 - shell_speed = AMMO_SPEED_TIER_3 - handful_state = "beanbag_slug" - -/datum/ammo/bullet/shotgun/beanbag/on_hit_mob(mob/M, obj/projectile/P) - if(!M || M == P.firer) return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - shake_camera(H, 2, 1) - - -/datum/ammo/bullet/shotgun/incendiary - name = "incendiary slug" - handful_state = "incendiary_slug" - damage_type = BURN - flags_ammo_behavior = AMMO_BALLISTIC - - accuracy = -HIT_ACCURACY_TIER_2 - max_range = 12 - damage = 55 - penetration= ARMOR_PENETRATION_TIER_1 - handful_state = "incendiary_slug" - -/datum/ammo/bullet/shotgun/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/shotgun/incendiary/on_hit_mob(mob/M,obj/projectile/P) - burst(get_turf(M),P,damage_type) - knockback(M,P) - -/datum/ammo/bullet/shotgun/incendiary/on_hit_obj(obj/O,obj/projectile/P) - burst(get_turf(P),P,damage_type) - -/datum/ammo/bullet/shotgun/incendiary/on_hit_turf(turf/T,obj/projectile/P) - burst(get_turf(T),P,damage_type) - - -/datum/ammo/bullet/shotgun/flechette - name = "flechette shell" - icon_state = "flechette" - handful_state = "flechette_shell" - bonus_projectiles_type = /datum/ammo/bullet/shotgun/flechette_spread - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - max_range = 12 - damage = 30 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_7 - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 - handful_state = "flechette_shell" - multiple_handful_name = TRUE - -/datum/ammo/bullet/shotgun/flechette_spread - name = "additional flechette" - icon_state = "flechette" - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - max_range = 12 - damage = 30 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_7 - scatter = SCATTER_AMOUNT_TIER_5 - -/datum/ammo/bullet/shotgun/buckshot - name = "buckshot shell" - icon_state = "buckshot" - handful_state = "buckshot_shell" - multiple_handful_name = TRUE - bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_5 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_5 - accurate_range = 4 - max_range = 4 - damage = 65 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_1 - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 - shell_speed = AMMO_SPEED_TIER_2 - damage_armor_punch = 0 - pen_armor_punch = 0 - handful_state = "buckshot_shell" - multiple_handful_name = TRUE - -/datum/ammo/bullet/shotgun/buckshot/incendiary - name = "incendiary buckshot shell" - handful_state = "incen_buckshot" - handful_type = /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary - -/datum/ammo/bullet/shotgun/buckshot/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/shotgun/buckshot/on_hit_mob(mob/M,obj/projectile/P) - knockback(M,P) - -//buckshot variant only used by the masterkey shotgun attachment. -/datum/ammo/bullet/shotgun/buckshot/masterkey - bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/masterkey - - damage = 55 - -/datum/ammo/bullet/shotgun/spread - name = "additional buckshot" - icon_state = "buckshot" - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 4 - max_range = 6 - damage = 65 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_1 - shell_speed = AMMO_SPEED_TIER_2 - scatter = SCATTER_AMOUNT_TIER_1 - damage_armor_punch = 0 - pen_armor_punch = 0 - -/datum/ammo/bullet/shotgun/spread/masterkey - damage = 20 - -/* - 8 GAUGE SHOTGUN AMMO -*/ - -/datum/ammo/bullet/shotgun/heavy/buckshot - name = "heavy buckshot shell" - icon_state = "buckshot" - handful_state = "heavy_buckshot" - multiple_handful_name = TRUE - bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/buckshot/spread - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3 - accurate_range = 3 - max_range = 3 - damage = 75 - penetration = 0 - shell_speed = AMMO_SPEED_TIER_2 - damage_armor_punch = 0 - pen_armor_punch = 0 - -/datum/ammo/bullet/shotgun/heavy/buckshot/on_hit_mob(mob/M,obj/projectile/P) - knockback(M,P) - -/datum/ammo/bullet/shotgun/heavy/buckshot/spread - name = "additional heavy buckshot" - max_range = 4 - scatter = SCATTER_AMOUNT_TIER_1 - bonus_projectiles_amount = 0 - -//basically the same -/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath - name = "dragon's breath shell" - handful_state = "heavy_dragonsbreath" - multiple_handful_name = TRUE - damage_type = BURN - damage = 60 - accurate_range = 3 - max_range = 4 - bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/spread - -/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/shotgun/heavy/buckshot/dragonsbreath/spread - name = "additional dragon's breath" - bonus_projectiles_amount = 0 - accurate_range = 4 - max_range = 5 //make use of the ablaze property - shell_speed = AMMO_SPEED_TIER_4 // so they hit before the main shell stuns - - -/datum/ammo/bullet/shotgun/heavy/slug - name = "heavy shotgun slug" - handful_state = "heavy_slug" - - accurate_range = 7 - max_range = 8 - damage = 90 //ouch. - penetration = ARMOR_PENETRATION_TIER_6 - damage_armor_punch = 2 - -/datum/ammo/bullet/shotgun/heavy/slug/on_hit_mob(mob/M,obj/projectile/P) - knockback(M, P, 7) - -/datum/ammo/bullet/shotgun/heavy/slug/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) - if(iscarbonsizexeno(living_mob)) - var/mob/living/carbon/xenomorph/target = living_mob - to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) - target.apply_effect(0.5, WEAKEN) - target.apply_effect(2, SUPERSLOW) - target.apply_effect(5, SLOW) - else - if(!isyautja(living_mob)) //Not predators. - living_mob.apply_effect(1, SUPERSLOW) - living_mob.apply_effect(2, SLOW) - to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) - living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) - -/datum/ammo/bullet/shotgun/heavy/beanbag - name = "heavy beanbag slug" - icon_state = "beanbag" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - handful_state = "heavy_beanbag" - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST - sound_override = 'sound/weapons/gun_shotgun_riot.ogg' - - max_range = 7 - shrapnel_chance = 0 - damage = 0 - stamina_damage = 100 - accuracy = HIT_ACCURACY_TIER_2 - shell_speed = AMMO_SPEED_TIER_2 - -/datum/ammo/bullet/shotgun/heavy/beanbag/on_hit_mob(mob/M, obj/projectile/P) - if(!M || M == P.firer) - return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - shake_camera(H, 2, 1) - -/datum/ammo/bullet/shotgun/heavy/flechette - name = "heavy flechette shell" - icon_state = "flechette" - handful_state = "heavy_flechette" - multiple_handful_name = TRUE - bonus_projectiles_type = /datum/ammo/bullet/shotgun/heavy/flechette_spread - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_3 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_3 - max_range = 12 - damage = 45 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_10 - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_2 - -/datum/ammo/bullet/shotgun/heavy/flechette_spread - name = "additional heavy flechette" - icon_state = "flechette" - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - max_range = 12 - damage = 45 - damage_var_low = PROJECTILE_VARIANCE_TIER_8 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_10 - scatter = SCATTER_AMOUNT_TIER_4 - -//Enormous shell for Van Bandolier's superheavy double-barreled hunting gun. -/datum/ammo/bullet/shotgun/twobore - name = "two bore bullet" - icon_state = "autocannon" - handful_state = "twobore" - - accurate_range = 8 //Big low-velocity projectile; this is for blasting dangerous game at close range. - max_range = 14 //At this range, it's lost all its damage anyway. - damage = 300 //Hits like a buckshot PB. - penetration = ARMOR_PENETRATION_TIER_3 - damage_falloff = DAMAGE_FALLOFF_TIER_1 * 3 //It has a lot of energy, but the 26mm bullet drops off fast. - effective_range_max = EFFECTIVE_RANGE_MAX_TIER_2 //Full damage up to this distance, then falloff for each tile beyond. - var/hit_messages = list() - -/datum/ammo/bullet/shotgun/twobore/on_hit_mob(mob/living/M, obj/projectile/P) - var/mob/shooter = P.firer - if(shooter && ismob(shooter) && HAS_TRAIT(shooter, TRAIT_TWOBORE_TRAINING) && M.stat != DEAD && prob(40)) //Death is handled by periodic life() checks so this should have a chance to fire on a killshot. - if(!length(hit_messages)) //Pick and remove lines, refill on exhaustion. - hit_messages = list("Got you!", "Aha!", "Bullseye!", "It's curtains for you, Sonny Jim!", "Your head will look fantastic on my wall!", "I have you now!", "You miserable coward! Come and fight me like a man!", "Tally ho!") - var/message = pick_n_take(hit_messages) - shooter.say(message) - - if(P.distance_travelled > 8) - knockback(M, P, 12) - - else if(!M || M == P.firer || M.lying) //These checks are included in knockback and would be redundant above. - return - - shake_camera(M, 3, 4) - M.apply_effect(2, WEAKEN) - M.apply_effect(4, SLOW) - if(iscarbonsizexeno(M)) - to_chat(M, SPAN_XENODANGER("The impact knocks you off your feet!")) - else //This will hammer a Yautja as hard as a human. - to_chat(M, SPAN_HIGHDANGER("The impact knocks you off your feet!")) - - step(M, get_dir(P.firer, M)) - -/datum/ammo/bullet/shotgun/twobore/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile) - if(iscarbonsizexeno(living_mob)) - var/mob/living/carbon/xenomorph/target = living_mob - to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!")) - target.apply_effect(0.5, WEAKEN) - target.apply_effect(2, SUPERSLOW) - target.apply_effect(5, SLOW) - else - if(!isyautja(living_mob)) //Not predators. - living_mob.apply_effect(1, SUPERSLOW) - living_mob.apply_effect(2, SLOW) - to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!")) - living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) - -/datum/ammo/bullet/lever_action - name = "lever-action bullet" - - damage = 80 - penetration = 0 - accuracy = HIT_ACCURACY_TIER_1 - shell_speed = AMMO_SPEED_TIER_6 - accurate_range = 14 - handful_state = "lever_action_bullet" - -//unused and not working. need to refactor MD code. Unobtainable. -//intended mechanic is to have xenos hit with it show up very frequently on any MDs around -/datum/ammo/bullet/lever_action/tracker - name = "tracking lever-action bullet" - icon_state = "redbullet" - damage = 70 - penetration = ARMOR_PENETRATION_TIER_3 - accuracy = HIT_ACCURACY_TIER_1 - handful_state = "tracking_lever_action_bullet" - -/datum/ammo/bullet/lever_action/tracker/on_hit_mob(mob/M, obj/projectile/P, mob/user) - //SEND_SIGNAL(user, COMSIG_BULLET_TRACKING, user, M) - M.visible_message(SPAN_DANGER("You hear a faint beep under [M]'s [M.mob_size > MOB_SIZE_HUMAN ? "chitin" : "skin"].")) - -/datum/ammo/bullet/lever_action/training - name = "lever-action blank" - icon_state = "blank" - damage = 70 //blanks CAN hurt you if shot very close - penetration = 0 - accuracy = HIT_ACCURACY_TIER_1 - damage_falloff = DAMAGE_FALLOFF_BLANK //not much, though (comparatively) - shell_speed = AMMO_SPEED_TIER_5 - handful_state = "training_lever_action_bullet" - -//unused, and unobtainable... for now -/datum/ammo/bullet/lever_action/marksman - name = "marksman lever-action bullet" - shrapnel_chance = 0 - damage_falloff = 0 - accurate_range = 12 - damage = 70 - penetration = ARMOR_PENETRATION_TIER_6 - shell_speed = AMMO_SPEED_TIER_6 - handful_state = "marksman_lever_action_bullet" - -/datum/ammo/bullet/lever_action/xm88 - name = ".458 SOCOM round" - - damage = 80 - penetration = ARMOR_PENETRATION_TIER_2 - accuracy = HIT_ACCURACY_TIER_1 - shell_speed = AMMO_SPEED_TIER_6 - accurate_range = 14 - handful_state = "boomslang_bullet" - -/datum/ammo/bullet/lever_action/xm88/pen20 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/lever_action/xm88/pen30 - penetration = ARMOR_PENETRATION_TIER_6 - -/datum/ammo/bullet/lever_action/xm88/pen40 - penetration = ARMOR_PENETRATION_TIER_8 - -/datum/ammo/bullet/lever_action/xm88/pen50 - penetration = ARMOR_PENETRATION_TIER_10 - -/* -//====== - Sniper Ammo -//====== -*/ - -/datum/ammo/bullet/sniper - name = "sniper bullet" - headshot_state = HEADSHOT_OVERLAY_HEAVY - damage_falloff = 0 - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER - accurate_range_min = 4 - - accuracy = HIT_ACCURACY_TIER_8 - accurate_range = 32 - max_range = 32 - scatter = 0 - damage = 70 - penetration= ARMOR_PENETRATION_TIER_10 - shell_speed = AMMO_SPEED_TIER_6 - damage_falloff = 0 - -/datum/ammo/bullet/sniper/on_hit_mob(mob/M,obj/projectile/P) - if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) - var/mob/living/L = M - L.apply_armoured_damage(damage*2, ARMOR_BULLET, BRUTE, null, penetration) - to_chat(P.firer, SPAN_WARNING("Bullseye!")) - -/datum/ammo/bullet/sniper/incendiary - name = "incendiary sniper bullet" - damage_type = BRUTE - shrapnel_chance = 0 - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER - - //Removed accuracy = 0, accuracy_var_high = Variance Tier 6, and scatter = 0. -Kaga - damage = 60 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/sniper/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/sniper/incendiary/on_hit_mob(mob/M,obj/projectile/P) - if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) - var/mob/living/L = M - var/blind_duration = 5 - if(isxeno(M)) - var/mob/living/carbon/xenomorph/target = M - if(target.mob_size >= MOB_SIZE_BIG) - blind_duration = 2 - L.AdjustEyeBlur(blind_duration) - L.adjust_fire_stacks(10) - to_chat(P.firer, SPAN_WARNING("Bullseye!")) - -/datum/ammo/bullet/sniper/flak - name = "flak sniper bullet" - damage_type = BRUTE - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER - - accuracy = HIT_ACCURACY_TIER_8 - scatter = SCATTER_AMOUNT_TIER_8 - damage = 55 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 //Documenting old code: This converts to a variance of 96-109% damage. -Kaga - penetration = 0 - -/datum/ammo/bullet/sniper/flak/on_hit_mob(mob/M,obj/projectile/P) - if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) - var/slow_duration = 7 - var/mob/living/L = M - if(isxeno(M)) - var/mob/living/carbon/xenomorph/target = M - if(target.mob_size >= MOB_SIZE_BIG) - slow_duration = 4 - M.adjust_effect(slow_duration, SUPERSLOW) - L.apply_armoured_damage(damage, ARMOR_BULLET, BRUTE, null, penetration) - to_chat(P.firer, SPAN_WARNING("Bullseye!")) - else - burst(get_turf(M),P,damage_type, 2 , 2) - burst(get_turf(M),P,damage_type, 1 , 2 , 0) - -/datum/ammo/bullet/sniper/flak/on_near_target(turf/T, obj/projectile/P) - burst(T,P,damage_type, 2 , 2) - burst(T,P,damage_type, 1 , 2, 0) - return 1 - -/datum/ammo/bullet/sniper/crude - name = "crude sniper bullet" - damage = 42 - penetration = ARMOR_PENETRATION_TIER_6 - -/datum/ammo/bullet/sniper/crude/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - pushback(M, P, 3) - -/datum/ammo/bullet/sniper/upp - name = "armor-piercing sniper bullet" - damage = 80 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/bullet/sniper/anti_materiel - name = "anti-materiel sniper bullet" - - shrapnel_chance = 0 // This isn't leaving any shrapnel. - accuracy = HIT_ACCURACY_TIER_8 - damage = 125 - shell_speed = AMMO_SPEED_TIER_6 - -/datum/ammo/bullet/sniper/anti_materiel/on_hit_mob(mob/M,obj/projectile/P) - if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) - var/mob/living/L = M - var/size_damage_mod = 0.8 - if(isxeno(M)) - var/mob/living/carbon/xenomorph/target = M - if(target.mob_size >= MOB_SIZE_XENO) - size_damage_mod += 0.6 - if(target.mob_size >= MOB_SIZE_BIG) - size_damage_mod += 0.6 - L.apply_armoured_damage(damage*size_damage_mod, ARMOR_BULLET, BRUTE, null, penetration) - // 180% damage to all targets (225), 240% (300) against non-Runner xenos, and 300% against Big xenos (375). -Kaga - to_chat(P.firer, SPAN_WARNING("Bullseye!")) - -/datum/ammo/bullet/sniper/anti_materiel/vulture - damage = 400 // Fully intended to vaporize anything smaller than a mini cooper - accurate_range_min = 10 - handful_state = "vulture_bullet" - sound_hit = 'sound/bullets/bullet_vulture_impact.ogg' - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER|AMMO_ANTIVEHICLE - -/datum/ammo/bullet/sniper/anti_materiel/vulture/on_hit_mob(mob/hit_mob, obj/projectile/bullet) - . = ..() - knockback(hit_mob, bullet, 30) - hit_mob.apply_effect(3, SLOW) - -/datum/ammo/bullet/sniper/anti_materiel/vulture/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating/heavy) - )) - -/datum/ammo/bullet/sniper/elite - name = "supersonic sniper bullet" - - shrapnel_chance = 0 // This isn't leaving any shrapnel. - accuracy = HIT_ACCURACY_TIER_8 - damage = 150 - shell_speed = AMMO_SPEED_TIER_6 + AMMO_SPEED_TIER_2 - -/datum/ammo/bullet/sniper/elite/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating) - )) - -/datum/ammo/bullet/sniper/elite/on_hit_mob(mob/M,obj/projectile/P) - if((P.projectile_flags & PROJECTILE_BULLSEYE) && M == P.original) - var/mob/living/L = M - var/size_damage_mod = 0.5 - if(isxeno(M)) - var/mob/living/carbon/xenomorph/target = M - if(target.mob_size >= MOB_SIZE_XENO) - size_damage_mod += 0.5 - if(target.mob_size >= MOB_SIZE_BIG) - size_damage_mod += 1 - L.apply_armoured_damage(damage*size_damage_mod, ARMOR_BULLET, BRUTE, null, penetration) - else - L.apply_armoured_damage(damage, ARMOR_BULLET, BRUTE, null, penetration) - // 150% damage to runners (225), 300% against Big xenos (450), and 200% against all others (300). -Kaga - to_chat(P.firer, SPAN_WARNING("Bullseye!")) - -/datum/ammo/bullet/tank/flak - name = "flak autocannon bullet" - icon_state = "autocannon" - damage_falloff = 0 - flags_ammo_behavior = AMMO_BALLISTIC - accurate_range_min = 4 - - accuracy = HIT_ACCURACY_TIER_8 - scatter = 0 - damage = 60 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_6 - accurate_range = 32 - max_range = 32 - shell_speed = AMMO_SPEED_TIER_6 - -/datum/ammo/bullet/tank/flak/on_hit_mob(mob/M,obj/projectile/P) - burst(get_turf(M),P,damage_type, 2 , 3) - burst(get_turf(M),P,damage_type, 1 , 3 , 0) - -/datum/ammo/bullet/tank/flak/on_near_target(turf/T, obj/projectile/P) - burst(get_turf(T),P,damage_type, 2 , 3) - burst(get_turf(T),P,damage_type, 1 , 3, 0) - return 1 - -/datum/ammo/bullet/tank/flak/on_hit_obj(obj/O,obj/projectile/P) - burst(get_turf(P),P,damage_type, 2 , 3) - burst(get_turf(P),P,damage_type, 1 , 3 , 0) - -/datum/ammo/bullet/tank/flak/on_hit_turf(turf/T,obj/projectile/P) - burst(get_turf(T),P,damage_type, 2 , 3) - burst(get_turf(T),P,damage_type, 1 , 3 , 0) - -/datum/ammo/bullet/tank/dualcannon - name = "dualcannon bullet" - icon_state = "autocannon" - damage_falloff = 0 - flags_ammo_behavior = AMMO_BALLISTIC - - accuracy = HIT_ACCURACY_TIER_8 - scatter = 0 - damage = 50 - damage_var_high = PROJECTILE_VARIANCE_TIER_8 - penetration = ARMOR_PENETRATION_TIER_3 - accurate_range = 10 - max_range = 12 - shell_speed = AMMO_SPEED_TIER_5 - -/datum/ammo/bullet/tank/dualcannon/on_hit_mob(mob/M,obj/projectile/P) - for(var/mob/living/carbon/L in get_turf(M)) - if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) - shake_camera(L, 1, 1) - -/datum/ammo/bullet/tank/dualcannon/on_near_target(turf/T, obj/projectile/P) - for(var/mob/living/carbon/L in T) - if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) - shake_camera(L, 1, 1) - return 1 - -/datum/ammo/bullet/tank/dualcannon/on_hit_obj(obj/O,obj/projectile/P) - for(var/mob/living/carbon/L in get_turf(O)) - if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) - shake_camera(L, 1, 1) - -/datum/ammo/bullet/tank/dualcannon/on_hit_turf(turf/T,obj/projectile/P) - for(var/mob/living/carbon/L in T) - if(L.stat == CONSCIOUS && L.mob_size <= MOB_SIZE_XENO) - shake_camera(L, 1, 1) - -/* -//====== - Special Ammo -//====== -*/ - -/datum/ammo/bullet/smartgun - name = "smartgun bullet" - icon_state = "redbullet" - flags_ammo_behavior = AMMO_BALLISTIC - - max_range = 12 - accuracy = HIT_ACCURACY_TIER_4 - damage = 30 - penetration = 0 - -/datum/ammo/bullet/smartgun/armor_piercing - name = "armor-piercing smartgun bullet" - icon_state = "bullet" - - accurate_range = 12 - accuracy = HIT_ACCURACY_TIER_2 - damage = 20 - penetration = ARMOR_PENETRATION_TIER_8 - damage_armor_punch = 1 - -/datum/ammo/bullet/smartgun/dirty - name = "irradiated smartgun bullet" - debilitate = list(0,0,0,3,0,0,0,1) - - shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 - accurate_range = 32 - accuracy = HIT_ACCURACY_TIER_3 - damage = 40 - penetration = 0 - -/datum/ammo/bullet/smartgun/dirty/armor_piercing - debilitate = list(0,0,0,3,0,0,0,1) - - accurate_range = 22 - accuracy = HIT_ACCURACY_TIER_3 - damage = 30 - penetration = ARMOR_PENETRATION_TIER_7 - damage_armor_punch = 3 - -/datum/ammo/bullet/smartgun/holo_target //Royal marines smartgun bullet has only diff between regular ammo is this one does holostacks - name = "holo-targeting smartgun bullet" - damage = 30 -///Stuff for the HRP holotargetting stacks - var/holo_stacks = 15 - -/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) - -/datum/ammo/bullet/smartgun/holo_target/ap - name = "armor-piercing smartgun bullet" - icon_state = "bullet" - - accurate_range = 12 - accuracy = HIT_ACCURACY_TIER_2 - damage = 20 - penetration = ARMOR_PENETRATION_TIER_8 - damage_armor_punch = 1 - -/datum/ammo/bullet/smartgun/m56_fpw - name = "\improper M56 FPW bullet" - icon_state = "redbullet" - flags_ammo_behavior = AMMO_BALLISTIC - - max_range = 7 - accuracy = HIT_ACCURACY_TIER_7 - damage = 35 - penetration = ARMOR_PENETRATION_TIER_1 - -/datum/ammo/bullet/turret - name = "autocannon bullet" - icon_state = "redbullet" //Red bullets to indicate friendly fire restriction - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_COVER - - accurate_range = 22 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_8 - max_range = 22 - damage = 30 - penetration = ARMOR_PENETRATION_TIER_7 - damage_armor_punch = 0 - pen_armor_punch = 0 - shell_speed = 2*AMMO_SPEED_TIER_6 - accuracy = HIT_ACCURACY_TIER_5 - -/datum/ammo/bullet/turret/dumb - icon_state = "bullet" - flags_ammo_behavior = AMMO_BALLISTIC - -/datum/ammo/bullet/machinegun //Adding this for the MG Nests (~Art) - name = "machinegun bullet" - icon_state = "bullet" // Keeping it bog standard with the turret but allows it to be changed - - accurate_range = 12 - damage = 35 - penetration= ARMOR_PENETRATION_TIER_10 //Bumped the penetration to serve a different role from sentries, MGs are a bit more offensive - accuracy = HIT_ACCURACY_TIER_3 - -/datum/ammo/bullet/machinegun/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) - )) - -/datum/ammo/bullet/machinegun/auto // for M2C, automatic variant for M56D, stats for bullet should always be moderately overtuned to fulfill its ultra-offense + flank-push purpose - name = "heavy machinegun bullet" - - accurate_range = 10 - damage = 50 - penetration = ARMOR_PENETRATION_TIER_6 - accuracy = -HIT_ACCURACY_TIER_2 // 75 accuracy - shell_speed = AMMO_SPEED_TIER_2 - max_range = 15 - effective_range_max = 7 - damage_falloff = DAMAGE_FALLOFF_TIER_8 - -/datum/ammo/bullet/machinegun/auto/set_bullet_traits() - return - -/datum/ammo/bullet/minigun - name = "minigun bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - accuracy = -HIT_ACCURACY_TIER_3 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 12 - damage = 35 - penetration = ARMOR_PENETRATION_TIER_6 - -/datum/ammo/bullet/minigun/New() - ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - damage = 15 - else if(SSticker.current_state < GAME_STATE_PLAYING) - RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(setup_hvh_damage)) - -/datum/ammo/bullet/minigun/proc/setup_hvh_damage() - if(MODE_HAS_FLAG(MODE_FACTION_CLASH)) - damage = 15 - -/datum/ammo/bullet/minigun/tank - accuracy = -HIT_ACCURACY_TIER_1 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_8 - accurate_range = 12 - -/datum/ammo/bullet/m60 - name = "M60 bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - accuracy = HIT_ACCURACY_TIER_2 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 12 - damage = 45 //7.62x51 is scary - penetration= ARMOR_PENETRATION_TIER_6 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/datum/ammo/bullet/pkp - name = "machinegun bullet" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - - accuracy = HIT_ACCURACY_TIER_1 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_8 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 14 - damage = 35 - penetration= ARMOR_PENETRATION_TIER_6 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - -/* -//====== - Rocket Ammo -//====== -*/ - -/datum/ammo/rocket - name = "high explosive rocket" - icon_state = "missile" - ping = null //no bounce off. - sound_bounce = "rocket_bounce" - damage_falloff = 0 - flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET|AMMO_STRIKES_SURFACE - var/datum/effect_system/smoke_spread/smoke - - accuracy = HIT_ACCURACY_TIER_2 - accurate_range = 7 - max_range = 7 - damage = 15 - shell_speed = AMMO_SPEED_TIER_2 - -/datum/ammo/rocket/New() - ..() - smoke = new() - -/datum/ammo/rocket/Destroy() - qdel(smoke) - smoke = null - . = ..() - -/datum/ammo/rocket/on_hit_mob(mob/M, obj/projectile/P) - cell_explosion(get_turf(M), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, get_turf(M)) - if(ishuman_strict(M)) // No yautya or synths. Makes humans gib on direct hit. - M.ex_act(350, P.dir, P.weapon_cause_data, 100) - smoke.start() - -/datum/ammo/rocket/on_hit_obj(obj/O, obj/projectile/P) - cell_explosion(get_turf(O), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, get_turf(O)) - smoke.start() - -/datum/ammo/rocket/on_hit_turf(turf/T, obj/projectile/P) - cell_explosion(T, 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, T) - smoke.start() - -/datum/ammo/rocket/do_at_max_range(obj/projectile/P) - cell_explosion(get_turf(P), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, get_turf(P)) - smoke.start() - -/datum/ammo/rocket/ap - name = "anti-armor rocket" - damage_falloff = 0 - flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET - - accuracy = HIT_ACCURACY_TIER_8 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_9 - accurate_range = 6 - max_range = 6 - damage = 10 - penetration= ARMOR_PENETRATION_TIER_10 - -/datum/ammo/rocket/ap/on_hit_mob(mob/M, obj/projectile/P) - var/turf/T = get_turf(M) - M.ex_act(150, P.dir, P.weapon_cause_data, 100) - M.apply_effect(2, WEAKEN) - M.apply_effect(2, PARALYZE) - if(ishuman_strict(M)) // No yautya or synths. Makes humans gib on direct hit. - M.ex_act(300, P.dir, P.weapon_cause_data, 100) - cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, T) - smoke.start() - -/datum/ammo/rocket/ap/on_hit_obj(obj/O, obj/projectile/P) - var/turf/T = get_turf(O) - O.ex_act(150, P.dir, P.weapon_cause_data, 100) - cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, T) - smoke.start() - -/datum/ammo/rocket/ap/on_hit_turf(turf/T, obj/projectile/P) - var/hit_something = 0 - for(var/mob/M in T) - M.ex_act(150, P.dir, P.weapon_cause_data, 100) - M.apply_effect(4, WEAKEN) - M.apply_effect(4, PARALYZE) - hit_something = 1 - continue - if(!hit_something) - for(var/obj/O in T) - if(O.density) - O.ex_act(150, P.dir, P.weapon_cause_data, 100) - hit_something = 1 - continue - if(!hit_something) - T.ex_act(150, P.dir, P.weapon_cause_data, 200) - - cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, T) - smoke.start() - -/datum/ammo/rocket/ap/do_at_max_range(obj/projectile/P) - var/turf/T = get_turf(P) - var/hit_something = 0 - for(var/mob/M in T) - M.ex_act(250, P.dir, P.weapon_cause_data, 100) - M.apply_effect(2, WEAKEN) - M.apply_effect(2, PARALYZE) - hit_something = 1 - continue - if(!hit_something) - for(var/obj/O in T) - if(O.density) - O.ex_act(250, P.dir, P.weapon_cause_data, 100) - hit_something = 1 - continue - if(!hit_something) - T.ex_act(250, P.dir, P.weapon_cause_data) - cell_explosion(T, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - smoke.set_up(1, T) - smoke.start() - -/datum/ammo/rocket/ap/anti_tank - name = "anti-tank rocket" - damage = 100 - var/vehicle_slowdown_time = 5 SECONDS - shrapnel_chance = 5 - shrapnel_type = /obj/item/large_shrapnel/at_rocket_dud - -/datum/ammo/rocket/ap/anti_tank/on_hit_obj(obj/O, obj/projectile/P) - if(istype(O, /obj/vehicle/multitile)) - var/obj/vehicle/multitile/M = O - M.next_move = world.time + vehicle_slowdown_time - playsound(M, 'sound/effects/meteorimpact.ogg', 35) - M.at_munition_interior_explosion_effect(cause_data = create_cause_data("Anti-Tank Rocket")) - M.interior_crash_effect() - var/turf/T = get_turf(M.loc) - M.ex_act(150, P.dir, P.weapon_cause_data, 100) - smoke.set_up(1, T) - smoke.start() - return - return ..() - - -/datum/ammo/rocket/ltb - name = "cannon round" - icon_state = "ltb" - flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET|AMMO_STRIKES_SURFACE - - accuracy = HIT_ACCURACY_TIER_3 - accurate_range = 32 - max_range = 32 - damage = 25 - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/rocket/ltb/on_hit_mob(mob/M, obj/projectile/P) - cell_explosion(get_turf(M), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - cell_explosion(get_turf(M), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/rocket/ltb/on_hit_obj(obj/O, obj/projectile/P) - cell_explosion(get_turf(O), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - cell_explosion(get_turf(O), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/rocket/ltb/on_hit_turf(turf/T, obj/projectile/P) - cell_explosion(get_turf(T), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - cell_explosion(get_turf(T), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/rocket/ltb/do_at_max_range(obj/projectile/P) - cell_explosion(get_turf(P), 220, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - cell_explosion(get_turf(P), 200, 100, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/rocket/wp - name = "white phosphorous rocket" - flags_ammo_behavior = AMMO_ROCKET|AMMO_EXPLOSIVE|AMMO_STRIKES_SURFACE - damage_type = BURN - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 8 - damage = 90 - max_range = 8 - -/datum/ammo/rocket/wp/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/rocket/wp/drop_flame(turf/T, datum/cause_data/cause_data) - playsound(T, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) - if(!istype(T)) return - smoke.set_up(1, T) - smoke.start() - var/datum/reagent/napalm/blue/R = new() - new /obj/flamer_fire(T, cause_data, R, 3) - - var/datum/effect_system/smoke_spread/phosphorus/landingSmoke = new /datum/effect_system/smoke_spread/phosphorus - landingSmoke.set_up(3, 0, T, null, 6, cause_data) - landingSmoke.start() - landingSmoke = null - -/datum/ammo/rocket/wp/on_hit_mob(mob/M, obj/projectile/P) - drop_flame(get_turf(M), P.weapon_cause_data) - -/datum/ammo/rocket/wp/on_hit_obj(obj/O, obj/projectile/P) - drop_flame(get_turf(O), P.weapon_cause_data) - -/datum/ammo/rocket/wp/on_hit_turf(turf/T, obj/projectile/P) - drop_flame(T, P.weapon_cause_data) - -/datum/ammo/rocket/wp/do_at_max_range(obj/projectile/P) - drop_flame(get_turf(P), P.weapon_cause_data) - -/datum/ammo/rocket/wp/upp - name = "extreme-intensity incendiary rocket" - flags_ammo_behavior = AMMO_ROCKET|AMMO_EXPLOSIVE|AMMO_STRIKES_SURFACE - damage_type = BURN - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 8 - damage = 150 - max_range = 10 - -/datum/ammo/rocket/wp/upp/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/rocket/wp/upp/drop_flame(turf/T, datum/cause_data/cause_data) - playsound(T, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) - if(!istype(T)) return - smoke.set_up(1, T) - smoke.start() - var/datum/reagent/napalm/upp/R = new() - new /obj/flamer_fire(T, cause_data, R, 3) - -/datum/ammo/rocket/wp/upp/on_hit_mob(mob/M, obj/projectile/P) - drop_flame(get_turf(M), P.weapon_cause_data) - -/datum/ammo/rocket/wp/upp/on_hit_obj(obj/O, obj/projectile/P) - drop_flame(get_turf(O), P.weapon_cause_data) - -/datum/ammo/rocket/wp/upp/on_hit_turf(turf/T, obj/projectile/P) - drop_flame(T, P.weapon_cause_data) - -/datum/ammo/rocket/wp/upp/do_at_max_range(obj/projectile/P) - drop_flame(get_turf(P), P.weapon_cause_data) - -/datum/ammo/rocket/wp/quad - name = "thermobaric rocket" - flags_ammo_behavior = AMMO_ROCKET|AMMO_STRIKES_SURFACE - - damage = 100 - max_range = 32 - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/rocket/wp/quad/on_hit_mob(mob/M, obj/projectile/P) - drop_flame(get_turf(M), P.weapon_cause_data) - explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) - -/datum/ammo/rocket/wp/quad/on_hit_obj(obj/O, obj/projectile/P) - drop_flame(get_turf(O), P.weapon_cause_data) - explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) - -/datum/ammo/rocket/wp/quad/on_hit_turf(turf/T, obj/projectile/P) - drop_flame(T, P.weapon_cause_data) - explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) - -/datum/ammo/rocket/wp/quad/do_at_max_range(obj/projectile/P) - drop_flame(get_turf(P), P.weapon_cause_data) - explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) - -/datum/ammo/rocket/custom - name = "custom rocket" - -/datum/ammo/rocket/custom/proc/prime(atom/A, obj/projectile/P) - var/obj/item/weapon/gun/launcher/rocket/launcher = P.shot_from - var/obj/item/ammo_magazine/rocket/custom/rocket = launcher.current_mag - if(rocket.locked && rocket.warhead && rocket.warhead.detonator) - if(rocket.fuel && rocket.fuel.reagents.get_reagent_amount(rocket.fuel_type) >= rocket.fuel_requirement) - rocket.forceMove(P.loc) - rocket.warhead.cause_data = P.weapon_cause_data - rocket.warhead.prime() - qdel(rocket) - smoke.set_up(1, get_turf(A)) - smoke.start() - -/datum/ammo/rocket/custom/on_hit_mob(mob/M, obj/projectile/P) - prime(M, P) - -/datum/ammo/rocket/custom/on_hit_obj(obj/O, obj/projectile/P) - prime(O, P) - -/datum/ammo/rocket/custom/on_hit_turf(turf/T, obj/projectile/P) - prime(T, P) - -/datum/ammo/rocket/custom/do_at_max_range(obj/projectile/P) - prime(null, P) - -/* -//====== - Energy Ammo -//====== -*/ - -/datum/ammo/energy - ping = null //no bounce off. We can have one later. - sound_hit = "energy_hit" - sound_miss = "energy_miss" - sound_bounce = "energy_bounce" - - damage_type = BURN - flags_ammo_behavior = AMMO_ENERGY - - accuracy = HIT_ACCURACY_TIER_4 - -/datum/ammo/energy/emitter //Damage is determined in emitter.dm - name = "emitter bolt" - icon_state = "emitter" - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_ARMOR - - accurate_range = 6 - max_range = 6 - -/datum/ammo/energy/taser - name = "taser bolt" - icon_state = "stun" - damage_type = OXY - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_ALWAYS_FF //Not that ignoring will do much right now. - - stamina_damage = 45 - accuracy = HIT_ACCURACY_TIER_8 - shell_speed = AMMO_SPEED_TIER_1 // Slightly faster - hit_effect_color = "#FFFF00" - -/datum/ammo/energy/taser/on_hit_mob(mob/M, obj/projectile/P) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.disable_special_items() // Disables scout cloak - -/datum/ammo/energy/taser/precise - name = "precise taser bolt" - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_MP - -/datum/ammo/energy/rxfm_eva - name = "laser blast" - icon_state = "laser_new" - flags_ammo_behavior = AMMO_LASER - accurate_range = 14 - max_range = 22 - damage = 45 - stamina_damage = 25 //why not - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/energy/rxfm_eva/on_hit_mob(mob/living/M, obj/projectile/P) - ..() - if(prob(10)) //small chance for one to ignite on hit - M.fire_act() - -/datum/ammo/energy/laz_uzi - name = "laser bolt" - icon_state = "laser_new" - flags_ammo_behavior = AMMO_ENERGY - damage = 40 - accurate_range = 5 - effective_range_max = 7 - max_range = 10 - shell_speed = AMMO_SPEED_TIER_4 - scatter = SCATTER_AMOUNT_TIER_6 - accuracy = HIT_ACCURACY_TIER_3 - damage_falloff = DAMAGE_FALLOFF_TIER_8 - -/datum/ammo/energy/yautja - headshot_state = HEADSHOT_OVERLAY_MEDIUM - accurate_range = 12 - shell_speed = AMMO_SPEED_TIER_3 - damage_type = BURN - flags_ammo_behavior = AMMO_IGNORE_RESIST - -/datum/ammo/energy/yautja/pistol - name = "plasma pistol bolt" - icon_state = "ion" - - damage = 40 - shell_speed = AMMO_SPEED_TIER_2 - -/datum/ammo/energy/yautja/pistol/incendiary - damage = 10 - -/datum/ammo/energy/yautja/pistol/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/shrapnel/plasma - name = "plasma wave" - shrapnel_chance = 0 - penetration = ARMOR_PENETRATION_TIER_10 - accuracy = HIT_ACCURACY_TIER_MAX - damage = 15 - icon_state = "shrapnel_plasma" - damage_type = BURN - -/datum/ammo/bullet/shrapnel/plasma/on_hit_mob(mob/hit_mob, obj/projectile/hit_projectile) - hit_mob.apply_effect(2, WEAKEN) - -/datum/ammo/energy/yautja/caster - name = "root caster bolt" - icon_state = "ion" - -/datum/ammo/energy/yautja/caster/stun - name = "low power stun bolt" - debilitate = list(2,2,0,0,0,1,0,0) - - damage = 0 - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST - -/datum/ammo/energy/yautja/caster/bolt - name = "plasma bolt" - icon_state = "pulse1" - flags_ammo_behavior = AMMO_IGNORE_RESIST - shell_speed = AMMO_SPEED_TIER_6 - damage = 35 - -/datum/ammo/energy/yautja/caster/bolt/stun - name = "high power stun bolt" - var/stun_time = 2 - - damage = 0 - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST - -/datum/ammo/energy/yautja/caster/bolt/stun/on_hit_mob(mob/M, obj/projectile/P) - var/mob/living/carbon/C = M - var/stun_time = src.stun_time - if(istype(C)) - if(isyautja(C) || ispredalien(C)) - return - to_chat(C, SPAN_DANGER("An electric shock ripples through your body, freezing you in place!")) - log_attack("[key_name(C)] was stunned by a high power stun bolt from [key_name(P.firer)] at [get_area(P)]") - - if(ishuman(C)) - var/mob/living/carbon/human/H = C - stun_time++ - H.apply_effect(stun_time, WEAKEN) - else - M.apply_effect(stun_time, WEAKEN) - - C.apply_effect(stun_time, STUN) - ..() - -/datum/ammo/energy/yautja/caster/sphere - name = "plasma eradicator" - icon_state = "bluespace" - flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_HITS_TARGET_TURF - shell_speed = AMMO_SPEED_TIER_4 - accuracy = HIT_ACCURACY_TIER_8 - - damage = 55 - - accurate_range = 8 - max_range = 8 - - var/vehicle_slowdown_time = 5 SECONDS - -/datum/ammo/energy/yautja/caster/sphere/on_hit_mob(mob/M, obj/projectile/P) - cell_explosion(P, 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/energy/yautja/caster/sphere/on_hit_turf(turf/T, obj/projectile/P) - cell_explosion(P, 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/energy/yautja/caster/sphere/on_hit_obj(obj/O, obj/projectile/P) - if(istype(O, /obj/vehicle/multitile)) - var/obj/vehicle/multitile/multitile_vehicle = O - multitile_vehicle.next_move = world.time + vehicle_slowdown_time - playsound(multitile_vehicle, 'sound/effects/meteorimpact.ogg', 35) - multitile_vehicle.at_munition_interior_explosion_effect(cause_data = create_cause_data("Plasma Eradicator", P.firer)) - multitile_vehicle.interior_crash_effect() - multitile_vehicle.ex_act(150, P.dir, P.weapon_cause_data, 100) - cell_explosion(get_turf(P), 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - -/datum/ammo/energy/yautja/caster/sphere/do_at_max_range(obj/projectile/P) - cell_explosion(get_turf(P), 170, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, P.weapon_cause_data) - - -/datum/ammo/energy/yautja/caster/sphere/stun - name = "plasma immobilizer" - damage = 0 - flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST - accurate_range = 20 - max_range = 20 - - var/stun_range = 4 // Big - var/stun_time = 6 - -/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_mob(mob/M, obj/projectile/P) - do_area_stun(P) - -/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_turf(turf/T,obj/projectile/P) - do_area_stun(P) - -/datum/ammo/energy/yautja/caster/sphere/stun/on_hit_obj(obj/O,obj/projectile/P) - do_area_stun(P) - -/datum/ammo/energy/yautja/caster/sphere/stun/do_at_max_range(obj/projectile/P) - do_area_stun(P) - -/datum/ammo/energy/yautja/caster/sphere/stun/proc/do_area_stun(obj/projectile/P) - playsound(P, 'sound/weapons/wave.ogg', 75, 1, 25) - for (var/mob/living/carbon/M in view(src.stun_range, get_turf(P))) - var/stun_time = src.stun_time - log_attack("[key_name(M)] was stunned by a plasma immobilizer from [key_name(P.firer)] at [get_area(P)]") - if (isyautja(M)) - stun_time -= 2 - if(ispredalien(M)) - continue - to_chat(M, SPAN_DANGER("A powerful electric shock ripples through your body, freezing you in place!")) - M.apply_effect(stun_time, STUN) - - if (ishuman(M)) - var/mob/living/carbon/human/H = M - H.apply_effect(stun_time, WEAKEN) - else - M.apply_effect(stun_time, WEAKEN) - -/datum/ammo/energy/yautja/rifle/bolt - name = "plasma rifle bolt" - icon_state = "ion" - damage_type = BURN - debilitate = list(0,2,0,0,0,0,0,0) - flags_ammo_behavior = AMMO_IGNORE_RESIST - - damage = 55 - penetration = ARMOR_PENETRATION_TIER_10 - -/datum/ammo/energy/yautja/rifle/bolt/on_hit_mob(mob/hit_mob, obj/projectile/hit_projectile) - if(isxeno(hit_mob)) - var/mob/living/carbon/xenomorph/xeno = hit_mob - xeno.apply_damage(damage * 0.75, BURN) - xeno.interference = 30 - -/* -//====== - Xeno Spits -//====== -*/ -/datum/ammo/xeno - icon_state = "neurotoxin" - ping = "ping_x" - damage_type = TOX - flags_ammo_behavior = AMMO_XENO - - ///used to make cooldown of the different spits vary. - var/added_spit_delay = 0 - var/spit_cost - - /// Should there be a windup for this spit? - var/spit_windup = FALSE - - /// Should there be an additional warning while winding up? (do not put to true if there is not a windup) - var/pre_spit_warn = FALSE - accuracy = HIT_ACCURACY_TIER_8*2 - max_range = 12 - -/datum/ammo/xeno/toxin - name = "neurotoxic spit" - damage_falloff = 0 - flags_ammo_behavior = AMMO_XENO|AMMO_IGNORE_RESIST - spit_cost = 25 - var/effect_power = XENO_NEURO_TIER_4 - var/datum/callback/neuro_callback - - shell_speed = AMMO_SPEED_TIER_3 - max_range = 7 - -/datum/ammo/xeno/toxin/New() - ..() - - neuro_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(apply_neuro)) - -/proc/apply_neuro(mob/M, power, insta_neuro) - if(skillcheck(M, SKILL_ENDURANCE, SKILL_ENDURANCE_MAX) && !insta_neuro) - M.visible_message(SPAN_DANGER("[M] withstands the neurotoxin!")) - return //endurance 5 makes you immune to weak neurotoxin - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.chem_effect_flags & CHEM_EFFECT_RESIST_NEURO || H.species.flags & NO_NEURO) - H.visible_message(SPAN_DANGER("[M] shrugs off the neurotoxin!")) - return //species like zombies or synths are immune to neurotoxin - - if(!isxeno(M)) - if(insta_neuro) - if(M.knocked_down < 3) - M.adjust_effect(1 * power, WEAKEN) - return - - if(ishuman(M)) - M.apply_effect(2.5, SUPERSLOW) - M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) - - var/no_clothes_neuro = FALSE - - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(!H.wear_suit || H.wear_suit.slowdown == 0) - no_clothes_neuro = TRUE - - if(no_clothes_neuro) - if(M.knocked_down < 5) - M.adjust_effect(1 * power, WEAKEN) // KD them a bit more - M.visible_message(SPAN_DANGER("[M] falls prone.")) - -/proc/apply_scatter_neuro(mob/M) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(skillcheck(M, SKILL_ENDURANCE, SKILL_ENDURANCE_MAX)) - M.visible_message(SPAN_DANGER("[M] withstands the neurotoxin!")) - return //endurance 5 makes you immune to weak neuro - if(H.chem_effect_flags & CHEM_EFFECT_RESIST_NEURO || H.species.flags & NO_NEURO) - H.visible_message(SPAN_DANGER("[M] shrugs off the neurotoxin!")) - return - - if(M.knocked_down < 0.7) // apply knockdown only if current knockdown is less than 0.7 second - M.apply_effect(0.7, WEAKEN) - M.visible_message(SPAN_DANGER("[M] falls prone.")) - -/datum/ammo/xeno/toxin/on_hit_mob(mob/M,obj/projectile/P) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.status_flags & XENO_HOST) - neuro_callback.Invoke(H, effect_power, TRUE) - return - - neuro_callback.Invoke(M, effect_power, FALSE) - -/datum/ammo/xeno/toxin/medium //Spitter - name = "neurotoxic spatter" - spit_cost = 50 - effect_power = 1 - - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/xeno/toxin/queen - name = "neurotoxic spit" - spit_cost = 50 - effect_power = 2 - - accuracy = HIT_ACCURACY_TIER_5*2 - max_range = 6 - 1 - -/datum/ammo/xeno/toxin/queen/on_hit_mob(mob/M,obj/projectile/P) - neuro_callback.Invoke(M, effect_power, TRUE) - -/datum/ammo/xeno/toxin/shotgun - name = "neurotoxic droplet" - flags_ammo_behavior = AMMO_XENO|AMMO_IGNORE_RESIST - bonus_projectiles_type = /datum/ammo/xeno/toxin/shotgun/additional - - accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 - accurate_range = 5 - max_range = 5 - scatter = SCATTER_AMOUNT_NEURO - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_4 - -/datum/ammo/xeno/toxin/shotgun/New() - ..() - - neuro_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(apply_scatter_neuro)) - -/datum/ammo/xeno/toxin/shotgun/additional - name = "additional neurotoxic droplets" - - bonus_projectiles_amount = 0 - -/*proc/neuro_flak(turf/T, obj/projectile/P, datum/callback/CB, power, insta_neuro, radius) - if(!T) return FALSE - var/firer = P.firer - var/hit_someone = FALSE - for(var/mob/living/carbon/M in orange(radius,T)) - if(isxeno(M) && isxeno(firer) && M:hivenumber == firer:hivenumber) - continue - - if(HAS_TRAIT(M, TRAIT_NESTED)) - continue - - hit_someone = TRUE - CB.Invoke(M, power, insta_neuro) - - P.play_hit_effect(M) - - return hit_someone - -/datum/ammo/xeno/toxin/burst //sentinel burst - name = "neurotoxic air splash" - effect_power = XENO_NEURO_TIER_1 - spit_cost = 50 - flags_ammo_behavior = AMMO_XENO|AMMO_IGNORE_RESIST - -/datum/ammo/xeno/toxin/burst/on_hit_mob(mob/M, obj/projectile/P) - if(isxeno(M) && isxeno(P.firer) && M:hivenumber == P.firer:hivenumber) - neuro_callback.Invoke(M, effect_power*1.5, TRUE) - - neuro_flak(get_turf(M), P, neuro_callback, effect_power, FALSE, 1) - -/datum/ammo/xeno/toxin/burst/on_near_target(turf/T, obj/projectile/P) - return neuro_flak(T, P, neuro_callback, effect_power, FALSE, 1) - -/datum/ammo/xeno/sticky - name = "sticky resin spit" - icon_state = "sticky" - ping = null - flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_EXPLOSIVE - added_spit_delay = 5 - spit_cost = 40 - - shell_speed = AMMO_SPEED_TIER_3 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_4 - max_range = 32 - -/datum/ammo/xeno/sticky/on_hit_mob(mob/M,obj/projectile/P) - drop_resin(get_turf(P)) - -/datum/ammo/xeno/sticky/on_hit_obj(obj/O,obj/projectile/P) - drop_resin(get_turf(P)) - -/datum/ammo/xeno/sticky/on_hit_turf(turf/T,obj/projectile/P) - drop_resin(T) - -/datum/ammo/xeno/sticky/do_at_max_range(obj/projectile/P) - drop_resin(get_turf(P)) - -/datum/ammo/xeno/sticky/proc/drop_resin(turf/T) - if(T.density) - return - - for(var/obj/O in T.contents) - if(istype(O, /obj/item/clothing/mask/facehugger)) - return - if(istype(O, /obj/effect/alien/egg)) - return - if(istype(O, /obj/structure/mineral_door) || istype(O, /obj/effect/alien/resin) || istype(O, /obj/structure/bed)) - return - if(O.density && !(O.flags_atom & ON_BORDER)) - return - - new /obj/effect/alien/resin/sticky/thin(T) */ - -/datum/ammo/xeno/acid - name = "acid spit" - icon_state = "xeno_acid" - sound_hit = "acid_hit" - sound_bounce = "acid_bounce" - damage_type = BURN - spit_cost = 25 - flags_ammo_behavior = AMMO_ACIDIC|AMMO_XENO - accuracy = HIT_ACCURACY_TIER_5 - damage = 20 - max_range = 8 // 7 will disappear on diagonals. i love shitcode - penetration = ARMOR_PENETRATION_TIER_2 - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/xeno/acid/on_shield_block(mob/M, obj/projectile/P) - burst(M,P,damage_type) - -/datum/ammo/xeno/acid/on_hit_mob(mob/M, obj/projectile/P) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(C.status_flags & XENO_HOST && HAS_TRAIT(C, TRAIT_NESTED) || C.stat == DEAD) - return FALSE - ..() - -/datum/ammo/xeno/acid/spatter - name = "acid spatter" - - damage = 30 - max_range = 6 - -/datum/ammo/xeno/acid/spatter/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - if(. == FALSE) - return - - new /datum/effects/acid(M, P.firer) - -/datum/ammo/xeno/acid/praetorian - name = "acid splash" - - accuracy = HIT_ACCURACY_TIER_10 + HIT_ACCURACY_TIER_5 - max_range = 8 - damage = 30 - shell_speed = AMMO_SPEED_TIER_2 - added_spit_delay = 0 - -/datum/ammo/xeno/acid/dot - name = "acid spit" - -/datum/ammo/xeno/acid/prae_nade // Used by base prae's acid nade - name = "acid scatter" - - flags_ammo_behavior = AMMO_STOPPED_BY_COVER - accuracy = HIT_ACCURACY_TIER_5 - accurate_range = 32 - max_range = 4 - damage = 25 - shell_speed = AMMO_SPEED_TIER_1 - scatter = SCATTER_AMOUNT_TIER_6 - - apply_delegate = FALSE - -/datum/ammo/xeno/acid/prae_nade/on_hit_mob(mob/M, obj/projectile/P) - if (!ishuman(M)) - return - - var/mob/living/carbon/human/H = M - - var/datum/effects/prae_acid_stacks/PAS = null - for (var/datum/effects/prae_acid_stacks/prae_acid_stacks in H.effects_list) - PAS = prae_acid_stacks - break - - if (PAS == null) - PAS = new /datum/effects/prae_acid_stacks(H) - else - PAS.increment_stack_count() - -/*datum/ammo/xeno/prae_skillshot - name = "blob of acid" - icon_state = "boiler_gas2" - ping = "ping_x" - flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_EXPLOSIVE|AMMO_IGNORE_RESIST - - accuracy = HIT_ACCURACY_TIER_5 - accurate_range = 32 - max_range = 8 - damage = 20 - damage_falloff = DAMAGE_FALLOFF_TIER_10 - shell_speed = AMMO_SPEED_TIER_1 - scatter = SCATTER_AMOUNT_TIER_10 - -/datum/ammo/xeno/prae_skillshot/on_hit_mob(mob/M, obj/projectile/P) - acid_stacks_aoe(get_turf(P)) - -/datum/ammo/xeno/prae_skillshot/on_hit_obj(obj/O, obj/projectile/P) - acid_stacks_aoe(get_turf(P)) - -/datum/ammo/xeno/prae_skillshot/on_hit_turf(turf/T, obj/projectile/P) - acid_stacks_aoe(get_turf(P)) - -/datum/ammo/xeno/prae_skillshot/do_at_max_range(obj/projectile/P) - acid_stacks_aoe(get_turf(P)) - -/datum/ammo/xeno/prae_skillshot/proc/acid_stacks_aoe(turf/T) - - if (!istype(T)) - return - - for (var/mob/living/carbon/human/H in orange(1, T)) - to_chat(H, SPAN_XENODANGER("You are spattered with acid!")) - animation_flash_color(H) - var/datum/effects/prae_acid_stacks/PAS = null - for (var/datum/effects/prae_acid_stacks/prae_acid_stacks in H.effects_list) - PAS = prae_acid_stacks - break - - if (PAS == null) - PAS = new /datum/effects/prae_acid_stacks(H) - PAS.increment_stack_count() - else - PAS.increment_stack_count() - PAS.increment_stack_count() */ - -/datum/ammo/xeno/boiler_gas - name = "glob of neuro gas" - icon_state = "neuro_glob" - ping = "ping_x" - debilitate = list(2,2,0,1,11,12,1,10) // Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony - flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_EXPLOSIVE|AMMO_IGNORE_RESIST|AMMO_HITS_TARGET_TURF|AMMO_ACIDIC - var/datum/effect_system/smoke_spread/smoke_system - spit_cost = 200 - pre_spit_warn = TRUE - spit_windup = 5 SECONDS - accuracy_var_high = PROJECTILE_VARIANCE_TIER_4 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_4 - accuracy = HIT_ACCURACY_TIER_2 - scatter = SCATTER_AMOUNT_TIER_4 - shell_speed = 0.75 - max_range = 16 - /// range on the smoke in tiles from center - var/smokerange = 4 - var/lifetime_mult = 1.0 - -/datum/ammo/xeno/boiler_gas/New() - ..() - set_xeno_smoke() - -/datum/ammo/xeno/boiler_gas/Destroy() - qdel(smoke_system) - smoke_system = null - . = ..() - -/datum/ammo/xeno/boiler_gas/on_hit_mob(mob/moob, obj/projectile/proj) - if(iscarbon(moob)) - var/mob/living/carbon/carbon = moob - if(carbon.status_flags & XENO_HOST && HAS_TRAIT(carbon, TRAIT_NESTED) || carbon.stat == DEAD) - return - var/datum/effects/neurotoxin/neuro_effect = locate() in moob.effects_list - if(!neuro_effect) - neuro_effect = new /datum/effects/neurotoxin(moob, proj.firer) - neuro_effect.duration += 5 - moob.apply_effect(3, DAZE) - to_chat(moob, SPAN_HIGHDANGER("Neurotoxic liquid spreads all over you and immediately soaks into your pores and orifices! Oh fuck!")) // Fucked up but have a chance to escape rather than being game-ended - drop_nade(get_turf(proj), proj,TRUE) - -/datum/ammo/xeno/boiler_gas/on_hit_obj(obj/outbacksteakhouse, obj/projectile/proj) - drop_nade(get_turf(proj), proj) - -/datum/ammo/xeno/boiler_gas/on_hit_turf(turf/Turf, obj/projectile/proj) - if(Turf.density && isturf(proj.loc)) - drop_nade(proj.loc, proj) //we don't want the gas globs to land on dense turfs, they block smoke expansion. - else - drop_nade(Turf, proj) - -/datum/ammo/xeno/boiler_gas/do_at_max_range(obj/projectile/proj) - drop_nade(get_turf(proj), proj) - -/datum/ammo/xeno/boiler_gas/proc/set_xeno_smoke(obj/projectile/proj) - smoke_system = new /datum/effect_system/smoke_spread/xeno_weaken() - -/datum/ammo/xeno/boiler_gas/proc/drop_nade(turf/turf, obj/projectile/proj) - var/lifetime_mult = 1.0 - var/datum/cause_data - if(isboiler(proj.firer)) - cause_data = proj.weapon_cause_data - smoke_system.set_up(smokerange, 0, turf, new_cause_data = cause_data) - smoke_system.lifetime = 12 * lifetime_mult - smoke_system.start() - turf.visible_message(SPAN_DANGER("A glob of acid lands with a splat and explodes into noxious fumes!")) - - -/datum/ammo/xeno/boiler_gas/acid - name = "glob of acid gas" - icon_state = "acid_glob" - ping = "ping_x" - accuracy_var_high = PROJECTILE_VARIANCE_TIER_4 - smokerange = 3 - - -/datum/ammo/xeno/boiler_gas/acid/set_xeno_smoke(obj/projectile/proj) - smoke_system = new /datum/effect_system/smoke_spread/xeno_acid() - -/datum/ammo/xeno/boiler_gas/acid/on_hit_mob(mob/moob, obj/projectile/proj) - if(iscarbon(moob)) - var/mob/living/carbon/carbon = moob - if(carbon.status_flags & XENO_HOST && HAS_TRAIT(carbon, TRAIT_NESTED) || carbon.stat == DEAD) - return - to_chat(moob,SPAN_HIGHDANGER("Acid covers your body! Oh fuck!")) - playsound(moob,"acid_strike",75,1) - INVOKE_ASYNC(moob, TYPE_PROC_REF(/mob, emote), "pain") // why do I need this bullshit - new /datum/effects/acid(moob, proj.firer) - drop_nade(get_turf(proj), proj,TRUE) - -/datum/ammo/xeno/bone_chips - name = "bone chips" - icon_state = "shrapnel_light" - ping = null - flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_STOPPED_BY_COVER|AMMO_IGNORE_ARMOR - damage_type = BRUTE - bonus_projectiles_type = /datum/ammo/xeno/bone_chips/spread - - damage = 8 - max_range = 6 - accuracy = HIT_ACCURACY_TIER_8 - accuracy_var_low = PROJECTILE_VARIANCE_TIER_7 - accuracy_var_high = PROJECTILE_VARIANCE_TIER_7 - bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_7 - shrapnel_type = /obj/item/shard/shrapnel/bone_chips - shrapnel_chance = 60 - -/datum/ammo/xeno/bone_chips/on_hit_mob(mob/M, obj/projectile/P) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if((HAS_FLAG(C.status_flags, XENO_HOST) && HAS_TRAIT(C, TRAIT_NESTED)) || C.stat == DEAD) - return - if(ishuman_strict(M) || isxeno(M)) - playsound(M, 'sound/effects/spike_hit.ogg', 25, 1, 1) - if(M.slowed < 3) - M.apply_effect(3, SLOW) - -/datum/ammo/xeno/bone_chips/spread - name = "small bone chips" - - scatter = 30 // We want a wild scatter angle - max_range = 5 - bonus_projectiles_amount = 0 - -/datum/ammo/xeno/bone_chips/spread/short_range - name = "small bone chips" - - max_range = 3 // Very short range - -/datum/ammo/xeno/bone_chips/spread/runner_skillshot - name = "bone chips" - - scatter = 0 - max_range = 5 - damage = 10 - shrapnel_chance = 0 - -/datum/ammo/xeno/bone_chips/spread/runner/on_hit_mob(mob/M, obj/projectile/P) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if((HAS_FLAG(C.status_flags, XENO_HOST) && HAS_TRAIT(C, TRAIT_NESTED)) || C.stat == DEAD) - return - if(ishuman_strict(M) || isxeno(M)) - playsound(M, 'sound/effects/spike_hit.ogg', 25, 1, 1) - if(M.slowed < 6) - M.apply_effect(6, SLOW) - -/datum/ammo/xeno/oppressor_tail - name = "tail hook" - icon_state = "none" - ping = null - flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_STOPPED_BY_COVER|AMMO_IGNORE_ARMOR - damage_type = BRUTE - - damage = XENO_DAMAGE_TIER_5 - max_range = 4 - accuracy = HIT_ACCURACY_TIER_MAX - -/datum/ammo/xeno/oppressor_tail/on_bullet_generation(obj/projectile/generated_projectile, mob/bullet_generator) - //The projectile has no icon, so the overlay shows up in FRONT of the projectile, and the beam connects to it in the middle. - var/image/hook_overlay = new(icon = 'icons/effects/beam.dmi', icon_state = "oppressor_tail_hook", layer = BELOW_MOB_LAYER) - generated_projectile.overlays += hook_overlay - -/datum/ammo/xeno/oppressor_tail/on_hit_mob(mob/target, obj/projectile/fired_proj) - var/mob/living/carbon/xenomorph/xeno_firer = fired_proj.firer - if(xeno_firer.can_not_harm(target)) - return - - shake_camera(target, 5, 0.1 SECONDS) - var/obj/effect/beam/tail_beam = fired_proj.firer.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 5) - var/image/tail_image = image('icons/effects/status_effects.dmi', "hooked") - target.overlays += tail_image - - new /datum/effects/xeno_slow(target, fired_proj.firer, ttl = 0.5 SECONDS) - target.apply_effect(0.5, STUN) - INVOKE_ASYNC(target, TYPE_PROC_REF(/atom/movable, throw_atom), fired_proj.firer, get_dist(fired_proj.firer, target)-1, SPEED_VERY_FAST) - - qdel(tail_beam) - addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/ammo/xeno/oppressor_tail, remove_tail_overlay), target, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise. - -/datum/ammo/xeno/oppressor_tail/proc/remove_tail_overlay(mob/overlayed_mob, image/tail_image) - overlayed_mob.overlays -= tail_image - -/* -//====== - Shrapnel -//====== -*/ -/datum/ammo/bullet/shrapnel - name = "shrapnel" - icon_state = "buckshot" - accurate_range_min = 5 - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_STOPPED_BY_COVER - - accuracy = HIT_ACCURACY_TIER_3 - accurate_range = 32 - max_range = 8 - damage = 25 - damage_var_low = -PROJECTILE_VARIANCE_TIER_6 - damage_var_high = PROJECTILE_VARIANCE_TIER_6 - penetration = ARMOR_PENETRATION_TIER_4 - shell_speed = AMMO_SPEED_TIER_2 - shrapnel_chance = 5 - -/datum/ammo/bullet/shrapnel/on_hit_obj(obj/O, obj/projectile/P) - if(istype(O, /obj/structure/barricade)) - var/obj/structure/barricade/B = O - B.health -= rand(2, 5) - B.update_health(1) - -/datum/ammo/bullet/shrapnel/rubber - name = "rubber pellets" - icon_state = "rubber_pellets" - flags_ammo_behavior = AMMO_STOPPED_BY_COVER - - damage = 0 - stamina_damage = 25 - shrapnel_chance = 0 - - -/datum/ammo/bullet/shrapnel/hornet_rounds - name = ".22 hornet round" - icon_state = "hornet_round" - flags_ammo_behavior = AMMO_BALLISTIC - damage = 20 - shrapnel_chance = 0 - shell_speed = AMMO_SPEED_TIER_3//she fast af boi - penetration = ARMOR_PENETRATION_TIER_5 - -/datum/ammo/bullet/shrapnel/hornet_rounds/on_hit_mob(mob/M, obj/projectile/P) - . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, 10, world.time) - -/datum/ammo/bullet/shrapnel/incendiary - name = "flaming shrapnel" - icon_state = "beanbag" // looks suprisingly a lot like flaming shrapnel chunks - flags_ammo_behavior = AMMO_STOPPED_BY_COVER - - shell_speed = AMMO_SPEED_TIER_1 - damage = 20 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/shrapnel/incendiary/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/bullet/shrapnel/metal - name = "metal shrapnel" - icon_state = "shrapnelshot_bit" - flags_ammo_behavior = AMMO_STOPPED_BY_COVER|AMMO_BALLISTIC - shell_speed = AMMO_SPEED_TIER_1 - damage = 30 - shrapnel_chance = 15 - accuracy = HIT_ACCURACY_TIER_8 - penetration = ARMOR_PENETRATION_TIER_4 - -/datum/ammo/bullet/shrapnel/light // weak shrapnel - name = "light shrapnel" - icon_state = "shrapnel_light" - - damage = 10 - penetration = ARMOR_PENETRATION_TIER_1 - shell_speed = AMMO_SPEED_TIER_1 - shrapnel_chance = 0 - -/datum/ammo/bullet/shrapnel/light/human - name = "human bone fragments" - icon_state = "shrapnel_human" - - shrapnel_chance = 50 - shrapnel_type = /obj/item/shard/shrapnel/bone_chips/human - -/datum/ammo/bullet/shrapnel/light/human/var1 // sprite variants - icon_state = "shrapnel_human1" - -/datum/ammo/bullet/shrapnel/light/human/var2 // sprite variants - icon_state = "shrapnel_human2" - -/datum/ammo/bullet/shrapnel/light/xeno - name = "alien bone fragments" - icon_state = "shrapnel_xeno" - - shrapnel_chance = 50 - shrapnel_type = /obj/item/shard/shrapnel/bone_chips/xeno - -/datum/ammo/bullet/shrapnel/spall // weak shrapnel - name = "spall" - icon_state = "shrapnel_light" - - damage = 10 - penetration = ARMOR_PENETRATION_TIER_1 - shell_speed = AMMO_SPEED_TIER_1 - shrapnel_chance = 0 - -/datum/ammo/bullet/shrapnel/light/glass - name = "glass shrapnel" - icon_state = "shrapnel_glass" - -/datum/ammo/bullet/shrapnel/light/effect/ // no damage, but looks bright and neat - name = "sparks" - - damage = 1 // Tickle tickle - -/datum/ammo/bullet/shrapnel/light/effect/ver1 - icon_state = "shrapnel_bright1" - -/datum/ammo/bullet/shrapnel/light/effect/ver2 - icon_state = "shrapnel_bright2" - -/datum/ammo/bullet/shrapnel/jagged - shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 - accuracy = HIT_ACCURACY_TIER_MAX - -/datum/ammo/bullet/shrapnel/jagged/on_hit_mob(mob/M, obj/projectile/P) - if(isxeno(M)) - M.apply_effect(0.4, SLOW) - -/* -//======== - CAS 30mm impacters -//======== -*/ -/datum/ammo/bullet/shrapnel/gau //for the GAU to have a impact bullet instead of firecrackers - name = "30mm Multi-Purpose shell" - - damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects. - damage_type = BRUTE - penetration = ARMOR_PENETRATION_TIER_2 - accuracy = HIT_ACCURACY_TIER_MAX - max_range = 0 - shrapnel_chance = 100 //the least of your problems - -/datum/ammo/bullet/shrapnel/gau/at - name = "30mm Anti-Tank shell" - - damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects. - penetration = ARMOR_PENETRATION_TIER_8 - accuracy = HIT_ACCURACY_TIER_MAX -/* -//====== - Misc Ammo -//====== -*/ - -/datum/ammo/alloy_spike - name = "alloy spike" - headshot_state = HEADSHOT_OVERLAY_MEDIUM - ping = "ping_s" - icon_state = "MSpearFlight" - sound_hit = "alloy_hit" - sound_armor = "alloy_armor" - sound_bounce = "alloy_bounce" - - accuracy = HIT_ACCURACY_TIER_8 - accurate_range = 12 - max_range = 12 - damage = 30 - penetration= ARMOR_PENETRATION_TIER_10 - shrapnel_chance = SHRAPNEL_CHANCE_TIER_7 - shrapnel_type = /obj/item/shard/shrapnel - -/datum/ammo/flamethrower - name = "flame" - icon_state = "pulse0" - damage_type = BURN - flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_HITS_TARGET_TURF - - max_range = 6 - damage = 35 - -/datum/ammo/flamethrower/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/flamethrower/on_hit_mob(mob/M, obj/projectile/P) - drop_flame(get_turf(M), P.weapon_cause_data) - -/datum/ammo/flamethrower/on_hit_obj(obj/O, obj/projectile/P) - drop_flame(get_turf(O), P.weapon_cause_data) - -/datum/ammo/flamethrower/on_hit_turf(turf/T, obj/projectile/P) - drop_flame(T, P.weapon_cause_data) - -/datum/ammo/flamethrower/do_at_max_range(obj/projectile/P) - drop_flame(get_turf(P), P.weapon_cause_data) - -/datum/ammo/flamethrower/tank_flamer - flamer_reagent_type = /datum/reagent/napalm/blue - -/datum/ammo/flamethrower/sentry_flamer - flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME - flamer_reagent_type = /datum/reagent/napalm/blue - - accuracy = HIT_ACCURACY_TIER_8 - accurate_range = 6 - max_range = 12 - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/flamethrower/sentry_flamer/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/flamethrower/sentry_flamer/glob - max_range = 14 - accurate_range = 10 - var/datum/effect_system/smoke_spread/phosphorus/smoke - -/datum/ammo/flamethrower/sentry_flamer/glob/New() - . = ..() - smoke = new() - -/datum/ammo/flamethrower/sentry_flamer/glob/drop_flame(turf/T, datum/cause_data/cause_data) - if(!istype(T)) - return - smoke.set_up(1, 0, T, new_cause_data = cause_data) - smoke.start() - -/datum/ammo/flamethrower/sentry_flamer/glob/Destroy() - qdel(smoke) - return ..() - -/datum/ammo/flamethrower/sentry_flamer/mini - name = "normal fire" - -/datum/ammo/flamethrower/sentry_flamer/mini/drop_flame(turf/T, datum/cause_data/cause_data) - if(!istype(T)) - return - var/datum/reagent/napalm/ut/R = new() - R.durationfire = BURN_TIME_INSTANT - new /obj/flamer_fire(T, cause_data, R, 0) - -/datum/ammo/flare - name = "flare" - ping = null //no bounce off. - damage_type = BURN - flags_ammo_behavior = AMMO_HITS_TARGET_TURF - icon_state = "flare" - - damage = 15 - accuracy = HIT_ACCURACY_TIER_3 - max_range = 14 - shell_speed = AMMO_SPEED_TIER_3 - - var/flare_type = /obj/item/device/flashlight/flare/on/gun - handful_type = /obj/item/device/flashlight/flare - -/datum/ammo/flare/set_bullet_traits() - . = ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/flare/on_hit_mob(mob/M,obj/projectile/P) - drop_flare(get_turf(M), P, P.firer) - -/datum/ammo/flare/on_hit_obj(obj/O,obj/projectile/P) - drop_flare(get_turf(P), P, P.firer) - -/datum/ammo/flare/on_hit_turf(turf/T, obj/projectile/P) - if(T.density && isturf(P.loc)) - drop_flare(P.loc, P, P.firer) - else - drop_flare(T, P, P.firer) - -/datum/ammo/flare/do_at_max_range(obj/projectile/P, mob/firer) - drop_flare(get_turf(P), P, P.firer) - -/datum/ammo/flare/proc/drop_flare(turf/T, obj/projectile/fired_projectile, mob/firer) - var/obj/item/device/flashlight/flare/G = new flare_type(T) - var/matrix/rotation = matrix() - rotation.Turn(fired_projectile.angle - 90) - G.apply_transform(rotation) - G.visible_message(SPAN_WARNING("\A [G] bursts into brilliant light nearby!")) - return G - -/datum/ammo/flare/signal - name = "signal flare" - icon_state = "flare_signal" - flare_type = /obj/item/device/flashlight/flare/signal/gun - handful_type = /obj/item/device/flashlight/flare/signal - -/datum/ammo/flare/signal/drop_flare(turf/T, obj/projectile/fired_projectile, mob/firer) - var/obj/item/device/flashlight/flare/signal/gun/signal_flare = ..() - signal_flare.activate_signal(firer) - if(istype(fired_projectile.shot_from, /obj/item/weapon/gun/flare)) - var/obj/item/weapon/gun/flare/flare_gun_fired_from = fired_projectile.shot_from - flare_gun_fired_from.last_signal_flare_name = signal_flare.name - -/datum/ammo/flare/starshell - name = "starshell ash" - icon_state = "starshell_bullet" - max_range = 5 - flare_type = /obj/item/device/flashlight/flare/on/starshell_ash - -/datum/ammo/flare/starshell/set_bullet_traits() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff, /datum/element/bullet_trait_incendiary) - )) - -/datum/ammo/souto - name = "Souto Can" - ping = null //no bounce off. - damage_type = BRUTE - shrapnel_type = /obj/item/reagent_container/food/drinks/cans/souto/classic - flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_IGNORE_ARMOR|AMMO_IGNORE_RESIST|AMMO_BALLISTIC|AMMO_STOPPED_BY_COVER|AMMO_SPECIAL_EMBED - var/obj/item/reagent_container/food/drinks/cans/souto/can_type - icon_state = "souto_classic" - - max_range = 12 - shrapnel_chance = 10 - accuracy = HIT_ACCURACY_TIER_8 + HIT_ACCURACY_TIER_8 - accurate_range = 12 - shell_speed = AMMO_SPEED_TIER_1 - -/datum/ammo/souto/on_embed(mob/embedded_mob, obj/limb/target_organ) - if(ishuman(embedded_mob) && !isyautja(embedded_mob)) - if(istype(target_organ)) - target_organ.embed(new can_type) - -/datum/ammo/souto/on_hit_mob(mob/M, obj/projectile/P) - if(!M || M == P.firer) return - if(M.throw_mode && !M.get_active_hand()) //empty active hand and we're in throw mode. If so we catch the can. - if(!M.is_mob_incapacitated()) // People who are not able to catch cannot catch. - if(P.contents.len == 1) - for(var/obj/item/reagent_container/food/drinks/cans/souto/S in P.contents) - M.put_in_active_hand(S) - for(var/mob/O in viewers(world_view_size, P)) //find all people in view. - O.show_message(SPAN_DANGER("[M] catches the [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught. - return //Can was caught. - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.species.name == "Human") //no effect on synths or preds. - H.apply_effect(6, STUN) - H.apply_effect(8, WEAKEN) - H.apply_effect(15, DAZE) - H.apply_effect(15, SLOW) - shake_camera(H, 2, 1) - if(P.contents.len) - drop_can(P.loc, P) //We make a can at the location. - -/datum/ammo/souto/on_hit_obj(obj/O,obj/projectile/P) - drop_can(P.loc, P) //We make a can at the location. - -/datum/ammo/souto/on_hit_turf(turf/T, obj/projectile/P) - drop_can(P.loc, P) //We make a can at the location. - -/datum/ammo/souto/do_at_max_range(obj/projectile/P) - drop_can(P.loc, P) //We make a can at the location. - -/datum/ammo/souto/on_shield_block(mob/M, obj/projectile/P) - drop_can(P.loc, P) //We make a can at the location. - -/datum/ammo/souto/proc/drop_can(loc, obj/projectile/P) - if(P.contents.len) - for(var/obj/item/I in P.contents) - I.forceMove(loc) - randomize_projectile(P) - -/datum/ammo/souto/proc/randomize_projectile(obj/projectile/P) - shrapnel_type = pick(typesof(/obj/item/reagent_container/food/drinks/cans/souto)-/obj/item/reagent_container/food/drinks/cans/souto) - -/datum/ammo/grenade_container - name = "grenade shell" - ping = null - damage_type = BRUTE - var/nade_type = /obj/item/explosive/grenade/high_explosive - icon_state = "grenade" - flags_ammo_behavior = AMMO_IGNORE_COVER|AMMO_SKIPS_ALIENS - - damage = 15 - accuracy = HIT_ACCURACY_TIER_3 - max_range = 6 - -/datum/ammo/grenade_container/on_hit_mob(mob/M,obj/projectile/P) - drop_nade(P) - -/datum/ammo/grenade_container/on_hit_obj(obj/O,obj/projectile/P) - drop_nade(P) - -/datum/ammo/grenade_container/on_hit_turf(turf/T,obj/projectile/P) - drop_nade(P) - -/datum/ammo/grenade_container/do_at_max_range(obj/projectile/P) - drop_nade(P) - -/datum/ammo/grenade_container/proc/drop_nade(obj/projectile/P) - var/turf/T = get_turf(P) - var/obj/item/explosive/grenade/G = new nade_type(T) - G.visible_message(SPAN_WARNING("\A [G] lands on [T]!")) - G.det_time = 10 - G.cause_data = P.weapon_cause_data - G.activate() - -/datum/ammo/grenade_container/rifle - flags_ammo_behavior = NO_FLAGS - -/datum/ammo/grenade_container/smoke - name = "smoke grenade shell" - nade_type = /obj/item/explosive/grenade/smokebomb - icon_state = "smoke_shell" - -/datum/ammo/hugger_container - name = "hugger shell" - ping = null - damage_type = BRUTE - var/hugger_hive = XENO_HIVE_NORMAL - icon_state = "smoke_shell" - - damage = 15 - accuracy = HIT_ACCURACY_TIER_3 - max_range = 6 - -/datum/ammo/hugger_container/on_hit_mob(mob/M,obj/projectile/P) - spawn_hugger(get_turf(P)) - -/datum/ammo/hugger_container/on_hit_obj(obj/O,obj/projectile/P) - spawn_hugger(get_turf(P)) - -/datum/ammo/hugger_container/on_hit_turf(turf/T,obj/projectile/P) - spawn_hugger(get_turf(P)) - -/datum/ammo/hugger_container/do_at_max_range(obj/projectile/P) - spawn_hugger(get_turf(P)) - -/datum/ammo/hugger_container/proc/spawn_hugger(turf/T) - var/obj/item/clothing/mask/facehugger/child = new(T) - child.hivenumber = hugger_hive - INVOKE_ASYNC(child, TYPE_PROC_REF(/obj/item/clothing/mask/facehugger, leap_at_nearest_target)) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index d747525f3feb..594ad6b69dce 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -18,6 +18,8 @@ They're all essentially identical when it comes to getting the job done. w_class = SIZE_SMALL throw_speed = SPEED_SLOW throw_range = 6 + ground_offset_x = 7 + ground_offset_y = 6 var/default_ammo = /datum/ammo/bullet var/caliber = null // This is used for matching handfuls to each other or whatever the mag is. Examples are" "12g" ".44" ".357" etc. var/current_rounds = -1 //Set this to something else for it not to start with different initial counts. @@ -50,8 +52,7 @@ They're all essentially identical when it comes to getting the job done. if(0) icon_state += "_e" //In case it spawns empty instead. item_state += "_e" - pixel_y = rand(-6, 6) - pixel_x = rand(-7, 7) + if(ammo_band_color && ammo_band_icon) update_ammo_band() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index e9ab9aecc3c2..e113363b8b7f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -287,16 +287,11 @@ /obj/item/weapon/gun/Destroy() in_chamber = null ammo = null - current_mag = null + QDEL_NULL(current_mag) target = null last_moved_mob = null if(flags_gun_features & GUN_FLASHLIGHT_ON)//Handle flashlight. flags_gun_features &= ~GUN_FLASHLIGHT_ON - if(ismob(loc)) - for(var/slot in attachments) - var/obj/item/attachable/potential_attachment = attachments[slot] - if(!potential_attachment) - continue attachments = null attachable_overlays = null QDEL_NULL(active_attachable) @@ -524,6 +519,10 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w if(fire_delay_group && delay_left > 0) LAZYSET(user.fire_delay_next_fire, src, world.time + delay_left) + for(var/obj/item/attachable/stock/smg/collapsible/brace/current_stock in contents) //SMG armbrace folds to stop it getting stuck on people + if(current_stock.stock_activated) + current_stock.activate_attachment(src, user, turn_off = TRUE) + unwield(user) set_gun_user(null) @@ -1959,6 +1958,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/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm index 13ccd03c3e82..323e994529ae 100644 --- a/code/modules/projectiles/guns/flamer/flamer.dm +++ b/code/modules/projectiles/guns/flamer/flamer.dm @@ -719,12 +719,12 @@ GLOBAL_LIST_EMPTY(flamer_particles) var/direction_angle = dir2angle(direction) var/obj/flamer_fire/foundflame = locate() in target if(!foundflame) - var/datum/reagent/R = new() - R.intensityfire = burn_lvl - R.durationfire = fire_lvl - R.burn_sprite = burn_sprite - R.burncolor = f_color - new/obj/flamer_fire(target, cause_data, R) + var/datum/reagent/fire_reag = new() + fire_reag.intensityfire = burn_lvl + fire_reag.durationfire = fire_lvl + fire_reag.burn_sprite = burn_sprite + fire_reag.burncolor = f_color + new/obj/flamer_fire(target, cause_data, fire_reag) if(target.density) return @@ -737,11 +737,9 @@ GLOBAL_LIST_EMPTY(flamer_particles) var/angle = 180 - abs( abs( direction_angle - spread_direction_angle ) - 180 ) // the angle difference between the spread direction and initial direction switch(angle) //this reduces power when the explosion is going around corners - if (0) - //no change if (45) spread_power *= 0.75 - else //turns out angles greater than 90 degrees almost never happen. This bit also prevents trying to spread backwards + if (90 to 180) //turns out angles greater than 90 degrees almost never happen. This bit also prevents trying to spread backwards continue switch(spread_direction) @@ -753,25 +751,29 @@ GLOBAL_LIST_EMPTY(flamer_particles) if (spread_power < 1) continue - var/turf/T = get_step(target, spread_direction) + var/turf/picked_turf = get_step(target, spread_direction) - if(!T) //prevents trying to spread into "null" (edge of the map?) + if(!picked_turf) //prevents trying to spread into "null" (edge of the map?) continue - if(aerial_flame_level && (T.get_pylon_protection_level() >= aerial_flame_level)) - break + if(aerial_flame_level) + if(picked_turf.get_pylon_protection_level() >= aerial_flame_level) + break + var/area/picked_area = get_area(picked_turf) + if(CEILING_IS_PROTECTED(picked_area?.ceiling, get_ceiling_protection_level(aerial_flame_level))) + break spawn(0) - fire_spread_recur(T, cause_data, spread_power, spread_direction, fire_lvl, burn_lvl, f_color, burn_sprite, aerial_flame_level) + fire_spread_recur(picked_turf, cause_data, spread_power, spread_direction, fire_lvl, burn_lvl, f_color, burn_sprite, aerial_flame_level) /proc/fire_spread(turf/target, datum/cause_data/cause_data, range, fire_lvl, burn_lvl, f_color, burn_sprite = "dynamic", aerial_flame_level = TURF_PROTECTION_NONE) - var/datum/reagent/R = new() - R.intensityfire = burn_lvl - R.durationfire = fire_lvl - R.burn_sprite = burn_sprite - R.burncolor = f_color + var/datum/reagent/fire_reag = new() + fire_reag.intensityfire = burn_lvl + fire_reag.durationfire = fire_lvl + fire_reag.burn_sprite = burn_sprite + fire_reag.burncolor = f_color - new/obj/flamer_fire(target, cause_data, R) + new/obj/flamer_fire(target, cause_data, fire_reag) for(var/direction in alldirs) var/spread_power = range switch(direction) @@ -779,7 +781,11 @@ GLOBAL_LIST_EMPTY(flamer_particles) spread_power-- else spread_power -= 1.414 //diagonal spreading - var/turf/T = get_step(target, direction) - if(aerial_flame_level && (T.get_pylon_protection_level() >= aerial_flame_level)) - continue - fire_spread_recur(T, cause_data, spread_power, direction, fire_lvl, burn_lvl, f_color, burn_sprite, aerial_flame_level) + var/turf/picked_turf = get_step(target, direction) + if(aerial_flame_level) + if(picked_turf.get_pylon_protection_level() >= aerial_flame_level) + continue + var/area/picked_area = get_area(picked_turf) + if(CEILING_IS_PROTECTED(picked_area?.ceiling, get_ceiling_protection_level(aerial_flame_level))) + continue + fire_spread_recur(picked_turf, cause_data, spread_power, direction, fire_lvl, burn_lvl, f_color, burn_sprite, aerial_flame_level) diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index 81d7dc166cd3..d93796fbb15f 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/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index edecce85ccb4..c3b4906c1b29 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -1278,7 +1278,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 name = "\improper M37-17 pump shotgun" - desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select USCM vessels out on the rim. You can switch the active internal magazine by toggling the shotgun tube." + desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select USCM vessels and stations in the outer veil. A button on the side toggles the internal tubes." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m3717" item_state = "m3717" diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 89e6594c64e7..24eddf31597d 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -11,7 +11,7 @@ aim_slowdown = SLOWDOWN_ADS_QUICK wield_delay = WIELD_DELAY_VERY_FAST attachable_allowed = list( - /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, @@ -50,7 +50,8 @@ /obj/item/attachable/suppressor, /obj/item/attachable/reddot, /obj/item/attachable/reflex, - /obj/item/attachable/angledgrip, + /obj/item/attachable/angledgrip, + /obj/item/attachable/verticalgrip, /obj/item/attachable/flashlight/grip, /obj/item/attachable/stock/smg, /obj/item/attachable/stock/smg/collapsible, diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b01203d0f4d8..adb97e3a1c43 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -455,12 +455,31 @@ if(hit_chance) // Calculated from combination of both ammo accuracy and gun accuracy var/hit_roll = rand(1,100) + var/direct_hit = FALSE - if(original != L || hit_roll > hit_chance-base_miss_chance[def_zone]-20) // If hit roll is high or the firer wasn't aiming at this mob, we still hit but now we might hit the wrong body part + // Wasn't the clicked target + if(original != L) def_zone = rand_zone() + + // Xenos get a RNG limb miss chance regardless of being clicked target or not, see below + else if(isxeno(L) && hit_roll > hit_chance - 20) + def_zone = rand_zone() + + // Other targets do the same roll with penalty - a near hit will hit but redirected to another limb + else if(!isxeno(L) && hit_roll > hit_chance - 20 - base_miss_chance[def_zone]) + def_zone = rand_zone() + else + direct_hit = TRUE SEND_SIGNAL(firer, COMSIG_BULLET_DIRECT_HIT, L) - hit_chance -= base_miss_chance[def_zone] // Reduce accuracy based on spot. + + // At present, Xenos have no inherent effects or localized damage stemming from limb targeting + // Therefore we exempt the shooter from direct hit accuracy penalties as well, + // simply to avoid them from resetting target to chest every time they want to shoot a xeno + + if(!direct_hit || !isxeno(L)) // For normal people or direct hits we apply the limb accuracy penalty + hit_chance -= base_miss_chance[def_zone] + // else for direct hits on xenos, we skip it, pretending it's a chest shot with zero penalty #if DEBUG_HIT_CHANCE to_world(SPAN_DEBUG("([L]) Hit chance: [hit_chance] | Roll: [hit_roll]")) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 643130559e94..2c08e9f4e693 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/reagents/chemistry_machinery/autodispenser.dm b/code/modules/reagents/chemistry_machinery/autodispenser.dm index 3486e97524b8..eed96564da71 100644 --- a/code/modules/reagents/chemistry_machinery/autodispenser.dm +++ b/code/modules/reagents/chemistry_machinery/autodispenser.dm @@ -154,8 +154,7 @@ data["multiplier"] = multiplier data["cycle_limit"] = cycle_limit data["automode"] = automode - data["linked_storage"] = linked_storage - data["networked_storage"] = linked_storage.is_in_network() + data["networked_storage"] = linked_storage?.is_in_network() data["smartlink"] = smartlink data["outputmode"] = outputmode data["buffervolume"] = reagents.total_volume @@ -347,8 +346,7 @@ C.reagents.trans_to(container, amount) //We don't care about keeping empty bottles stored if(C.reagents.total_volume <= 0 && istypestrict(C,/obj/item/reagent_container/glass/bottle)) - linked_storage.item_quants[C.name]-- - qdel(C) //Might want to connect it to a disposal system later instead + linked_storage.delete_contents(C) if(stage_missing) amount = stage_missing diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm index 9d2d1ff10a0c..1e7e3bb08384 100644 --- a/code/modules/reagents/chemistry_machinery/chem_master.dm +++ b/code/modules/reagents/chemistry_machinery/chem_master.dm @@ -237,8 +237,6 @@ while (count--) var/obj/item/reagent_container/pill/P = new/obj/item/reagent_container/pill(loc) P.pill_desc = "A custom pill." - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) P.icon_state = "pill"+pillsprite reagents.trans_to(P,amount_per_pill) if(loaded_pill_bottle) @@ -271,8 +269,6 @@ P.name = "[name] vial" reagents.trans_to(P, 30) - P.pixel_x = rand(-7, 7) //random position - P.pixel_y = rand(-7, 7) P.update_icon() if(href_list["store"]) diff --git a/code/modules/reagents/chemistry_machinery/pandemic.dm b/code/modules/reagents/chemistry_machinery/pandemic.dm index aef4823effda..c9e34f79609e 100644 --- a/code/modules/reagents/chemistry_machinery/pandemic.dm +++ b/code/modules/reagents/chemistry_machinery/pandemic.dm @@ -132,7 +132,7 @@ if(archive_diseases[id]) var/datum/disease/advance/A = archive_diseases[id] A.AssignName(new_name) - for(var/datum/disease/advance/AD in active_diseases) + for(var/datum/disease/advance/AD in SSdisease.all_diseases) AD.Refresh() updateUsrDialog() diff --git a/code/modules/reagents/chemistry_properties/prop_positive.dm b/code/modules/reagents/chemistry_properties/prop_positive.dm index 7f476cecf2c5..971051e9bf88 100644 --- a/code/modules/reagents/chemistry_properties/prop_positive.dm +++ b/code/modules/reagents/chemistry_properties/prop_positive.dm @@ -548,7 +548,7 @@ rarity = PROPERTY_RARE category = PROPERTY_TYPE_REACTANT value = 3 - max_level = 1 + COOLDOWN_DECLARE(ghost_notif) /datum/chem_property/positive/defibrillating/on_delete(mob/living/M) ..() @@ -574,19 +574,33 @@ /datum/chem_property/positive/defibrillating/process_dead(mob/living/M, potency = 1, delta_time) if(!ishuman(M)) return - var/mob/living/carbon/human/H = M - H.apply_damage(-H.getOxyLoss(), OXY) - if(H.check_tod() && H.is_revivable() && H.health > HEALTH_THRESHOLD_DEAD) - to_chat(H, SPAN_NOTICE("You feel your heart struggling as you suddenly feel a spark, making it desperately try to continue pumping.")) - playsound_client(H.client, 'sound/effects/Heart Beat Short.ogg', 35) - addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, handle_revive)), 50, TIMER_UNIQUE) - else if (potency > POTENCY_MAX_TIER_1 && H.check_tod() && H.is_revivable() && H.health < HEALTH_THRESHOLD_DEAD) //Will heal if level is 7 or greater - to_chat(H, SPAN_NOTICE("You feel a faint spark in your chest.")) - H.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, BRUTE) - H.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, BURN) - H.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, TOX) - H.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, CLONE) - H.apply_damage(-H.getOxyLoss(), OXY) + var/mob/living/carbon/human/dead = M + var/revivable = dead.check_tod() && dead.is_revivable() + if(revivable && (dead.health > HEALTH_THRESHOLD_DEAD)) + addtimer(CALLBACK(dead, TYPE_PROC_REF(/mob/living/carbon/human, handle_revive)), 5 SECONDS) + to_chat(dead, SPAN_NOTICE("You feel your heart struggling as you suddenly feel a spark, making it desperately try to continue pumping.")) + playsound_client(dead.client, 'sound/effects/heart_beat_short.ogg', 35) + else if ((potency >= 1) && revivable && dead.health <= HEALTH_THRESHOLD_DEAD) //heals on all level above 1. This is however, minimal. + to_chat(dead, SPAN_NOTICE("You feel a faint spark in your chest.")) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, BRUTE) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, BURN) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, TOX) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, CLONE) + dead.apply_damage(-dead.getOxyLoss(), OXY) + if(potency > CREATE_MAX_TIER_1) //heal more if higher levels + dead.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, BRUTE) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, BURN) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, TOX) + dead.apply_damage(-potency * POTENCY_MULTIPLIER_LOW, CLONE) + if(dead.health < HEALTH_THRESHOLD_DEAD) + return + if(!COOLDOWN_FINISHED(src, ghost_notif)) + return + var/mob/dead/observer/ghost = dead.get_ghost() + if(ghost?.client) + COOLDOWN_START(src, ghost_notif, 30 SECONDS) + playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg') + to_chat(ghost, SPAN_BOLDNOTICE("Your heart is struggling to pump! There is a chance you might get up!(Verbs -> Ghost -> Re-enter corpse, or click here!)")) return TRUE /datum/chem_property/positive/hyperdensificating diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm index 640e18426311..cec04ca66616 100644 --- a/code/modules/reagents/chemistry_properties/prop_special.dm +++ b/code/modules/reagents/chemistry_properties/prop_special.dm @@ -96,7 +96,7 @@ H.contract_disease(new /datum/disease/xeno_transformation(0),1) //This is the real reason PMCs are being sent to retrieve it. /datum/chem_property/special/DNA_Disintegrating/trigger() - SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", TRUE, FALSE, FALSE, holder.name, TRUE) + SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", TRUE, FALSE, holder.name) chemical_data.update_credits(10) message_admins("The research department has discovered DNA_Disintegrating in [holder.name] adding 10 bonus tech points.") var/datum/techtree/tree = GET_TREE(TREE_MARINE) diff --git a/code/modules/reagents/chemistry_reagents/drink.dm b/code/modules/reagents/chemistry_reagents/drink.dm index 468243a0cc8d..3bd7336c32b6 100644 --- a/code/modules/reagents/chemistry_reagents/drink.dm +++ b/code/modules/reagents/chemistry_reagents/drink.dm @@ -85,13 +85,13 @@ /datum/reagent/drink/carrotjuice/on_mob_life(mob/living/M) . = ..() - if(!.) return + if(!.) + return M.ReduceEyeBlur(1) M.ReduceEyeBlind(1) - if(!data) data = 1 + if(!data) + data = 1 switch(data) - if(1 to 20) - //nothing if(21 to INFINITY) if(prob(data-10)) M.disabilities &= ~NEARSIGHTED diff --git a/code/modules/reagents/chemistry_reagents/toxin.dm b/code/modules/reagents/chemistry_reagents/toxin.dm index 458424a5db11..6ffd14ea8ae3 100644 --- a/code/modules/reagents/chemistry_reagents/toxin.dm +++ b/code/modules/reagents/chemistry_reagents/toxin.dm @@ -279,4 +279,4 @@ color = "#669900" reagent_state = LIQUID chemclass = CHEM_CLASS_NONE - properties = list(PROPERTY_CORROSIVE = 2, PROPERTY_TOXIC = 1) + properties = list(PROPERTY_CORROSIVE = 2, PROPERTY_TOXIC = 1, PROPERTY_CROSSMETABOLIZING = 3) diff --git a/code/modules/recycling/recycler.dm b/code/modules/recycling/recycler.dm index 73d00b763f68..abbf010bf4cc 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/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index ba842fb0bfb9..8221b8771c88 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -43,7 +43,6 @@ var/input = "DANGER, THE EMERGENCY DESTRUCT SYSTEM IS NOW ACTIVATED. PROCEED TO THE SELF-DESTRUCT CHAMBER FOR CONTROL ROD INSERTION." marine_announcement(input, name, 'sound/AI/selfdestruct_short.ogg', logging = log) security_level = SEC_LEVEL_DELTA - EvacuationAuthority.enable_self_destruct() /proc/get_security_level() switch(security_level) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 26869cfcf448..3d0c8fca142d 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -297,10 +297,14 @@ return var/mob/living/carbon/human/human_user = user - if(!(ACCESS_MARINE_SENIOR in human_user.wear_id?.access)) + if(!(ACCESS_MARINE_COMMAND in human_user.wear_id?.access)) to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting confirmation of the evacuation order\".")) return + if(SShijack.current_progress < SShijack.early_launch_required_progress) + to_chat(user, SPAN_NOTICE("[src]'s screen says \"Unable to launch, fuel insufficient\".")) + return + if(tgui_alert(user, "Early launch the lifeboat?", "Confirm", list("Yes", "No"), 10 SECONDS) == "Yes") to_chat(user, SPAN_NOTICE("[src]'s screen blinks and says \"Early launch accepted\".")) lifeboat.evac_launch() diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 954c91d9ca54..4fe102270537 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -8,9 +8,6 @@ exproof = TRUE needs_power = FALSE - // True if we are doing a flyby - var/is_set_flyby = FALSE - // Admin disabled var/disabled = FALSE @@ -54,15 +51,15 @@ /obj/structure/machinery/computer/shuttle/dropship/flight/enable() disabled = FALSE -/obj/structure/machinery/computer/shuttle/dropship/flight/proc/update_equipment(optimised=FALSE) +/obj/structure/machinery/computer/shuttle/dropship/flight/proc/update_equipment(optimised=FALSE, is_flyby=FALSE) var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId) if(!dropship) return // initial flight time - var/flight_duration = is_set_flyby ? DROPSHIP_TRANSIT_DURATION : DROPSHIP_TRANSIT_DURATION * GLOB.ship_alt + var/flight_duration = is_flyby ? DROPSHIP_TRANSIT_DURATION : DROPSHIP_TRANSIT_DURATION * GLOB.ship_alt if(optimised) - if(is_set_flyby) + if(is_flyby) flight_duration = DROPSHIP_TRANSIT_DURATION * 1.5 else flight_duration = DROPSHIP_TRANSIT_DURATION * SHUTTLE_OPTIMIZE_FACTOR_TRAVEL @@ -76,7 +73,7 @@ for(var/obj/structure/dropship_equipment/equipment as anything in dropship.equipments) // fuel enhancer if(istype(equipment, /obj/structure/dropship_equipment/fuel/fuel_enhancer)) - if(is_set_flyby) + if(is_flyby) flight_duration = flight_duration / SHUTTLE_FUEL_ENHANCE_FACTOR_TRAVEL else flight_duration = flight_duration * SHUTTLE_FUEL_ENHANCE_FACTOR_TRAVEL @@ -179,9 +176,8 @@ return to_chat(xeno, SPAN_NOTICE("You command the metal bird to come down. Clever girl.")) xeno_announcement(SPAN_XENOANNOUNCE("Your Queen has commanded the metal bird to the hive at [linked_lz]."), xeno.hivenumber, XENO_GENERAL_ANNOUNCE) - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_flight("Unknown", "Remote launch signal for [shuttle.name] received. Authentication garbled.") - link.log_ares_security("Security Alert", "Remote launch signal for [shuttle.name] received. Authentication garbled.") + log_ares_flight("Unknown", "Remote launch signal for [shuttle.name] received. Authentication garbled.") + log_ares_security("Security Alert", "Remote launch signal for [shuttle.name] received. Authentication garbled.") return if(shuttle.destination.id != linked_lz) to_chat(xeno, "The shuttle not ready. The screen reads T-[shuttle.timeLeft(10)]. Have patience.") @@ -218,19 +214,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) @@ -275,8 +271,7 @@ GLOB.alt_ctrl_disabled = TRUE marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY) - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.") + log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.") var/mob/living/carbon/xenomorph/xeno = user var/hivenumber = XENO_HIVE_NORMAL @@ -320,13 +315,21 @@ .["primary_lz"] = SSticker.mode.active_lz?.linked_lz if(shuttle.destination) .["target_destination"] = shuttle.in_flyby? "Flyby" : shuttle.destination.name - .["destinations"] = list() .["door_status"] = is_remote ? list() : shuttle.get_door_data() - - .["flight_configuration"] = is_set_flyby ? "flyby" : "ferry" .["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT) + .["destinations"] = list() + // add flight + .["destinations"] += list( + list( + "id" = DROPSHIP_FLYBY_ID, + "name" = "Flyby", + "available" = TRUE, + "error" = FALSE + ) + ) + for(var/obj/docking_port/stationary/dock in compatible_landing_zones) var/dock_reserved = FALSE for(var/obj/docking_port/mobile/other_shuttle in SSshuttle.mobile) @@ -355,42 +358,44 @@ to_chat(user, SPAN_WARNING("The dropship isn't responding to controls.")) return - var/datum/ares_link/link = GLOB.ares_link switch(action) if("move") if(shuttle.mode != SHUTTLE_IDLE && (shuttle.mode != SHUTTLE_CALL && !shuttle.destination)) to_chat(usr, SPAN_WARNING("You can't move to a new destination right now.")) return TRUE - if(is_set_flyby && !skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) - to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby.")) - return FALSE var/is_optimised = FALSE // automatically apply optimisation if user is a pilot if(skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) is_optimised = TRUE - update_equipment(is_optimised) - if(is_set_flyby) + + var/dock_id = params["target"] + if(dock_id == DROPSHIP_FLYBY_ID) + if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) + to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby.")) + return FALSE + update_equipment(is_optimised, TRUE) to_chat(user, SPAN_NOTICE("You begin the launch sequence for a flyby.")) - link.log_ares_flight(user.name, "Launched Dropship [shuttle.name] on a flyby.") + log_ares_flight(user.name, "Launched Dropship [shuttle.name] on a flyby.") var/log = "[key_name(user)] launched the dropship [src.shuttleId] on flyby." msg_admin_niche(log) log_interact(user, msg = "[log]") shuttle.send_for_flyby() return TRUE - var/dockId = params["target"] + + update_equipment(is_optimised, FALSE) var/list/local_data = ui_data(user) var/found = FALSE playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1) for(var/destination in local_data["destinations"]) - if(destination["id"] == dockId) + if(destination["id"] == dock_id) found = TRUE break if(!found) - log_admin("[key_name(user)] may be attempting a href dock exploit on [src] with target location \"[dockId]\"") - to_chat(user, SPAN_WARNING("The [dockId] dock is not available at this time.")) + log_admin("[key_name(user)] may be attempting a href dock exploit on [src] with target location \"[dock_id]\"") + to_chat(user, SPAN_WARNING("The [dock_id] dock is not available at this time.")) return - var/obj/docking_port/stationary/dock = SSshuttle.getDock(dockId) + var/obj/docking_port/stationary/dock = SSshuttle.getDock(dock_id) var/dock_reserved = FALSE for(var/obj/docking_port/mobile/other_shuttle in SSshuttle.mobile) if(dock == other_shuttle.destination) @@ -401,7 +406,7 @@ return TRUE SSshuttle.moveShuttle(shuttle.id, dock.id, TRUE) to_chat(user, SPAN_NOTICE("You begin the launch sequence to [dock].")) - link.log_ares_flight(user.name, "Launched Dropship [shuttle.name] on a flight to [dock].") + log_ares_flight(user.name, "Launched Dropship [shuttle.name] on a flight to [dock].") var/log = "[key_name(user)] launched the dropship [src.shuttleId] on transport." msg_admin_niche(log) log_interact(user, msg = "[log]") @@ -419,18 +424,6 @@ else playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, 1) to_chat(user, SPAN_WARNING("Door controls have been overridden. Please call technical support.")) - if("set-ferry") - is_set_flyby = FALSE - link.log_ares_flight(user.name, "Set Dropship [shuttle.name] to transport runs.") - var/log = "[key_name(user)] set the dropship [src.shuttleId] into transport" - msg_admin_niche(log) - log_interact(user, msg = "[log]") - if("set-flyby") - is_set_flyby = TRUE - link.log_ares_flight(user.name, "Set Dropship [shuttle.name] to flyby runs.") - var/log = "[key_name(user)] set the dropship [src.shuttleId] into flyby." - msg_admin_niche(log) - log_interact(user, msg = "[log]") if("set-automate") var/almayer_lz = params["hangar_id"] var/ground_lz = params["ground_id"] @@ -450,7 +443,7 @@ shuttle.automated_lz_id = ground_lz shuttle.automated_delay = delay playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1) - link.log_ares_flight(user.name, "Enabled autopilot for Dropship [shuttle.name].") + log_ares_flight(user.name, "Enabled autopilot for Dropship [shuttle.name].") var/log = "[key_name(user)] has enabled auto pilot on '[shuttle.name]'" message_admins(log) log_interact(user, msg = "[log]") @@ -467,7 +460,7 @@ shuttle.automated_lz_id = null shuttle.automated_delay = null playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1) - link.log_ares_flight(user.name, "Disabled autopilot for Dropship [shuttle.name].") + log_ares_flight(user.name, "Disabled autopilot for Dropship [shuttle.name].") var/log = "[key_name(user)] has disabled auto pilot on '[shuttle.name]'" message_admins(log) log_interact(user, msg = "[log]") diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index 6f9292cfc048..eb81a4a98a8a 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -12,6 +12,7 @@ unslashable = TRUE unacidable = TRUE var/pod_state = STATE_IDLE + var/launch_without_evac = FALSE /obj/structure/machinery/computer/shuttle/escape_pod_panel/ex_act(severity) return FALSE @@ -56,6 +57,7 @@ .["door_state"] = door.density .["door_lock"] = shuttle.door_handler.is_locked .["can_delay"] = TRUE//launch_status[2] + .["launch_without_evac"] = launch_without_evac /obj/structure/machinery/computer/shuttle/escape_pod_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -66,7 +68,7 @@ var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId) switch(action) if("force_launch") - if(pod_state != STATE_READY && pod_state != STATE_DELAYED) + if(!launch_without_evac && pod_state != STATE_READY && pod_state != STATE_DELAYED) return shuttle.evac_launch() @@ -83,6 +85,9 @@ shuttle.door_handler.control_doors("force-lock-launch") . = TRUE +/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison + launch_without_evac = TRUE + //========================================================================================= //================================Evacuation Sleeper======================================= //========================================================================================= @@ -208,10 +213,12 @@ unslashable = TRUE unacidable = TRUE var/obj/docking_port/mobile/crashable/escape_shuttle/linked_shuttle + var/start_locked = TRUE /obj/structure/machinery/door/airlock/evacuation/Initialize() . = ..() - INVOKE_ASYNC(src, PROC_REF(lock)) + if(start_locked) + INVOKE_ASYNC(src, PROC_REF(lock)) /obj/structure/machinery/door/airlock/evacuation/Destroy() if(linked_shuttle) @@ -250,3 +257,6 @@ if(!density) return -1 return ..() + +/obj/structure/machinery/door/airlock/evacuation/liaison + start_locked = FALSE diff --git a/code/modules/shuttle/computers/trijent_elevator_control.dm b/code/modules/shuttle/computers/trijent_elevator_control.dm index 290d0c94b33d..41c3456a1fe0 100644 --- a/code/modules/shuttle/computers/trijent_elevator_control.dm +++ b/code/modules/shuttle/computers/trijent_elevator_control.dm @@ -1,8 +1,6 @@ /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call name = "\improper Elevator Call" desc = "Control panel for the elevator" - icon = 'icons/obj/structures/machinery/computer.dmi' - icon_state = "elevator_screen" shuttleId = MOBILE_TRIJENT_ELEVATOR is_call = TRUE var/dockId @@ -10,6 +8,13 @@ /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/get_landing_zones() return list(SSshuttle.getDock(dockId)) + +/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/occupied + dockId = STAT_TRIJENT_OCCUPIED + +/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/empty + dockId = STAT_TRIJENT_EMPTY + /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/lz1 dockId = STAT_TRIJENT_LZ1 @@ -38,8 +43,15 @@ /obj/structure/machinery/computer/shuttle/elevator_controller/proc/get_landing_zones() . = list() + var/obj/docking_port/mobile/trijent_elevator/shuttle = SSshuttle.getShuttle(shuttleId) + for(var/obj/docking_port/stationary/trijent_elevator/elev in SSshuttle.stationary) - . += list(elev) + if(!shuttle.elevator_network) + . += list(elev) + continue + if(shuttle.elevator_network == elev.elevator_network) + . += list(elev) + continue /obj/structure/machinery/computer/shuttle/elevator_controller/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index 7796ed0510c8..36bc879ace46 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -72,6 +72,7 @@ break sleep(10) + SShijack.announce_status_on_crash() SSticker.hijack_ocurred() /datum/dropship_hijack/almayer/proc/fire() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 983fffeb2634..7bbdb214d34b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -268,9 +268,7 @@ if(!roundstart_template) CRASH("json_key:[json_key] value \[[sid]\] resulted in a null shuttle template for [src]") else if(roundstart_template) // passed a PATH - var/sid = "[initial(roundstart_template.shuttle_id)]" - - roundstart_template = SSmapping.shuttle_templates[sid] + roundstart_template = SSmapping.all_shuttle_templates[roundstart_template] if(!roundstart_template) CRASH("Invalid path ([roundstart_template]) passed to docking port.") @@ -433,7 +431,7 @@ // Called after the shuttle is loaded from template /obj/docking_port/mobile/proc/linkup(datum/map_template/shuttle/template, obj/docking_port/stationary/dock) var/list/static/shuttle_id = list() - var/idnum = ++shuttle_id[template] + var/idnum = ++shuttle_id[id] if(idnum > 1) if(id == initial(id)) id = "[id][idnum]" diff --git a/code/modules/shuttle/shuttles.md b/code/modules/shuttle/shuttles.md index 373e18b44953..f800303414d2 100644 --- a/code/modules/shuttle/shuttles.md +++ b/code/modules/shuttle/shuttles.md @@ -16,3 +16,28 @@ Shuttle map templates are used to define what the shuttle should look like. When defining the shuttle dimensions, define the height/width as if it was orienting north. The subsystem will properly line everything up, this allows for stationary docks to be in different orientations to their defined map template. A shuttle has a height, width, dheight and dwidth. The height and width is the size of the shuttle, with respect to its direction. If the template direction is North/South then width is your X coordinate and height is your Y. If the template direction is East/West then width is your Y direction and height is your X. On stationary docking ports, you can specify dwidth and dheight (auto generated for mobile), these are offsets for how your shuttle should land on the site. When a mobile port lands on a stationary port it wants to place the bottom left of the shuttle turfs on the stationary port. The dwidth/dheight allows you to offset this. + + +# Generic Elevator Shuttle + +The elevator used on Trijent (DesertDam) can be used in any map and multiple can exist on one map. + +Do not modify the trident shuttle map. You can code in elevators from the following two docking ports (where the elevator can go): + +- /obj/docking_port/stationary/trijent_elevator/occupied +- /obj/docking_port/stationary/trijent_elevator/empty + +An occupied stationary port will start the map with an elevator and an empty one will not. +All docking ports are, by default, linked together. One elevator can go to all docking ports. +To limit access between docking ports you can use tags. + +To setup an elevator: +- place the docking port where you want the elevator to sit +- give the docking port instance a unique ID +- give the docking port instance a unique Name +- make sure the door direction is correct west/east +- give the docking port shuttle_area the area name for where it sits +- if you want to build a docking port 'network' then change the roudnstart_template to a subclass +- if you want to assign a docking port to a 'network' then give it a value in "tag" + +If things are unclear, look at trident. It has two elevator networks. diff --git a/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm b/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm index 6029d345b6d7..1f0a8fd502cf 100644 --- a/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm @@ -11,7 +11,7 @@ /// The % chance of the escape pod crashing into the groundmap before lifeboats leaving var/early_crash_land_chance = 75 /// The % chance of the escape pod crashing into the groundmap - var/crash_land_chance = 25 + var/crash_land_chance = 0 /// How many people can be in the escape pod before it crashes var/max_capacity = 3 @@ -103,7 +103,7 @@ /obj/docking_port/mobile/crashable/escape_shuttle/crash_check() . = ..() - if(prob((EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS ? crash_land_chance : early_crash_land_chance))) + if(prob((SShijack.hijack_status >= HIJACK_OBJECTIVES_COMPLETE ? crash_land_chance : early_crash_land_chance))) return TRUE /obj/docking_port/mobile/crashable/escape_shuttle/open_doors() @@ -124,8 +124,8 @@ id = ESCAPE_SHUTTLE_EAST_CL width = 4 height = 5 - early_crash_land_chance = 25 - crash_land_chance = 5 + early_crash_land_chance = 0 + crash_land_chance = 0 /obj/docking_port/mobile/crashable/escape_shuttle/w id = ESCAPE_SHUTTLE_WEST diff --git a/code/modules/shuttle/shuttles/crashable/lifeboats.dm b/code/modules/shuttle/shuttles/crashable/lifeboats.dm index 93489ee4a359..11b376563d64 100644 --- a/code/modules/shuttle/shuttles/crashable/lifeboats.dm +++ b/code/modules/shuttle/shuttles/crashable/lifeboats.dm @@ -51,10 +51,10 @@ /obj/docking_port/mobile/crashable/lifeboat/crash_check() . = ..() - if(EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS) + if(SShijack.hijack_status >= HIJACK_OBJECTIVES_COMPLETE) return FALSE - if(prob(abs(((world.time - EvacuationAuthority.evac_time) / EVACUATION_AUTOMATIC_DEPARTURE) - 1) * 100)) + if(prob(abs((SShijack.current_progress - SShijack.required_progress) / SShijack.required_progress) * 100)) return TRUE /obj/docking_port/mobile/crashable/lifeboat/open_doors() diff --git a/code/modules/shuttle/shuttles/trijent_elevator.dm b/code/modules/shuttle/shuttles/trijent_elevator.dm index 86ad6f7ef217..457c150212c0 100644 --- a/code/modules/shuttle/shuttles/trijent_elevator.dm +++ b/code/modules/shuttle/shuttles/trijent_elevator.dm @@ -19,6 +19,7 @@ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) var/datum/door_controller/aggregate/door_control + var/elevator_network /obj/docking_port/mobile/trijent_elevator/Initialize(mapload, ...) . = ..() @@ -36,6 +37,12 @@ . = ..() door_control.control_doors("force-lock-launch", "all", force=TRUE) +/obj/docking_port/mobile/trijent_elevator/linkup(datum/map_template/shuttle/template, obj/docking_port/stationary/dock) + ..() + var/datum/map_template/shuttle/trijent_elevator/elev = template + elevator_network = elev.elevator_network + log_debug("Adding network [elev.elevator_network] to [id]") + /obj/docking_port/stationary/trijent_elevator dir=NORTH width=7 @@ -43,6 +50,7 @@ // shutters to clear the area var/airlock_area var/airlock_exit + var/elevator_network /obj/docking_port/stationary/trijent_elevator/proc/get_doors() . = list() @@ -74,6 +82,17 @@ door_control.control_doors("force-lock-launch") qdel(door_control) +/obj/docking_port/stationary/trijent_elevator/occupied + name = "occupied" + id = STAT_TRIJENT_OCCUPIED + airlock_exit = "west" + roundstart_template = /datum/map_template/shuttle/trijent_elevator + +/obj/docking_port/stationary/trijent_elevator/empty + name = "empty" + id = STAT_TRIJENT_EMPTY + airlock_exit = "west" + /obj/docking_port/stationary/trijent_elevator/lz1 name="Lz1 Elevator" id=STAT_TRIJENT_LZ1 @@ -98,7 +117,3 @@ id=STAT_TRIJENT_OMEGA airlock_area=/area/shuttle/trijent_shuttle/omega airlock_exit="east" - -/datum/map_template/shuttle/trijent_elevator - name = "Trijent Elevator" - shuttle_id = MOBILE_TRIJENT_ELEVATOR diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 7ec4b2eb7333..032294a45b39 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -102,8 +102,7 @@ automated_launch = FALSE automated_launch_timer = TIMER_ID_NULL ai_silent_announcement("Dropship '[name]' departing.") - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_flight("Automated", "Dropship [name] launched on an automatic flight.") + log_ares_flight("Automated", "Dropship [name] launched on an automatic flight.") /* @@ -268,17 +267,11 @@ in_transit_time_left = 0 - if(EvacuationAuthority.dest_status >= NUKE_EXPLOSION_IN_PROGRESS) - return FALSE //If a nuke is in progress, don't attempt a landing. - playsound_area(get_area(turfs_int[sound_target]), sound_landing, 100) playsound(turfs_trg[sound_target], sound_landing, 100) playsound_area(get_area(turfs_int[sound_target]), channel = SOUND_CHANNEL_AMBIENCE, status = SOUND_UPDATE) sleep(100) //Wait for it to finish. - if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED) - return FALSE //If a nuke finished, don't land. - target_turf = T_trg target_rotation = trg_rot shuttle_turfs = turfs_int @@ -435,9 +428,6 @@ in_transit_time_left = 0 - if(EvacuationAuthority.dest_status >= NUKE_EXPLOSION_IN_PROGRESS) - return FALSE //If a nuke is in progress, don't attempt a landing. - //This is where things change and shit gets real marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg', logging = ARES_LOG_SECURITY) @@ -450,9 +440,6 @@ sleep(85) - if(EvacuationAuthority.dest_status == NUKE_EXPLOSION_FINISHED) - return FALSE //If a nuke finished, don't land. - if(security_level < SEC_LEVEL_RED) //automatically set security level to red. set_security_level(SEC_LEVEL_RED, TRUE) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 12356754872c..dccdfad920f4 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -293,8 +293,7 @@ GLOBAL_LIST_EMPTY(shuttle_controls) marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY) shuttle.alerts_allowed-- - var/datum/ares_link/link = GLOB.ares_link - link.log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.") + log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.") to_chat(Q, SPAN_DANGER("A loud alarm erupts from [src]! The fleshy hosts must know that you can access it!")) xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"),3,Q.hivenumber) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 767f50fc9750..ea075080121b 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/code/modules/teleporters/teleporter_admin_verbs.dm b/code/modules/teleporters/teleporter_admin_verbs.dm index 930f9209d481..61f21fdb34ee 100644 --- a/code/modules/teleporters/teleporter_admin_verbs.dm +++ b/code/modules/teleporters/teleporter_admin_verbs.dm @@ -3,7 +3,7 @@ set desc = "Force a teleporter to teleport" set category = "Admin.Game" - var/available_teleporters = SSteleporter.teleporters + var/list/datum/teleporter/available_teleporters = GLOB.teleporters var/datum/teleporter/teleporter = tgui_input_list(usr, "Which teleporter do you want to use?", "Select a teleporter:", available_teleporters) if(!teleporter) diff --git a/code/modules/teleporters/teleporter_console.dm b/code/modules/teleporters/teleporter_console.dm index b9a3629c881d..88384578a939 100644 --- a/code/modules/teleporters/teleporter_console.dm +++ b/code/modules/teleporters/teleporter_console.dm @@ -40,19 +40,13 @@ if(linked_teleporter) // Maybe should debug log this because it's indicative of bad logic, but I'll leave it out for the sake of (potential) spam return TRUE - if(SSteleporter) - - var/datum/teleporter/found_teleporter = SSteleporter.teleporters_by_id[teleporter_id] - if(found_teleporter) - linked_teleporter = found_teleporter - linked_teleporter.linked_consoles += src - else - log_debug("Couldn't find teleporter matching ID [linked_teleporter]. Code: TELEPORTER_CONSOLE_2") - log_admin("Couldn't find teleporter matching ID [linked_teleporter]. Tell the devs. Code: TELEPORTER_CONSOLE_2") - return FALSE + var/datum/teleporter/found_teleporter = GLOB.teleporters_by_id[teleporter_id] + if(found_teleporter) + linked_teleporter = found_teleporter + linked_teleporter.linked_consoles += src else - log_debug("Couldn't find teleporter SS to pull teleporter from. Code: TELEPORTER_CONSOLE_3") - log_admin("Couldn't find teleporter SS to pull teleporter from. Tell the devs. Code: TELEPORTER_CONSOLE_3") + log_debug("Couldn't find teleporter matching ID [linked_teleporter]. Code: TELEPORTER_CONSOLE_2") + log_admin("Couldn't find teleporter matching ID [linked_teleporter]. Tell the devs. Code: TELEPORTER_CONSOLE_2") return FALSE return TRUE @@ -181,9 +175,9 @@ if(SSmapping.configs[GROUND_MAP].map_name != MAP_CORSAT) // Bad style, but I'm leaving it here for now until someone wants to add a teleporter to another map return - if(SSteleporter.teleporters.len) // already made the damn thing + if(GLOB.teleporters.len) // already made the damn thing return var/datum/teleporter/corsat/teleporter = new - SSteleporter.teleporters_by_id[teleporter.id] = teleporter - SSteleporter.teleporters += teleporter + GLOB.teleporters_by_id[teleporter.id] = teleporter + GLOB.teleporters += teleporter diff --git a/code/modules/teleporters/teleporter_landmarks.dm b/code/modules/teleporters/teleporter_landmarks.dm index 75ce77550f52..fe0ab4648903 100644 --- a/code/modules/teleporters/teleporter_landmarks.dm +++ b/code/modules/teleporters/teleporter_landmarks.dm @@ -41,30 +41,24 @@ /obj/effect/landmark/teleporter_loc/LateInitialize() . = ..() - if (SSteleporter) - var/datum/teleporter/T = SSteleporter.teleporters_by_id[linked_teleporter] - if (T) - if (!T.locations[location_id]) - T.locations[location_id] = list() + var/datum/teleporter/T = GLOB.teleporters_by_id[linked_teleporter] + if (T) + if (!T.locations[location_id]) + T.locations[location_id] = list() - var/list/location = T.locations[location_id] + var/list/location = T.locations[location_id] - if (!location) - log_debug("Teleporter locations turf list not properly instantiated. Code: TELEPORTER_LANDMARK_1") - log_admin("Teleporter locations turf list not properly instantiated. Tell the devs. Code: TELEPORTER_LANDMARK_1") - qdel(src) - return - - location[index] = get_turf(src) - - else - log_debug("Couldn't find teleporter matching ID [linked_teleporter]. Code: TELEPORTER_LANDMARK_2") - log_admin("Couldn't find teleporter matching ID [linked_teleporter]. Tell the devs. Code: TELEPORTER_LANDMARK_2") + if (!location) + log_debug("Teleporter locations turf list not properly instantiated. Code: TELEPORTER_LANDMARK_1") + log_admin("Teleporter locations turf list not properly instantiated. Tell the devs. Code: TELEPORTER_LANDMARK_1") qdel(src) return + + location[index] = get_turf(src) + else - log_debug("Couldn't find teleporter SS to register with. Code: TELEPORTER_LANDMARK_3") - log_admin("Couldn't find teleporter SS to register with. Tell the devs. Code: TELEPORTER_LANDMARK_3") + log_debug("Couldn't find teleporter matching ID [linked_teleporter]. Code: TELEPORTER_LANDMARK_2") + log_admin("Couldn't find teleporter matching ID [linked_teleporter]. Tell the devs. Code: TELEPORTER_LANDMARK_2") qdel(src) return diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm index 08b8142ab358..2bed879a0a99 100644 --- a/code/modules/tents/folded_tents.dm +++ b/code/modules/tents/folded_tents.dm @@ -1,20 +1,34 @@ /obj/item/folded_tent name = "Folded Abstract Tent" icon = 'icons/obj/structures/tents_folded.dmi' + icon_state = "tent" w_class = SIZE_LARGE /// Required cleared area along X axis var/dim_x = 1 /// Required cleared area along Y axis var/dim_y = 1 - /// Deployment X offset - var/off_x = 0 - /// Deployment Y offset - var/off_y = 0 - /// Map Template to use for the tent - var/template + /// Tents map template typepath + var/template_preset = "abstract" + ///Map template datum used for tent + var/datum/map_template/template /// If this tent can be deployed anywhere var/unrestricted_deployment = FALSE +/obj/item/folded_tent/Initialize(mapload, ...) + . = ..() + if(template_preset == "abstract") //So spawning an abstract tent wont fail create and destroy + return + set_template(SSmapping.tent_type_templates[template_preset]) + if(!template) + CRASH("[src] initialized with template preset, \"[template_preset]\", that does not exist.") + +/obj/item/folded_tent/proc/set_template(datum/map_template/new_template) + if(!istype(new_template)) + return + template = new_template + dim_x = template.width + dim_y = template.height + /// Check an area is clear for deployment of the tent /obj/item/folded_tent/proc/check_area(turf/ref_turf, mob/message_receiver, display_error = FALSE) SHOULD_NOT_SLEEP(TRUE) @@ -47,9 +61,11 @@ return FALSE return TRUE -/obj/item/folded_tent/proc/unfold(turf/ref_turf) - var/datum/map_template/template_instance = new template() - template_instance.load(ref_turf, FALSE, FALSE) +/obj/item/folded_tent/proc/unfold(mob/user, turf/ref_turf) + if(!istype(template)) + to_chat(user, SPAN_BOLDWARNING("[src] does not contain a tent! It is broken!")) + CRASH("[src] attempted to unfold \"[template]\" as a tent.") + template.load(ref_turf, FALSE, FALSE) /obj/item/folded_tent/proc/get_deployment_area(turf/ref_turf) RETURN_TYPE(/list/turf) @@ -58,11 +74,13 @@ /obj/item/folded_tent/attack_self(mob/living/user) . = ..() + var/off_x = -(tgui_input_number(user, "If facing North or South", "Set X Offset", 0, dim_x, 0, 30 SECONDS, TRUE)) + var/off_y = -(tgui_input_number(user, "If facing East or West", "Set Y Offset", 0, dim_y, 0, 30 SECONDS, TRUE)) var/turf/deploy_turf = user.loc if(!istype(deploy_turf)) return // In a locker or something. Get lost you already have a home. - switch(user.dir) // Fix up offset deploy location so tent is better centered + can be deployed under all angles + switch(user.dir) //Handles offsets when deploying if(NORTH) deploy_turf = locate(deploy_turf.x + off_x, deploy_turf.y + 1, deploy_turf.z) if(SOUTH) @@ -103,7 +121,7 @@ QDEL_IN(gfx, 1.5 SECONDS) return - unfold(deploy_turf) + unfold(user, deploy_turf) user.visible_message(SPAN_INFO("[user] finishes deploying the [src]!"), SPAN_INFO("You finish deploying the [src]!")) for(var/gfx in turf_overlay) qdel(gfx) @@ -113,36 +131,25 @@ name = "folded USCM Command Tent" icon_state = "cmd" desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. Unfold in a suitable location to maximize usefulness. Staff Officer not included. ENTRANCE TO THE SOUTH." - dim_x = 2 - dim_y = 4 - off_x = -1 - template = /datum/map_template/tent/cmd + template_preset = "tent_cmd" /obj/item/folded_tent/med name = "folded USCM Medical Tent" icon_state = "med" desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. Unfold in a suitable location to maximize health gains. Surgical Tray not included. ENTRANCE TO THE SOUTH." - dim_x = 2 - dim_y = 4 - template = /datum/map_template/tent/med + template_preset = "tent_med" /obj/item/folded_tent/reqs name = "folded USCM Requisitions Tent" icon_state = "req" desc = "A standard USCM Requisitions Tent. Now, you can enjoy req line anywhere you go! Unfold in a suitable location to maximize resource distribution. ASRS not included. ENTRANCE TO THE SOUTH." - dim_x = 4 - dim_y = 4 - off_x = -2 - template = /datum/map_template/tent/reqs + template_preset = "tent_reqs" /obj/item/folded_tent/big name = "folded USCM Big Tent" icon_state = "big" desc = "A standard USCM Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH." - dim_x = 3 - dim_y = 4 - off_x = -2 - template = /datum/map_template/tent/big + template_preset = "tent_big" /obj/effect/overlay/temp/tent_deployment_error icon = 'icons/effects/effects.dmi' diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index 41a047339452..b9a9f27a28ae 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -153,4 +153,9 @@ /world/TgsSecurityLevel() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) - api.SecurityLevel() + return api.SecurityLevel() + +/world/TgsVisibility() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + return api.Visibility() diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index 68b0330fe860..07ce3b684584 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -11,6 +11,15 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) src.event_handler = event_handler src.version = version +/datum/tgs_api/proc/TerminateWorld() + while(TRUE) + TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]") + world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866 + del(world) + world.sleep_offline = FALSE // just in case, this is BYOND after all... + sleep(1) + TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]") + /datum/tgs_api/latest parent_type = /datum/tgs_api/v5 @@ -57,3 +66,6 @@ TGS_PROTECT_DATUM(/datum/tgs_api) /datum/tgs_api/proc/SecurityLevel() return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/Visibility() + return TGS_UNIMPLEMENTED diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index b9a75c4abb48..945e2e411767 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -73,7 +73,7 @@ if(cached_json["apiValidateOnly"]) TGS_INFO_LOG("Validating API and exiting...") Export(TGS4_COMM_VALIDATE, list(TGS4_PARAMETER_DATA = "[minimum_required_security_level]")) - del(world) + TerminateWorld() security_level = cached_json["securityLevel"] chat_channels_json_path = cached_json["chatChannelsJson"] @@ -188,7 +188,7 @@ requesting_new_port = TRUE if(!world.OpenPort(0)) //open any port TGS_ERROR_LOG("Unable to open random port to retrieve new port![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() //request a new port export_lock = FALSE @@ -196,16 +196,16 @@ if(!new_port_json) TGS_ERROR_LOG("No new port response from server![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() var/new_port = new_port_json[TGS4_PARAMETER_DATA] if(!isnum(new_port) || new_port <= 0) TGS_ERROR_LOG("Malformed new port json ([json_encode(new_port_json)])![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() if(new_port != world.port && !world.OpenPort(new_port)) TGS_ERROR_LOG("Unable to open port [new_port]![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() requesting_new_port = FALSE while(export_lock) diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 5d3d491a7362..1b52b31d6a73 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.6.1" +"5.6.2" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index f973338daa03..bdcd4e4dd58e 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -48,6 +48,7 @@ #define DMAPI5_RUNTIME_INFORMATION_REVISION "revision" #define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges" #define DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL "securityLevel" +#define DMAPI5_RUNTIME_INFORMATION_VISIBILITY "visibility" #define DMAPI5_CHAT_UPDATE_CHANNELS "channels" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 34cc43f8762f..7226f29bba60 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -4,6 +4,7 @@ var/instance_name var/security_level + var/visibility var/reboot_mode = TGS_REBOOT_MODE_NORMAL @@ -50,10 +51,11 @@ if(runtime_information[DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY]) TGS_INFO_LOG("DMAPI validation, exiting...") - del(world) + TerminateWorld() version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] + visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY] instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] var/list/revisionData = runtime_information[DMAPI5_RUNTIME_INFORMATION_REVISION] @@ -252,3 +254,7 @@ /datum/tgs_api/v5/SecurityLevel() RequireInitialBridgeResponse() return security_level + +/datum/tgs_api/v5/Visibility() + RequireInitialBridgeResponse() + return visibility diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index c679737dfc49..f163adaaafe3 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -48,6 +48,7 @@ #undef DMAPI5_RUNTIME_INFORMATION_REVISION #undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES #undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL +#undef DMAPI5_RUNTIME_INFORMATION_VISIBILITY #undef DMAPI5_CHAT_UPDATE_CHANNELS diff --git a/code/modules/vehicles/interior/interior.dm b/code/modules/vehicles/interior/interior.dm index 046b42495ac7..f2afcd5ae5f7 100644 --- a/code/modules/vehicles/interior/interior.dm +++ b/code/modules/vehicles/interior/interior.dm @@ -318,7 +318,7 @@ var/turf/min = reservation.bottom_left_coords var/turf/max = reservation.top_right_coords - return list(Floor(min[1] + (max[1] - min[1])), Floor(min[2] + (max[2] - min[2])), min[3]) + return list(Floor(min[1] + (max[1] - min[1])/2), Floor(min[2] + (max[2] - min[2])/2), min[3]) /datum/interior/proc/get_middle_turf() var/list/turf/bounds = get_bound_turfs() diff --git a/colonialmarines.dme b/colonialmarines.dme index 7efb7e21944f..bceea69ea7f5 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1,4 +1,4 @@ -s// DM Environment file for colonialmarines.dme. +// DM Environment file for colonialmarines.dme. // All manual changes should be made outside the BEGIN_ and END_ blocks. // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS @@ -11,6 +11,7 @@ s// DM Environment file for colonialmarines.dme. #define DEBUG // END_PREFERENCES // BEGIN_INCLUDE +#include "code\__odlint.dm" #include "code\_byond_version_compat.dm" #include "code\_compile_options.dm" #include "code\_experiments.dm" @@ -60,6 +61,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\generators.dm" #include "code\__DEFINES\guns.dm" +#include "code\__DEFINES\hijack.dm" #include "code\__DEFINES\html.dm" #include "code\__DEFINES\hud.dm" #include "code\__DEFINES\human.dm" @@ -226,7 +228,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\controllers\mc\master.dm" #include "code\controllers\mc\subsystem.dm" #include "code\controllers\subsystem\acid_pillar.dm" -#include "code\controllers\subsystem\admin.dm" #include "code\controllers\subsystem\assets.dm" #include "code\controllers\subsystem\atoms.dm" #include "code\controllers\subsystem\autofire.dm" @@ -237,11 +238,10 @@ s// DM Environment file for colonialmarines.dme. #include "code\controllers\subsystem\decorator.dm" #include "code\controllers\subsystem\disease.dm" #include "code\controllers\subsystem\events.dm" -#include "code\controllers\subsystem\fail_to_topic.dm" -#include "code\controllers\subsystem\fast_machinery.dm" #include "code\controllers\subsystem\fz_transitions.dm" +#include "code\controllers\subsystem\game_decorator.dm" #include "code\controllers\subsystem\garbage.dm" -#include "code\controllers\subsystem\htmlui.dm" +#include "code\controllers\subsystem\hijack.dm" #include "code\controllers\subsystem\human.dm" #include "code\controllers\subsystem\inactivity.dm" #include "code\controllers\subsystem\influxdriver.dm" @@ -253,7 +253,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\controllers\subsystem\lighting.dm" #include "code\controllers\subsystem\machinery.dm" #include "code\controllers\subsystem\mapping.dm" -#include "code\controllers\subsystem\midi.dm" #include "code\controllers\subsystem\minimap.dm" #include "code\controllers\subsystem\mob.dm" #include "code\controllers\subsystem\nanoui.dm" @@ -273,15 +272,11 @@ s// DM Environment file for colonialmarines.dme. #include "code\controllers\subsystem\round_recording.dm" #include "code\controllers\subsystem\shuttle.dm" #include "code\controllers\subsystem\shuttles.dm" -#include "code\controllers\subsystem\smoke_system.dm" #include "code\controllers\subsystem\sound.dm" #include "code\controllers\subsystem\sound_loops.dm" #include "code\controllers\subsystem\soundscape.dm" -#include "code\controllers\subsystem\stamina.dm" #include "code\controllers\subsystem\statpanel.dm" -#include "code\controllers\subsystem\stats_collector.dm" #include "code\controllers\subsystem\techtree.dm" -#include "code\controllers\subsystem\teleporter.dm" #include "code\controllers\subsystem\tgui.dm" #include "code\controllers\subsystem\ticker.dm" #include "code\controllers\subsystem\time_track.dm" @@ -291,11 +286,10 @@ s// DM Environment file for colonialmarines.dme. #include "code\controllers\subsystem\weather.dm" #include "code\controllers\subsystem\x_evolution.dm" #include "code\controllers\subsystem\xeno.dm" -#include "code\controllers\subsystem\xenocon.dm" -#include "code\controllers\subsystem\init\earlyruntimes.dm" #include "code\controllers\subsystem\init\landmarks.dm" #include "code\controllers\subsystem\init\law.dm" #include "code\controllers\subsystem\init\lobby_art.dm" +#include "code\controllers\subsystem\processing\defprocess.dm" #include "code\controllers\subsystem\processing\effects.dm" #include "code\controllers\subsystem\processing\fastobj.dm" #include "code\controllers\subsystem\processing\hive_status.dm" @@ -335,7 +329,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\datums\quadtree.dm" #include "code\datums\recipe.dm" #include "code\datums\shuttles.dm" -#include "code\datums\skills.dm" #include "code\datums\soundOutput.dm" #include "code\datums\tgs_event_handler.dm" #include "code\datums\vehicles.dm" @@ -354,6 +347,22 @@ s// DM Environment file for colonialmarines.dme. #include "code\datums\agents\tools\toolbox.dm" #include "code\datums\agents\tools\tracker.dm" #include "code\datums\agents\tools\tranq_gun.dm" +#include "code\datums\ammo\ammo.dm" +#include "code\datums\ammo\energy.dm" +#include "code\datums\ammo\misc.dm" +#include "code\datums\ammo\rocket.dm" +#include "code\datums\ammo\shrapnel.dm" +#include "code\datums\ammo\xeno.dm" +#include "code\datums\ammo\bullet\bullet.dm" +#include "code\datums\ammo\bullet\lever_action.dm" +#include "code\datums\ammo\bullet\pistol.dm" +#include "code\datums\ammo\bullet\revolver.dm" +#include "code\datums\ammo\bullet\rifle.dm" +#include "code\datums\ammo\bullet\shotgun.dm" +#include "code\datums\ammo\bullet\smg.dm" +#include "code\datums\ammo\bullet\sniper.dm" +#include "code\datums\ammo\bullet\special_ammo.dm" +#include "code\datums\ammo\bullet\tank.dm" #include "code\datums\autocells\auto_cell.dm" #include "code\datums\autocells\explosion.dm" #include "code\datums\autocells\vomit_wave.dm" @@ -569,6 +578,23 @@ s// DM Environment file for colonialmarines.dme. #include "code\datums\redis\redis_message.dm" #include "code\datums\redis\callbacks\_redis_callback.dm" #include "code\datums\redis\callbacks\asay.dm" +#include "code\datums\skills\civilian.dm" +#include "code\datums\skills\clf.dm" +#include "code\datums\skills\cmb.dm" +#include "code\datums\skills\commando.dm" +#include "code\datums\skills\contractor.dm" +#include "code\datums\skills\dutch.dm" +#include "code\datums\skills\forecon.dm" +#include "code\datums\skills\freelancer.dm" +#include "code\datums\skills\gladiator.dm" +#include "code\datums\skills\mercenary.dm" +#include "code\datums\skills\misc.dm" +#include "code\datums\skills\pmc.dm" +#include "code\datums\skills\rmc.dm" +#include "code\datums\skills\skills.dm" +#include "code\datums\skills\synthetic.dm" +#include "code\datums\skills\upp.dm" +#include "code\datums\skills\uscm.dm" #include "code\datums\stamina\_stamina.dm" #include "code\datums\stamina\none.dm" #include "code\datums\statistics\cause_data.dm" @@ -675,7 +701,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\cas_manager\datums\cas_signal.dm" #include "code\game\gamemodes\cm_initialize.dm" #include "code\game\gamemodes\cm_process.dm" -#include "code\game\gamemodes\cm_self_destruct.dm" #include "code\game\gamemodes\events.dm" #include "code\game\gamemodes\game_mode.dm" #include "code\game\gamemodes\colonialmarines\colonialmarines.dm" @@ -773,7 +798,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\machinery\lightswitch.dm" #include "code\game\machinery\line_nexter.dm" #include "code\game\machinery\machinery.dm" -#include "code\game\machinery\magnet.dm" #include "code\game\machinery\mass_driver.dm" #include "code\game\machinery\mining.dm" #include "code\game\machinery\misc.dm" @@ -795,7 +819,10 @@ s// DM Environment file for colonialmarines.dme. #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" #include "code\game\machinery\ARES\ARES_procs.dm" #include "code\game\machinery\ARES\ARES_records.dm" #include "code\game\machinery\ARES\ARES_step_triggers.dm" @@ -905,6 +932,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\machinery\vending\vendor_types\crew\sea.dm" #include "code\game\machinery\vending\vendor_types\crew\senior_officers.dm" #include "code\game\machinery\vending\vendor_types\crew\staff_officer.dm" +#include "code\game\machinery\vending\vendor_types\crew\staff_officer_armory.dm" #include "code\game\machinery\vending\vendor_types\crew\synthetic.dm" #include "code\game\machinery\vending\vendor_types\crew\vehicle_crew.dm" #include "code\game\machinery\vending\vendor_types\squad_prep\squad_engineer.dm" @@ -970,6 +998,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\effects\landmarks\structure_spawners\setup_distress.dm" #include "code\game\objects\effects\landmarks\structure_spawners\structure_spawner.dm" #include "code\game\objects\effects\landmarks\structure_spawners\xvx_hive.dm" +#include "code\game\objects\effects\spawners\faction_spawners.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" #include "code\game\objects\effects\spawners\prop_gun_spawner.dm" #include "code\game\objects\effects\spawners\random.dm" @@ -1249,13 +1278,15 @@ s// DM Environment file for colonialmarines.dme. #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" @@ -1600,7 +1631,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\decorators\admin_runtime_decorator.dm" #include "code\modules\decorators\cassette_decorator.dm" #include "code\modules\decorators\christmas.dm" -#include "code\modules\decorators\halloween.dm" #include "code\modules\decorators\mass_xeno_decorator.dm" #include "code\modules\decorators\weapon_decorator.dm" #include "code\modules\decorators\weapon_map_decorator.dm" @@ -1696,6 +1726,9 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\gear_presets\survivors\sorokyne_strata\preset_sorokyne_strata.dm" #include "code\modules\gear_presets\survivors\trijent\crashlanding_upp_bar_insert_trijent.dm" #include "code\modules\gear_presets\survivors\trijent\preset_trijent.dm" +#include "code\modules\holidays\halloween\decorators.dm" +#include "code\modules\holidays\halloween\pumpkins\patches.dm" +#include "code\modules\holidays\halloween\pumpkins\wearable.dm" #include "code\modules\hydroponics\botany_disks.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\hydro_tools.dm" @@ -1716,6 +1749,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\law\laws\major_crime.dm" #include "code\modules\law\laws\minor_crime.dm" #include "code\modules\law\laws\optional.dm" +#include "code\modules\law\laws\precautionary_charge.dm" #include "code\modules\lighting\emissive_blocker.dm" #include "code\modules\lighting\lighting_area.dm" #include "code\modules\lighting\lighting_atom.dm" @@ -2122,7 +2156,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\power\smes_construction.dm" #include "code\modules\power\terminal.dm" #include "code\modules\power\turbine.dm" -#include "code\modules\projectiles\ammo_datums.dm" #include "code\modules\projectiles\ammunition.dm" #include "code\modules\projectiles\gun.dm" #include "code\modules\projectiles\gun_attachables.dm" diff --git a/config/example/config.txt b/config/example/config.txt index dcce46434404..8e8bb2b754d5 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/dependencies.sh b/dependencies.sh index 2889751d36e6..f88c2f9b0a4b 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -19,3 +19,5 @@ export SPACEMAN_DMM_VERSION=suite-1.7.2 # Python version for mapmerge and other tools export PYTHON_VERSION=3.7.9 + +export OPENDREAM_VERSION=0.2.0 diff --git a/html/changelogs/AutoChangeLog-pr-4613.yml b/html/changelogs/AutoChangeLog-pr-4613.yml deleted file mode 100644 index 427478819bca..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4613.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "irRegularGuy646" -delete-after: True -changes: - - bugfix: "fixed new goggle's on helmet sprite" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4756.yml b/html/changelogs/AutoChangeLog-pr-4756.yml new file mode 100644 index 000000000000..f0e5a3bc074d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4756.yml @@ -0,0 +1,4 @@ +author: "fira" +delete-after: True +changes: + - bugfix: "Spawned bottles now use all 4 of their sprites as intended rather than always the same." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4760.yml b/html/changelogs/AutoChangeLog-pr-4760.yml new file mode 100644 index 000000000000..b16cb2437199 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4760.yml @@ -0,0 +1,6 @@ +author: "QuickLode" +delete-after: True +changes: + - rscadd: "adds another Colony Synthetic variant, changes up some existing ones(trucker,CMB)" + - bugfix: "fixes a small problem with WY-Colony Synthetic access(thx forest), adds WY subtype of Synthetics for admin building/faxes" + - bugfix: "fixes problems with organic spawning ferret industries Trucker Synthetic" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4820.yml b/html/changelogs/AutoChangeLog-pr-4820.yml new file mode 100644 index 000000000000..26c72a285527 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4820.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - rscadd: "Xeno tacmap icons for hive core and clusters." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4848.yml b/html/changelogs/AutoChangeLog-pr-4848.yml new file mode 100644 index 000000000000..4977495850ff --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4848.yml @@ -0,0 +1,4 @@ +author: "zzzmike" +delete-after: True +changes: + - spellcheck: "fixed a typo" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4851.yml b/html/changelogs/AutoChangeLog-pr-4851.yml new file mode 100644 index 000000000000..e6e261c03e38 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4851.yml @@ -0,0 +1,4 @@ +author: "Releasethesea" +delete-after: True +changes: + - rscadd: "Makes it so cigars fit in helmets." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4854.yml b/html/changelogs/AutoChangeLog-pr-4854.yml new file mode 100644 index 000000000000..c506769a9ab0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4854.yml @@ -0,0 +1,5 @@ +author: "Skye." +delete-after: True +changes: + - maptweak: "Tweaks a Cabinet in the SW mines of Solaris Ridge" + - bugfix: "On account of it being propped up on the floor like a cardboard cutout." \ No newline at end of file diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 0d0ed6ed21cd..49bc7a740145 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -127,3 +127,304 @@ - rscadd: Added missing flight record for Queen dropship summon. - code_imp: Added security record option for shipwide_ai_announcement. - rscadd: Added security records for unidentified lifeforms announcement. +2023-10-11: + BeagleGaming1: + - rscadd: Light floor can be examined to tell if it is on, off, or broken. + - code_imp: Light floor subtypes for easier mapping + Birdtalon: + - bugfix: You can now pick up paper bins + - bugfix: Campfires stop consuming wood when full + Zonespace27: + - rscdel: Predators can no longer see their or others cross-round honor count. + irRegularGuy646: + - bugfix: fixed new goggle's on helmet sprite +2023-10-12: + QuickLode: + - rscadd: Adds a handheld distress beacon for the Colonial Marshal. They can use + this to signal distress which in turn allows reinforcements in the form of Anchorpoint + Marine QRF or nearby CMB teams. Admins do the final check. + - rscadd: Adds a CMB Patrol Team which responds to "Marshals in Distress" call. + - admin: headset admin response no longer specifies USCM origin(as this is used + for USCM, WY, and now CMB) + - spellcheck: fixes a CMB typo in response message. Also a miniscule change to HG + 37-12 desc. + - spellcheck: fixes 2 misc typos in CMB Inspections + harryob: + - rscadd: origin descriptions are now displayed when selecting an origin + mullenpaul: + - ui: tweaked flyby controls to make them in line with other destinations +2023-10-13: + Drathek: + - refactor: Refactored camera code to be less blocking, use typechecks less often, + and provide somewhat more fluid descriptions to photos. +2023-10-14: + BeagleGaming1: + - bugfix: M39 arm brace disables when dropped + CapCamIII: + - bugfix: UPP Sapper/Medic survivor use their correct paygrade instead of UE3M/UE3S + QuickLode: + - rscadd: Colony Supervisor now has a guaranteed grant. + - balance: nerfs PMC Synthetic's gear + - bugfix: PMC Synthetic has corrected access(thx forest) + - bugfix: Colony Supervisor can now have access to his own colony(LOL). + mullenpaul: + - rscadd: adds weapon spawners for USCM, CLF, PMC and UPP +2023-10-15: + Birdtalon: + - bugfix: Limb printer can no longer double print or print without metal. + Drathek: + - ui: Fixed a duplicate Options button + Lalipar: + - qol: Readable time for when a fax was sent in fax panel + - qol: Adds ckey/character name for faxes in fax panel + - qol: Adds fax subject to fax panel + - bugfix: Added CMB faxes to Fax Panel + fira: + - bugfix: Fix nuke explosion getting canceled in some very rare cases. + - bugfix: Xeno Name preference does not require a reconnection to apply anymore. + It still won't change your current Xenomorph's name however. + - bugfix: Fixed Tape Recorder failing to record when no language information is + present. + harryob: + - admin: administrators without R_DEBUG can now restart the server without starting + the round +2023-10-16: + CapCamIII: + - balance: ERTs now have a variant of the standard medkit that has no storage lock. + - bugfix: Lots of ERTs now correctly have a medkit spawning in their gear + Drathek: + - bugfix: Fixed the hive surge join as xeno observer alert text link not actually + doing anything. + Twomoon: + - rscadd: Added new haircut + Waseemq1235: + - admin: Makes subtle messages more noticeable. + Zonespace, Wei (sprites): + - balance: Removed NSG, Type71, tactical Mar-40, and Mar-50 from the black market + - balance: Removed Ext. M4ra mags from the black market + - balance: Removed monkeycubes from the black market + - balance: Removed lunge mines from the black market + - balance: You now need a modified security access tuner to access the black market, + which can be found ship- and ground-side where scanners and radios can spawn. + fira: + - bugfix: The Turing Machine should now keep working as intended if its linked Smartfridge + is blown up. + - bugfix: Fixed xeno cultists always being created into normal hive, irrespective + of the selected hive. + - bugfix: Fixed 'Join as Freed Mob' verb crashing if freed mobs had previously been + deleted. + - bugfix: Fixed issues with turfs, notably lighting, arising when building it from + a sheets stack. +2023-10-17: + VileBeggar: + - qol: The Queen's psychic messages now use a bigger font and are harder to miss. + Warfan1815: + - mapadd: New Squad Briefings south and north of normal briefing! Feel free to use + them to your heart's content. + - maptweak: Moved long-rest bunks further north and further south of where they + were originally +2023-10-18: + mullenpaul: + - code_imp: resolves flyby issues by refactoring update_equipment logic + - refactor: removes unwanted code + realforest2001: + - code_imp: Moved most data storage from ARES Interface and APOLLO consoles to a + new ARES datacore datum. + - code_imp: Moved the two consoles to separate files for easier navigation, and + moved their respective UI data to the files. + - code_imp: Ares logging procs are now global procs with integrated can_log checks, + rather than requiring definition of ares_link for every use. + - rscadd: Added ares_can_log checks to all the places I could find missing them. + - bugfix: Fixed missing rejection button for access tickets. + - rscdel: Removed claim ticket button from Access Tickets. +2023-10-19: + BeagleGaming1: + - refactor: Refactored handheld beacons and related code + CapCamIII: + - bugfix: Equipped marine presets spawn with full food on spawn + Huffie56: + - refactor: refactor ammo_datums file. + SpartanBobby: + - maptweak: fixes lack of warning stripes under doors in squad briefing areas and + newly added maint doors onboard USS Almayer + - maptweak: fixes incorrect tiles used under window frames in new squad briefing + areas onboard USS Almayer + - maptweak: fixes pipe sections under window frames in new squad briefing areas + onboard USS Almayer + - maptweak: fixes pipes that lead nowhere in new squad briefing areas onboard USS + Almayer + - maptweak: fixes button that was being hidden by light due to recent USS Almayer + changes + - maptweak: corrects strangely laid out vent sections due to recent USS Almayer + changes + - maptweak: makes USS Almayer Bunks consistent with the rest of the ship's shower + and bathrooms + - maptweak: updates "Dusty Beret" prop item to now be the RMC Beret it was originally + referencing (now that the RMC are ingame) + VileBeggar: + - qol: All squad uniform vendors have had their standard apparel condensed into + one button. + fira: + - bugfix: Fixed caps displaying contained items on character even without being + worn. + neeshacark: + - qol: MT, CT, and Nurses can now take the bad leg trait. +2023-10-20: + Drathek: + - bugfix: Fixed a cause of bad icon operations + - bugfix: Bandaided a problem with nulls in GLOB.clients + IsProbablyCatto: + - qol: Medbelts pull from pillbottles as default + Kitsunemitsu: + - bugfix: fixed FTLs being demoted from SL erroneously having the tag TL in chat. + MrDas: + - bugfix: You can now disassemble wide airlocks. (You can't unwrench them though) + - spellcheck: Fixed a few typos in airlock assembly. + - imageadd: Added wide airlock assembly and generic solid wide airlock sprites. + SpartanBobby: + - maptweak: Removes stunprod from LV522 + VileBeggar: + - rscadd: Dartboards are now functional and can be crafted with cardboard. + - bugfix: Fixed an issue with some deconstructed signs losing their icon. +2023-10-21: + Birdtalon: + - rscadd: USCM Service Jacket to SEA Vendor + CapCamIII: + - balance: Crawling now only takes 1 second to move and no longer has an overhead + icon when doing it. + - balance: Timer on attempting to join ERT after death is now 30 seconds down from + 1 minute + - spellcheck: UPP Synth Survivor on the Trijent Dam nightmare is now called a Support + Synthetic instead of a Combat Synthetic, as its not a combat synthetic + Drathek: + - bugfix: Fixed imaginary friends not initializing correctly and throwing a runtime + - ui: Tweaked the position of some ghost alerts + SpartanBobby: + - maptweak: Fixes incorrect DIR on fireshutters in memorial + - maptweak: Corrects lack of warning stripe tile under door in north brig maint + Steelpoint: + - rscadd: UPP ERT's have a chance to be neutral to the USCM. + fira: + - bugfix: Xeno and Megaphone abovehead chat speech should now properly be centered + horizontally. + - bugfix: Fixed Rangefinders/Designators preventing you from lazing if you looked + up/down them without moving. + - bugfix: Fixed Rangefinders/Designators forcing you to look up/down again if you + had moved while using them. + foxtrot1322: + - rscadd: Added splints to the survival pouch + - rscadd: Increased survival pouch storage space by 1 + - spellcheck: Updates the survival pouch's description +2023-10-22: + Drathek: + - bugfix: Fix incend and cluster OBs not respecting ceiling OB protections. + - bugfix: Disabled code in icon2html that is causing bad icon operations + Morrow: + - server: the rustg mysql driver is now properly compatible with mariadb + Zonespace27: + - rscadd: Mentors can now unmark mhelps + fira: + - bugfix: Removed redundant double binding for F1 to AdminHelp from default keybinds. + This does not affect existing users or their settings. + - rscadd: Stamping papers now makes a noise. + - bugfix: Fixed incorrect Reqs vendors visuals on the Almayer. They now blend in + with the walls again. + - bugfix: Re-fixed Megaphone above-head-chat drifting to the left. + harryob: + - admin: no more href token errors when changing the game mode via game panel + - bugfix: mentorhelp response no longer gives a dead discord link + - admin: view-target-records now allows you to note people properly + kiVts: + - rscadd: Ghosts get notified when they are being revived by DFB property + - balance: DFB property healing threshold lowered, You can create DFB property higher + than one. + realforest2001: + - rscadd: Added Discretionary Arrest to JAS. + - rscadd: Added a new category to JAS, Precautionary Charges. Moves Insanity and + POW to this category. +2023-10-23: + QuickLode: + - balance: Nerfs synth surv pouch by removing 1 storage slot. + SpypigDev: + - rscadd: CIC Armory SO vendor + - balance: Moved most combat-themed gear from SO spawn vendors, to CIC Armory vendor + - balance: Made RTO pack a point-buy item in CIC Armory vendor for SOs + Steelpoint: + - balance: Revolver Heavy ammo no longer stuns targets it strikes, it will instead + knock them back and slow them down for a short time. + harryob: + - server: the server now respects /string/title for late joiners + stalkerino: + - balance: m39 is able to use vertigrip +2023-10-24: + Segrain: + - bugfix: Slicing food once again works as intended. +2023-10-25: + fira: + - bugfix: Fixed Ghosts and Queen Eye occasionally "eating" pounces in place of a + mob on the same turf. + - bugfix: Re-Re-Fixed Xeno Above Head Chat offsets, for real this time + - bugfix: Fixed people talking in radios all the time. Finally some quiet. + - bugfix: deadchat death messages should now display immediately rather than being + delayed a couple seconds. +2023-10-26: + 4hands44: + - rscadd: Added more attachments, and belts to the CO arsenal. + - rscadd: CO now has an Essentials Kit like other roles, containing his Designator, + and other useful tools. + - rscadd: Re-Adds Bridgecoat to some Officer Dress vendors. (Limited to CO(+) and + XO currently.) + - rscdel: Removed Laser Designator from CO spawn Preset. + - balance: CO can now vend welding Helmet visors. + - balance: Adds grenade packets to CO Vendor. + XDinka: + - rscadd: 'Added four new haircuts: gentle ponytail, edgar haircut, emo bun, taper + haircut.' +2023-10-27: + Backsea: + - bugfix: Fixed the incorrectly placed shutters at req and that one light near CIC + Birdtalon: + - refactor: Refactored praetorian pierce ability + - bugfix: Praetorian vanguard can no longer pierce through windowed doors + SASoperative: + - rscadd: Added donator item and sprites + Zonespace27: + - rscdel: Re-removed CO/XO bridge coat + fira: + - rscadd: Added about 50 new tips. + - rscadd: Bloody footprints are now slightly offset to break long visual straight + lines. + - bugfix: Items do not align back to the center of turfs anymore when picked from + a surface (table or rack) + - rscadd: Some more items now have offsets on the map display, and they all can + be slightly offset. + - code_imp: Rewrote Xeno Acid ticking code. + - bugfix: Weather updates won't cause turfs to acid melt more rapidly anymore + - bugfix: Fixed various issues in the Networking between Turing machine and Smartfridges. + realforest2001: + - bugfix: Fixes custom ERT calling broadcasting when it should not. + - code_imp: Removes unused vars from ERT procs. + - code_imp: Renames the announce var in ERT procs to be more indicative of what + it does. + - rscadd: Added a setting on custom ERTs for announcing beacon was received. +2023-10-29: + Segrain: + - bugfix: Incendiary OB once again spreads to intended size. + fira: + - bugfix: Sprite-click shots onto Xenos are no longer affected by limb-targeting + penalty, because it was an accuracy debuff when there is no inherent benefit + to targeting Xeno limbs. + realforest2001: + - imageadd: Added sprites for provost senior and marshal uniforms. + - spellcheck: Gave unique names to the provost armour subtypes. + - balance: Prevented most provost armour from being able to fit inside bags. + - balance: Returned provost armour to the same slowdowns as MP armour. + - code_imp: Removed a lot of duplicate code in Provost presets and uniform/suits. +2023-10-31: + SASoperative: + - bugfix: Fixed sprite issue by disabling camo variant for donator item + fira: + - bugfix: Fixed Limbs and Organs deleting incorrectly on species change. + mullenpaul: + - refactor: reworked trijent elevators to be reusable on new maps + - maptweak: Trijent map now has two elevators, lz1 to engineering and lz2 to omega diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml new file mode 100644 index 000000000000..18b35afdd339 --- /dev/null +++ b/html/changelogs/archive/2023-11.yml @@ -0,0 +1,110 @@ +2023-11-01: + 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. +2023-11-07: + 567Turtle: + - soundadd: New whistle sound effect + Alexguinea: + - rscadd: Added toners to the rec vendor + AndroBetel: + - spellcheck: Fixed a typo in RO rules sign. + - spellcheck: RO mention is no more, replaced with QM. + BeagleGaming1: + - code_imp: Tents now hold the datum directly, instead of the typepath + - admin: Added a proc for staff to change tent dmm's + Blundir: + - rscadd: added shotgun tube toggle hotkey + Doubleumc: + - bugfix: vehicle interiors can hear exterior noises + Drathek: + - bugfix: Fixed various job's entry messages having broken links to the wiki + Firartix and Frans_Feiffer: + - rscadd: Readded Halloween pumpkin helmets. + IowaPotatoFarmer: + - rscadd: Added new survivor presets for New Varadero to make them more visually + distinct and unique to the map. + - rscdel: Removed the ability to build ground structures or anchor wall girders + on top of xeno tunnels. + - bugfix: Fixed wall girders being anchorable on shuttle tiles. + Morrow, Zonespace: + - rscadd: Added objectives to hijack. You now must hold different sections of the + ship to successfully launch lifeboats or pods + - rscadd: The areas that contribute to hijack objectives are the lifeboat pumps, + astronav, and engineering + - rscadd: Fuel pumps now have red alert sentries + - rscadd: Corporate liaison evac shuttle now can be launched at any time even if + evac has not been called + - rscadd: You can now self-destruct the ship by overloading the fusion generators + in engineering once lifeboat fuel is at 100%. + - rscdel: Removed auto launch of lifeboats and pods + - code_imp: Refactored EvacuationAuthority into SShijack + Releasethesea: + - balance: Makes it so that Pill packets fit in helmets + SpartanBobby: + - maptweak: Alot of changes to big reds admin area, including new windows, prop + placement, room detailing, new doors + Steelpoint: + - rscadd: Corpsman can chose to optionally vend a set of armoured sterile gloves + as a alternative to regular gloves. They provide full glove protection, but + are otherwise an aesthetic choice. + TopHatPenguin: + - rscadd: Adds a mostly built communications office nightmare insert to Kutjevo + which attaches onto the sensor tower. + - rscadd: Re-adds the Kutjevo blackbox. + Xander3359: + - bugfix: Fixes being able to create ghost tanks from a Broiler-T unit. + blackdragonTOW: + - imageadd: Changed nanotrasen cashcard icon to W-Y + fira: + - rscdel: Removed unused magnet and mass driver legacy SS13 machinery. + - bugfix: Fixed being able to put anything in your boots. You're not wizards! + - admin: Added better logging for orbital bombardment. + realforest2001: + - rscadd: Added a big line to Nightmare survivor spawns that indicates hostility. diff --git a/html/statbrowser.js b/html/statbrowser.js index c2dbce1215b6..289536d37da1 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..."; } @@ -1045,18 +1060,7 @@ Byond.subscribeTo("remove_mc", remove_mc); Byond.subscribeTo("add_verb_list", add_verb_list); function createOptionsButton() { - 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/misc/events/pumpkins.dmi b/icons/misc/events/pumpkins.dmi new file mode 100644 index 000000000000..e3087e7c444c Binary files /dev/null and b/icons/misc/events/pumpkins.dmi differ diff --git a/icons/mob/humans/human_hair.dmi b/icons/mob/humans/human_hair.dmi index bfe0e072f19d..9634a2543aa4 100644 Binary files a/icons/mob/humans/human_hair.dmi and b/icons/mob/humans/human_hair.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 8a51050c03c3..a6e9ef72c010 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index ce576bdd9cc5..51cad85586e7 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index dad985c1e11c..19d73f120f9b 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 cc91c47fe2fc..d8b49e8f4516 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/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index d7dfd5394f0d..52f2c7f0a9cb 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 624d8792cf2d..a911171f8521 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 873c325a560e..7a2dcce20c5d 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index f9c06fca4437..4119b32a09cf 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 1595402fef50..1c2134ee3b80 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index d05d7ffdf77e..fb655de1eafa 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/hats.dmi b/icons/obj/items/clothing/hats.dmi index 7d2c45103ba6..a6a0e6fb9099 100644 Binary files a/icons/obj/items/clothing/hats.dmi and b/icons/obj/items/clothing/hats.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index d158d9f6bd1f..10fbfff30d7c 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 4266db88afe8..765f9deae113 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/devices.dmi b/icons/obj/items/devices.dmi index 8bf7634a7df4..9e0891f36170 100644 Binary files a/icons/obj/items/devices.dmi and b/icons/obj/items/devices.dmi differ diff --git a/icons/obj/items/helmet_garb.dmi b/icons/obj/items/helmet_garb.dmi index 40a45526306b..bbebf822c9d5 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 1f74fc09b9ea..52b53208e226 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 000000000000..8596fd69df9c 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 000000000000..6bd7205e9a94 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 e336d68dfd23..4a40561475c6 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 6f160bbbe7cb..5632ca31481e 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 398256490294..40e489df90c2 100644 Binary files a/icons/obj/items/weapons/weapons.dmi and b/icons/obj/items/weapons/weapons.dmi differ diff --git a/icons/obj/structures/doors/2x1generic_solid.dmi b/icons/obj/structures/doors/2x1generic_solid.dmi new file mode 100644 index 000000000000..9c00b7b3277d Binary files /dev/null and b/icons/obj/structures/doors/2x1generic_solid.dmi differ diff --git a/icons/obj/structures/doors/airlock_assembly2x1.dmi b/icons/obj/structures/doors/airlock_assembly2x1.dmi index a8d69b6f6a2d..cafd5c415b89 100644 Binary files a/icons/obj/structures/doors/airlock_assembly2x1.dmi and b/icons/obj/structures/doors/airlock_assembly2x1.dmi differ diff --git a/icons/obj/structures/machinery/fusion_eng.dmi b/icons/obj/structures/machinery/fusion_eng.dmi index 038fae342b64..4d42baac7255 100644 Binary files a/icons/obj/structures/machinery/fusion_eng.dmi and b/icons/obj/structures/machinery/fusion_eng.dmi differ diff --git a/icons/obj/structures/tents_folded.dmi b/icons/obj/structures/tents_folded.dmi index e9f4555ae6a1..e93702d7b2f9 100644 Binary files a/icons/obj/structures/tents_folded.dmi and b/icons/obj/structures/tents_folded.dmi differ diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 0034b4fd6ff7..28195bb238fe 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index a37ab648b7f5..c9112160d94f 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -55,7 +55,7 @@ if(tgui_alert(src, "This will open the discord in your browser. Are you sure?", "Confirm", list("Yes", "No")) != "Yes") return - src << link("https://discord.gg/cmss13") + src << link("[CONFIG_GET(string/discordurl)]") return /client/verb/submitbug() diff --git a/interface/skin.dmf b/interface/skin.dmf index 5d06bb40e858..e31c42938cd9 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -164,7 +164,6 @@ window "mainwindow" anchor2 = -1,-1 is-default = true saved-params = "pos;size;is-minimized;is-maximized" - title = "CM-SS13 - USS Almayer" is-maximized = true statusbar = false icon = 'icons\\taskbar\\gml_distress.png' diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index b29802bd6548..412d970cffbd 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -11058,21 +11058,10 @@ /turf/closed/wall/solaris/rock, /area/bigredv2/outside/sw) "aFd" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/jungle{ - bushes_spawn = 0; - icon_state = "grass_impenetrable" +/obj/structure/flora/jungle/plantbot1{ + pixel_y = 10 }, +/turf/open/jungle, /area/bigredv2/outside/admin_building) "aFf" = ( /obj/structure/closet/secure_closet/scientist, @@ -12526,10 +12515,7 @@ "aIY" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aIZ" = ( /obj/effect/decal/warning_stripes{ @@ -14231,7 +14217,6 @@ /area/bigredv2/outside/admin_building) "aNC" = ( /obj/structure/machinery/computer/station_alert, -/obj/structure/machinery/camera/autoname, /obj/structure/surface/table, /turf/open/floor{ icon_state = "white" @@ -14286,6 +14271,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 9; icon_state = "darkred2" @@ -14298,6 +14284,7 @@ }, /area/bigredv2/outside/admin_building) "aNK" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 9; icon_state = "darkred2" @@ -14321,6 +14308,7 @@ /area/bigredv2/outside/admin_building) "aNN" = ( /obj/structure/machinery/vending/coffee, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 1; icon_state = "darkred2" @@ -14342,6 +14330,9 @@ /area/bigredv2/outside/admin_building) "aNQ" = ( /obj/structure/bed, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, /turf/open/floor{ icon_state = "wood" }, @@ -15145,16 +15136,22 @@ }, /area/bigredv2/outside/admin_building) "aPP" = ( -/turf/open/floor{ +/obj/structure/stairs/perspective{ dir = 1; - icon_state = "rampbottom" + icon_state = "p_stair_full" + }, +/turf/open/floor{ + icon_state = "dark" }, /area/bigredv2/outside/admin_building) "aPQ" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ +/obj/structure/stairs/perspective{ dir = 1; - icon_state = "rampbottom" + icon_state = "p_stair_full" + }, +/turf/open/floor{ + icon_state = "dark" }, /area/bigredv2/outside/admin_building) "aPS" = ( @@ -15182,7 +15179,17 @@ }, /area/bigredv2/outside/admin_building) "aPW" = ( -/obj/structure/coatrack, +/obj/structure/coatrack{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/clothing/shoes/dress{ + pixel_y = -13 + }, +/obj/item/clothing/under/suit_jacket/trainee{ + pixel_x = -6; + pixel_y = 15 + }, /turf/open/floor{ icon_state = "wood" }, @@ -15653,6 +15660,7 @@ name = "Storm Shutters"; pixel_y = -32 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ icon_state = "darkred2" }, @@ -15987,9 +15995,8 @@ }, /area/bigredv2/outside/admin_building) "aRZ" = ( -/obj/structure/machinery/door/airlock/almayer/command/colony{ - dir = 1; - name = "\improper Operations EVA" +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, /turf/open/floor{ icon_state = "delivery" @@ -16309,6 +16316,14 @@ }, /area/bigredv2/outside/general_store) "aSQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, /obj/structure/machinery/door/airlock/almayer/command/colony{ dir = 1; name = "\improper Operations" @@ -16319,6 +16334,8 @@ /area/bigredv2/outside/admin_building) "aSR" = ( /obj/structure/pipes/vents/pump, +/obj/structure/surface/rack, +/obj/item/weapon/gun/smg/mp27, /turf/open/floor{ dir = 8; icon_state = "redcorner" @@ -16355,6 +16372,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/item/prop/alien/hugger, /turf/open/floor{ dir = 1; icon_state = "darkred2" @@ -16370,8 +16388,14 @@ }, /area/bigredv2/outside/admin_building) "aSX" = ( -/obj/structure/machinery/suit_storage_unit/carbon_unit, -/turf/open/floor/plating, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor{ + icon_state = "white" + }, /area/bigredv2/outside/admin_building) "aSZ" = ( /obj/structure/machinery/power/apc{ @@ -16384,10 +16408,12 @@ /turf/open/floor/plating, /area/bigredv2/outside/admin_building) "aTb" = ( -/obj/structure/surface/table/woodentable, -/obj/effect/landmark/objective_landmark/close, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, /turf/open/floor{ - icon_state = "wood" + icon_state = "white" }, /area/bigredv2/outside/admin_building) "aTc" = ( @@ -16562,24 +16588,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) -"aTA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) -"aTB" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "aTC" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -16714,7 +16722,10 @@ }, /area/bigredv2/outside/general_store) "aTU" = ( -/obj/structure/machinery/message_server, +/obj/structure/prop/server_equipment/yutani_server{ + density = 0; + pixel_y = 16 + }, /turf/open/floor{ icon_state = "podhatchfloor" }, @@ -16724,12 +16735,6 @@ icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) -"aTX" = ( -/obj/structure/machinery/computer3/server, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/admin_building) "aTY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -16738,8 +16743,6 @@ }, /area/bigredv2/outside/admin_building) "aTZ" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/smg/mp27, /obj/structure/machinery/light{ dir = 4 }, @@ -16765,28 +16768,34 @@ }, /area/bigredv2/outside/admin_building) "aUd" = ( -/obj/structure/machinery/alarm{ - dir = 1; - pixel_y = -30 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 5; + icon_state = "darkred2" }, -/turf/open/floor/plating, /area/bigredv2/outside/admin_building) "aUe" = ( /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/machinery/alarm{ + dir = 1; + pixel_y = -30 + }, +/obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/plating, /area/bigredv2/outside/admin_building) "aUf" = ( /obj/effect/landmark/good_item, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 8; icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aUg" = ( -/obj/structure/surface/table/woodentable, -/obj/item/device/camera, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "wood" }, @@ -16940,20 +16949,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) -"aUB" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) -"aUC" = ( -/obj/effect/decal/remains/human, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "aUD" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -17180,12 +17175,10 @@ dir = 4 }, /turf/open/floor{ - icon_state = "dark" + icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) "aVk" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/pistol/mod88, /turf/open/floor{ dir = 8; icon_state = "redcorner" @@ -17414,13 +17407,11 @@ dir = 1; network = list("interrogation") }, -/obj/structure/machinery/computer3/server, /turf/open/floor{ icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) "aVT" = ( -/obj/structure/machinery/computer3/server, /turf/open/floor{ dir = 9; icon_state = "darkblue2" @@ -17436,7 +17427,6 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/photocopier, /turf/open/floor{ dir = 1; icon_state = "darkblue2" @@ -17452,13 +17442,16 @@ phone_id = "Operations"; pixel_y = 24 }, +/obj/item/prop/alien/hugger, /turf/open/floor{ dir = 1; icon_state = "darkblue2" }, /area/bigredv2/outside/admin_building) "aVX" = ( -/obj/structure/machinery/computer/cameras, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, /obj/structure/surface/table, /turf/open/floor{ dir = 5; @@ -17640,7 +17633,6 @@ }, /area/bigredv2/outside/admin_building) "aWD" = ( -/obj/structure/machinery/computer3/server, /turf/open/floor{ dir = 8; icon_state = "darkblue2" @@ -17660,7 +17652,9 @@ }, /area/bigredv2/outside/admin_building) "aWG" = ( -/obj/structure/machinery/computer/communications, +/obj/structure/machinery/computer/communications{ + dir = 8 + }, /obj/structure/surface/table, /turf/open/floor{ dir = 6; @@ -17668,10 +17662,10 @@ }, /area/bigredv2/outside/admin_building) "aWH" = ( -/obj/structure/surface/table/woodentable, -/obj/item/device/pinpointer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "wood" + dir = 1; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aWI" = ( @@ -17829,6 +17823,10 @@ pixel_y = 32 }, /obj/effect/landmark/good_item, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, /turf/open/floor{ dir = 1; icon_state = "darkred2" @@ -17843,12 +17841,9 @@ }, /area/bigredv2/outside/admin_building) "aXk" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +/obj/item/prop/alien/hugger, /turf/open/floor{ - dir = 4; - icon_state = "darkred2" + icon_state = "white" }, /area/bigredv2/outside/admin_building) "aXl" = ( @@ -18008,16 +18003,17 @@ /turf/open/floor/plating, /area/bigredv2/outside/cargo) "aXL" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 10; + dir = 8; icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aXM" = ( -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 8; - icon_state = "darkredcorners2" + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aXN" = ( @@ -18026,12 +18022,16 @@ density = 0; req_one_access_txt = "200" }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor{ dir = 10; icon_state = "darkblue2" }, /area/bigredv2/outside/admin_building) "aXO" = ( +/obj/item/prop/alien/hugger, /turf/open/floor{ icon_state = "darkblue2" }, @@ -18114,22 +18114,23 @@ /area/bigredv2/outside/cargo) "aYh" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/light{ - dir = 8 - }, /turf/open/floor{ dir = 8; - icon_state = "darkred2" + icon_state = "darkredcorners2" }, /area/bigredv2/outside/admin_building) "aYi" = ( /obj/effect/spawner/random/toolbox, +/obj/structure/platform_decoration, /turf/open/floor{ icon_state = "dark" }, /area/bigredv2/outside/admin_building) "aYk" = ( /obj/effect/landmark/survivor_spawner, +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor{ icon_state = "dark" }, @@ -18151,23 +18152,33 @@ }, /area/bigredv2/outside/admin_building) "aYo" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Operations Toilet" +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "delivery" + dir = 5; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aYp" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Operations Toilet" + }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYq" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/effect/landmark/objective_landmark/far, +/obj/structure/sink{ + pixel_x = 1; + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 29 + }, /turf/open/floor{ icon_state = "freezerfloor" }, @@ -18176,6 +18187,10 @@ /obj/structure/toilet{ dir = 8 }, +/obj/item/prop/alien/hugger, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor{ icon_state = "freezerfloor" }, @@ -18295,21 +18310,25 @@ }, /area/bigredv2/outside/c) "aYL" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 8; - icon_state = "carpet6-2" + icon_state = "dark" }, /area/bigredv2/outside/admin_building) "aYM" = ( +/obj/item/prop/alien/hugger, /turf/open/floor{ - dir = 8; - icon_state = "carpet14-10" + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aYN" = ( +/obj/structure/machinery/door/airlock/almayer/command/colony{ + dir = 1; + name = "\improper Operations Meeting Room" + }, /turf/open/floor{ - dir = 8; - icon_state = "carpet10-8" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYO" = ( @@ -18326,6 +18345,7 @@ name = "Weyland-Yutani Automatic Teller Machine"; pixel_y = 30 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 1; icon_state = "darkred2" @@ -18335,6 +18355,7 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 1; icon_state = "darkred2" @@ -18511,9 +18532,9 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/item/prop/alien/hugger, /turf/open/floor{ - dir = 8; - icon_state = "carpet7-3" + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "aZA" = ( @@ -18524,16 +18545,10 @@ /area/bigredv2/outside/admin_building) "aZB" = ( /obj/structure/bed/chair/comfy/black, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aZC" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aZE" = ( /turf/open/floor{ @@ -18619,27 +18634,26 @@ /turf/open/floor, /area/bigredv2/outside/cargo) "aZS" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname{ + dir = 1 + }, /turf/open/floor{ - dir = 8; - icon_state = "carpet7-3" + icon_state = "white" }, /area/bigredv2/outside/admin_building) "aZT" = ( /obj/structure/surface/table, -/obj/structure/machinery/computer3/laptop/secure_data, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/obj/structure/prop/server_equipment/laptop/on, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aZU" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/bed/chair/comfy/blue{ dir = 8 }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aZW" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -18863,13 +18877,10 @@ }, /area/bigredv2/outside/cargo) "baG" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/bed/chair/comfy/blue{ dir = 4 }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "baI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ @@ -18881,6 +18892,7 @@ /area/bigredv2/outside/admin_building) "baJ" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) "baK" = ( @@ -19021,10 +19033,7 @@ "bbj" = ( /obj/structure/surface/table, /obj/item/alienjar, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bbk" = ( /obj/structure/machinery/light{ @@ -19050,7 +19059,9 @@ /area/bigredv2/outside/admin_building) "bbm" = ( /obj/structure/surface/table, -/obj/structure/machinery/computer/med_data/laptop, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 4 + }, /turf/open/floor{ dir = 8; icon_state = "carpet15-15" @@ -19065,11 +19076,14 @@ }, /area/bigredv2/outside/admin_building) "bbo" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/comfy/blue, +/obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) "bbp" = ( -/obj/structure/bed/chair, +/obj/structure/bed/sofa/south/grey/left{ + pixel_y = 6 + }, /obj/structure/machinery/atm{ name = "Weyland-Yutani Automatic Teller Machine"; pixel_y = 30 @@ -19077,7 +19091,9 @@ /turf/open/floor, /area/bigredv2/outside/admin_building) "bbq" = ( -/obj/structure/bed/chair, +/obj/structure/bed/sofa/south/grey{ + pixel_y = 6 + }, /obj/structure/machinery/light{ dir = 1 }, @@ -19087,6 +19103,7 @@ /obj/structure/surface/table, /obj/item/storage/photo_album, /obj/item/tool/pen/red, +/obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) "bbs" = ( @@ -19308,14 +19325,16 @@ }, /area/bigredv2/outside/admin_building) "bbY" = ( -/obj/structure/bed/chair/office/dark, +/obj/structure/bed/chair/comfy/blue, /turf/open/floor{ icon_state = "wood" }, /area/bigredv2/outside/admin_building) "bbZ" = ( /obj/structure/surface/table, -/obj/structure/machinery/computer/cameras/wooden_tv, +/obj/structure/machinery/computer/cameras/wooden_tv{ + dir = 8 + }, /obj/structure/machinery/light{ dir = 4 }, @@ -19526,53 +19545,47 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/obj/item/prop/alien/hugger, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bcF" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/bed/chair/comfy/blue{ dir = 8 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bcG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bcH" = ( /obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "bcI" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 8; icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bcJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 4; + dir = 8; icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) @@ -19736,45 +19749,38 @@ }, /area/bigredv2/outside/c) "bdl" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 8; - icon_state = "carpet9-4" + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bdm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 +/obj/structure/surface/table/woodentable, +/turf/open/floor{ + icon_state = "wood" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "bdn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/command/colony{ - name = "\improper Operations Meeting Room" +/obj/structure/machinery/light{ + dir = 1 }, +/obj/structure/surface/table/woodentable, +/obj/item/device/camera, /turf/open/floor{ - icon_state = "delivery" + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "bdo" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, /turf/open/floor{ - icon_state = "dark" + dir = 10; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bdp" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - frequency = 1469; - name = "General Listening Channel"; - pixel_x = 30 - }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger, /turf/open/floor{ - dir = 4; + dir = 6; icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) @@ -19787,6 +19793,7 @@ /area/bigredv2/outside/admin_building) "bdr" = ( /obj/structure/machinery/vending/snack, +/obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) "bds" = ( @@ -19909,7 +19916,9 @@ /area/bigredv2/outside/cargo) "bdO" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor, +/turf/open/floor{ + icon_state = "wood" + }, /area/bigredv2/outside/admin_building) "bdP" = ( /obj/structure/machinery/photocopier, @@ -27159,6 +27168,15 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_se) +"bMa" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/pistol/mod88, +/obj/item/weapon/gun/pistol/mod88, +/turf/open/floor{ + dir = 8; + icon_state = "redcorner" + }, +/area/bigredv2/outside/admin_building) "bMf" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -27198,6 +27216,10 @@ icon_state = "mars_cave_18" }, /area/bigredv2/outside/lz2_west_cas) +"bQe" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor, +/area/bigredv2/outside/admin_building) "bQi" = ( /turf/open/floor{ icon_state = "darkish" @@ -27310,10 +27332,7 @@ "caN" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "ccP" = ( /obj/structure/surface/table, @@ -27326,6 +27345,11 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/lz2_west_cas) +"cec" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa, +/turf/open/floor/plating, +/area/bigredv2/outside/cargo) "ced" = ( /obj/effect/landmark/corpsespawner/ua_riot, /obj/item/weapon/gun/rifle/m41a/training, @@ -27516,6 +27540,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"czS" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating, +/area/bigredv2/outside/admin_building) "czV" = ( /obj/item/tool/pickaxe, /turf/open/mars_cave{ @@ -27615,6 +27643,23 @@ /obj/item/paper/bigred/smuggling, /turf/open/floor, /area/bigredv2/outside/cargo) +"cJa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/airlock/almayer/command/colony{ + dir = 1; + name = "\improper Operations" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "cJh" = ( /obj/structure/bed/chair{ dir = 8; @@ -27728,6 +27773,14 @@ "cVY" = ( /turf/open/mars, /area/bigredv2/outside/space_port_lz2) +"cXG" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "cYI" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27797,6 +27850,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"din" = ( +/obj/structure/machinery/blackbox_recorder, +/obj/item/prop/almayer/flight_recorder/colony{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, +/area/bigredv2/outside/admin_building) "dlr" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor, @@ -27948,6 +28011,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dBm" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "dBE" = ( /obj/item/trash/cigbutt/cigarbutt{ pixel_x = 2; @@ -28381,6 +28452,12 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"eoU" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y2" + }, +/area/bigredv2/outside/admin_building) "epe" = ( /turf/open/floor{ dir = 1; @@ -28667,6 +28744,15 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"eSN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "eTj" = ( /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/mars{ @@ -28800,6 +28886,15 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor, /area/bigredv2/outside/engineering) +"fhy" = ( +/obj/structure/bed/chair/comfy/blue{ + dir = 8 + }, +/turf/open/floor{ + dir = 8; + icon_state = "carpet15-15" + }, +/area/bigredv2/outside/admin_building) "fhI" = ( /obj/effect/landmark/hunter_secondary, /turf/open/mars_cave{ @@ -29135,6 +29230,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"fPB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/bigredv2/outside/admin_building) "fQv" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -29407,6 +29506,20 @@ icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) +"gvI" = ( +/obj/structure/transmitter/colony_net{ + dir = 4; + do_not_disturb = 1; + 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) "gxJ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -29576,13 +29689,19 @@ icon_state = "darkblue2" }, /area/bigredv2/caves/eta/research) -"gXh" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +"gWU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" + icon_state = "dark" }, -/area/bigredv2/caves_lambda) +/area/bigredv2/outside/admin_building) "gXp" = ( /turf/open/mars_cave{ icon_state = "mars_cave_6" @@ -29672,6 +29791,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/bigredv2/caves/eta/storage) +"hkY" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "hmm" = ( /turf/open/floor{ icon_state = "delivery" @@ -29755,20 +29883,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/filtration_plant) -"htp" = ( -/obj/structure/transmitter/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) "hvQ" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -29791,6 +29905,13 @@ icon_state = "dark" }, /area/bigredv2/caves/lambda/research) +"hxs" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "hyv" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -30323,6 +30444,17 @@ icon_state = "darkgreencorners2" }, /area/bigredv2/caves/eta/research) +"iDT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "darkredcorners2" + }, +/area/bigredv2/outside/admin_building) "iDW" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -30489,6 +30621,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"iZc" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "iZh" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" @@ -30594,11 +30734,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, @@ -30628,6 +30763,12 @@ /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"jna" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor{ + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "jnR" = ( /turf/open/floor{ dir = 9; @@ -30735,8 +30876,13 @@ }, /area/bigredv2/caves/lambda/virology) "jAm" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/effect/landmark/objective_landmark/far, +/obj/structure/coatrack{ + pixel_x = -8; + pixel_y = 16 + }, +/obj/item/clothing/shoes/black{ + pixel_y = -7 + }, /turf/open/floor{ icon_state = "wood" }, @@ -30890,15 +31036,6 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) -"jNO" = ( -/obj/structure/machinery/sensortower{ - pixel_x = -9 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "jOc" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -31240,6 +31377,14 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"khP" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "khR" = ( /obj/structure/machinery/floodlight, /turf/open/mars_cave{ @@ -31465,6 +31610,13 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/space_port_lz2) +"kIv" = ( +/obj/structure/curtain/red, +/obj/item/prop/alien/hugger, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "kIW" = ( /obj/structure/fence, /turf/open/floor{ @@ -31523,6 +31675,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_research) +"kNP" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "kPu" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -31550,6 +31710,10 @@ "kRo" = ( /turf/open/floor/plating, /area/bigredv2/outside/telecomm/warehouse) +"kRK" = ( +/obj/structure/window/framed/solaris/reinforced, +/turf/open/floor/plating, +/area/bigredv2/outside/admin_building) "kSm" = ( /obj/item/storage/belt/grenade, /obj/structure/closet/crate, @@ -31921,6 +32085,15 @@ }, /turf/closed/wall/solaris, /area/bigredv2/outside/cargo) +"lMw" = ( +/obj/structure/machinery/sensortower{ + pixel_x = -9 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "lMB" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz1cave" @@ -32172,13 +32345,9 @@ }, /area/bigredv2/caves/mining) "mrH" = ( -/obj/structure/machinery/blackbox_recorder, -/obj/item/prop/almayer/flight_recorder/colony{ - pixel_x = -6; - pixel_y = 10 - }, +/obj/structure/machinery/computer3/server, /turf/open/floor{ - icon_state = "dark" + icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) "mrS" = ( @@ -32294,6 +32463,16 @@ icon_state = "mars_cave_15" }, /area/bigredv2/outside/lz1_north_cas) +"mEH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "mFT" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/landmark/corpsespawner/russian, @@ -32311,7 +32490,7 @@ "mGS" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/floor{ - icon_state = "dark" + icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) "mHp" = ( @@ -32402,6 +32581,18 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"mST" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "mUy" = ( /turf/open/mars_cave{ icon_state = "mars_cave_7" @@ -32513,6 +32704,11 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz2_south_cas) +"nky" = ( +/obj/structure/machinery/vending/coffee, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor, +/area/bigredv2/outside/admin_building) "nkQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_23" @@ -32615,6 +32811,16 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"nuw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "nwS" = ( /obj/item/ore{ pixel_x = -7; @@ -32688,6 +32894,13 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"nFH" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "nGm" = ( /obj/structure/fence, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -32867,6 +33080,14 @@ /obj/item/tool/warning_cone, /turf/open/mars, /area/bigredv2/outside/s) +"nZD" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "nZK" = ( /obj/item/ore/diamond, /obj/item/stack/sheet/mineral/diamond{ @@ -32910,6 +33131,15 @@ icon_state = "wood" }, /area/bigredv2/caves/eta/living) +"ocR" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "odw" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -32999,6 +33229,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"ole" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y0" + }, +/area/bigredv2/outside/admin_building) "olT" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/shuttle/escapepod{ @@ -33219,12 +33455,30 @@ icon_state = "vault" }, /area/bigredv2/outside/general_offices) +"oDW" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "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) +"oFY" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/prop/alien/hugger, +/turf/open/floor{ + dir = 8; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "oIc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; @@ -33393,6 +33647,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) +"oWe" = ( +/obj/structure/machinery/photocopier{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkblue2" + }, +/area/bigredv2/outside/admin_building) "oWC" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -33515,6 +33779,12 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/outside/filtration_plant) +"pdG" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "pdN" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz1entrance" @@ -33668,6 +33938,31 @@ icon_state = "mars_cave_14" }, /area/bigredv2/caves/mining) +"pxH" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) +"pyU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "pBD" = ( /turf/open/floor{ dir = 4; @@ -33771,6 +34066,16 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) +"pNU" = ( +/obj/structure/bed, +/obj/item/prop/alien/hugger, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "pOL" = ( /obj/structure/closet/crate/miningcar/yellow, /turf/open/mars_cave{ @@ -34075,6 +34380,12 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"qoN" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "qpn" = ( /obj/item/tool/warning_cone{ pixel_x = -6 @@ -34141,6 +34452,16 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"qyi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkredcorners2" + }, +/area/bigredv2/outside/admin_building) "qzO" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -34347,6 +34668,13 @@ icon_state = "mars_cave_17" }, /area/bigredv2/caves/mining) +"qXi" = ( +/obj/structure/surface/table/woodentable, +/obj/item/device/pinpointer, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "qYY" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -34523,6 +34851,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"rpI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "rqa" = ( /obj/structure/tunnel{ id = "hole4" @@ -35244,6 +35582,15 @@ icon_state = "delivery" }, /area/bigredv2/caves_lambda) +"szi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "szw" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_6" @@ -35366,7 +35713,7 @@ }, /area/bigredv2/caves_sw) "sLS" = ( -/obj/effect/landmark/objective_landmark/medium, +/obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/plating, /area/bigredv2/outside/admin_building) "sNQ" = ( @@ -35405,6 +35752,17 @@ icon_state = "mars_cave_23" }, /area/bigredv2/outside/lz1_telecomm_cas) +"sRy" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/command/colony{ + name = "\improper Operations Meeting Room" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "sSU" = ( /turf/open/mars_cave{ icon_state = "mars_cave_19" @@ -35475,6 +35833,12 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/xenobiology) +"tap" = ( +/obj/structure/machinery/message_server, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, +/area/bigredv2/outside/admin_building) "tcb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pizzabox/meat, @@ -35486,6 +35850,15 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves_research) +"tdn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "tdp" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" @@ -35631,6 +36004,11 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves_research) +"toA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger, +/turf/open/floor, +/area/bigredv2/outside/admin_building) "tpR" = ( /obj/structure/bed/chair{ dir = 4; @@ -35784,6 +36162,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"tBD" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "w-y1" + }, +/area/bigredv2/outside/admin_building) "tBK" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe{ @@ -35877,6 +36261,19 @@ }, /turf/open/floor, /area/bigred/ground/garage_workshop) +"tJn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "tJv" = ( /obj/structure/tunnel{ id = "hole3" @@ -36167,12 +36564,19 @@ icon_state = "delivery" }, /area/bigredv2/outside/telecomm/lz2_cave) +"uoj" = ( +/obj/effect/decal/remains/human, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "upE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigred/ground/garage_workshop) "upV" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ icon_state = "delivery" }, @@ -36381,6 +36785,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"uKH" = ( +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) "uNW" = ( /obj/effect/decal/cleanable/blood{ dir = 8; @@ -36659,6 +37073,15 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"vpx" = ( +/obj/structure/platform, +/obj/structure/flora/jungle/planttop1{ + pixel_y = 10 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "vpY" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "eta"; @@ -36865,6 +37288,19 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_virology) +"vOs" = ( +/obj/structure/coatrack{ + pixel_x = 12 + }, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/storage/windbreaker/windbreaker_gray{ + pixel_x = 11; + pixel_y = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "vPP" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 6 @@ -37008,16 +37444,31 @@ }, /area/space) "weO" = ( -/obj/structure/closet/secure_closet/medical_wall, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" +/obj/structure/closet/secure_closet/medical_wall{ + pixel_y = -5 }, +/turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) "wfd" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"wfk" = ( +/obj/structure/filingcabinet/medical{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/medical{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) "wfm" = ( /obj/structure/bed/chair{ buckling_y = 5; @@ -37223,6 +37674,12 @@ icon_state = "delivery" }, /area/bigredv2/caves/lambda/virology) +"wxo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "wBi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -37288,6 +37745,24 @@ /obj/structure/closet/firecloset/full, /turf/open/mars, /area/bigredv2/outside/c) +"wGD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/item/prop/alien/hugger, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "wGF" = ( /obj/item/tool/warning_cone, /turf/open/floor{ @@ -37301,6 +37776,16 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"wHx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkredcorners2" + }, +/area/bigredv2/outside/admin_building) "wIw" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -37503,6 +37988,15 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"xej" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "xeN" = ( /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/mars_cave{ @@ -37803,6 +38297,14 @@ }, /turf/open/floor, /area/bigredv2/outside/engineering) +"xBn" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) "xBr" = ( /obj/item/ore{ pixel_x = 9 @@ -37889,6 +38391,13 @@ /obj/structure/prop/server_equipment/yutani_server, /turf/open/floor/greengrid, /area/bigredv2/caves/lambda/research) +"xKG" = ( +/obj/structure/bed/sofa/south/grey/right{ + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor, +/area/bigredv2/outside/admin_building) "xLM" = ( /obj/structure/machinery/light{ dir = 1 @@ -44266,8 +44775,8 @@ aao aao aao aao -uHQ weO +pSa wtj rKs wJd @@ -50488,7 +50997,7 @@ aOB aOB aNm aoH -jjt +cec aXH asK aZn @@ -54602,7 +55111,7 @@ aHF aHF apC apC -apC +apJ apJ apJ apC @@ -54612,7 +55121,7 @@ apC apC apJ apJ -apC +apJ apC apC apC @@ -54825,19 +55334,19 @@ aRT aof aTV mGS -aTV +tap aof aNK aXL +bdo aof -aYL -aZz -aZS -aZS -aZS -aZS aZz -bcM +aOO +aOO +aOO +aOO +cXG +aOO apC apC aHD @@ -55038,23 +55547,23 @@ aGD aMf aPL aMf -aMf +aXk aof aTV -aOM aTV +din aof -aNL -aUb +aWH +aOM +jna asT -aYM -aZA -aZA +aZC +aZC baG -aZA +aZC baG -aZA -bcN +aZC +aOO bdO apC aHD @@ -55258,21 +55767,21 @@ aQW aRU aof aTU -aOM +wGD aTV aof aYU +aOM aUb asT -aYM aZB aZT aIY bbj caN bcE -bcN -aYO +aOO +aOO apC aHD aBR @@ -55466,7 +55975,7 @@ awQ aJl aKo aKo -aKo +aSX aMF aNz aKo @@ -55475,21 +55984,21 @@ aQX aRV aof aTV -aOM +gWU aVS aof aXg +aOM aUb -asT -aYM -aZA +aof +aZC aZU -aZA +aZC aZU -aZA +aZC bcF -bcN -aYO +aOO +aOO apD aHD aBR @@ -55683,7 +56192,7 @@ aDN ayN aKp aQW -aMf +aTb kmm aNA aMf @@ -55691,13 +56200,13 @@ aMf aQY aMf aSQ +tJn +pyU +tJn +cJa +iZc aOM aOM -aOM -aSQ -aNL -aUb -asT aYN aZC aZC @@ -55705,8 +56214,8 @@ aZC aZC aZC bcG -bdl -aYO +aOO +aOO apD aHD aBR @@ -55908,22 +56417,22 @@ aPM aQZ aRX aof -aTX +mrH aVj mrH aof -aNL +uKH +aOM aUb -asT -aYO -aYO -aYO -aYO -aYO -aYO +aof +aOO +aOO +aOO +aOO +aOO bcH -bdm -aYO +aOO +aOO apC aHD aBR @@ -56118,7 +56627,7 @@ alu aKq aHF aHF -apC +apD aNC aMf aPN @@ -56130,19 +56639,19 @@ aof aof aof aNL +aOM aUb aof -asT -asT -asT +aof asT asT asT aof -bdn +sRy +aof aof apC -aHD +wxo aBR aBR bhi @@ -56337,9 +56846,9 @@ aHF aHF apD aND +aXk aMf -aMf -aQZ +aZS aof aSR aTY @@ -56347,19 +56856,19 @@ aTY aTY aWC aXj -aXM +aOI aYh -aRd -aRd +oDW +oFY bcI -aRd +bcJ aRd aVl -bcI +qoN bdo -aXL -apC -aHD +apD +bhU +wxo aBR aBR bhi @@ -56561,21 +57070,21 @@ aof aSS aTZ aVk -aVk +bMa aof -aSV +mEH aOM aYi -aOM -aOM +xBn +nZD aPS aOM aOM aOM aPS -aOM -aUb -apC +bdl +apD +bhU aHD aBR aBR @@ -56780,19 +57289,19 @@ aof aof aof aof -aSV -aOM +mEH aOM +vpx aFd -aOM +khP aZW aOK bbk aOK -bcJ +aPS bdp -aUc -apC +apD +aHF aHD aBR aBR @@ -56996,12 +57505,12 @@ aST aRd aVl aRd -aRd +bcJ aSW aOM aYk -aOM -aOM +dBm +pxH aZX aof aof @@ -57211,11 +57720,11 @@ aRc aof aSU aUa +aXM aOK aOK aOK -aXk -aOK +hkY aYl aYS aOM @@ -57427,11 +57936,11 @@ aof aof aof aSV -aUb -aof -aof +bdl aof aof +kRK +kRK aof aof aYT @@ -57641,17 +58150,17 @@ apD aNI aRd bcI -aRd +bcJ aRY aSW -aUb -aof +bdl +kRK aVT aWD aWD aXN -aof -aYU +kRK +aWH aOM aZY aof @@ -57659,7 +58168,7 @@ bbm aJb bcN aof -aJT +wfk apC aHD aIn @@ -57855,27 +58364,27 @@ aBR aBR aMc apD -aNJ -aOK +aUd +aXM aPS aOM aOK aOK aUc -aof +aYm aVU aOM aOM aXO -aof +kRK aNL aOM aZX aof -aZU +fhy aZA bcN -aOO +kIv aOO apC aHD @@ -58290,21 +58799,21 @@ aBR aMc apD aNK -aOL +aXL aPS aOM aof wvK -aSX +wvK aof -aVU +oWe aOM aXl aXP aof aNL aOM -aZX +szi aof aNQ aOO @@ -58512,16 +59021,16 @@ aPS aOM aRZ aTa -aUd -aof +aTa +aRZ aVU aWE aXm aXQ -aof +kRK aYV aOM -aZX +szi aof aOO bbY @@ -58729,12 +59238,12 @@ aPS aUb aof aSZ -aTa +czS aof aVW aWF aof -aof +kRK aof aYU aOM @@ -58943,18 +59452,18 @@ apC aNN aOM aPS -aUb +bdl aof sLS aUe aof aVX aWG -aof +kRK aNK -aOL -aYW -aOM +mST +iDT +nuw aZX aof aof @@ -59157,7 +59666,7 @@ aBR aBR aMc apD -aNL +aWH aOM aPS aRh @@ -59165,20 +59674,20 @@ aof aof aof aof +kRK +kRK aof -aof -aof -aNL -aOM -aOM -aOM +aWH +xej +ole +eSN aPS baI aYO bca bcQ bdr -bdO +nky apC beC aNw @@ -59378,24 +59887,24 @@ aNL aOM aPV aRi -aOL -aOL +aXL +aXL aUf aVm aOL aOL aOL aYW -aOM -aOM -aOM +xej +tBD +eSN aZZ upV baJ bcb bcR bcc -aYO +toA apC aTh aIn @@ -59591,28 +60100,28 @@ aKr aBR aMc apC -aNJ -aOM -aOK +aUd +aYL +aYM aOK aOK aOM aOK aOK aOK -aOM -aOK -aOK -aOM +aYL +aXM aOK -aYS -aUb +wHx +eoU +eSN +bdl aof bbo bcc bcS bcc -aYO +bQe apD aTh aIn @@ -59821,9 +60330,9 @@ aON aof aof aYo -aof -aNL -aUb +rpI +qyi +bdl aof bbp bcc @@ -60029,17 +60538,17 @@ aNO aOO aPW aof -aNO +bdm aOO -aPW +vOs aof jAm aOO -aPW +hxs aof aYp aof -aNL +aWH aUb aof bbq @@ -60246,20 +60755,20 @@ aNP aOO aOO aof -aNP +bdn aOO aOO aof aNP -aOO -aOO +pdG +qXi aof aYq aof -aNL +aWH aUb aof -bbo +xKG aTa bcV bdt @@ -60463,12 +60972,12 @@ aNQ aGG aPX aof -aNQ -aTb +pNU +aOO aUg aof aNQ -aWH +aOO aXn aof aYr @@ -60477,10 +60986,10 @@ aNJ aUc aof bbr +toA aYO -aYO -aTa -aYO +fPB +bQe bek bjZ aMg @@ -74321,7 +74830,7 @@ adZ aqX arE asn -htp +gvI amk ajm aqc @@ -77173,8 +77682,8 @@ aOn aOn aOn aTv -aTA -aUB +tdn +kNP wQC gXp qQn @@ -77390,8 +77899,8 @@ gXp gXp gXp aTw -aTB -aUC +ocR +uoj wQC tQw aWN @@ -77606,7 +78115,7 @@ tQw ahw tQw tQw -gXh +nFH aTv aMT tQw @@ -77824,7 +78333,7 @@ tQw xFZ xFZ aSm -jNO +lMw aMT tQw xFZ diff --git a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm index e2b3e939a2e6..7a66b2422807 100644 --- a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm +++ b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm @@ -2,10 +2,6 @@ "ab" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/admin_building) -"ac" = ( -/obj/effect/acid_hole, -/turf/closed/wall/solaris, -/area/bigredv2/outside/admin_building) "ad" = ( /obj/structure/window/framed/solaris, /turf/open/floor/plating, @@ -15,88 +11,68 @@ /area/bigredv2/outside/admin_building) "af" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/light{ - dir = 8 - }, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor{ - icon_state = "darkred2"; - dir = 8 + dir = 8; + icon_state = "darkredcorners2" }, /area/bigredv2/outside/admin_building) "ag" = ( /obj/effect/spawner/random/toolbox, +/obj/structure/platform_decoration, /turf/open/floor{ icon_state = "dark" }, /area/bigredv2/outside/admin_building) "ai" = ( /obj/effect/landmark/survivor_spawner, +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor{ icon_state = "dark" }, /area/bigredv2/outside/admin_building) "aj" = ( +/turf/open/floor{ + icon_state = "darkred2" + }, +/area/bigredv2/outside/admin_building) +"ak" = ( /obj/structure/window_frame/solaris, /obj/item/shard, /turf/open/floor/plating, /area/bigredv2/outside/admin_building) -"ak" = ( -/obj/structure/barricade/metal/wired{ - icon_state = "metal_2"; - dir = 1 - }, -/turf/open/floor{ - icon_state = "carpet14-10"; - dir = 8 - }, -/area/bigredv2/outside/admin_building) "al" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/command/colony{ + dir = 1; + name = "\improper Operations Meeting Room" }, /turf/open/floor{ - icon_state = "carpet10-8"; - dir = 8 + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "am" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 - }, -/obj/structure/barricade/metal/wired{ - icon_state = "metal_2"; - dir = 4 +/obj/structure/platform, +/obj/structure/flora/jungle/planttop1{ + pixel_y = 10 }, -/obj/item/ammo_magazine/rifle{ - current_rounds = 0; - pixel_x = -9; - pixel_y = -4 +/turf/open/floor{ + icon_state = "dark" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "an" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "darkred2"; - dir = 8 + dir = 8; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "ap" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/jungle{ - bushes_spawn = 0; - icon_state = "grass_impenetrable" +/obj/structure/flora/jungle/plantbot1{ + pixel_y = 10 }, +/turf/open/jungle, /area/bigredv2/outside/admin_building) "ar" = ( /obj/structure/machinery/light{ @@ -106,38 +82,30 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 - }, -/area/bigredv2/outside/admin_building) -"as" = ( -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "at" = ( /obj/structure/bed/chair/comfy/black, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "au" = ( /obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "av" = ( /obj/structure/barricade/metal/wired{ - icon_state = "metal_2"; - dir = 4 + dir = 4; + icon_state = "metal_2" + }, +/turf/open/floor{ + icon_state = "wood" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "aw" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor{ icon_state = "dark" @@ -151,33 +119,23 @@ "aA" = ( /obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "aB" = ( /obj/structure/surface/table, -/obj/structure/machinery/computer3/laptop/secure_data, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/obj/structure/prop/server_equipment/laptop/on, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "carpet15-15"; +/obj/structure/bed/chair/comfy/blue{ dir = 8 }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aD" = ( -/obj/item/stack/sheet/metal/small_stack, -/turf/open/floor{ - icon_state = "carpet6-2"; - dir = 8 - }, +/obj/effect/acid_hole, +/turf/closed/wall/solaris, /area/bigredv2/outside/admin_building) "aG" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -196,20 +154,11 @@ icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) -"aI" = ( -/turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 - }, -/area/bigredv2/outside/admin_building) "aJ" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/bed/chair/comfy/blue{ dir = 4 }, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aK" = ( /obj/structure/surface/table, @@ -219,54 +168,41 @@ name = "dented M4A3 service pistol" }, /obj/item/ammo_magazine/pistol/rubber, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aL" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aM" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/sandbags/wired, /turf/open/floor{ - icon_state = "darkred2"; - dir = 8 + dir = 8; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aN" = ( /obj/structure/barricade/sandbags/wired, /turf/open/floor{ - icon_state = "darkred2"; - dir = 4 + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aO" = ( /obj/item/storage/secure/briefcase, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aP" = ( /obj/structure/barricade/metal/wired{ dir = 4 }, -/turf/open/floor, -/area/bigredv2/outside/admin_building) -"aQ" = ( /turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) -"aR" = ( -/turf/open/floor, +"aQ" = ( +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aS" = ( /obj/item/ammo_magazine/rifle/rubber{ @@ -274,10 +210,7 @@ pixel_x = -3; pixel_y = -6 }, -/turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aT" = ( /obj/effect/decal/cleanable/blood, @@ -291,38 +224,32 @@ }, /obj/item/storage/toolbox/syndicate, /turf/open/floor{ - icon_state = "darkred2"; - dir = 4 + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aV" = ( /obj/structure/surface/table, /obj/item/ammo_magazine/rifle/rubber, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aW" = ( /obj/effect/decal/cleanable/blood, /obj/item/tool/weldingtool, -/turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "aX" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/crap_item, /turf/open/floor{ - icon_state = "darkred2"; - dir = 8 + dir = 8; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aY" = ( /turf/open/floor{ - icon_state = "darkred2"; - dir = 4 + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "aZ" = ( @@ -338,8 +265,7 @@ num_of_magazines = 2 }, /turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "ba" = ( @@ -348,52 +274,45 @@ dir = 4 }, /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bb" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/bed/chair/comfy/blue{ dir = 8 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/landmark/corpsespawner/wygoon, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "carpet11-12"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "bd" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, /obj/item/ammo_magazine/rifle{ current_rounds = 0; pixel_x = -8; pixel_y = 9 }, -/turf/open/floor, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, /area/bigredv2/outside/admin_building) "be" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, /turf/open/floor{ - icon_state = "darkred2"; - dir = 8 + dir = 8; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bf" = ( @@ -409,8 +328,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "darkred2"; - dir = 4 + dir = 4; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bh" = ( @@ -429,43 +348,28 @@ num_of_magazines = 1 }, /turf/open/floor{ - icon_state = "carpet5-1"; - dir = 8 - }, -/area/bigredv2/outside/admin_building) -"bj" = ( -/turf/open/floor{ - icon_state = "carpet13-5"; - dir = 8 - }, -/area/bigredv2/outside/admin_building) -"bk" = ( -/turf/open/floor{ - icon_state = "carpet9-4"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "bl" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 +/turf/open/floor{ + icon_state = "wood" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "bm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/machinery/door/airlock/almayer/command/colony{ - name = "\improper Operations Meeting Room" +/turf/open/floor{ + dir = 8; + icon_state = "darkred2" }, -/turf/open/floor, /area/bigredv2/outside/admin_building) "bn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, /turf/open/floor{ - icon_state = "dark" + dir = 10; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bo" = ( @@ -476,30 +380,21 @@ pixel_x = 30 }, /turf/open/floor{ - icon_state = "darkred2"; - dir = 4 + dir = 6; + icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) "bp" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor, /area/bigredv2/outside/admin_building) -"bq" = ( -/turf/open/floor{ - icon_state = "darkred2"; - dir = 10 - }, -/area/bigredv2/outside/admin_building) -"br" = ( -/turf/open/floor{ - icon_state = "darkred2" - }, -/area/bigredv2/outside/admin_building) "bs" = ( -/turf/open/floor{ - icon_state = "darkred2"; - dir = 6 +/obj/structure/window/framed/solaris/reinforced, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Operations"; + name = "\improper Operations Shutters" }, +/turf/open/floor/plating, /area/bigredv2/outside/admin_building) "dp" = ( /obj/item/ammo_magazine/rifle/rubber{ @@ -507,28 +402,24 @@ pixel_x = -6; pixel_y = -4 }, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "is" = ( /obj/item/ammo_magazine/pistol/rubber{ current_rounds = 0 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "wood" + }, /area/bigredv2/outside/admin_building) "jq" = ( /obj/item/weapon/gun/rifle/m41a/corporate{ current_mag = /obj/item/ammo_magazine/rifle/rubber; + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up."; name = "battered M41A pulse rifle MK2"; - pixel_x = 4; - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up." - }, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 + pixel_x = 4 }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "lz" = ( /obj/item/ammo_magazine/rifle/rubber{ @@ -536,8 +427,7 @@ pixel_y = 11 }, /turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "rv" = ( @@ -545,8 +435,7 @@ current_rounds = 0 }, /turf/open/floor{ - icon_state = "carpet7-3"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "si" = ( @@ -564,15 +453,52 @@ pixel_y = 17 }, /turf/open/floor{ - icon_state = "carpet13-5"; - dir = 8 + icon_state = "wood" }, /area/bigredv2/outside/admin_building) "uv" = ( /obj/item/ammo_magazine/rifle{ current_rounds = 0; - pixel_y = 7; - pixel_x = -9 + pixel_x = -9; + pixel_y = 7 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/admin_building) +"vH" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) +"vO" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) +"yf" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) +"za" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/command/colony{ + name = "\improper Operations Meeting Room" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, /turf/open/floor, /area/bigredv2/outside/admin_building) @@ -580,17 +506,25 @@ /obj/item/ammo_magazine/pistol/rubber{ current_rounds = 0 }, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "Br" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/regular/empty, +/turf/open/floor/carpet, +/area/bigredv2/outside/admin_building) +"ND" = ( +/obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 + icon_state = "dark" + }, +/area/bigredv2/outside/admin_building) +"Pk" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" }, /area/bigredv2/outside/admin_building) "QR" = ( @@ -600,7 +534,9 @@ /obj/item/ammo_magazine/pistol/rubber{ current_rounds = 0 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "wood" + }, /area/bigredv2/outside/admin_building) "Sz" = ( /obj/item/ammo_magazine/rifle/rubber{ @@ -608,14 +544,11 @@ pixel_x = 5; pixel_y = -5 }, -/turf/open/floor{ - icon_state = "carpet15-15"; - dir = 8 - }, +/turf/open/floor/carpet, /area/bigredv2/outside/admin_building) (1,1,1) = {" -ab +aj ab ab ab @@ -627,12 +560,12 @@ ab ab "} (2,1,1) = {" -ac +aj aD ar aA lz -aI +bl rv aZ bi @@ -646,7 +579,7 @@ AC aJ aO aJ -as +aQ si bp "} @@ -659,23 +592,23 @@ aK Br aV ba -bj +bl uv "} (5,1,1) = {" aj -ak +ae jq aC -as +aQ aC Sz bb -bj -aR +bl +bl "} (6,1,1) = {" -ad +ay al au aW @@ -683,12 +616,12 @@ aL aS aQ bc -bk +bl is "} (7,1,1) = {" -ad -am +aj +ae av aP aP @@ -696,35 +629,35 @@ QR aP bd bl -aR +bl "} (8,1,1) = {" -ae -aj aj -ad +ae +ae ad ad ad ae -bm +za +ae ae "} (9,1,1) = {" af -an +bm an be aM an aX -be +ND bn -bq +bs "} (10,1,1) = {" ag -ay +vO aw bf ay @@ -732,12 +665,12 @@ aT ay bf ay -br +bs "} (11,1,1) = {" -ay +am ap -ay +Pk aG aN aU @@ -748,8 +681,8 @@ bs "} (12,1,1) = {" ai -ay -ay +vH +yf aH ae ae diff --git a/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm b/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm index c29681e40bf4..f3fa4dbcc6e9 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/BigRed/standalone/medbay-passage.dmm b/maps/map_files/BigRed/standalone/medbay-passage.dmm index 75d323f0116d..d5b7db11d82b 100644 --- a/maps/map_files/BigRed/standalone/medbay-passage.dmm +++ b/maps/map_files/BigRed/standalone/medbay-passage.dmm @@ -61,6 +61,31 @@ "m" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/c) +"n" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/c) +"w" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -83,6 +108,16 @@ icon_state = "white" }, /area/bigredv2/outside/admin_building) +"X" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/c) (1,1,1) = {" a @@ -97,7 +132,7 @@ a a c h -l +n R "} (3,1,1) = {" @@ -105,7 +140,7 @@ a a d i -d +w S "} (4,1,1) = {" @@ -113,7 +148,7 @@ a a e l -l +X T "} (5,1,1) = {" diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index e265184172a6..ab1e9cbaa2fd 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -13345,16 +13345,6 @@ icon_state = "plate" }, /area/corsat/sigma/airlock/control) -"aLr" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/obj/item/tool/weldingtool, -/obj/item/clothing/head/welding, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "yellow" - }, -/area/corsat/gamma/engineering) "aLs" = ( /turf/open/floor/corsat{ dir = 1; @@ -31253,16 +31243,6 @@ icon_state = "yellow" }, /area/corsat/omega/maint) -"bLH" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/obj/item/tool/weldingtool, -/obj/item/clothing/head/welding, -/turf/open/floor/corsat{ - dir = 5; - icon_state = "yellow" - }, -/area/corsat/omega/maint) "bLI" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "Custodial Closet"; @@ -31960,16 +31940,6 @@ icon_state = "yellowcorner" }, /area/corsat/gamma/engineering) -"bNV" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/obj/item/tool/weldingtool, -/obj/item/clothing/head/welding, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/corsat{ - icon_state = "yellow" - }, -/area/corsat/sigma/south/engineering) "bNW" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/corsat{ @@ -37936,14 +37906,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{ @@ -38077,6 +38039,16 @@ icon_state = "officesquares" }, /area/corsat/gamma/administration) +"dNs" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/tool/weldingtool, +/obj/item/clothing/head/welding, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "yellow" + }, +/area/corsat/omega/maint) "dNC" = ( /turf/open/floor/corsat{ dir = 8; @@ -45748,6 +45720,14 @@ icon_state = "purplewhite" }, /area/corsat/gamma/biodome/complex) +"jpn" = ( +/obj/structure/surface/rack, +/obj/item/toy/plush/farwa, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "red" + }, +/area/corsat/omega/hangar/security) "jpB" = ( /turf/open/floor/corsat{ dir = 4; @@ -59316,6 +59296,16 @@ icon_state = "red" }, /area/corsat/sigma/hangar/checkpoint) +"tCi" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/tool/weldingtool, +/obj/item/clothing/head/welding, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "yellow" + }, +/area/corsat/gamma/engineering) "tCn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -60207,6 +60197,16 @@ icon_state = "red" }, /area/corsat/sigma/hangar/monorail/control) +"ukQ" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/tool/weldingtool, +/obj/item/clothing/head/welding, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/corsat{ + icon_state = "yellow" + }, +/area/corsat/sigma/south/engineering) "ukV" = ( /obj/structure/window_frame/corsat, /turf/open/floor/plating, @@ -80399,7 +80399,7 @@ bEp aZb pyL aiB -dGy +jpn lWG lWG lWG @@ -83306,7 +83306,7 @@ azE agQ qKN kyQ -bLH +dNs bOK mAt bLO @@ -96177,7 +96177,7 @@ roh mJy aRd aqi -aLr +tCi nxZ bQs aqi @@ -106604,7 +106604,7 @@ xhd auH bxL aCr -bNV +ukQ aEw aEw aEw diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index ed7688070a2f..4b760f41e5c0 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -10112,7 +10112,8 @@ icon_state = "S" }, /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/omega{ - pixel_y = 32 + pixel_y = 32; + shuttleId = "trijentshuttle22" }, /turf/open/floor/prison{ dir = 8; @@ -14387,7 +14388,13 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "aRB" = ( -/obj/docking_port/stationary/trijent_elevator/lz2, +/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" = ( @@ -20754,7 +20761,7 @@ /area/desert_dam/interior/dam_interior/tech_storage) "bmo" = ( /obj/structure/safe, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /obj/item/reagent_container/food/drinks/bottle/absinthe, /obj/structure/machinery/light{ dir = 1 @@ -61538,7 +61545,13 @@ /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/caves/temple) "ipQ" = ( -/obj/docking_port/stationary/trijent_elevator/omega, +/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) "iqs" = ( @@ -62546,7 +62559,8 @@ /area/desert_dam/exterior/valley/valley_labs) "mej" = ( /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/lz2{ - pixel_x = 32 + pixel_x = 32; + shuttleId = "trijentshuttle22" }, /turf/open/floor/prison{ dir = 4; @@ -63387,7 +63401,13 @@ }, /area/desert_dam/interior/caves/central_caves) "pif" = ( -/obj/docking_port/stationary/trijent_elevator/engineering, +/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" = ( @@ -64025,7 +64045,13 @@ /turf/open/desert/rock/deep, /area/desert_dam/interior/caves/temple) "rxS" = ( -/obj/docking_port/stationary/trijent_elevator/lz1, +/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" = ( diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm index 1dd3650ad747..d0ebbc5039d5 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 73ae1b5ef485..7928c7f06b71 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm @@ -2502,7 +2502,7 @@ /obj/structure/prop/wooden_cross{ pixel_y = 13 }, -/obj/item/toy/farwadoll, +/obj/item/toy/plush/farwa, /turf/open/mars{ icon_state = "mars_dirt_5" }, diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 0fd8b269d33c..5da17a318887 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -15559,7 +15559,7 @@ /area/prison/command/secretary_office) "aRX" = ( /obj/structure/surface/rack, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /turf/open/floor/wood, /area/prison/command/office) "aRY" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 0d4ed21934d0..7238b5ab66cb 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -7,109 +7,12 @@ }, /turf/open/space, /area/fiorina/oob) -"aac" = ( -/obj/structure/machinery/power/apc, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"aad" = ( -/obj/structure/machinery/power/apc, -/turf/open/floor/prison{ - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"aae" = ( -/obj/structure/machinery/power/apc, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"aaf" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/iv_drip{ - pixel_y = 19 - }, -/obj/item/bedsheet/green, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"aag" = ( -/obj/item/trash/eat, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"aah" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"aai" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"aaj" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "green" - }, -/area/fiorina/station/chapel) "aak" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "4" }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) -"aam" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "green" - }, -/area/fiorina/station/transit_hub) -"aan" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"aao" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"aap" = ( -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) "aaq" = ( /obj/structure/machinery/power/apc{ dir = 1 @@ -133,104 +36,132 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"aat" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/baton, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"aau" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +"aaR" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/station/research_cells) -"aav" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/item/weapon/baton, -/turf/open/floor/prison{ - icon_state = "redfull" +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/security) -"aaK" = ( +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"abG" = ( +/obj/item/trash/chunk, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/research_cells) -"aaW" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison, -/area/fiorina/station/security) -"abe" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/medbay) "abJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"acx" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "ppflowers_2" +"ace" = ( +/obj/effect/landmark{ + icon_state = "hive_spawn"; + name = "xeno_hive_spawn" }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"adk" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/tumor/aux_engi) +"ach" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2" + icon_state = "greenfull" }, /area/fiorina/tumor/servers) -"adl" = ( -/obj/structure/machinery/computer/secure_data, +"aco" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/reagent_container/food/drinks/sillycup{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = 1; + pixel_y = -1 }, /turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"acO" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_v" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"adq" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) -"adH" = ( -/obj/structure/closet/secure_closet/medical3, +"adE" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) -"adY" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +/area/fiorina/tumor/aux_engi) +"aeb" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" }, +/area/fiorina/tumor/servers) +"aej" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "damaged3" + }, +/area/fiorina/station/security) +"aeo" = ( +/obj/structure/monorail{ + name = "launch track" }, -/area/fiorina/station/disco) -"aee" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_tram) +"aeF" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibup1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"aeI" = ( +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, /area/fiorina/station/central_ring) -"aem" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/donkpockets{ - pixel_x = 5; - pixel_y = 9 +"aeS" = ( +/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/storage/box/donkpockets, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/ice_lab) "afk" = ( /turf/open/floor{ desc = "A sophisticated device that captures and converts light from the system's star into energy for the station."; @@ -238,6 +169,48 @@ name = "solarpanel" }, /area/fiorina/oob) +"afq" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" + }, +/area/fiorina/station/medbay) +"afO" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"afW" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"afX" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"aga" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/pills/lowchance, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"agh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/ice_lab) "agi" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/servers) @@ -291,32 +264,15 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"ahe" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ - icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"ahn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, +"ahm" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"aic" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"ahR" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform{ - dir = 8 + dir = 5; + icon_state = "darkyellow2" }, -/turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) "aif" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -325,54 +281,31 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"aiK" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, +"aik" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ icon_state = "darkbrown2" }, -/area/fiorina/station/park) -"aiV" = ( -/obj/structure/bed/roller, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"aja" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"ajh" = ( -/obj/item/device/flashlight/on, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrowncorners2" - }, /area/fiorina/tumor/aux_engi) -"aji" = ( -/obj/structure/prop/resin_prop{ - icon_state = "sheater0" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"aiv" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/area/fiorina/tumor/servers) -"ajp" = ( -/obj/structure/window/framed/prison, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "whitepurple" }, -/area/fiorina/station/medbay) -"ajr" = ( -/turf/open/floor/prison{ +/area/fiorina/station/research_cells) +"aje" = ( +/obj/structure/stairs/perspective{ dir = 4; - icon_state = "redcorner" + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/security) +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "aju" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -381,96 +314,84 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"ajw" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "ajx" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/space/basic, /area/fiorina/oob) -"ajD" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"ajP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/pizzabox/margherita, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"ajH" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/electrical{ - pixel_y = -3 + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 6 +/area/fiorina/station/medbay) +"ajZ" = ( +/obj/effect/landmark{ + icon_state = "hive_spawn"; + name = "xeno_hive_spawn" }, -/obj/structure/machinery/light/double/blue, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ + dir = 1; icon_state = "darkbrown2" }, -/area/fiorina/maintenance) -"ajK" = ( +/area/fiorina/tumor/aux_engi) +"akp" = ( /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "green" }, -/area/fiorina/station/park) -"ajN" = ( -/obj/structure/barricade/wooden, +/area/fiorina/station/chapel) +"akM" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkpurplefull2" }, +/area/fiorina/station/research_cells) +"akW" = ( +/obj/structure/bed/chair/janicart, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"ajX" = ( -/obj/structure/mirror{ - pixel_x = -29 - }, -/obj/structure/sink{ +"akZ" = ( +/obj/structure/machinery/light/double/blue{ dir = 8; - pixel_x = -12; - pixel_y = 2 + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "sterile_white" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/civres_blue) -"akc" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/station/telecomm/lz1_tram) +"alC" = ( +/obj/structure/inflatable/popped, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"akw" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "green" - }, /area/fiorina/station/transit_hub) -"akE" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/tumor/servers) -"alr" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) -"alu" = ( +"alK" = ( +/obj/item/trash/cigbutt/cigarbutt, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe" + icon_state = "darkyellow2" }, -/area/fiorina/oob) -"alJ" = ( -/obj/structure/inflatable/popped/door, +/area/fiorina/station/flight_deck) +"alP" = ( +/obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/park) "alX" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/prison/chapel_carpet{ @@ -478,6 +399,13 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"alY" = ( +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, +/area/fiorina/station/security) "amd" = ( /obj/effect/decal/hefa_cult_decals/d96, /obj/item/paper/crumpled/bloody, @@ -489,36 +417,39 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"ami" = ( -/obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"amj" = ( -/obj/structure/prop/resin_prop{ - icon_state = "sheater0" - }, +"amn" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"amx" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" + dir = 4; + icon_state = "whitepurple" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells) "amF" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/aux_engi) +"amZ" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "ane" = ( /obj/item/weapon/unathiknife{ name = "ceremonial knife" }, /turf/open/floor/wood, /area/fiorina/station/chapel) +"anl" = ( +/obj/item/pamphlet/engineer, +/obj/structure/closet, +/obj/item/handcuffs, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/lowsec) "anm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -543,6 +474,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"ann" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "anq" = ( /turf/closed/shuttle/ert{ icon_state = "stan9" @@ -555,13 +493,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"anG" = ( -/obj/structure/largecrate/supply, -/obj/structure/platform_decoration{ - dir = 8 +"any" = ( +/obj/item/stack/cable_coil/random, +/turf/open/floor/prison{ + icon_state = "redfull" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "anJ" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -575,125 +512,149 @@ }, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"aoa" = ( -/obj/structure/machinery/door/airlock/almayer/maint/autoname{ - name = "\improper Null Hatch REPLACE ME"; - req_access = null; - req_one_access = null +"anR" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"aoH" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"anT" = ( +/obj/item/reagent_container/food/snacks/meat, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"anW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/area/fiorina/tumor/ice_lab) -"apf" = ( -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"app" = ( -/obj/item/trash/pistachios, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "green" }, -/area/fiorina/tumor/ice_lab) -"apw" = ( -/turf/open/auto_turf/sand/layer1, -/area/fiorina/tumor/civres) -"apy" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 8 +/area/fiorina/station/chapel) +"aoo" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"aoZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + pixel_y = 11 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"aqI" = ( /turf/open/floor/prison{ - icon_state = "red" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security) -"aqJ" = ( -/obj/structure/monorail{ - dir = 6; - name = "launch track" +/area/fiorina/station/research_cells) +"ape" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, +/area/fiorina/maintenance) +"apf" = ( /turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"aqS" = ( -/obj/item/explosive/grenade/high_explosive/frag, +/area/fiorina/station/civres_blue) +"apu" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "blue" }, -/area/fiorina/tumor/servers) -"aqW" = ( -/obj/structure/platform{ - dir = 1 +/area/fiorina/station/power_ring) +"apw" = ( +/turf/open/auto_turf/sand/layer1, +/area/fiorina/tumor/civres) +"apO" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "whitegreen" }, -/obj/structure/platform{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"aqj" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform_decoration{ - dir = 9 +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"aqo" = ( +/obj/item/shard{ + icon_state = "large" }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) +"aqw" = ( +/obj/item/stool, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/civres_blue) "arl" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"arm" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "arn" = ( /obj/effect/landmark/nightmare{ insert_tag = "researchprestine" }, /turf/closed/wall/prison, /area/fiorina/station/research_cells) -"arq" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/obj/item/stack/sheet/metal{ - amount = 5 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"art" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/lz/near_lzI) -"aru" = ( -/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + dir = 10; + icon_state = "greenblue" }, -/area/fiorina/station/lowsec) -"arS" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "2" +/area/fiorina/station/botany) +"arG" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/servers) -"arY" = ( +/area/fiorina/tumor/aux_engi) +"arT" = ( /obj/structure/stairs/perspective{ - dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, /turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/power_ring) +"arW" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/oob) +"asf" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "ask" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -705,12 +666,48 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) +"aso" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "ast" = ( /obj/structure/machinery/power/apc{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) +"asz" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) +"asE" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"asI" = ( +/obj/item/toy/deck, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"atd" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "atl" = ( /obj/structure/platform{ dir = 1 @@ -729,13 +726,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"atm" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/telecomm/lz1_tram) "atp" = ( /obj/item/book/manual/security_space_law{ pixel_x = 3; @@ -743,31 +733,26 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"atx" = ( -/obj/structure/barricade/metal{ - health = 250; - icon_state = "metal_1" - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"atE" = ( +"atw" = ( +/obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" - }, -/area/fiorina/station/power_ring) -"auH" = ( -/obj/item/bodybag, -/obj/item/bodybag{ - pixel_y = 2 + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/bodybag{ - pixel_y = 4 +/area/fiorina/station/medbay) +"atY" = ( +/obj/structure/bedsheetbin, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"auj" = ( +/obj/item/frame/rack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) "auQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -783,87 +768,65 @@ name = "astroturf" }, /area/fiorina/station/park) -"avf" = ( -/obj/structure/machinery/computer/station_alert{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"avl" = ( +"auS" = ( +/obj/structure/closet/wardrobe/orange, +/obj/item/clothing/under/color/orange, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) -"avs" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"avI" = ( -/obj/structure/closet/bodybag, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +"avc" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" }, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/research_cells) -"avX" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) +"avJ" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"avT" = ( +/obj/item/trash/semki, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "avY" = ( /obj/item/clothing/head/soft/rainbow, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"awh" = ( -/obj/structure/prop/resin_prop{ - icon_state = "rack" - }, -/obj/item/storage/toolbox, -/obj/item/storage/toolbox, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/tumor/servers) -"awo" = ( -/obj/structure/bed{ - icon_state = "abed" +"awL" = ( +/obj/structure/monorail{ + name = "launch track" }, -/obj/item/reagent_container/food/snacks/wrapped/barcardine, -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"awU" = ( +/obj/structure/machinery/iv_drip{ + pixel_y = 19 }, -/area/fiorina/station/lowsec) -"awx" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"awF" = ( -/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/research_cells) "axb" = ( /obj/item/clothing/suit/storage/marine/specialist, /turf/open/floor/plating/prison, /area/fiorina/oob) -"axi" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "blue" +"axn" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, -/area/fiorina/station/chapel) +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) +"axx" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "axA" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -874,45 +837,62 @@ }, /turf/closed/wall/prison, /area/fiorina/station/security) -"ayv" = ( -/obj/item/trash/pistachios, +"aye" = ( +/obj/structure/bed/chair{ + dir = 1 + }, /turf/open/floor/prison{ - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"ayA" = ( +/area/fiorina/station/security) +"ayo" = ( /obj/structure/platform, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/security) +"ayB" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_x = -5 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"ayG" = ( +/obj/structure/machinery/power/apc{ + dir = 1 + }, /turf/open/floor/prison{ dir = 9; - icon_state = "greenfull" + icon_state = "yellow" }, -/area/fiorina/station/transit_hub) -"ayK" = ( +/area/fiorina/station/disco) +"ayH" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_27"; - layer = 3.1; - pixel_x = -2; - pixel_y = 10 +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, /turf/open/floor/prison{ dir = 4; - icon_state = "redcorner" - }, -/area/fiorina/station/power_ring) -"ayM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/pistol/heavy{ - pixel_y = 7 + icon_state = "darkyellowfull2" }, -/obj/item/ammo_magazine/pistol/heavy{ - pixel_y = 12 +/area/fiorina/station/flight_deck) +"ayW" = ( +/obj/structure/bed{ + icon_state = "abed" }, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -920,12 +900,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"azg" = ( -/obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) "azs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -942,60 +916,23 @@ /obj/structure/girder, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"azy" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) -"azI" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"azJ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"azN" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"azK" = ( +/obj/structure/machinery/microwave{ + desc = "There's two of them."; + pixel_y = 5 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"azT" = ( -/obj/item/inflatable, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + desc = "Holy shit"; + pixel_y = 18 }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" +/obj/item/storage/pill_bottle/kelotane/skillless{ + desc = "Don't touch -Dr. O"; + pixel_x = 6; + pixel_y = 31 }, -/area/fiorina/station/lowsec) +/turf/open/floor/prison, +/area/fiorina/station/medbay) "azZ" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/ice_lab) @@ -1007,17 +944,18 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"aAH" = ( -/obj/item/device/multitool, +"aAk" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"aAA" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"aAM" = ( -/obj/structure/reagent_dispensers/fueltank/gas/hydrogen{ - layer = 2.6 + dir = 1; + icon_state = "green" }, -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/transit_hub) +"aAJ" = ( +/obj/structure/bed/sofa/vert/grey, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -1030,21 +968,6 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"aBk" = ( -/obj/effect/spawner/random/tool, -/obj/structure/surface/rack, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"aBm" = ( -/obj/item/trash/uscm_mre, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) "aBs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -1060,6 +983,18 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) +"aBD" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) "aBJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/chef_recipes{ @@ -1067,39 +1002,10 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"aBO" = ( -/obj/item/ammo_magazine/rifle/m16, +"aBZ" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/prison, -/area/fiorina/station/security) -"aBX" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/structure/surface/rack, -/obj/item/clothing/gloves/latex, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"aCi" = ( -/obj/structure/prop/invuln{ - desc = "Floating cells are reserved for highly dangerous criminals. Whoever is out there is probably best left out there."; - icon = 'icons/obj/structures/doors/celldoor.dmi'; - icon_state = "door_closed"; - layer = 2.5; - name = "cell door" - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"aCn" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/park) "aCC" = ( /obj/item/tool/soap{ pixel_x = 2; @@ -1107,129 +1013,56 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"aCT" = ( -/obj/structure/bed/sofa/south/grey/left, +"aCZ" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"aDc" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"aCV" = ( -/obj/item/explosive/grenade/high_explosive/m15{ - pixel_x = -9; - pixel_y = -8 + icon_state = "floor_plate" }, -/obj/item/explosive/grenade/high_explosive/frag{ - pixel_x = 6; - pixel_y = 3 +/area/fiorina/tumor/servers) +"aDx" = ( +/turf/open/floor/prison{ + icon_state = "yellow" }, +/area/fiorina/station/central_ring) +"aEi" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/civres) +"aEB" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/tumor/servers) -"aDh" = ( +/area/fiorina/station/security/wardens) +"aEC" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/oob) -"aDi" = ( -/obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"aDl" = ( -/obj/structure/machinery/vending/cola, -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 24 - }, +/area/fiorina/station/power_ring) +"aEG" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/park) -"aDr" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/area/fiorina/station/medbay) +"aEQ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"aDs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/powercell, -/obj/item/storage/syringe_case/burn{ - pixel_x = -10; - pixel_y = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"aDw" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/structure/platform_decoration, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"aDC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/security_space_law{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3; - pixel_y = 5 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"aEi" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/civres) -"aFg" = ( -/obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security/wardens) -"aFh" = ( -/obj/structure/toilet{ - dir = 4; - pixel_y = 8 - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"aFn" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/telecomm/lz1_cargo) "aFp" = ( /obj/structure/machinery/defenses/tesla_coil{ faction_group = list("CLF") }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"aFJ" = ( -/obj/item/tool/wrench, -/turf/open/floor/prison{ - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) "aFK" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -1240,35 +1073,40 @@ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"aFV" = ( -/obj/item/stack/sheet/wood, -/obj/structure/machinery/light/double/blue, +"aFQ" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibmid3" + }, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) "aFZ" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) -"aGs" = ( -/obj/structure/window/framed/prison/reinforced{ - opacity = 1 +"aGF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/frame/firstaid_arm_assembly, +/obj/item/stack/nanopaste{ + pixel_x = 11; + pixel_y = 6 }, -/obj/structure/machinery/door/poddoor/shutters/almayer, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"aGS" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison{ - icon_state = "whitegreen" +/area/fiorina/station/security/wardens) +"aGR" = ( +/obj/structure/largecrate/random, +/obj/effect/spawner/random/powercell, +/obj/item/device/camera/oldcamera{ + pixel_y = 11 }, -/area/fiorina/station/medbay) -"aGV" = ( -/obj/structure/largecrate/random/barrel/red, /turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) "aHg" = ( /obj/structure/prop/resin_prop, /turf/open/floor/plating/prison, @@ -1277,151 +1115,76 @@ /obj/item/tool/crowbar, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzI) -"aHs" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"aHx" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"aHA" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"aHY" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null - }, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/storage/pill_bottle/alkysine, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +"aHH" = ( +/obj/item/tool/shovel/etool, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"aHJ" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"aIf" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" + icon_state = "darkbrownfull2" }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) -"aIh" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/tumor/aux_engi) +"aHK" = ( +/obj/item/ammo_casing{ + icon_state = "casing_1" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/lz/near_lzI) -"aIp" = ( -/obj/structure/closet/secure_closet/personal, +/area/fiorina/station/medbay) +"aId" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/hypospray, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"aIv" = ( -/obj/structure/bed{ - icon_state = "abed" +/area/fiorina/station/botany) +"aIm" = ( +/obj/structure/barricade/deployable{ + dir = 4 }, -/obj/item/storage/box/holobadge{ - pixel_y = 3 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/security) +"aIB" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"aIE" = ( +/area/fiorina/station/park) +"aJk" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/meat{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/reagent_container/food/snacks/meat{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/meat{ - pixel_x = -1; - pixel_y = 6 - }, +/obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/power_ring) -"aIK" = ( -/obj/structure/surface/rack, -/obj/item/tool/plantspray/weeds, -/turf/open/floor/prison{ +/area/fiorina/tumor/ice_lab) +"aJo" = ( +/obj/structure/bed/chair{ dir = 4; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"aIR" = ( -/obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"aIX" = ( -/turf/open/floor/prison{ - icon_state = "yellowfull" + pixel_x = -5 }, -/area/fiorina/station/central_ring) -"aIZ" = ( -/obj/structure/prop/resin_prop{ - icon_state = "rack" +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/tumor/servers) -"aJf" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/emergency, +/area/fiorina/station/medbay) +"aJv" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) -"aJg" = ( -/turf/open/floor/prison{ - 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, -/obj/effect/landmark/objective_landmark/close, -/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{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) "aJX" = ( /obj/structure/bed/chair{ dir = 8 @@ -1433,43 +1196,32 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"aKc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/sake, +"aKb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 9; + icon_state = "whitegreen" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/medbay) "aKA" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 }, /turf/open/space, /area/fiorina/oob) -"aKF" = ( -/obj/item/storage/backpack{ - pixel_x = -11; - pixel_y = 15 - }, -/obj/item/trash/syndi_cakes, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"aKN" = ( +/obj/structure/machinery/computer/cameras{ + network = list("omega") }, -/area/fiorina/station/lowsec) -"aKW" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/tumor/aux_engi) -"aLj" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" - }, -/turf/open/floor/prison{ - icon_state = "greenblue" - }, -/area/fiorina/station/botany) "aLp" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -1479,39 +1231,65 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer_hull, /area/fiorina/station/medbay) +"aLz" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "aLC" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison{ dir = 10; - icon_state = "damaged1" + icon_state = "whitepurple" }, -/area/fiorina/station/central_ring) -"aLR" = ( -/obj/item/stack/medical/bruise_pack, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/research_cells) "aLT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"aLX" = ( +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "aMg" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/ice_lab) -"aMq" = ( +"aMr" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison{ - dir = 1; - icon_state = "bluecorner" + icon_state = "bluefull" }, -/area/fiorina/station/civres_blue) -"aMz" = ( +/area/fiorina/station/power_ring) +"aMu" = ( +/obj/effect/alien/weeds/node, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"aME" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/security) "aMM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -1519,67 +1297,87 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"aMZ" = ( -/obj/structure/platform_decoration{ - dir = 4 +"aMS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, +/obj/item/clothing/mask/cigarette, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_y = 8 }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" +/obj/structure/sign/nosmoking_1{ + pixel_y = 30 }, -/area/fiorina/station/park) -"aNn" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" + icon_state = "redfull" }, -/area/fiorina/station/park) -"aNw" = ( -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "whitegreen" +/area/fiorina/station/security) +"aNk" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/station/medbay) -"aNP" = ( -/obj/structure/inflatable, -/obj/structure/barricade/handrail/type_b, -/obj/structure/barricade/handrail/type_b{ - dir = 4 +/turf/open/floor/prison, +/area/fiorina/station/security) +"aNz" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + layer = 3.5 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/power_ring) "aOc" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_3"; opacity = 0 }, /area/fiorina/tumor/ship) -"aOd" = ( +"aOm" = ( +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, +/area/fiorina/tumor/servers) +"aOC" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"aOL" = ( +/obj/structure/filingcabinet{ + pixel_x = -8 + }, +/obj/structure/filingcabinet{ + pixel_x = 8 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = -7; + pixel_y = 11 }, -/area/fiorina/tumor/ice_lab) -"aOh" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "redfull" + }, +/area/fiorina/station/security) +"aOT" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 }, -/area/fiorina/oob) -"aOJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/lz/near_lzII) "aPd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 @@ -1591,22 +1389,17 @@ name = "astroturf" }, /area/fiorina/station/park) -"aPi" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"aPq" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" +"aPr" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/area/fiorina/station/research_cells) +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"aPv" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) "aPD" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -1616,80 +1409,52 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"aPF" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_7" - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "aPH" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) -"aQB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"aPO" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/area/fiorina/station/civres_blue) +"aQH" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/landmark/nightmare{ + insert_tag = "yardbasketball" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) -"aQE" = ( -/obj/item/stack/sheet/metal{ - amount = 5 +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, +/area/fiorina/station/central_ring) +"aQR" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"aQK" = ( -/obj/item/trash/uscm_mre, -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison{ +/area/fiorina/station/transit_hub) +"aQW" = ( +/obj/structure/barricade/sandbags{ dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"aQM" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"aQU" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" + icon_state = "sandbag_0"; + pixel_y = 2 }, /turf/open/floor/prison, -/area/fiorina/station/security) -"aQZ" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 4; - icon_state = "red" - }, -/area/fiorina/station/security) -"aRb" = ( -/obj/structure/largecrate/random/secure, -/obj/structure/barricade/wooden{ - dir = 4 +/area/fiorina/lz/near_lzII) +"aQY" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitepurple" + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/tumor/ice_lab) "aRk" = ( /obj/structure/cargo_container/grant/left, /turf/open/floor/plating/plating_catwalk/prison, @@ -1700,26 +1465,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"aRx" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/pill_bottle/tramadol/skillless, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"aRB" = ( -/obj/item/ammo_casing{ - icon_state = "cartridge_2" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"aRG" = ( +"aRv" = ( +/obj/structure/platform, +/obj/structure/closet/firecloset/full, +/obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) +/area/fiorina/lz/near_lzI) "aRT" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -1729,43 +1480,60 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"aRY" = ( -/obj/structure/barricade/wooden{ +"aSm" = ( +/obj/structure/bed/chair{ dir = 8 }, -/obj/structure/bed/chair/wheelchair{ - desc = "Great scott, it can move on its own!"; - dir = 4; - icon_state = "officechair_white"; - name = "Dr. O's fantastic self rolling wheelie chair"; - pixel_x = 7 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"aSw" = ( -/obj/structure/inflatable/door, /turf/open/floor/prison{ - icon_state = "whitegreencorner" + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "aSz" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/research_cells) +"aSA" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"aSM" = ( +/obj/effect/spawner/random/gun/shotgun/highchance{ + mags_max = 0; + mags_min = 0 + }, +/turf/open/floor/prison, +/area/fiorina/station/chapel) "aSS" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) +"aTe" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "aTo" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/transit_hub) +"aTx" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/security) "aTE" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"aTL" = ( +/obj/structure/bed/chair{ + dir = 4; + layer = 2.8 + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "aTM" = ( /obj/item/stack/tile/plasteel{ pixel_x = 12; @@ -1773,123 +1541,37 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"aUa" = ( -/obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/floor/prison{ - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"aUx" = ( -/obj/structure/sign/poster{ - desc = "Hubba hubba."; - icon_state = "poster17"; - name = "magazine" - }, -/obj/structure/sign/poster{ - desc = "Hubba hubba."; - icon_state = "poster3"; - name = "magazine"; - pixel_x = 6; - pixel_y = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"aUM" = ( -/obj/item/clothing/head/welding, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"aVd" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"aVh" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" - }, +"aTO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck/uno, /turf/open/floor/prison{ dir = 9; icon_state = "greenfull" }, -/area/fiorina/station/transit_hub) -"aVA" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"aVD" = ( +/area/fiorina/station/botany) +"aTY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/card/id/guest{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/card/id/guest, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"aVE" = ( -/obj/vehicle/train/cargo/engine, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"aVJ" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"aVK" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 1 - }, +/obj/item/storage/briefcase, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"aVN" = ( -/obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"aVS" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison{ - dir = 1; icon_state = "blue_plate" }, /area/fiorina/station/botany) -"aVT" = ( -/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..."; - dir = 1; - health = 25000; - pixel_y = 19 - }, -/obj/item/stack/sheet/wood, -/obj/structure/machinery/computer/cameras/wooden_tv{ - desc = "Somehow, it still functions."; - layer = 3.1; - name = "discarded camera console"; - pixel_x = -6; - pixel_y = 5 - }, +"aUg" = ( +/obj/item/tool/crowbar/red, +/turf/open/floor/prison, +/area/fiorina/station/security) +"aUA" = ( +/obj/item/stack/cable_coil/orange, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/servers) +/area/fiorina/tumor/ice_lab) +"aVd" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "aVU" = ( /turf/open/floor/corsat{ icon_state = "squares" @@ -1898,35 +1580,15 @@ "aWk" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/telecomm/lz2_maint) -"aWo" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"aWD" = ( -/obj/item/device/taperecorder{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"aWP" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" +"aWI" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/telecomm/lz1_cargo) -"aWR" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/medbay) "aWV" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) @@ -1941,45 +1603,81 @@ dir = 5 }, /area/fiorina/tumor/aux_engi) -"aXK" = ( -/obj/item/clothing/under/shorts/green, -/turf/open/floor/prison{ +"aXp" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/obj/structure/bed/chair/wheelchair{ + desc = "Great scott, it can move on its own!"; dir = 4; - icon_state = "cell_stripe" + icon_state = "officechair_white"; + name = "Dr. O's fantastic self rolling wheelie chair"; + pixel_x = 7 }, -/area/fiorina/station/central_ring) -"aXM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/cable_coil/orange, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/maintenance) -"aYA" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"aXv" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"aXx" = ( /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; - pixel_y = -3 + pixel_y = 13 }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"aXC" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "damaged2" }, /area/fiorina/station/lowsec) -"aYZ" = ( -/obj/structure/machinery/disposal, +"aXO" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "damaged2" }, -/area/fiorina/station/security/wardens) -"aZz" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5" +/area/fiorina/station/central_ring) +"aXR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/station/medbay) +"aYf" = ( +/obj/item/tool/scythe, /turf/open/floor/prison{ dir = 8; - icon_state = "whitegreen" + icon_state = "blue_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/botany) +"aYg" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/obj/structure/machinery/shower{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/research_cells) +"aZi" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/tumor/servers) "aZD" = ( /obj/structure/platform{ dir = 8 @@ -1996,43 +1694,24 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"aZL" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "aZN" = ( /obj/item/toy/crayon/yellow, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"aZQ" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"aZU" = ( -/obj/structure/bed/chair{ +"aZW" = ( +/obj/structure/platform_decoration{ dir = 8 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"aZZ" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"bac" = ( -/obj/item/stack/sheet/wood{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/stack/sheet/wood, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/park) "baC" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station) @@ -2041,19 +1720,54 @@ /obj/item/stack/catwalk, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"bby" = ( -/turf/open/floor/prison, +"baM" = ( +/obj/effect/spawner/random/gun/smg, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"bbn" = ( +/obj/item/device/motiondetector, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"bbp" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) -"bbT" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"bbI" = ( +/obj/item/stool{ + pixel_x = -4; + pixel_y = 23 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"bbU" = ( +/obj/structure/sign/safety/fire_haz, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/civres) +"bcd" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/station/flight_deck) "bce" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -2063,81 +1777,71 @@ /obj/item/storage/pill_bottle/kelotane/skillless, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"bcg" = ( -/obj/structure/platform{ - dir = 4 - }, +"bcp" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "greenblue" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/botany) -"bck" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ - pixel_y = 7 +/area/fiorina/station/telecomm/lz1_tram) +"bcq" = ( +/obj/item/prop/helmetgarb/riot_shield, +/turf/open/floor/prison, +/area/fiorina/station/security) +"bcz" = ( +/obj/structure/machinery/light/small{ + dir = 4; + pixel_x = 11; + pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"bcs" = ( -/obj/structure/largecrate/random, +/area/fiorina/tumor/aux_engi) +"bcT" = ( +/obj/structure/platform, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "darkbrown2" }, /area/fiorina/station/park) -"bcF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +"bcX" = ( +/obj/item/tool/warning_cone, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/area/fiorina/station/medbay) -"bcH" = ( -/obj/item/tool/screwdriver, /turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"bcV" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/telecomm/lz1_cargo) +"bdb" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/area/fiorina/tumor/ice_lab) -"bdI" = ( -/obj/structure/bed/roller, -/obj/item/bedsheet/green, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "darkbrown2" }, -/area/fiorina/station/research_cells) -"bdL" = ( -/obj/structure/inflatable/door, +/area/fiorina/station/park) +"bdE" = ( +/obj/item/stack/cable_coil, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"bdS" = ( -/obj/item/tool/weldingtool{ - pixel_x = 6; - pixel_y = -2 +/area/fiorina/tumor/civres) +"bec" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/servers) -"bej" = ( -/obj/structure/barricade/handrail/type_b, -/obj/structure/barricade/handrail/type_b{ - dir = 4 +/area/fiorina/lz/near_lzI) +"beh" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/tumor/ice_lab) "bel" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -2149,10 +1853,31 @@ icon_state = "squares" }, /area/fiorina/station/civres_blue) -"beV" = ( -/turf/open/floor/prison{ +"bem" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"ber" = ( +/obj/structure/inflatable/popped/door, +/obj/item/ammo_magazine/m56d, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"bez" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; dir = 4; - icon_state = "bluecorner" + layer = 6; + name = "overhead pipe"; + pixel_y = 20 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"beB" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/power_ring) "beW" = ( @@ -2162,52 +1887,19 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"bfb" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" - }, -/obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"bfg" = ( -/obj/structure/surface/rack, -/obj/item/storage/bible/hefa{ - pixel_y = 3 - }, -/obj/item/storage/bible/hefa, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"bfs" = ( -/obj/item/stack/sheet/wood{ - amount = 10 - }, +"bff" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"bfx" = ( -/obj/item/trash/barcardine, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/civres_blue) "bfF" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"bfZ" = ( -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"bgb" = ( -/obj/structure/surface/rack, -/obj/item/storage/pill_bottle/bicaridine/skillless, -/obj/item/storage/pill_bottle/bicaridine/skillless, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "bgc" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -2223,27 +1915,18 @@ /obj/item/trash/pistachios, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"bgG" = ( -/obj/structure/reagent_dispensers/watertank{ - layer = 2.6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzII) -"bgR" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" - }, +"bgD" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"bha" = ( -/obj/structure/platform_decoration, +/area/fiorina/tumor/ice_lab) +"bhf" = ( +/obj/item/fuelCell, +/obj/structure/surface/rack, /turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/maintenance) "bht" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" @@ -2263,100 +1946,103 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"bhM" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/disco) -"bhR" = ( -/obj/item/device/flashlight/lamp/tripod, +"bhW" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 4; + icon_state = "greencorner" }, -/area/fiorina/station/research_cells) +/area/fiorina/tumor/civres) "bhX" = ( /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) "bis" = ( /turf/closed/wall/prison, /area/fiorina/station/chapel) -"biH" = ( -/obj/structure/machinery/door/poddoor/almayer{ - density = 0; - dir = 4 - }, +"bix" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"biJ" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" + dir = 8; + icon_state = "darkyellow2" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) -"bjk" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/area/fiorina/station/telecomm/lz1_cargo) +"bjf" = ( +/obj/item/tool/warning_cone, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"bjo" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/faxmachine, +/turf/open/floor/prison, +/area/fiorina/station/security) +"bjt" = ( +/obj/structure/bed{ + icon_state = "abed" }, +/obj/item/bedsheet/green, /turf/open/floor/prison{ dir = 6; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"bjx" = ( +"bjR" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"bjy" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/area/fiorina/tumor/aux_engi) +"bjZ" = ( +/obj/item/weapon/twohanded/spear, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + icon_state = "darkpurplefull2" }, -/area/fiorina/tumor/ice_lab) -"bjO" = ( -/obj/structure/closet/bodybag, +/area/fiorina/station/research_cells) +"bkg" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"bki" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/boxing/yellow, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/medbay) -"bka" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" +/area/fiorina/station/lowsec) +"bkQ" = ( +/obj/item/ammo_casing{ + icon_state = "casing_7_1" }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) -"bkS" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, -/area/fiorina/lz/near_lzII) -"blb" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 + icon_state = "floor_plate" }, +/area/fiorina/station/lowsec) +"bkU" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"bln" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" +/area/fiorina/station/central_ring) +"ble" = ( +/obj/structure/prop/resin_prop{ + icon_state = "rack" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/tumor/aux_engi) +"blA" = ( +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "blG" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 2; @@ -2364,188 +2050,215 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"blQ" = ( -/obj/structure/inflatable/popped/door, +"bma" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/newspaper, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/botany) +"bmw" = ( +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) "bmE" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"bmO" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" +"bmT" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, -/area/fiorina/station/flight_deck) +/turf/open/space, +/area/fiorina/oob) "bmV" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bmX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 1 +"bne" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/lz/near_lzII) +"bnh" = ( +/obj/item/storage/briefcase, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/transit_hub) +"bno" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"bnx" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "bnA" = ( /turf/closed/wall/prison, /area/fiorina/station/transit_hub) -"bnK" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) +"bnJ" = ( +/obj/structure/machinery/lapvend, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "bnL" = ( /obj/item/storage/fancy/cigarettes/lady_finger, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"bod" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 9 +"bnM" = ( +/obj/structure/disposalpipe/segment{ + icon_state = "delivery_outlet"; + layer = 6; + name = "overhead ducting"; + pixel_y = 33 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/tumor/civres) "boe" = ( /obj/item/tool/wet_sign, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"boh" = ( -/obj/item/stool, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"bop" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "yellowcorner" - }, -/area/fiorina/station/lowsec) "bou" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"bow" = ( +"boF" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + icon_state = "floor_plate" }, /area/fiorina/station/medbay) -"bpq" = ( -/obj/item/stack/sheet/wood{ - amount = 10 +"boI" = ( +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = 5; + pixel_y = 12 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"bpC" = ( -/obj/item/tank/jetpack/carbondioxide, -/obj/structure/surface/rack, +/area/fiorina/station/medbay) +"bpe" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"bpG" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "bee" - }, +/area/fiorina/station/civres_blue) +"bpo" = ( +/obj/item/dogtag, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "blue" }, -/area/fiorina/tumor/servers) -"bpK" = ( +/area/fiorina/station/civres_blue) +"bpx" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"bqu" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 }, -/obj/item/weapon/gun/energy/taser, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/station/security) -"bqy" = ( -/obj/structure/platform, +/area/fiorina/station/research_cells) +"bqC" = ( /obj/structure/platform{ dir = 8 }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"bqD" = ( /obj/structure/platform_decoration{ - dir = 10 + dir = 4 }, -/obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"bra" = ( -/obj/structure/largecrate/random/case, +/area/fiorina/station/lowsec) +"bqF" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/weapon/gun/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/storage/belt/marine, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"brr" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/area/fiorina/station/security) +"bqX" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"brl" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"brC" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 6; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"bry" = ( -/obj/structure/inflatable/popped/door, +"brR" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/tumor/servers) -"brI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" + icon_state = "cell_stripe" }, -/turf/open/space/basic, -/area/fiorina/oob) -"brS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard, +/area/fiorina/station/flight_deck) +"brY" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/research_cells) -"bsd" = ( -/obj/structure/closet/basketball, -/obj/item/storage/pill_bottle/bicaridine/skillless, -/obj/effect/landmark/objective_landmark/science, +/area/fiorina/station/transit_hub) +"bsc" = ( +/obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkredfull2" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/security) +"bsk" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) "bsm" = ( /obj/item/shard{ icon_state = "medium"; @@ -2560,76 +2273,88 @@ icon_state = "stan_l_w" }, /area/fiorina/tumor/ship) -"bsq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - pixel_y = 9 +"bsO" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/barricade/wooden{ + dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"bsF" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/station/park) -"bsJ" = ( +/area/fiorina/station/research_cells) +"bsR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowcorners2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/flight_deck) -"btq" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" +/area/fiorina/station/medbay) +"buz" = ( +/obj/item/stack/rods, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"buG" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/tumor/ice_lab) -"btz" = ( -/obj/structure/platform, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/park) -"btB" = ( -/obj/structure/cargo_container/grant/right{ - density = 0; - desc = "A huge industrial shipping container. You could slip just behind it."; - health = 5000; - layer = 4; - unacidable = 1 +/area/fiorina/station/central_ring) +"buJ" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) -"btP" = ( -/obj/item/tool/kitchen/rollingpin, +"bvg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 6 + }, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/fiorina/station/power_ring) -"bux" = ( -/obj/structure/toilet{ +"bvp" = ( +/obj/structure/barricade/wooden{ dir = 4; - pixel_y = 8 + pixel_y = 4 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + dir = 10; + icon_state = "damaged1" }, -/area/fiorina/station/lowsec) -"buz" = ( -/obj/item/stack/rods, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) -"buO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/mask/surgical, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/central_ring) +"bvr" = ( +/obj/item/explosive/grenade/high_explosive/m15, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, +/area/fiorina/tumor/aux_engi) +"bvs" = ( +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/central_ring) "bvK" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/atmospipes{ @@ -2641,179 +2366,292 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"bxa" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, +"bwj" = ( +/obj/structure/computerframe, /turf/open/floor/prison{ - icon_state = "whitegreen" + icon_state = "floor_plate" }, /area/fiorina/station/medbay) -"bxl" = ( -/obj/structure/machinery/light/double/blue{ +"bwk" = ( +/obj/item/tool/wrench, +/turf/open/floor/prison{ dir = 1; - pixel_y = 21 + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"bww" = ( +/obj/item/trash/candy, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"bxr" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - density = 0; - pixel_y = 16 +/area/fiorina/station/telecomm/lz1_cargo) +"bxc" = ( +/obj/structure/window/reinforced, +/turf/open/floor/prison, +/area/fiorina/station/security) +"bxd" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/oob) +"bxe" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"bxg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/civres_blue) +"bxm" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ dir = 1; icon_state = "darkbrown2" }, -/area/fiorina/maintenance) +/area/fiorina/station/park) +"bxv" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) +"bxy" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"bxA" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"bxE" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 4; + layer = 6; + name = "overhead pipe"; + pixel_y = 20 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"bxQ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) "bxV" = ( /obj/item/clothing/head/cmcap, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/wood, /area/fiorina/station/chapel) -"bxW" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"bya" = ( +/obj/structure/machinery/disposal, +/obj/item/tool/kitchen/rollingpin{ + pixel_y = 8 }, -/turf/open/floor/prison, -/area/fiorina/tumor/fiberbush) +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/station/civres_blue) "byb" = ( /turf/closed/shuttle/ert{ icon_state = "stan27" }, /area/fiorina/tumor/ship) +"byc" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "bym" = ( /turf/closed/shuttle/ert{ icon_state = "stan20" }, /area/fiorina/lz/near_lzI) -"byn" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/prison{ - dir = 10; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"byr" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/fancy/vials/random, -/obj/effect/landmark/objective_landmark/science, +"byB" = ( +/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"byt" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ - icon_state = "bluefull" +/area/fiorina/station/chapel) +"byE" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"byF" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/power_ring) -"bzC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/newspaper, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/platform_decoration{ + dir = 6 }, -/area/fiorina/tumor/servers) -"bzG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 6; + icon_state = "whitegreen" }, -/area/fiorina/station/disco) -"bzH" = ( -/obj/structure/sign/poster{ - icon_state = "poster7"; - pixel_x = -26; - pixel_y = 6 +/area/fiorina/tumor/ice_lab) +"byG" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/tumor/ice_lab) +"byJ" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "green" }, -/area/fiorina/station/medbay) -"bzL" = ( -/obj/structure/bed/sofa/vert/grey/bot, +/area/fiorina/tumor/civres) +"byT" = ( +/obj/structure/platform, /turf/open/floor/prison, /area/fiorina/station/transit_hub) +"byY" = ( +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"bze" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" + }, +/area/fiorina/station/medbay) "bzO" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/power_ring) -"bAb" = ( +"bzU" = ( +/obj/item/tool/shovel/snow, +/obj/item/device/flashlight, /obj/structure/surface/rack, -/obj/item/explosive/grenade/high_explosive/frag, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/servers) +/area/fiorina/tumor/ice_lab) "bAc" = ( /turf/closed/shuttle/ert{ icon_state = "stan25" }, /area/fiorina/tumor/aux_engi) -"bAS" = ( +"bAf" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/tumor/ice_lab) -"bAU" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/fiorina/station/power_ring) +"bAE" = ( +/obj/structure/surface/rack, +/obj/item/storage/pill_bottle/bicaridine/skillless, +/obj/item/storage/pill_bottle/bicaridine/skillless, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/gibspawner/human, +/area/fiorina/station/medbay) +"bAM" = ( +/obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/lowsec) +"bBr" = ( +/obj/structure/barricade/metal/wired{ + dir = 1 + }, +/obj/item/bodybag/tarp/reactive, +/obj/item/bodybag/tarp/reactive, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"bBt" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "bBA" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" }, /area/fiorina/station/power_ring) -"bBS" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +"bBB" = ( +/obj/structure/largecrate/random/barrel, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) -"bBX" = ( -/obj/structure/largecrate/random/case/double, +/area/fiorina/station/park) +"bBK" = ( +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"bCk" = ( -/obj/effect/decal/cleanable/blood/drip, +/area/fiorina/station/security) +"bCe" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2" + icon_state = "redcorner" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/security) "bCu" = ( /obj/item/shard{ icon_state = "large" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"bDd" = ( -/obj/structure/machinery/photocopier, -/turf/open/floor/prison, -/area/fiorina/station/security) -"bDu" = ( -/obj/item/trash/barcardine, +"bDv" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/flight_deck) "bDx" = ( /obj/item/tool/extinguisher/mini, /obj/structure/machinery/light/double/blue{ @@ -2824,215 +2662,198 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"bDC" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/fire/empty, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"bDD" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno/body, +"bDJ" = ( +/obj/effect/spawner/random/gun/pistol, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"bDN" = ( +"bDM" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/park) +/area/fiorina/station/chapel) "bDU" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"bEn" = ( +"bDX" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ + icon_state = "green" + }, +/area/fiorina/station/chapel) +"bEk" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/oob) +"bEm" = ( +/obj/effect/landmark/wo_supplies/storage/belts/knifebelt, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"bEA" = ( +/obj/structure/barricade/wooden{ dir = 4; - icon_state = "darkbrown2" + pixel_y = 4 }, -/area/fiorina/tumor/aux_engi) -"bEO" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"bED" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/area/fiorina/station/chapel) +/turf/open/floor/prison, +/area/fiorina/station/park) "bEP" = ( /obj/item/device/flashlight, /turf/open/floor/prison/chapel_carpet{ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"bET" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/uscm_mre, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "bEX" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/disco) -"bFh" = ( -/obj/item/stack/sheet/metal{ - amount = 5 +"bFg" = ( +/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, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"bFj" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/civres_blue) +"bFi" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/turf/closed/shuttle/ert{ - icon_state = "leftengine_1"; - layer = 3 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/oob) +/area/fiorina/station/park) "bFr" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/chapel) -"bFt" = ( -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) "bFA" = ( /turf/closed/shuttle/ert{ icon_state = "wy27" }, /area/fiorina/station/medbay) -"bFN" = ( +"bFC" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/prison, +/area/fiorina/station/park) +"bFJ" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"bFL" = ( +/obj/structure/mirror{ + pixel_x = -32 + }, /obj/structure/sink{ dir = 8; pixel_x = -12 }, -/obj/item/reagent_container/glass/bottle/cyanide{ - pixel_x = -12; - pixel_y = 13 - }, /turf/open/floor/prison{ dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"bFR" = ( -/obj/item/ammo_magazine/rifle/m16, -/obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "kitchen" }, -/area/fiorina/station/security) -"bFY" = ( -/obj/structure/bed/chair/comfy{ +/area/fiorina/tumor/civres) +"bGA" = ( +/obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"bGr" = ( -/obj/structure/barricade/metal/wired, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"bGs" = ( -/obj/structure/inflatable/popped, +/area/fiorina/station/park) +"bGB" = ( +/obj/structure/largecrate/supply/generator, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"bGt" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"bGy" = ( -/obj/structure/machinery/shower{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/lowsec) -"bGQ" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 + icon_state = "floor_plate" }, -/obj/item/clothing/gloves/combat, +/area/fiorina/station/telecomm/lz1_cargo) +"bGH" = ( +/obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "whitegreen" }, -/area/fiorina/station/research_cells) -"bGT" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/tumor/ice_lab) "bGY" = ( /turf/closed/shuttle/elevator{ dir = 9 }, /area/fiorina/station/civres_blue) -"bHl" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +"bHt" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 }, -/turf/open/floor/prison{ +/obj/structure/prop/structure_lattice{ dir = 4; - icon_state = "darkyellow2" + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/station/telecomm/lz1_tram) +/turf/open/floor/prison, +/area/fiorina/station/chapel) "bHv" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"bHI" = ( -/obj/item/frame/rack, +"bHP" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"bHR" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/servers) -"bHY" = ( -/obj/item/weapon/gun/flamer, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_magazine/flamer_tank, -/obj/item/ammo_magazine/flamer_tank, -/obj/item/storage/pouch/flamertank, -/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) -"bIg" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +"bHU" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/area/fiorina/station/transit_hub) -"bII" = ( -/obj/structure/bed/chair, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"bIz" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"bIP" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "yellow" }, -/area/fiorina/station/medbay) -"bIX" = ( +/area/fiorina/station/lowsec) +"bIR" = ( +/obj/structure/closet/secure_closet/security, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/disco) "bIZ" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -3065,122 +2886,108 @@ name = "astroturf" }, /area/fiorina/station/park) -"bJz" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/tumor/servers) -"bJF" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue" +"bJG" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryotop" }, -/area/fiorina/station/chapel) -"bKs" = ( -/obj/item/tool/warning_cone, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"bKM" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/pipes/standard/simple/visible{ + dir = 5 }, -/area/fiorina/tumor/servers) -"bLd" = ( -/obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"bLg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"bLz" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/medbay) +"bKF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/pill_bottle/imidazoline, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/park) +/area/fiorina/tumor/ice_lab) "bLA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"bMd" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +"bLE" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/fiorina/station/security) +"bLJ" = ( +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) +"bLM" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/medbay) +"bLO" = ( +/obj/item/stack/cable_coil/blue, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, +/area/fiorina/tumor/ice_lab) "bMh" = ( /obj/item/frame/table/wood/fancy, /obj/item/paper/prison_station/warden_note, /obj/item/tool/pen, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"bMr" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/station/civres_blue) "bMu" = ( /obj/structure/curtain{ layer = 3 }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"bMA" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket" +"bMz" = ( +/obj/item/tool/lighter/random, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, +/area/fiorina/tumor/civres) +"bMF" = ( +/obj/item/trash/cigbutt/cigarbutt, /turf/open/floor/prison{ - icon_state = "blue" + icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"bNf" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" +/area/fiorina/lz/near_lzI) +"bMG" = ( +/obj/structure/surface/rack, +/obj/item/handcuffs/zip, +/turf/open/floor/prison{ + icon_state = "darkredfull2" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"bNz" = ( +/area/fiorina/station/lowsec) +"bMI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/folder/black_random, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "bluefull" }, -/area/fiorina/maintenance) -"bNA" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/area/fiorina/station/power_ring) +"bMT" = ( +/obj/structure/tunnel/maint_tunnel, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/ice_lab) +"bNo" = ( +/obj/item/trash/uscm_mre, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"bNN" = ( -/obj/structure/closet/crate/trashcart, +"bNE" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/civres_blue) "bNP" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/prison, @@ -3191,47 +2998,61 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"bOh" = ( -/obj/item/stack/folding_barricade, +"bOp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/barbed_wire, +/obj/item/stack/barbed_wire, +/obj/item/stack/cable_coil/blue, +/obj/item/stack/cable_coil/blue, +/obj/item/stack/cable_coil/blue, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"bOx" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"bOz" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/closed/shuttle/ert{ - icon_state = "rightengine_1"; - layer = 3; - opacity = 0 + icon_state = "whitepurple" }, -/area/fiorina/oob) +/area/fiorina/station/research_cells) "bOK" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/corsat{ icon_state = "squares" }, /area/fiorina/station/civres_blue) -"bPf" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"bPk" = ( -/obj/effect/decal/cleanable/blood/oil, +"bOR" = ( +/obj/structure/bed/roller, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"bPh" = ( +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "bPl" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/chapel) +"bPn" = ( +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) +"bPy" = ( +/obj/structure/prop/resin_prop{ + icon_state = "sheater0" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "bPG" = ( /turf/open/floor/plating/prison, /area/fiorina/station/botany) @@ -3241,18 +3062,40 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bPS" = ( +"bPQ" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/power_ring) -"bQh" = ( -/obj/structure/prop/invuln/minecart_tracks{ +/area/fiorina/station/chapel) +"bPT" = ( +/obj/structure/monorail{ + dir = 5; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/aux_engi) +"bPV" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"bQh" = ( +/obj/structure/prop/invuln/minecart_tracks{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"bQj" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "bQk" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -3264,21 +3107,43 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bQx" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, +"bQn" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gib2" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" + }, +/area/fiorina/station/medbay) +"bQv" = ( +/obj/item/trash/cigbutt/ucigbutt, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/chapel) "bQy" = ( /obj/structure/surface/table/woodentable, /obj/item/reagent_container/spray/pepper, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"bQL" = ( +/obj/item/tool/mop, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/chapel) "bQM" = ( /turf/open/space, /area/fiorina/oob) +"bQW" = ( +/obj/item/frame/rack, +/obj/item/stack/medical/bruise_pack, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "bRb" = ( /obj/structure/machinery/defenses/sentry/premade/dumb{ dir = 4 @@ -3292,23 +3157,69 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"bRu" = ( -/obj/item/weapon/gun/smg/mp5, -/obj/item/ammo_casing{ - icon_state = "casing_6_1" +"bRo" = ( +/obj/structure/sink{ + pixel_y = 23 + }, +/obj/item/prop/helmetgarb/rabbitsfoot{ + pixel_y = 22 + }, +/obj/item/reagent_container/food/drinks/bottle/kahlua{ + pixel_x = 5; + pixel_y = 25 }, /turf/open/floor/prison{ dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"bRs" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/prison{ icon_state = "floor_plate" }, +/area/fiorina/station/park) +"bRA" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) -"bRU" = ( -/obj/item/device/multitool, +"bRC" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"bRQ" = ( +/obj/item/stock_parts/micro_laser/ultra, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "darkpurple2" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/servers) +"bSm" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"bSq" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/smg/nailgun, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) +"bSs" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, +/area/fiorina/station/security) "bSM" = ( /obj/structure/machinery/portable_atmospherics/hydroponics{ draw_warnings = 0; @@ -3318,35 +3229,52 @@ }, /turf/open/floor/greengrid, /area/fiorina/station/botany) -"bSP" = ( -/obj/item/tool/surgery/scalpel, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"bST" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/alien/weeds/node, +"bSS" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"bTc" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/tumor/aux_engi) -"bTe" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/chapel) "bTo" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/space, /area/fiorina/oob) -"bTG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/gun/shotgun/highchance, +"bTp" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/maintenance) +/area/fiorina/lz/near_lzI) +"bTr" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"bTC" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) "bTI" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ indestructible = 1; @@ -3354,67 +3282,28 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"bUt" = ( +/obj/structure/largecrate/random, +/obj/item/trash/pistachios, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "bUw" = ( /obj/structure/prop/invuln/minecart_tracks/bumper{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bUy" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) "bUB" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 }, /turf/open/space, /area/fiorina/oob) -"bUH" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_tram) -"bUJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/objective{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"bVh" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"bVk" = ( -/obj/item/device/flashlight/lamp/tripod, +"bVE" = ( +/obj/structure/closet/boxinggloves, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"bVO" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) -"bVY" = ( -/obj/structure/coatrack, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) +/area/fiorina/station/central_ring) "bVZ" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; @@ -3426,382 +3315,393 @@ /obj/structure/machinery/faxmachine, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"bWr" = ( +"bWy" = ( +/obj/item/reagent_container/glass/bucket/mopbucket, +/obj/item/tool/mop, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"bXc" = ( /obj/structure/inflatable/popped, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"bWE" = ( -/obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"bXa" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 - }, -/obj/structure/barricade/handrail/type_b{ dir = 4; - layer = 3.5 + icon_state = "whitegreen" }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/area/fiorina/station/medbay) +"bXe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_box/magazine/misc/flares, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/servers) +"bXh" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "bluecorner" }, -/area/fiorina/tumor/ice_lab) -"bXk" = ( -/obj/effect/decal/cleanable/blood/gibs/robot/limb, +/area/fiorina/station/chapel) +"bXz" = ( +/obj/item/stack/sheet/wood, /turf/open/floor/prison{ - dir = 5; + dir = 8; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"bYq" = ( -/obj/item/ammo_casing{ - icon_state = "casing_10_1" +"bXA" = ( +/obj/item/tool/screwdriver, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"bYY" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"bYv" = ( -/obj/structure/filingcabinet, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"bYB" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" + icon_state = "darkbrowncorners2" }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"bYG" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 +/area/fiorina/maintenance) +"bZn" = ( +/obj/item/device/taperecorder{ + pixel_x = 1; + pixel_y = 3 }, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"bYS" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" +/area/fiorina/station/chapel) +"bZD" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"bZu" = ( -/obj/structure/sink{ +/area/fiorina/tumor/aux_engi) +"bZI" = ( +/obj/structure/surface/table/reinforced/prison{ dir = 8; - pixel_x = -12 + flipped = 1 }, +/obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - dir = 10; + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"bZY" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"car" = ( +/obj/structure/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/prison{ + dir = 8; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"bZC" = ( -/obj/structure/barricade/wooden{ - dir = 4 - }, -/obj/item/tool/crowbar/red, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, +"caA" = ( +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"bZF" = ( -/obj/effect/landmark/objective_landmark/far, +/area/fiorina/tumor/servers) +"caC" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "green" }, -/area/fiorina/tumor/aux_engi) -"bZY" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) +/area/fiorina/station/transit_hub) "caF" = ( /turf/open/floor/wood, /area/fiorina/station/lowsec) -"cbb" = ( -/obj/structure/monorail{ - dir = 5; - name = "launch track" +"caX" = ( +/obj/structure/inflatable/popped/door, +/obj/item/ammo_casing{ + icon_state = "casing_1" }, -/turf/open/space, -/area/fiorina/oob) -"cbe" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison{ - 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 + dir = 10; + icon_state = "sterile_white" }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/medbay) +"cbd" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"cbA" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/fiorina/station/park) +"cbE" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + indestructible = 1 }, -/area/fiorina/station/power_ring) -"cbC" = ( -/obj/structure/kitchenspike, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/item/clothing/head/that{ + anchored = 1; + indestructible = 1; + pixel_y = 7 }, -/area/fiorina/station/power_ring) -"cbK" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/turf/open/floor/plating/prison, +/area/fiorina/tumor/civres) +"cbF" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/obj/item/weapon/gun/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/obj/item/storage/belt/marine, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, -/turf/open/floor/prison{ - icon_state = "redfull" +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/security) +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "cbN" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station) +"cbY" = ( +/obj/item/newspaper, +/turf/open/floor/prison{ + icon_state = "whitepurplecorner" + }, +/area/fiorina/station/research_cells) "ccH" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/prison, /area/fiorina/station/civres_blue) -"cdD" = ( +"ccY" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/prop/invuln{ + desc = "The best ride in the universe. For the one and only Souto Man! Although, this one seems to have no fuel left."; + dir = 4; + icon = 'icons/obj/vehicles/vehicles.dmi'; + icon_state = "soutomobile"; + name = "Disabled Souto Mobile" + }, +/turf/open/floor/prison, +/area/fiorina/station/park) +"ccZ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"cdp" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkbrown2" + icon_state = "darkyellow2" }, -/area/fiorina/station/park) -"cel" = ( +/area/fiorina/station/flight_deck) +"cdV" = ( /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"ceC" = ( -/turf/closed/wall/r_wall/prison, -/area/fiorina/station/security) -"ceZ" = ( -/obj/structure/bed{ - icon_state = "abed" + dir = 1; + icon_state = "blue_plate" }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/botany) +"cdY" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docstripingdir" }, -/area/fiorina/station/research_cells) -"cfc" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0" +/obj/structure/bed/roller, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/telecomm/lz1_cargo) -"cfj" = ( -/obj/item/trash/cigbutt, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"cft" = ( -/obj/item/frame/rack, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 +/area/fiorina/station/medbay) +"ceq" = ( +/obj/item/bodybag, +/obj/item/bodybag{ + pixel_y = 2 + }, +/obj/item/bodybag{ + pixel_y = 4 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"cfz" = ( -/obj/item/stock_parts/manipulator/pico, +/area/fiorina/station/medbay) +"cer" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "darkpurple2" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/tumor/servers) -"cfD" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"ceB" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, +/area/fiorina/station/civres_blue) +"ceC" = ( +/turf/closed/wall/r_wall/prison, +/area/fiorina/station/security) +"ceJ" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) -"cfN" = ( +"cfa" = ( +/obj/item/frame/rack, +/obj/structure/barricade/handrail/type_b{ + dir = 1 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, +/area/fiorina/station/lowsec) +"cfG" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) -"cgE" = ( -/obj/structure/machinery/vending/sovietsoda, +"cfU" = ( +/obj/item/prop/helmetgarb/gunoil, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"chA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space/basic, -/area/fiorina/oob) -"chJ" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/storage/fancy/cigar/tarbacks, +"cgx" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"chS" = ( -/obj/structure/window, +/area/fiorina/station/medbay) +"chg" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "bluefull" }, -/area/fiorina/tumor/servers) -"chT" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/power_ring) +"chx" = ( +/obj/structure/stairs/perspective{ dir = 8; - pixel_x = -10; - pixel_y = -3 + icon_state = "p_stair_full" }, -/turf/open/floor/wood, -/area/fiorina/station/park) -"cie" = ( -/obj/structure/machinery/vending/cola, -/obj/structure/prop/souto_land/streamer{ - pixel_y = 24 +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"chE" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + density = 0; + pixel_y = 16 }, /turf/open/floor/prison{ - dir = 4; + dir = 1; icon_state = "darkbrown2" }, -/area/fiorina/station/park) -"cif" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"ciX" = ( -/obj/structure/monorail{ - name = "launch track" - }, +/area/fiorina/maintenance) +"chT" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; + dir = 8; + pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) -"ciZ" = ( -/obj/item/explosive/grenade/incendiary/molotov, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/wood, +/area/fiorina/station/park) +"chZ" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 }, -/area/fiorina/station/lowsec) -"cjl" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/iv_drip{ - pixel_y = 19 +/obj/structure/curtain/shower, +/obj/structure/window{ + dir = 4 + }, +/obj/item/coin/uranium{ + desc = "You found one of the three uranium coins. It is entirely worthless." }, -/obj/item/newspaper, -/obj/item/bedsheet/green, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"cjp" = ( -/obj/item/stool, -/obj/structure/sign/poster{ - icon_state = "poster14"; - pixel_y = 32 +"ciy" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" +/obj/structure/platform_decoration{ + dir = 6 }, -/area/fiorina/station/lowsec) -"cjs" = ( -/obj/effect/decal/cleanable/blood, +/obj/structure/closet/emcloset, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/botany) -"cjA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/area/fiorina/station/medbay) +"ciA" = ( +/obj/structure/machinery/vending/snack/packaged, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"ciM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = -6; + pixel_y = 4 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/obj/item/reagent_container/syringe{ + pixel_x = 3; + pixel_y = -3 }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = 6; + pixel_y = 12 }, -/turf/open/space/basic, -/area/fiorina/oob) -"cjF" = ( +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"cjS" = ( -/obj/item/newspaper, +/area/fiorina/tumor/ice_lab) +"cje" = ( +/obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "darkpurplefull2" }, -/area/fiorina/tumor/ice_lab) -"ckj" = ( +/area/fiorina/tumor/servers) +"cjG" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/civres_blue) +"cki" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/secure_data{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "ckm" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"ckr" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_tram) +"ckt" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) "ckx" = ( /obj/structure/platform{ dir = 1 @@ -3809,35 +3709,27 @@ /obj/item/fuelCell, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"cky" = ( -/obj/structure/bed/roller, -/obj/item/trash/used_stasis_bag, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"ckD" = ( -/obj/item/stool, +"ckA" = ( +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) +"ckS" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"cll" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -5; - pixel_y = -6 - }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -5; - pixel_y = -11 + icon_state = "yellowfull" }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/area/fiorina/station/lowsec) +"ckZ" = ( +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/station/park) +"clb" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket" }, -/area/fiorina/station/flight_deck) +/turf/open/floor/prison, +/area/fiorina/station/chapel) "cls" = ( /obj/structure/surface/table/woodentable, /turf/open/floor/carpet, @@ -3846,9 +3738,19 @@ /obj/structure/girder, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"clG" = ( -/turf/open/floor/prison, -/area/fiorina/maintenance) +"clv" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"clA" = ( +/obj/item/weapon/baton/cattleprod, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "clN" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -3860,186 +3762,95 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"clZ" = ( -/obj/structure/machinery/washing_machine, -/obj/structure/machinery/washing_machine{ - pixel_y = 15 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"cmg" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"cmj" = ( -/obj/item/stack/sheet/wood, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" +"cmy" = ( +/obj/structure/sign/prop3{ + desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, -/area/fiorina/station/research_cells) -"cmm" = ( -/obj/structure/reagent_dispensers/watertank, +/turf/closed/wall/prison, +/area/fiorina/station/central_ring) +"cmE" = ( +/obj/item/stack/sheet/wood/medium_stack, +/obj/item/stack/sheet/wood/medium_stack, +/obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"cmz" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/fiorina/oob) -"cmI" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/prop/almayer/comp_open{ - pixel_y = 6 + icon_state = "darkbrownfull2" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/maintenance) "cmP" = ( /obj/structure/pipes/standard/tank{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"cmV" = ( +"cns" = ( /obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"cmW" = ( -/turf/open/floor/prison{ - icon_state = "panelscorched" - }, -/area/fiorina/station/chapel) -"cnl" = ( -/obj/structure/largecrate/supply/supplies/metal, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"cnn" = ( -/obj/item/device/flashlight, -/turf/open/floor/prison{ dir = 8; - icon_state = "blue" + icon_state = "p_stair_full" }, -/area/fiorina/station/civres_blue) -"cnu" = ( -/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison, -/area/fiorina/station/disco) -"cnU" = ( -/obj/structure/machinery/computer/atmos_alert, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/fiberbush) -"cnW" = ( -/obj/structure/inflatable/popped, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"coh" = ( -/obj/item/stack/sheet/metal, +/area/fiorina/station/security) +"cnH" = ( +/obj/item/stock_parts/manipulator/pico, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 6; + icon_state = "darkpurple2" }, -/area/fiorina/tumor/civres) +/area/fiorina/tumor/servers) "coj" = ( /obj/item/stool, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"coT" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 8; - icon_state = "greenblue" +"cpv" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/botany) -"cph" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/spacecash/c20, +/obj/structure/surface/rack, /turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/lz/near_lzI) "cpP" = ( /turf/closed/shuttle/elevator/gears, /area/fiorina/station/telecomm/lz1_cargo) -"cpS" = ( -/obj/structure/prop/souto_land/pole, -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 24 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"cpW" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"cqz" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_leftengine" }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, /area/fiorina/oob) -"cqc" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"cqy" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 +"cqP" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"cqz" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_leftengine" +"cqT" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched1" }, -/area/fiorina/oob) -"cqH" = ( -/obj/structure/surface/rack, -/obj/item/clothing/gloves/latex, +/area/fiorina/station/security) +"cqV" = ( +/obj/item/stool, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"cqU" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/station/power_ring) +"cqW" = ( +/obj/item/stool, +/turf/open/floor/prison{ + icon_state = "damaged2" + }, +/area/fiorina/station/lowsec) +"cqX" = ( +/obj/item/stool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) "cri" = ( /obj/structure/machinery/computer/prisoner, /obj/structure/window/reinforced{ @@ -4050,59 +3861,36 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"crw" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +"crm" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/lz/near_lzI) -"crH" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrowncorners2" +/area/fiorina/station/medbay) +"cry" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/fiorina/tumor/aux_engi) +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "crM" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) -"crO" = ( -/turf/open/floor/prison{ - icon_state = "damaged3" - }, -/area/fiorina/station/security) -"csl" = ( -/obj/item/trash/boonie, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"cso" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/obj/item/storage/pill_bottle/dexalin/skillless, +"csL" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"csp" = ( -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"csH" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 + dir = 4; + icon_state = "cell_stripe" }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) +/area/fiorina/station/telecomm/lz1_tram) "ctc" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" @@ -4113,76 +3901,112 @@ /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"ctz" = ( -/obj/structure/machinery/power/apc{ - dir = 8 +"ctC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/skills{ + dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "ctD" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"ctJ" = ( -/obj/effect/landmark/objective_landmark/close, +"ctI" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/tumor/civres) -"cua" = ( -/obj/structure/sign/safety/fire_haz, +/area/fiorina/station/research_cells) +"ctW" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/coin/uranium, +/obj/item/bedsheet/green, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/tumor/civres) -"cvf" = ( -/obj/structure/prop/structure_lattice{ +/area/fiorina/station/lowsec) +"ctY" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) +"cui" = ( +/obj/structure/bed/chair/comfy{ dir = 4 }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" }, +/area/fiorina/station/civres_blue) +"cum" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 1 + }, +/obj/item/frame/rack, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"cvk" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 +/area/fiorina/station/disco) +"cvc" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/structure/machinery/m56d_hmg/mg_turret/dropship{ + dir = 4 }, -/obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison{ dir = 1; - icon_state = "yellow" + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) +"cvd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, -/area/fiorina/station/lowsec) -"cvn" = ( -/obj/structure/window/framed/prison/reinforced/hull, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) -"cvp" = ( -/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ icon_state = "bluefull" }, -/area/fiorina/station/power_ring) -"cvq" = ( -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/civres_blue) +"cvi" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"cvr" = ( -/obj/structure/platform, -/obj/structure/reagent_dispensers/oxygentank{ - layer = 2.6 + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/station/medbay) +"cvn" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) +"cvv" = ( +/obj/structure/bed/sofa/vert/grey, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/lz/near_lzII) +"cvH" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "cvL" = ( /obj/effect/landmark/nightmare{ insert_tag = "gamertime" @@ -4198,203 +4022,193 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"cwO" = ( -/turf/open/floor/prison{ - icon_state = "whitegreen" +"cwM" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/station/medbay) -"cwU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"cxd" = ( -/obj/structure/prop/invuln/minecart_tracks/bumper{ - dir = 1 + icon_state = "floor_plate" }, +/area/fiorina/station/power_ring) +"cxb" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"cxe" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 + dir = 8; + icon_state = "darkbrown2" }, +/area/fiorina/maintenance) +"cxc" = ( +/obj/item/stack/folding_barricade, +/obj/structure/surface/table/woodentable/fancy, /turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/lz/near_lzI) -"cxl" = ( -/obj/structure/filingcabinet/disk, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/chapel) +"cxy" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0; + pixel_x = 10; + pixel_y = -8 }, -/area/fiorina/tumor/servers) -"cxn" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, -/area/fiorina/station/botany) -"cxF" = ( -/obj/structure/bed/chair/office/dark, +/turf/open/floor/prison, +/area/fiorina/station/security) +"cxA" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "cyb" = ( /turf/open/organic/grass{ desc = "It'll get in your shoes no matter what you do."; name = "astroturf" }, /area/fiorina/tumor/aux_engi) -"cyd" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) "cye" = ( /obj/item/trash/pistachios, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"cyu" = ( +"cyk" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) -"cyL" = ( +/obj/item/device/megaphone, /turf/open/floor/prison{ - icon_state = "platingdmg1" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/aux_engi) -"cyO" = ( -/obj/structure/machinery/vending/hydronutrients, +/area/fiorina/tumor/ice_lab) +"cyR" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "bluefull" }, -/area/fiorina/station/botany) -"cyU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/mineral/plastic/small_stack, -/turf/open/floor/prison, /area/fiorina/station/power_ring) "cyV" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"czj" = ( -/obj/structure/closet/toolcloset, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison{ +"czf" = ( +/obj/structure/monorail{ dir = 4; - icon_state = "darkbrown2" + name = "launch track" }, -/area/fiorina/maintenance) -"czC" = ( -/obj/structure/bedsheetbin, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"czr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"cAv" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 + icon_state = "bluefull" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/power_ring) +"czJ" = ( +/obj/structure/reagent_dispensers/watertank{ + layer = 2.6 }, -/area/fiorina/station/central_ring) -"cAA" = ( -/obj/effect/landmark/static_comms/net_two, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) -"cAV" = ( -/obj/item/ammo_casing{ - dir = 2; - icon_state = "casing_5" - }, +"cAJ" = ( +/obj/item/trash/snack_bowl, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec) +"cAO" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) +"cAU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/radio, +/obj/item/tool/pen/blue, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "cAW" = ( /turf/open/space/basic, /area/fiorina/oob) -"cBB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/mineral/plastic, +"cBm" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/electrical, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/tumor/aux_engi) +"cBn" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"cBG" = ( +/obj/effect/alien/weeds/node, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) +"cBJ" = ( +/obj/item/clothing/shoes/laceup, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) "cBK" = ( /obj/item/shard{ icon_state = "large" }, /turf/open/space, /area/fiorina/oob) -"cBQ" = ( -/obj/structure/platform{ - dir = 1 +"cBX" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13 }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"cBT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/computer/cameras{ - dir = 4 - }, +/area/fiorina/station/medbay) +"cCe" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitepurplecorner" }, -/area/fiorina/station/security) -"cBU" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/research_cells) +"cCh" = ( +/obj/item/ammo_casing{ + dir = 6; + icon_state = "casing_10_1" }, -/area/fiorina/tumor/servers) -"cBY" = ( -/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison, -/area/fiorina/tumor/servers) -"cCq" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"cCs" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/medbay) "cCt" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood, @@ -4403,6 +4217,14 @@ /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"cCy" = ( +/obj/structure/bed/sofa/vert/grey/top, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "cCB" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, @@ -4411,59 +4233,48 @@ /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, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) -"cDj" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"cCO" = ( +/obj/item/clothing/accessory/armband/cargo{ + desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; + name = "HEFA Order milita armband" }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/chapel) +"cDb" = ( +/obj/item/tool/crowbar, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "cDl" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"cDr" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" - }, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"cDZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ - dir = 1 +"cDE" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" }, +/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"cEf" = ( -/obj/item/tool/extinguisher, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"cEl" = ( +/area/fiorina/station/security) +"cEb" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"cEg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/maintenance) +/area/fiorina/station/research_cells) "cEw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/transit_hub) @@ -4472,114 +4283,108 @@ icon_state = "stan_inner_t_right" }, /area/fiorina/tumor/ship) -"cEB" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"cFf" = ( -/obj/structure/machinery/vending/snack, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +"cEG" = ( +/obj/item/tool/pickaxe, +/obj/structure/platform{ + dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"cFn" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison, -/area/fiorina/station/park) -"cFq" = ( -/obj/item/tool/mop, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"cFy" = ( -/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/lowsec) -"cFC" = ( -/obj/item/trash/cigbutt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/area/fiorina/tumor/ice_lab) +"cEW" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_4" }, -/area/fiorina/station/medbay) -"cFE" = ( -/obj/item/clothing/mask/cigarette, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/area/fiorina/station/research_cells) -"cFN" = ( +/area/fiorina/station/central_ring) +"cEY" = ( +/obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/central_ring) -"cFQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/vodka{ - pixel_x = -4; - pixel_y = 12 +/area/fiorina/station/park) +"cFg" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 }, -/obj/item/reagent_container/food/drinks/bottle/vodka{ - pixel_x = 6; - pixel_y = 3 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/lz/near_lzII) +"cFq" = ( +/obj/item/tool/mop, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"cFT" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/civres) "cFX" = ( /obj/structure/largecrate/supply/supplies, /obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"cGg" = ( -/obj/structure/machinery/gibber, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/power_ring) -"cGm" = ( +"cGa" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/ice_lab) "cGR" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/fiorina/station/park) -"cHq" = ( -/obj/structure/barricade/wooden{ - dir = 8 +"cGS" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"cGU" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"cHl" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"cHx" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison, /area/fiorina/station/security) -"cHD" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_one_access = null +"cHm" = ( +/obj/item/bedsheet/green, +/obj/structure/bed, +/obj/item/toy/plush/farwa, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"cHC" = ( +/obj/item/trash/popcorn, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, -/turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/lowsec) "cHF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright, @@ -4589,44 +4394,55 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"cHJ" = ( -/obj/item/trash/hotdog, +"cHK" = ( +/obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"cIt" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/medbay) -"cJa" = ( -/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "darkpurplefull2" }, -/area/fiorina/tumor/aux_engi) -"cJo" = ( -/obj/item/tool/warning_cone, +/area/fiorina/station/research_cells) +"cIJ" = ( /obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"cIQ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 + }, +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/fiorina/station/park) "cJv" = ( /obj/item/stack/rods, /turf/open/floor/corsat{ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) -"cJw" = ( -/obj/structure/surface/table/almayer, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/tool/pen, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "cJz" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -4638,30 +4454,94 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) +"cJL" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) +"cJS" = ( +/obj/item/trash/uscm_mre, +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) "cJW" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) +"cJY" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) "cKa" = ( /turf/closed/wall/prison, /area/fiorina/station/research_cells) -"cLc" = ( -/obj/structure/largecrate/random/case/small, -/obj/item/bodybag/tarp/reactive{ - pixel_y = 6 +"cKb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"cLr" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access, -/obj/structure/machinery/light/double/blue, +/area/fiorina/tumor/civres) +"cKB" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/ice_lab) +"cKH" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"cKJ" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/reagent_container/glass/bottle/robot/antitoxin, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"cKU" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/botany) "cLu" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -4669,92 +4549,111 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"cLE" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 +"cLy" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/obj/item/clothing/gloves/boxing/green, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) -"cLR" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "greenblue" +/area/fiorina/tumor/ice_lab) +"cLC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/machinery/computer/cameras{ + dir = 4 }, -/area/fiorina/station/botany) -"cMg" = ( -/obj/item/trash/snack_bowl, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"cME" = ( -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"cMJ" = ( -/obj/structure/machinery/vending/cola, +/area/fiorina/station/security) +"cLS" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"cNn" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/station/telecomm/lz1_cargo) +"cLZ" = ( +/obj/structure/largecrate/guns/merc, +/obj/item/toy/deck/uno, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, /area/fiorina/station/power_ring) -"cNC" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_y = 21 +"cMb" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) +"cMD" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, -/turf/open/floor/prison, /area/fiorina/station/central_ring) -"cOb" = ( -/obj/item/ammo_casing{ - icon_state = "casing_6" +"cME" = ( +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"cMP" = ( +/obj/structure/machinery/shower{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "kitchen" }, -/area/fiorina/station/lowsec) -"cOl" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/research_cells) +"cNe" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, -/area/fiorina/station/research_cells) -"cOn" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/tumor/servers) +"cOj" = ( /turf/open/floor/prison{ - dir = 8; icon_state = "blue" }, /area/fiorina/station/civres_blue) -"cOq" = ( -/obj/item/disk, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"cOy" = ( -/obj/item/tool/shovel/snow, -/obj/item/device/flashlight, -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/science, +"cOB" = ( +/obj/item/stool, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/flight_deck) +"cOC" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"cOF" = ( +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"cOL" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "darkyellow2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/telecomm/lz1_cargo) +"cPh" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "cPq" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -4763,69 +4662,74 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"cPI" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "4" +"cPs" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/item/prop/helmetgarb/flair_initech, -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"cPQ" = ( -/obj/structure/bed/roller, -/obj/effect/decal/cleanable/blood/gibs/body, +/area/fiorina/tumor/servers) +"cPz" = ( +/obj/structure/machinery/fuelcell_recycler, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"cQn" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +/area/fiorina/station/telecomm/lz1_cargo) +"cPC" = ( +/obj/item/stack/sandbags_empty, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) -"cQu" = ( -/obj/item/weapon/gun/energy/taser, -/turf/open/floor/prison, -/area/fiorina/station/security) -"cQA" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 +/area/fiorina/tumor/civres) +"cPL" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/obj/structure/machinery/shower{ - dir = 4 +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) +"cQe" = ( +/obj/item/reagent_container/food/snacks/donkpocket, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"cQf" = ( +/obj/structure/machinery/power/apc{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/research_cells) -"cQG" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/lowsec) +"cQv" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1"; + layer = 3 }, +/area/fiorina/oob) +"cRg" = ( +/obj/structure/machinery/vending/coffee/simple, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"cQX" = ( -/obj/item/stack/cable_coil, +/area/fiorina/station/park) +"cRl" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/book/manual/security_space_law, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/servers) -"cRs" = ( -/obj/effect/landmark/survivor_spawner, +/area/fiorina/station/security) +"cRx" = ( +/obj/structure/machinery/sensortower, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/civres) "cRB" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ density = 0; @@ -4835,63 +4739,115 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"cRN" = ( -/obj/structure/closet/emcloset, -/obj/item/weapon/nullrod{ - desc = "The explosive tip has been deactivated."; - force = 25; - icon_state = "hefasword"; - name = "de-activated HEFA Sword" +"cRI" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"cRS" = ( -/obj/structure/platform, +/obj/item/stool, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"cRK" = ( +/obj/structure/window, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"cRM" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"cRZ" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"cSh" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, /area/fiorina/station/botany) "cTr" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"cTA" = ( -/obj/item/shard{ - icon_state = "medium" - }, +"cTx" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp/green, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"cTy" = ( +/obj/item/stool, +/obj/item/trash/cigbutt{ + pixel_y = 8 }, -/area/fiorina/station/disco) -"cUE" = ( -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"cVk" = ( -/obj/structure/platform_decoration{ - dir = 8 +"cTD" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/obj/structure/platform_decoration{ - dir = 4 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibup1" +/area/fiorina/lz/near_lzI) +"cTE" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_1" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"cVl" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +"cUd" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/lz/near_lzI) +"cUA" = ( +/obj/structure/largecrate/random, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/station/park) +"cUU" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) +"cVu" = ( +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "cVQ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -4903,120 +4859,59 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, /area/fiorina/station/disco) -"cVX" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; - pixel_x = 1; - pixel_y = -1 +"cXp" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/ice_lab) +"cXV" = ( +/obj/item/ammo_magazine/smg/mp5, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 1; + icon_state = "darkyellowcorners2" }, -/area/fiorina/station/research_cells) -"cWG" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"cYd" = ( /obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/plating/prison, -/area/fiorina/station/chapel) -"cWM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/blood/empty{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_container/blood/BMinus{ - pixel_x = 7; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"cWN" = ( -/obj/item/weapon/gun/rifle/mar40, +/area/fiorina/tumor/ice_lab) +"cYe" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"cWR" = ( -/obj/effect/landmark/objective_landmark/medium, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"cWU" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"cXm" = ( -/obj/item/inflatable, -/obj/item/inflatable, -/obj/item/inflatable, -/obj/item/inflatable, -/obj/item/inflatable, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"cXq" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/surface/rack, -/obj/item/stack/flag/yellow, -/obj/item/stack/flag/yellow, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"cXw" = ( -/obj/structure/machinery/photocopier{ +/area/fiorina/station/transit_hub) +"cYi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/card/id/gold{ + pixel_x = 2; pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/oob) -"cXY" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"cYa" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/central_ring) -"cYg" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/research_cells) +"cYj" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "p_stair_full" + pixel_y = 21 }, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"cYv" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/station/lowsec) +"cYI" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/aux_engi) "cYP" = ( /obj/structure/closet/crate/trashcart, /obj/item/storage/pill_bottle/dexalin/skillless, @@ -5024,6 +4919,19 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"cYS" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/central_ring) "cYT" = ( /obj/vehicle/powerloader{ dir = 8 @@ -5032,24 +4940,38 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"cYY" = ( -/obj/structure/machinery/iv_drip{ - pixel_y = 19 +"cYV" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) +"cZe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/phone, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"cZc" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/area/fiorina/tumor/ice_lab) +"cZh" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/spawner/random/gun/rifle, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/area/fiorina/station/lowsec) +"cZp" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" }, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "cZq" = ( /obj/item/shard{ icon_state = "medium" @@ -5060,18 +4982,39 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"cZy" = ( +/obj/structure/machinery/door/window/northleft{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security/wardens) +"cZP" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"cZR" = ( +/turf/open/floor/prison{ + icon_state = "damaged2" + }, +/area/fiorina/station/disco) "cZV" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, /turf/open/floor/wood, /area/fiorina/station/security) -"das" = ( -/obj/structure/platform/shiva{ - dir = 1 +"dae" = ( +/obj/structure/machinery/vending/walkman, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/aux_engi) "daA" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -5092,19 +5035,25 @@ /obj/structure/machinery/autolathe, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"daP" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "daS" = ( /obj/item/ammo_magazine/pistol/kt42, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"daY" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/trash/kepler, +/turf/open/floor/prison, +/area/fiorina/station/security) +"dbh" = ( +/obj/structure/machinery/vending/sovietsoda, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"dbi" = ( +/obj/item/storage/toolbox/electrical, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) "dbq" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -5116,63 +5065,93 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"dbL" = ( -/obj/item/clothing/under/color/orange, -/turf/open/floor/prison{ - icon_state = "yellowfull" +"dbr" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/lowsec) -"dbX" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/park) +"dbI" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 8; + icon_state = "floor_marked" }, -/area/fiorina/tumor/aux_engi) -"ddc" = ( -/obj/item/stack/sandbags_empty/half, +/area/fiorina/station/lowsec) +"dbW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/donkpockets{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/storage/box/donkpockets, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"dcv" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"dds" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/station/research_cells) +"dcy" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"dcO" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "yellow" + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) +"dde" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/oob) +"ddt" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/beer_pack{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) -"ddz" = ( -/obj/item/stack/sheet/cardboard, +"ddv" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" + dir = 4; + icon_state = "darkbrown2" }, -/area/fiorina/station/research_cells) +/area/fiorina/maintenance) "ddA" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"ddE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -5; - pixel_y = -6 - }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -5; - pixel_y = -11 - }, +"ddB" = ( /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) -"ddF" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" + dir = 9; + icon_state = "whitegreen" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/medbay) +"ddD" = ( +/obj/structure/janitorialcart, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "ddG" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xtracks" @@ -5188,14 +5167,24 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"ddO" = ( -/obj/structure/machinery/computer/cameras{ - dir = 1 +"ddN" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" }, +/area/fiorina/tumor/servers) +"ddU" = ( +/obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security) +/area/fiorina/tumor/servers) +"ddY" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) "dec" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -5214,207 +5203,100 @@ name = "astroturf" }, /area/fiorina/station/park) -"deE" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"deH" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) "deL" = ( /obj/structure/window/framed/prison/reinforced/hull, /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) -"deN" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) "deR" = ( /obj/item/toy/crayon/red, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"deW" = ( -/obj/structure/bed/chair{ - dir = 8 - }, +"dfc" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"dfa" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"dfu" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "darkbrown2" +/area/fiorina/oob) +"dfh" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/station/park) -"dfz" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"dfD" = ( -/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"dfV" = ( +/area/fiorina/station/civres_blue) +"dfA" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 + }, +/obj/structure/machinery/m56d_hmg, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"dga" = ( /obj/structure/monorail{ + dir = 4; name = "launch track" }, /turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"dfZ" = ( -/obj/effect/spawner/random/gun/rifle/lowchance, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"dgx" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"dgz" = ( -/obj/item/trash/cigbutt/ucigbutt, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"dgB" = ( -/obj/structure/barricade/wooden{ - dir = 1 +/area/fiorina/tumor/aux_engi) +"dhc" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"dgF" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"dhe" = ( -/turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "yellow" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/disco) "dhi" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/space/basic, /area/fiorina/oob) -"dhj" = ( -/obj/item/trash/eat, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/structure/machinery/blackbox_recorder, -/obj/item/prop/almayer/flight_recorder/colony{ - pixel_x = -6; - pixel_y = 10 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"dhs" = ( -/obj/item/tool/weldingtool, -/turf/open/floor/prison, -/area/fiorina/station/security) -"dhD" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" +"dhL" = ( +/obj/structure/barricade/wooden{ + dir = 4 }, -/area/fiorina/station/lowsec) -"dhN" = ( -/obj/structure/machinery/light/double/blue, +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"dhV" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/civres_blue) +"dhZ" = ( +/obj/structure/window/reinforced{ dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" + layer = 3 }, -/area/fiorina/lz/near_lzI) -"diP" = ( +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"diF" = ( +/obj/item/stack/sheet/cardboard, /turf/open/floor/prison{ - dir = 9; - icon_state = "green" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/tumor/civres) -"diR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger, -/obj/item/clothing/accessory/holobadge/cord, +/area/fiorina/station/lowsec) +"diJ" = ( +/obj/item/stool, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "yellowfull" }, -/area/fiorina/lz/near_lzI) -"diS" = ( -/obj/structure/largecrate/supply/supplies/water, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = -4; - pixel_y = 14 +/area/fiorina/station/lowsec) +"diL" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 1; - pixel_y = 12 +/obj/structure/platform{ + dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"diX" = ( -/obj/structure/machinery/disposal, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"djd" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "greenbluecorner" - }, -/area/fiorina/station/botany) +/area/fiorina/station/central_ring) "dje" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/prison, @@ -5423,23 +5305,6 @@ /obj/effect/spawner/random/gun/smg/midchance, /turf/open/floor/wood, /area/fiorina/station/park) -"djx" = ( -/obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"djA" = ( -/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/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) "djB" = ( /obj/vehicle/powerloader{ dir = 4 @@ -5448,162 +5313,105 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"djU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) -"dka" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"djF" = ( +/obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "whitepurple" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/research_cells) "dkb" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"dkj" = ( +"dkl" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 6; + pixel_y = -7 + }, +/obj/structure/prop/souto_land/streamer{ + pixel_y = 24 + }, +/turf/open/floor/prison, +/area/fiorina/station/park) +"dkn" = ( +/turf/open/floor/prison, +/area/fiorina/station/security/wardens) +"dkz" = ( +/obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"dkX" = ( +/obj/structure/barricade/sandbags{ dir = 8; - icon_state = "whitepurple" + icon_state = "sandbag_0" }, -/area/fiorina/station/research_cells) -"dkC" = ( -/obj/item/tool/warning_cone, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "darkyellow2" }, -/area/fiorina/station/park) -"dkP" = ( -/obj/structure/largecrate/random, -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/telecomm/lz1_cargo) +"dlj" = ( +/obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"dlr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/radio{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/device/radio{ + pixel_x = 6; + pixel_y = 7 }, -/area/fiorina/station/park) -"dla" = ( -/obj/structure/inflatable, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "redfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "dlA" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"dlE" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/disco) -"dlW" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +"dmQ" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"dlX" = ( -/obj/structure/surface/rack, -/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" +"dmT" = ( +/obj/item/shard{ + icon_state = "large" }, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"dme" = ( -/obj/structure/machinery/deployable/barrier, -/turf/open/floor/prison, -/area/fiorina/station/security) -"dmu" = ( -/obj/structure/filingcabinet/disk, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"dmB" = ( -/obj/structure/bed/chair{ +/area/fiorina/station/park) +"dnj" = ( +/obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"dmH" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"dnp" = ( -/obj/item/ammo_casing{ - icon_state = "casing_8" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"dnx" = ( -/obj/structure/bed/sofa/south/grey/left, -/obj/structure/machinery/light/double/blue{ - dir = 1; +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 2; pixel_y = 21 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/disco) "dnz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/spawner/random/toy, /turf/open/floor/wood, /area/fiorina/station/chapel) -"dnA" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"dnB" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"dnE" = ( -/obj/structure/machinery/newscaster{ - pixel_y = 32 - }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"dnI" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "ywflowers_4" - }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) "dnK" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -5613,6 +5421,12 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) +"dnX" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "doe" = ( /obj/item/tool/kitchen/utensil/pspoon, /turf/open/space/basic, @@ -5629,13 +5443,6 @@ /obj/structure/machinery/computer/shuttle/dropship/flight/lz1, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"doB" = ( -/obj/item/ammo_casing{ - dir = 6; - icon_state = "casing_10_1" - }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) "doD" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -5655,40 +5462,36 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"dpr" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"dpe" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 }, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 6; + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"dpt" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" +"dpn" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/telecomm/lz1_cargo) -"dpE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/powercell, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/tumor/servers) +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "dpH" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"dpI" = ( -/obj/structure/window/reinforced{ - dir = 8 +"dpZ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "greenblue" }, -/obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/botany) "dqa" = ( /obj/structure/platform{ dir = 1 @@ -5698,13 +5501,6 @@ name = "pool" }, /area/fiorina/station/park) -"dqk" = ( -/obj/effect/spawner/random/sentry/midchance, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "dqE" = ( /obj/structure/prop/souto_land/pole, /turf/open/floor/wood, @@ -5722,79 +5518,92 @@ icon_state = "stan_inner_s_w" }, /area/fiorina/tumor/ship) -"dra" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 +"dqX" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; - pixel_x = 1; - pixel_y = -1 +/area/fiorina/tumor/ice_lab) +"drd" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ dir = 5; - icon_state = "whitepurple" + icon_state = "darkyellow2" }, -/area/fiorina/station/research_cells) -"dro" = ( -/obj/structure/closet/l3closet/general, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"dso" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/effect/spawner/random/tool, -/obj/item/clothing/gloves/combat, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"dsv" = ( -/obj/item/stack/cable_coil, +/area/fiorina/station/flight_deck) +"drk" = ( +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"dsQ" = ( -/obj/effect/decal/cleanable/blood/drip, +/area/fiorina/station/power_ring) +"drt" = ( +/obj/structure/machinery/vending/hydroseeds, /turf/open/floor/prison{ - dir = 5; - icon_state = "greenblue" + dir = 1; + icon_state = "blue_plate" }, /area/fiorina/station/botany) -"dsT" = ( +"drZ" = ( +/obj/item/clothing/mask/cigarette, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/tumor/ice_lab) -"dtc" = ( -/obj/structure/bed/chair{ +/area/fiorina/station/research_cells) +"dsS" = ( +/obj/structure/barricade/handrail/type_b{ dir = 4; - pixel_y = 4 + layer = 3.5 }, +/obj/item/trash/barcardine, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrowncorners2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/maintenance) +/area/fiorina/tumor/ice_lab) +"dsW" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) "dtg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"dui" = ( -/obj/item/ammo_casing{ - icon_state = "casing_6_1" +"dtk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/golden_cup, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/power_ring) +"dtR" = ( +/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/civres_blue) +"dtS" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, +/area/fiorina/station/chapel) +"due" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/monorail{ + dir = 10; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "duw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/machinery/light/double/blue{ @@ -5805,19 +5614,6 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"duB" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/curtain/shower, -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "duF" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, @@ -5826,59 +5622,56 @@ /obj/structure/machinery/photocopier, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"dvq" = ( -/obj/structure/machinery/newscaster, -/turf/closed/wall/prison, -/area/fiorina/station/medbay) -"dvs" = ( +"duV" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/emails{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"dvV" = ( -/obj/item/stack/cable_coil, +/obj/item/clipboard, /turf/open/floor/prison{ - dir = 5; - icon_state = "blue" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"dvY" = ( -/obj/structure/machinery/door/airlock/almayer/maint/autoname{ - dir = 1; - name = "\improper Null Hatch REPLACE ME"; - req_access = null; - req_one_access = null - }, -/turf/open/floor/plating/prison, +"duW" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"dwg" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"dvg" = ( +/obj/structure/bed/sofa/south/grey/right, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"dvq" = ( +/obj/structure/machinery/newscaster, +/turf/closed/wall/prison, +/area/fiorina/station/medbay) +"dvB" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) +"dwf" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"dwk" = ( -/obj/structure/surface/rack, -/obj/item/device/camera, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/fiberbush) -"dwM" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" +/area/fiorina/maintenance) +"dwJ" = ( +/obj/structure/machinery/processor{ + desc = "It CAN blend it."; + icon_state = "blender_e"; + name = "Blendomatic"; + pixel_x = -2; + pixel_y = 10 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/medbay) +/area/fiorina/station/civres_blue) +"dwP" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/station/chapel) "dwQ" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/fiberbush) @@ -5888,80 +5681,81 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) +"dwZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/objective{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "dxb" = ( /obj/item/storage/briefcase/stowaway, /turf/open/space, /area/fiorina/oob) -"dxd" = ( -/obj/structure/platform{ - dir = 1 +"dxc" = ( +/obj/structure/monorail{ + name = "launch track" }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/park) -"dxg" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/lz/near_lzI) +"dxl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/area/fiorina/tumor/servers) -"dxA" = ( -/obj/structure/barricade/wooden, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/fiorina/oob) +"dxv" = ( /turf/open/floor/prison{ - icon_state = "cell_stripe" + dir = 10; + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) +/area/fiorina/maintenance) "dxE" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"dxJ" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"dxO" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +"dxP" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/flight_deck) +/turf/open/floor/plating/prison, +/area/fiorina/tumor/civres) "dxS" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/servers) -"dyd" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +"dxW" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"dyi" = ( +/area/fiorina/station/power_ring) +"dyh" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/disco) -"dyp" = ( -/obj/item/tool/kitchen/utensil/pspoon, /turf/open/floor/prison{ dir = 4; - icon_state = "blue" + icon_state = "greenfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/servers) "dyB" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" @@ -5969,81 +5763,52 @@ /obj/item/explosive/grenade/high_explosive/m15, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"dyM" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"dzj" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"dzk" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"dyY" = ( +/obj/structure/toilet{ + dir = 1 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/tumor/civres) "dzl" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) -"dzo" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"dAe" = ( -/obj/structure/machinery/line_nexter{ - id = "line2"; - pixel_x = -2 +"dzB" = ( +/turf/open/floor/prison{ + icon_state = "kitchen" }, -/obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"dAk" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/prison, -/area/fiorina/station/park) -"dAA" = ( -/obj/structure/barricade/wooden{ - dir = 4 +/area/fiorina/station/research_cells) +"dzE" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 }, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"dAB" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"dAQ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 + icon_state = "kitchen" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"dBa" = ( +/area/fiorina/station/lowsec) +"dAd" = ( /obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" + icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform, +/obj/structure/platform/stair_cut/alt, /turf/open/floor/plating/prison, /area/fiorina/station/disco) +"dAg" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"dBl" = ( +/obj/item/ammo_magazine/rifle/mar40/extended, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "dBq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -6059,55 +5824,81 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"dBC" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"dBs" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/prison{ + icon_state = "redfull" }, +/area/fiorina/station/security) +"dBt" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "greenblue" }, -/area/fiorina/tumor/servers) -"dBI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt, +/area/fiorina/station/botany) +"dBy" = ( +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"dBz" = ( +/obj/structure/bed/chair/comfy, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"dBO" = ( +/obj/structure/machinery/vending/security, +/turf/open/floor/prison{ + icon_state = "redfull" }, +/area/fiorina/station/security) +"dBZ" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/station/flight_deck) +"dCg" = ( +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/obj/item/prop/helmetgarb/flair_initech, +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"dBR" = ( -/obj/structure/bed/chair/comfy{ +"dCn" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + density = 0; dir = 4 }, /turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"dBY" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/security) +"dCs" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gib2" }, -/area/fiorina/tumor/servers) -"dCb" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/station/power_ring) -"dCl" = ( -/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/servers) -"dCo" = ( -/obj/item/clothing/shoes/laceup, +/area/fiorina/station/medbay) +"dCt" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/transit_hub) "dCu" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -6115,133 +5906,88 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"dCA" = ( -/obj/item/organ/lungs, -/obj/effect/decal/cleanable/blood, +"dCv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"dCF" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) +"dCK" = ( +/obj/structure/prop/souto_land/pole, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "dCM" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"dDm" = ( -/obj/item/device/flashlight, +"dDn" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"dDy" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"dDM" = ( -/obj/structure/closet/wardrobe/orange, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"dDS" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" +/area/fiorina/station/park) +"dDI" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 8 }, -/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ dir = 4; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"dDU" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgibdown1" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) -"dEo" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" + icon_state = "darkyellowfull2" }, -/obj/structure/platform, +/area/fiorina/lz/near_lzI) +"dDT" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"dEy" = ( -/obj/item/trash/uscm_mre, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) -"dEF" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 + pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/power_ring) -"dEI" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/tumor/servers) +"dDU" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgibdown1" }, -/obj/structure/platform, /turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) -"dFh" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/chapel) -"dFk" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreencorner" - }, -/area/fiorina/tumor/ice_lab) -"dFw" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +"dEh" = ( +/obj/item/reagent_container/food/drinks/cans/sodawater, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) -"dFC" = ( -/obj/structure/prop/almayer/computers/sensor_computer1{ - name = "computer" +/area/fiorina/station/central_ring) +"dEj" = ( +/obj/structure/machinery/optable{ + desc = "This maybe could be used for advanced medical procedures."; + name = "Exam Table" }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/obj/item/bedsheet/ce{ + desc = "It crinkles, aggressively."; + name = "sterile wax sheet" }, -/area/fiorina/station/lowsec) -"dFE" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/park) -"dFG" = ( -/obj/structure/inflatable, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" + icon_state = "redfull" }, /area/fiorina/station/medbay) +"dFh" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/chapel) +"dFB" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/spawner/random/gun/shotgun/midchance, +/turf/open/floor/prison, +/area/fiorina/station/security) "dFH" = ( /obj/structure/closet/cabinet, /obj/item/key/cargo_train, @@ -6249,36 +5995,28 @@ /obj/item/clothing/accessory/armband/cargo, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"dFM" = ( -/obj/item/circuitboard/machine/pacman/super, -/obj/structure/machinery/constructable_frame{ - icon_state = "box_1" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"dFO" = ( -/obj/item/weapon/gun/rifle/m16, -/obj/effect/decal/cleanable/blood, +"dFI" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, /turf/open/floor/prison{ - icon_state = "damaged3" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security) -"dGc" = ( -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/research_cells) +"dFK" = ( +/obj/structure/surface/rack, +/obj/item/ammo_box/magazine/nailgun, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/park) -"dGj" = ( -/obj/structure/machinery/power/apc{ - start_charge = 0 +/area/fiorina/maintenance) +"dFM" = ( +/obj/item/circuitboard/machine/pacman/super, +/obj/structure/machinery/constructable_frame{ + icon_state = "box_1" }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"dGw" = ( -/turf/open/floor/prison, -/area/fiorina/station/central_ring) +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "dGx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -6291,107 +6029,101 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) +"dGA" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/park) +"dHb" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/storage/box/pillbottles, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "dHd" = ( /obj/structure/sign/safety/bulkhead_door, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/civres) -"dHp" = ( +"dHD" = ( /turf/open/floor/prison{ - dir = 8; + dir = 1; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"dHI" = ( -/obj/item/ammo_casing{ - icon_state = "casing_1" - }, +"dHU" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"dIa" = ( -/obj/item/stack/sheet/metal{ - amount = 5 + icon_state = "platingdmg1" }, +/area/fiorina/station/security) +"dIh" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"dIi" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" + dir = 10; + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "dIo" = ( /turf/closed/wall/prison, /area/fiorina/tumor/civres) -"dIp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"dIq" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" +"dIx" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/flight_deck) -"dID" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/medical_decals{ - dir = 4; - icon_state = "triagedecaldir" +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, +/area/fiorina/station/disco) +"dJd" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"dIK" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/area/fiorina/station/lowsec) +"dJe" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/park) +"dJh" = ( +/obj/structure/bookcase/manuals/research_and_development{ + pixel_y = 10 }, -/obj/structure/largecrate/random, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"dJt" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/area/fiorina/station/telecomm/lz1_tram) -"dJl" = ( -/obj/item/device/flashlight/flare, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + icon_state = "yellow" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/disco) "dKo" = ( /obj/effect/spawner/random/gun/shotgun, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"dKy" = ( -/obj/item/trash/c_tube, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"dKI" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +"dKB" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"dKN" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) +/area/fiorina/station/telecomm/lz1_tram) "dKX" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/plating/plating_catwalk/prison, @@ -6402,133 +6134,142 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"dLx" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 - }, +"dLL" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"dLF" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" + icon_state = "darkpurple2" }, -/area/fiorina/station/research_cells) -"dMa" = ( -/obj/structure/stairs/perspective, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"dMc" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/tumor/servers) +"dLN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/emails{ + pixel_y = 5 }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"dMm" = ( -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"dMv" = ( +"dMt" = ( /turf/open/floor/prison{ - icon_state = "greenbluecorner" + dir = 8; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/botany) -"dMK" = ( -/obj/item/tool/pickaxe, -/obj/item/tool/pickaxe{ - pixel_y = 5 +/area/fiorina/tumor/aux_engi) +"dNc" = ( +/obj/structure/platform{ + dir = 1 }, -/obj/item/tool/pickaxe{ - pixel_y = 10 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"dMO" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/fiorina/station/power_ring) +"dNh" = ( +/turf/open/auto_turf/sand/layer1, +/area/fiorina/lz/near_lzI) +"dNk" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"dNx" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/aux_engi) +"dNC" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" + icon_state = "darkredfull2" }, -/area/fiorina/station/park) -"dNh" = ( -/turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzI) -"dNF" = ( +"dOk" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "panelscorched" + }, +/area/fiorina/tumor/civres) +"dOt" = ( +/obj/structure/surface/table/reinforced/prison{ + flipped = 1 }, -/area/fiorina/tumor/ice_lab) -"dOs" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/medbay) "dOE" = ( /obj/item/storage/bible/hefa, /turf/open/floor/wood, /area/fiorina/station/chapel) -"dOF" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, +"dOO" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/oob) +/area/fiorina/station/medbay) "dOX" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzI) -"dPC" = ( -/obj/structure/machinery/computer3/server/rack, +"dOZ" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"dPQ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/area/fiorina/station/power_ring) +"dPe" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/disco) -"dQp" = ( -/obj/effect/decal/hefa_cult_decals/d32, +"dPm" = ( +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 + }, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"dQA" = ( -/obj/item/tool/screwdriver, +/area/fiorina/station/power_ring) +"dPr" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/telecomm/lz1_tram) +"dPZ" = ( +/obj/structure/monorail{ + dir = 6; + name = "launch track" + }, +/turf/open/space, +/area/fiorina/oob) +"dQe" = ( +/obj/item/tool/surgery/scalpel, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"dQV" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) "dQW" = ( /obj/item/ammo_casing{ dir = 8; @@ -6539,22 +6280,28 @@ name = "astroturf" }, /area/fiorina/station/park) -"dQY" = ( -/obj/structure/platform{ - dir = 4 +"dRk" = ( +/obj/item/shard{ + icon_state = "large" }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/disco) -"dRm" = ( -/obj/item/storage/bible/hefa, +/area/fiorina/tumor/servers) +"dRs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/accessory/blue, /turf/open/floor/prison{ - dir = 6; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/aux_engi) +"dRx" = ( +/obj/structure/monorail{ + dir = 5; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "dRO" = ( /obj/effect/acid_hole{ dir = 4 @@ -6564,120 +6311,143 @@ name = "metal wall" }, /area/fiorina/oob) -"dRW" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"dSw" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"dSy" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 8 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"dSz" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, +"dSM" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/tumor/servers) "dTf" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"dTp" = ( +"dTg" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"dTv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) "dTx" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"dUs" = ( +"dTX" = ( +/obj/structure/surface/rack, +/obj/item/storage/bible/hefa{ + pixel_y = 3 + }, +/obj/item/storage/bible/hefa, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"dUf" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/prison{ dir = 9; - icon_state = "blue" + icon_state = "greenfull" }, -/area/fiorina/station/civres_blue) -"dUZ" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/tumor/civres) +"dUi" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 8 }, -/turf/open/space/basic, -/area/fiorina/oob) -"dVe" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"dUn" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_x = 1; + pixel_y = 10 }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"dUu" = ( +/obj/structure/machinery/recharge_station, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"dVm" = ( -/obj/item/storage/pill_bottle/spaceacillin/skillless, +/area/fiorina/station/security) +"dUx" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, /turf/open/floor/prison{ - dir = 5; + dir = 6; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"dVK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"dWx" = ( -/obj/structure/platform_decoration{ - dir = 4 +"dVu" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"dVx" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"dVA" = ( +/obj/item/stool, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"dVC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"dVD" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"dVR" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"dWn" = ( +/obj/structure/barricade/wooden, +/obj/item/device/flashlight/flare, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"dWp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/pill_bottle/russianRed{ + pixel_y = 9 + }, +/obj/item/storage/pill_bottle/kelotane/skillless, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "dWB" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"dWM" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"dWN" = ( -/obj/structure/inflatable/popped/door, +"dXi" = ( +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 4; + icon_state = "darkpurple2" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) "dXv" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -6687,122 +6457,138 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"dXz" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) "dXG" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"dXH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +"dXK" = ( +/obj/item/newspaper, /turf/open/floor/prison{ + icon_state = "green" + }, +/area/fiorina/station/transit_hub) +"dXN" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 + }, +/obj/structure/barricade/handrail/type_b{ dir = 4; - icon_state = "blue_plate" + layer = 3.5 }, -/area/fiorina/station/botany) -"dYp" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Hangar Landing Zone" +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"dYr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/explosive/grenade/incendiary/molotov, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/tumor/ice_lab) +"dXS" = ( +/obj/structure/bed/chair/office/light, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/station/lowsec) -"dYv" = ( -/obj/item/device/flashlight, +/area/fiorina/station/research_cells) +"dXT" = ( +/obj/structure/platform_decoration, +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"dYI" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan20" +/area/fiorina/station/power_ring) +"dYi" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) +"dYo" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/area/fiorina/tumor/aux_engi) -"dYP" = ( -/obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "yellow" }, -/area/fiorina/station/research_cells) -"dZc" = ( -/obj/structure/bed/chair{ - dir = 1 +/area/fiorina/station/disco) +"dYp" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "Hangar Landing Zone" }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"dYq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/faxmachine, /turf/open/floor/prison{ - dir = 9; - icon_state = "blue" + icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"dZt" = ( -/obj/structure/machinery/disposal, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"dYC" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) +"dYI" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan20" }, +/area/fiorina/tumor/aux_engi) +"dYV" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/chapel) -"dZA" = ( -/obj/structure/closet, +/area/fiorina/maintenance) +"dZj" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/flight_deck) -"eag" = ( -/obj/item/clothing/under/color/orange, -/obj/item/clothing/under/color/orange, -/obj/item/clothing/under/color/orange, -/obj/structure/surface/rack, +/area/fiorina/tumor/aux_engi) +"dZo" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"eaL" = ( +/area/fiorina/tumor/aux_engi) +"dZu" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/head/beret/eng{ - pixel_x = 5; - pixel_y = 3 +/obj/item/card/id/guest, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "redfull" }, -/obj/item/book/manual/engineering_guide{ - pixel_x = -4 +/area/fiorina/station/security) +"dZK" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, +/area/fiorina/station/chapel) +"dZQ" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"eac" = ( +/obj/structure/bed/chair{ + dir = 1 }, -/area/fiorina/tumor/civres) -"eaQ" = ( -/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + icon_state = "yellowfull" + }, +/area/fiorina/station/disco) +"eao" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" }, /area/fiorina/station/lowsec) -"eaZ" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"ebc" = ( +"eca" = ( /obj/structure/platform{ dir = 1 }, @@ -6814,48 +6600,25 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"ebm" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 5; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"ebP" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"ecp" = ( -/obj/structure/inflatable/popped/door, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) "ecu" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"ecC" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 +"ecD" = ( +/obj/structure/bed/chair{ + dir = 1 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"ecF" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ - pixel_y = 32 +/obj/structure/prop/souto_land/streamer{ + pixel_y = 24 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + icon_state = "darkbrown2" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/park) "ecL" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -6869,60 +6632,62 @@ icon_state = "stan_rightengine" }, /area/fiorina/tumor/ship) -"eda" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, +"ecU" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"edd" = ( -/obj/structure/window/framed/prison/reinforced, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"edv" = ( -/obj/item/storage/fancy/cigar, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"eej" = ( -/obj/item/reagent_container/food/drinks/coffee{ - name = "\improper paper cup" + icon_state = "darkyellow2" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"eev" = ( -/obj/structure/machinery/vending/walkman, +/area/fiorina/station/flight_deck) +"eds" = ( +/obj/structure/surface/rack, +/obj/item/device/flashlight, +/obj/effect/decal/cleanable/blood, +/obj/item/attachable/bipod, +/obj/item/device/multitool, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/aux_engi) -"eew" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/telecomm/lz1_cargo) +"edu" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"edy" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/station/central_ring) +"edY" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"eeH" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "eeI" = ( /obj/structure/lattice, /obj/item/stack/sheet/metal, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"eeL" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "green" - }, -/area/fiorina/station/transit_hub) "efk" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/landmark/objective_landmark/close, @@ -6943,141 +6708,121 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/prison, /area/fiorina/oob) -"efz" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +"efI" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 4; + layer = 6; + name = "overhead pipe"; + pixel_y = 20 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, +/turf/open/floor/prison, /area/fiorina/tumor/servers) -"efS" = ( -/obj/structure/monorail{ - dir = 9; - name = "launch track" +"efR" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/central_ring) "efT" = ( /obj/structure/machinery/shower{ dir = 8 }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) -"ege" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"efW" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"egm" = ( -/obj/structure/bed/sofa/south/grey/right, -/obj/item/storage/briefcase{ - pixel_y = -2 + dir = 6; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"egd" = ( +/obj/structure/machinery/photocopier, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) +"egk" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) "egv" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/civres_blue) -"egx" = ( -/obj/item/trash/boonie, -/turf/open/floor/prison, +"egz" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "egL" = ( /obj/item/newspaper, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"egY" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"ehf" = ( -/obj/item/stack/sheet/metal, +"egT" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"ehr" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"ehg" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; - name = "\improper Fiorina Engineering Canteen Vendor" - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"ehA" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"eir" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/structure/barricade/wooden{ - dir = 4 - }, -/turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"eix" = ( -/obj/structure/closet/bombcloset, +"ehy" = ( +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"ejk" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 12 + icon_state = "darkyellowfull2" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/lz/near_lzI) +"ehO" = ( +/obj/structure/platform/shiva, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"eim" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/tumor/civres) -"ejn" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/random/gun/pistol/midchance, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security) -"ejp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/rollingpin, -/obj/item/reagent_container/food/snacks/grown/carrot, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" +/area/fiorina/tumor/servers) +"eio" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"eip" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/civres_blue) +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"ejf" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) "ejq" = ( /obj/structure/machinery/space_heater, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) +"ejs" = ( +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/fiorina/station/security) "ejt" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, @@ -7085,68 +6830,92 @@ "ejw" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) -"ejO" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; +"ejL" = ( +/obj/structure/largecrate/supply/supplies/water, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 1; + pixel_y = 12 + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"ejM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/wy_mre{ + pixel_x = 5; pixel_y = 2 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/disco) +/area/fiorina/station/research_cells) +"ekb" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_tram) "eki" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"ekH" = ( -/obj/structure/bed/roller, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"eli" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 +"ekx" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, -/obj/structure/platform_decoration{ - dir = 6 +/area/fiorina/station/power_ring) +"ekz" = ( +/obj/structure/barricade/wooden{ + dir = 1 }, -/obj/structure/closet/emcloset, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"elq" = ( +"ekF" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenbluecorner" - }, -/area/fiorina/station/botany) -"elC" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "bluefull" }, +/area/fiorina/station/civres_blue) +"ekS" = ( +/obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 10; + icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"elY" = ( -/obj/structure/largecrate/random, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"ekW" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"elc" = ( +/obj/structure/bed/roller, +/obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/lowsec) +"ele" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) +"elO" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "emm" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -7166,41 +6935,24 @@ }, /turf/open/space, /area/fiorina/oob) -"emU" = ( -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"ena" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "end" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"enh" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"enu" = ( +/obj/item/trash/uscm_mre, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/power_ring) -"enG" = ( -/obj/item/tool/warning_cone, +/area/fiorina/station/flight_deck) +"enx" = ( +/obj/item/tool/shovel, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "green" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/civres) "enH" = ( /obj/effect/alien/weeds/node, /turf/open/organic/grass{ @@ -7212,74 +6964,126 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/oob) -"eok" = ( +"eot" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/oob) +/area/fiorina/station/telecomm/lz1_tram) "eov" = ( /turf/closed/wall/r_wall/prison_unmeltable{ desc = "A huge chunk of metal used to seperate rooms."; name = "metal wall" }, /area/fiorina/station/research_cells) -"eoR" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison, -/area/fiorina/station/park) +"eow" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "eoW" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"eoZ" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +"epB" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"epD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_y = 13 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"eph" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"eps" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/tumor/ice_lab) "epV" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/wood, /area/fiorina/station/chapel) -"eqq" = ( -/obj/structure/surface/table/reinforced/prison, +"epY" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"eqi" = ( +/obj/structure/surface/rack, +/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/emergency_oxygen/engi, +/obj/item/device/flashlight, +/obj/item/device/flashlight, /turf/open/floor/prison{ dir = 1; - icon_state = "blue_plate" + icon_state = "darkyellow2" }, -/area/fiorina/station/botany) -"eqC" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"eqQ" = ( -/turf/open/floor/corsat{ - icon_state = "squares" +"eqw" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"eqT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper/janitor, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 4; + icon_state = "bluecorner" }, -/area/fiorina/station/disco) -"ere" = ( -/obj/structure/barricade/handrail/type_b, +/area/fiorina/station/power_ring) +"eqJ" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"eqQ" = ( +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"eqS" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "green" + }, +/area/fiorina/station/chapel) +"eqU" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"eqZ" = ( +/obj/structure/largecrate/random/mini/ammo, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"erb" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ + dir = 1; icon_state = "darkyellow2" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/telecomm/lz1_cargo) +"erh" = ( +/obj/item/ammo_casing{ + icon_state = "casing_1" + }, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"erj" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) "erl" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -7288,41 +7092,49 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"ers" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, +"erw" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"erB" = ( -/obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"erD" = ( +/obj/structure/largecrate/supply, +/obj/structure/platform_decoration{ + dir = 8 }, -/area/fiorina/station/civres_blue) +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/medbay) "erT" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 }, /turf/open/space, /area/fiorina/oob) -"esE" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +"erU" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/machinery/shower{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "kitchen" }, -/area/fiorina/lz/near_lzI) -"esF" = ( +/area/fiorina/station/lowsec) +"esw" = ( /turf/open/floor/prison{ - icon_state = "panelscorched" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) +"esR" = ( +/obj/structure/machinery/space_heater, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "esS" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, @@ -7335,111 +7147,108 @@ name = "astroturf" }, /area/fiorina/station/park) +"etj" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" + }, +/area/fiorina/station/chapel) +"etq" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "etL" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"euC" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"euG" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"euR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder/red{ - pixel_x = 4; - pixel_y = -2 +"eub" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/obj/item/folder/red{ - pixel_x = -3; - pixel_y = 2 +/obj/item/storage/box/holobadge{ + pixel_y = 3 }, -/obj/item/tool/stamp, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 6; + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"euT" = ( -/obj/item/tool/wet_sign, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = -1 - }, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"evc" = ( -/obj/structure/machinery/power/terminal{ - dir = 1 +"eux" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 4; + icon_state = "yellow" }, -/area/fiorina/tumor/aux_engi) -"evf" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5_1" +/area/fiorina/station/lowsec) +"euz" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 }, -/area/fiorina/station/lowsec) -"evg" = ( -/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) -"evv" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 10; + icon_state = "bright_clean_marked" }, -/obj/effect/landmark/nightmare{ - insert_tag = "nogear" +/area/fiorina/station/medbay) +"evd" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 2; + layer = 6; + name = "overhead pipe"; + pixel_x = -16; + pixel_y = 12 }, /turf/open/floor/prison, -/area/fiorina/station/security) -"evD" = ( -/obj/structure/lz_sign/prison_sign, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"evH" = ( -/obj/structure/surface/rack, -/obj/item/tool/plantspray/pests, -/obj/item/tool/plantspray/weeds, +/area/fiorina/tumor/servers) +"evk" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + dir = 6; + icon_state = "whitegreen" }, -/area/fiorina/station/botany) -"evQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_y = 4 +/area/fiorina/station/medbay) +"evl" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "brflowers_1" }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/turf/open/floor/prison{ - icon_state = "redfull" +/area/fiorina/station/central_ring) +"evC" = ( +/obj/structure/barricade/sandbags{ + dir = 4; + icon_state = "sandbag_0"; + pixel_y = 2 }, -/area/fiorina/station/security) -"evU" = ( -/obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/flight_deck) +"evT" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, +/area/fiorina/station/botany) "ewx" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -7448,16 +7257,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"ewy" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - layer = 2.8 - }, -/obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) "ewE" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -7470,30 +7269,42 @@ /obj/structure/surface/rack, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"ewY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, +"ewI" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/civres_blue) -"exs" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/fiorina/station/medbay) +"exa" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison, +/area/fiorina/station/park) +"exl" = ( +/obj/structure/largecrate/random, +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/disco) +"exy" = ( /obj/structure/bed/chair{ dir = 4; pixel_y = 4 }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 8 - }, /turf/open/floor/prison{ dir = 10; - icon_state = "bright_clean_marked" + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) +/area/fiorina/maintenance) +"exI" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" + }, +/area/fiorina/station/park) "exO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -7505,187 +7316,228 @@ name = "astroturf" }, /area/fiorina/station/park) -"eyo" = ( -/obj/structure/prop/resin_prop, +"exW" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"eyi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/atmos_alert{ + dir = 8 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/fiberbush) +"eyj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/utensil/knife{ + pixel_x = 9 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"eys" = ( +/obj/vehicle/train/cargo/engine, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"eyv" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"eyy" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/effect/landmark/nightmare{ + insert_tag = "nogear" + }, +/turf/open/floor/prison, +/area/fiorina/station/security) "eyz" = ( /obj/structure/machinery/portable_atmospherics/canister/phoron, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"eyM" = ( -/obj/structure/closet/secure_closet/engineering_welding, +"eyO" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"eza" = ( -/obj/structure/barricade/wooden{ - dir = 4 + dir = 4; + icon_state = "blue_plate" }, +/area/fiorina/station/botany) +"ezd" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/station/telecomm/lz1_cargo) -"ezb" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/research_cells) +"eze" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/area/fiorina/tumor/aux_engi) +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "ezn" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/telecomm/lz1_cargo) -"ezo" = ( -/obj/structure/bed/chair/janicart, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"ezr" = ( -/obj/structure/bed{ - icon_state = "psychbed" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"ezx" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"ezz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/accessory/blue, +"ezO" = ( +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/tumor/aux_engi) -"ezJ" = ( -/turf/open/floor/prison{ - icon_state = "whitegreen" +/area/fiorina/station/security) +"ezU" = ( +/obj/structure/surface/table/reinforced/prison{ + dir = 4; + flipped = 1 }, -/area/fiorina/tumor/ice_lab) -"ezT" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "redcorner" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "ezV" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"eAo" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"eAy" = ( -/turf/open/floor/prison{ - icon_state = "green" - }, -/area/fiorina/station/transit_hub) "eAM" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"eAQ" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "eAY" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"eBs" = ( -/obj/structure/barricade/wooden{ - dir = 1 +"eBa" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_3" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, +/area/fiorina/station/central_ring) +"eBj" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"eBC" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/area/fiorina/station/power_ring) +"eBr" = ( +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"eCg" = ( -/obj/structure/largecrate/supply/explosives/mines, +/area/fiorina/station/transit_hub) +"eBO" = ( +/obj/structure/machinery/door/airlock/almayer/marine, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "yellowfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"eCh" = ( -/obj/structure/reagent_dispensers/watertank, +/area/fiorina/station/lowsec) +"eBS" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "cell_stripe" }, -/area/fiorina/station/medbay) -"eCA" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison, /area/fiorina/station/power_ring) -"eDn" = ( -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/central_ring) -"eDs" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, +"eCy" = ( +/obj/effect/spawner/random/gun/pistol, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/servers) -"eEh" = ( -/obj/structure/barricade/wooden, -/obj/item/device/flashlight/flare, +/area/fiorina/station/medbay) +"eCK" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 10; + icon_state = "floor_marked" + }, +/area/fiorina/lz/near_lzII) +"eDp" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"eEk" = ( -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/flight_deck) -"eEo" = ( +/area/fiorina/lz/near_lzI) +"eDA" = ( /obj/structure/prop/structure_lattice{ - dir = 4 + dir = 4; + health = 300 }, /obj/structure/prop/structure_lattice{ dir = 4; layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/research_cells) +"eEx" = ( +/obj/item/circuitboard/machine/rdserver, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) +"eEC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/plasteel/medium_stack, +/obj/item/reagent_container/food/drinks/flask/vacuumflask{ + pixel_x = 7; + pixel_y = 22 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "eED" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin{ @@ -7698,47 +7550,132 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"eFa" = ( -/obj/structure/barricade/metal{ - dir = 1; - health = 250; - icon_state = "metal_1" +"eEJ" = ( +/obj/structure/machinery/computer3/server/rack, +/obj/structure/barricade/handrail/type_b{ + dir = 8; + layer = 3.5 }, -/turf/open/floor/wood, -/area/fiorina/station/park) -"eFD" = ( -/obj/structure/window_frame/prison, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) -"eGg" = ( -/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"eEQ" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/telecomm/lz1_cargo) -"eGz" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"eGV" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"eGY" = ( -/obj/structure/toilet{ +/area/fiorina/lz/near_lzI) +"eET" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) +"eEX" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"eFa" = ( +/obj/structure/barricade/metal{ + dir = 1; + health = 250; + icon_state = "metal_1" + }, +/turf/open/floor/wood, +/area/fiorina/station/park) +"eFq" = ( +/obj/item/storage/bible/hefa, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, +/area/fiorina/station/chapel) +"eFD" = ( +/obj/structure/window_frame/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) +"eFQ" = ( +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/fiorina/station/disco) +"eFR" = ( +/obj/structure/prop/souto_land/streamer{ dir = 8; - pixel_y = 8 + pixel_y = 24 }, -/obj/effect/spawner/random/gun/smg, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/park) +"eFX" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/ice_lab) +"eGm" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"eGO" = ( +/obj/item/storage/toolbox/electrical, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "eHa" = ( -/obj/structure/extinguisher_cabinet, -/turf/closed/wall/r_wall/prison_unmeltable, +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/fiorina/oob) +"eHk" = ( +/obj/structure/machinery/door/morgue{ + dir = 2; + name = "Confession Booth" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/chapel) +"eHn" = ( +/obj/structure/barricade/metal{ + health = 250; + icon_state = "metal_1" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"eHt" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 + }, +/obj/structure/largecrate/random/mini/med{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/floor/prison, /area/fiorina/station/central_ring) "eHC" = ( /turf/closed/shuttle/ert{ @@ -7753,30 +7690,44 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"eIp" = ( -/obj/structure/platform{ - dir = 4 +"eHQ" = ( +/obj/item/trash/popcorn, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"eIx" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/ice_lab) +"eIB" = ( +/obj/item/frame/rack, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "eIF" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ icon_state = "plate" }, /area/fiorina/tumor/ship) -"eJi" = ( -/obj/structure/bed{ - icon_state = "abed" - }, +"eIX" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/oob) "eJm" = ( /obj/structure/machinery/door/poddoor/almayer{ density = 0; @@ -7784,23 +7735,28 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"eJq" = ( -/obj/structure/platform{ - dir = 8 +"eJt" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/structure/machinery/autolathe/full{ - layer = 2.98 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"eJP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/cigbutt, +/area/fiorina/station/power_ring) +"eJy" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"eJK" = ( +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/civres_blue) "eJQ" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -7808,64 +7764,84 @@ /obj/structure/lattice, /turf/open/space/basic, /area/fiorina/oob) -"eKg" = ( +"eLu" = ( +/turf/closed/wall/prison, +/area/fiorina/maintenance) +"eLw" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"eLy" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/prison{ dir = 6; - icon_state = "darkpurple2" + icon_state = "yellow" }, -/area/fiorina/station/central_ring) -"eKu" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/disco) +"eLB" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 }, -/obj/structure/platform, /turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean_marked" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/power_ring) -"eLu" = ( -/turf/closed/wall/prison, -/area/fiorina/maintenance) -"eLO" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/lz/near_lzI) +"eLQ" = ( +/obj/item/weapon/gun/energy/taser, +/turf/open/floor/prison, +/area/fiorina/station/security) +"eLU" = ( +/obj/item/tool/mop{ + pixel_y = 23 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"eLX" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/station/central_ring) +"eME" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) "eMG" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/access{ name = "greenhouse airlock" }, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"eMJ" = ( -/obj/structure/inflatable/popped/door, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"eML" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform_decoration{ - dir = 4 +"eMI" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) -"eMO" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "ywflowers_2" - }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, /area/fiorina/station/central_ring) "eMU" = ( /turf/closed/shuttle/ert{ @@ -7873,51 +7849,51 @@ opacity = 0 }, /area/fiorina/station/power_ring) -"eNm" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - layer = 2.97; - pixel_y = -14 - }, +"eNa" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "yellowcorner" + }, +/area/fiorina/station/lowsec) +"eNn" = ( +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 }, -/area/fiorina/station/telecomm/lz1_cargo) -"eNs" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "blue" + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/station/power_ring) -"eNV" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/station/park) +"eNr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/surgical_tray/empty, /turf/open/floor/prison, /area/fiorina/station/lowsec) -"eOf" = ( -/obj/structure/sink{ +"eNv" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ dir = 4; - pixel_x = 12 + icon_state = "darkyellowfull2" }, -/obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" +/area/fiorina/station/telecomm/lz1_tram) +"eOp" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryocell1decal" }, -/area/fiorina/station/lowsec) -"eOo" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 +/turf/open/floor/prison{ + icon_state = "whitegreen" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/area/fiorina/station/medbay) +"eOy" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/fiberbush) +/area/fiorina/station/medbay) "eOF" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -7927,48 +7903,22 @@ }, /turf/open/space, /area/fiorina/oob) -"eOH" = ( -/obj/structure/filingcabinet, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"eOI" = ( +/obj/item/shard{ + icon_state = "large" }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" }, -/area/fiorina/tumor/servers) -"eON" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"eOS" = ( -/obj/item/tool/warning_cone, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"ePf" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"ePm" = ( -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 - }, +/area/fiorina/station/transit_hub) +"eOM" = ( +/obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/medbay) "ePq" = ( /obj/item/trash/cigbutt/ucigbutt, /obj/item/trash/cigbutt/ucigbutt{ @@ -7985,13 +7935,32 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"ePx" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) "ePB" = ( /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz2_maint) +"ePM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/spacecash/c20, +/turf/open/floor/prison, +/area/fiorina/station/security) +"ePU" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"eQb" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/boxing/green, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "eQk" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -8000,82 +7969,107 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"eQv" = ( -/obj/item/tool/warning_cone, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" +"eQz" = ( +/obj/structure/machinery/gibber, +/obj/effect/decal/cleanable/blood{ + pixel_x = 8; + pixel_y = 10 }, -/area/fiorina/station/park) -"eQD" = ( -/obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "blue_plate" }, -/area/fiorina/tumor/servers) -"eQR" = ( +/area/fiorina/station/botany) +"eQQ" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "green" + icon_state = "platingdmg1" + }, +/area/fiorina/station/chapel) +"eQX" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" }, -/area/fiorina/tumor/servers) -"eRi" = ( /turf/open/floor/prison{ dir = 8; icon_state = "darkyellow2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/flight_deck) +"eQY" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"eRl" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"eRq" = ( +/obj/item/toy/bikehorn, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "eRz" = ( /obj/structure/machinery/vending/snack/packaged, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"eRH" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, +"eRF" = ( +/obj/item/stack/cable_coil, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"eRS" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/station/medbay) +"eRR" = ( +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, +/area/fiorina/station/telecomm/lz1_cargo) +"eRZ" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"eRY" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"eSg" = ( -/obj/effect/decal/cleanable/blood/drip, +/area/fiorina/station/medbay) +"eSn" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 6; + icon_state = "greenblue" }, -/area/fiorina/station/telecomm/lz1_cargo) -"eSs" = ( -/obj/item/prop/helmetgarb/riot_shield, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/botany) "eSF" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"eSZ" = ( -/obj/structure/bed/roller, +"eSH" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"eSO" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"eTa" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "eTb" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -8085,81 +8079,47 @@ "eTc" = ( /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"eTd" = ( -/obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"eTh" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"eTn" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/station/civres_blue) -"eTo" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/station_alert, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"eTx" = ( -/obj/structure/reagent_dispensers/water_cooler, +"eTr" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, -/area/fiorina/station/chapel) +/area/fiorina/station/power_ring) "eTC" = ( /obj/item/frame/rack, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"eTJ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "eUi" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_cargo) -"eUk" = ( +"eUo" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"eUy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/coffee, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrowncorners2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) -"eUD" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +/area/fiorina/station/medbay) +"eUN" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/fiorina/station/security) -"eVb" = ( -/obj/item/reagent_container/blood, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenbluecorner" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/botany) +/area/fiorina/station/medbay) +"eUP" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"eUZ" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "eVf" = ( /obj/structure/prop/souto_land/pole, /obj/structure/prop/souto_land/streamer{ @@ -8167,6 +8127,16 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"eVj" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "eVm" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/r_wall/prison_unmeltable, @@ -8175,49 +8145,64 @@ /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"eVL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"eVK" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"eVN" = ( +/obj/item/bodybag, +/obj/item/bodybag{ + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) "eVO" = ( /turf/closed/shuttle/ert, /area/fiorina/tumor/ship) -"eVZ" = ( -/obj/item/trash/sosjerky, -/turf/open/floor/prison, -/area/fiorina/station/security) -"eWh" = ( -/obj/item/stack/sheet/metal{ - amount = 5 +"eWf" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, +/area/fiorina/station/central_ring) +"eWr" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "darkyellow2" + icon_state = "green" }, -/area/fiorina/lz/near_lzI) -"eWu" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 +/area/fiorina/tumor/civres) +"eWz" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flash, +/turf/open/floor/prison{ + icon_state = "redfull" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/area/fiorina/station/security) +"eWA" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"eWO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/newspaper, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/civres) "eWP" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -8238,32 +8223,13 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"eXd" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) "eXp" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/civres_blue) -"eXr" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzI) -"eXC" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) +"eXz" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/prison, +/area/fiorina/station/disco) "eXP" = ( /obj/structure/machinery/door/poddoor/almayer{ density = 0; @@ -8271,24 +8237,38 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"eXU" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"eYi" = ( -/obj/item/stack/cable_coil, +"eYr" = ( +/obj/structure/inflatable, +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"eYs" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/fire/empty, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"eYz" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) "eYC" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"eYN" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, +/area/fiorina/station/botany) "eYT" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -8304,39 +8284,72 @@ }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) -"eZm" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ +"eZi" = ( +/obj/structure/machinery/power/apc{ dir = 8 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"eZD" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"eZr" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"eZQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/handcuffs{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/weapon/gun/launcher/grenade/m81, -/obj/item/storage/pill_bottle/kelotane, /turf/open/floor/prison{ icon_state = "redfull" }, /area/fiorina/station/security) -"eZL" = ( -/obj/item/reagent_container/food/snacks/meat, +"eZW" = ( +/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - icon_state = "greenblue" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"eZN" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 4 +/area/fiorina/station/disco) +"fac" = ( +/obj/structure/platform/shiva{ + dir = 1 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"faw" = ( +/obj/structure/barricade/metal{ + health = 250; + icon_state = "metal_1" + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"faD" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"fbc" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/medbay) "fbo" = ( /obj/structure/barricade/plasteel, /obj/structure/barricade/metal{ @@ -8346,87 +8359,47 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"fbs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - pixel_y = 9 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/security) -"fbL" = ( -/obj/effect/decal/cleanable/blood/drip, +"fbF" = ( +/obj/item/clothing/suit/chef/classic, +/obj/structure/bed/stool, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"fbT" = ( -/obj/structure/platform{ - dir = 4 + dir = 10; + icon_state = "kitchen" }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/area/fiorina/station/civres_blue) +"fbX" = ( +/obj/item/stack/sheet/wood{ + amount = 10 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"fbW" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryotop" - }, -/obj/structure/pipes/standard/simple/visible{ - dir = 5 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/area/fiorina/station/telecomm/lz1_cargo) +"fcg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_x = -2; + pixel_y = 7 }, -/area/fiorina/station/medbay) -"fcp" = ( -/obj/item/trash/burger, -/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/civres) "fcA" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"fcO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper/carbon, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"fcX" = ( -/obj/structure/closet/crate/trashcart, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +"fcB" = ( +/obj/structure/barricade/deployable{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"fde" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" + dir = 1; + icon_state = "yellow" }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec) "fdf" = ( /obj/structure/closet, /obj/item/stack/cable_coil, @@ -8434,93 +8407,62 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"fdn" = ( +"fdu" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "floor_marked" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/research_cells) -"fdK" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/prop/invuln{ - desc = "The best ride in the universe. For the one and only Souto Man! Although, this one seems to have no fuel left."; - dir = 4; - icon = 'icons/obj/vehicles/vehicles.dmi'; - icon_state = "soutomobile"; - name = "Disabled Souto Mobile" +/area/fiorina/lz/near_lzI) +"fdC" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = -7; + pixel_y = 7 }, /turf/open/floor/prison, -/area/fiorina/station/park) -"fdS" = ( -/obj/structure/bed/chair/comfy, +/area/fiorina/station/flight_deck) +"fdR" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/security/wardens) +/area/fiorina/station/park) "fdV" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 }, /turf/open/space/basic, /area/fiorina/oob) -"feO" = ( -/obj/structure/largecrate/supply/medicine/iv, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"feY" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"ffm" = ( -/obj/structure/bed/chair{ +"fer" = ( +/obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/medbay) -"ffN" = ( -/obj/structure/largecrate/random, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"ffU" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5_1" - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, +/area/fiorina/station/medbay) +"ffA" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/transit_hub) "ffZ" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/power_ring) -"fgb" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"fgB" = ( -/obj/item/stack/folding_barricade, +"fgq" = ( +/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "bluefull" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) "fgM" = ( /obj/structure/platform, /obj/item/ammo_casing{ @@ -8532,44 +8474,34 @@ name = "pool" }, /area/fiorina/station/park) +"fgN" = ( +/obj/item/device/flashlight/flare, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzI) "fgU" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"fhc" = ( -/turf/open/floor/prison{ - icon_state = "darkbrowncorners2" +"fgY" = ( +/obj/structure/surface/rack, +/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" }, -/area/fiorina/maintenance) -"fhz" = ( -/obj/structure/barricade/wooden, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/central_ring) -"fhC" = ( -/obj/item/stack/rods, +/area/fiorina/station/medbay) +"fhB" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/emergency, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"fhX" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/lz/near_lzI) -"fhZ" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/aux_engi) "fic" = ( /obj/structure/bed/sofa/south/grey/right, /obj/structure/machinery/cm_vending/sorted/medical/wall_med/souto{ @@ -8577,12 +8509,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"fin" = ( -/obj/structure/machinery/light/double/blue, +"fie" = ( /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/chapel) "fiq" = ( /turf/open/floor/plating/prison, /area/fiorina/oob) @@ -8594,42 +8526,20 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"fiu" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/structure/inflatable, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"fiD" = ( -/obj/structure/bed/roller, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"fiF" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +"fiw" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/station/civres_blue) -"fiI" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 1 +/area/fiorina/station/power_ring) +"fiG" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_7" }, -/obj/item/frame/rack, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/disco) +/area/fiorina/station/security) "fiU" = ( /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) @@ -8637,16 +8547,37 @@ /turf/closed/wall/prison, /area/fiorina/lz/near_lzI) "fje" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 6 +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = -13; - pixel_y = 13 +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"fjg" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/disco) +"fjo" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5_1" + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "fjr" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/plating_catwalk/prison, @@ -8657,211 +8588,174 @@ /obj/item/attachable/magnetic_harness, /turf/open/floor/wood, /area/fiorina/station/civres_blue) +"fjV" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "fjX" = ( /turf/closed/shuttle/elevator{ dir = 9 }, /area/fiorina/tumor/aux_engi) -"fkP" = ( -/obj/structure/platform{ +"fkG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ dir = 1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"fkY" = ( -/obj/item/tool/wet_sign, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = -1 + icon_state = "redfull" }, -/turf/open/floor/prison, /area/fiorina/station/security) -"flg" = ( -/obj/structure/platform_decoration{ - dir = 1 +"fkH" = ( +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"flm" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"flo" = ( -/obj/structure/platform{ - dir = 4 +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" }, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"flq" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/reagent_container/food/snacks/meat, +/area/fiorina/station/medbay) +"fmb" = ( +/obj/item/storage/firstaid/toxin, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/botany) -"flC" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/chapel) "fmg" = ( /obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"fmL" = ( -/obj/item/frame/toolbox_tiles, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"fmM" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"fmU" = ( -/obj/effect/decal/cleanable/blood, +"fmE" = ( +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/prison{ - dir = 6; - icon_state = "green" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/maintenance) "fmY" = ( /obj/item/device/cassette_tape/ocean, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"fnj" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) "fnn" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fnt" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"fno" = ( +/obj/structure/machinery/space_heater, +/obj/structure/platform{ + dir = 4 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/disco) -"fnB" = ( -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/tumor/ice_lab) "fnD" = ( /turf/closed/shuttle/elevator{ dir = 4 }, /area/fiorina/station/telecomm/lz1_cargo) -"fnW" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"fon" = ( -/obj/item/device/flashlight/lamp/tripod, +"fnY" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"foL" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" +/area/fiorina/station/park) +"fob" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/botany) -"foT" = ( -/obj/structure/machinery/power/port_gen/pacman, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"foV" = ( -/obj/structure/largecrate/random, -/obj/item/trash/pistachios, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"foZ" = ( -/obj/item/stack/sandbags_empty, +/area/fiorina/station/power_ring) +"fop" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/civres) -"fpi" = ( -/obj/item/clothing/head/soft/yellow, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" +/area/fiorina/tumor/ice_lab) +"fou" = ( +/obj/structure/barricade/deployable{ + dir = 8 }, -/area/fiorina/tumor/servers) -"fpl" = ( -/obj/structure/barricade/sandbags{ +/turf/open/floor/prison, +/area/fiorina/station/security) +"fpg" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "sandbag_0"; - pixel_y = 2 + pixel_x = 10; + pixel_y = 13 }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "fpn" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/aux_engi) -"fpp" = ( -/turf/open/floor/prison{ +"fpq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/bed/chair{ dir = 4; - icon_state = "green" + pixel_y = 4 }, -/area/fiorina/tumor/civres) +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean_marked" + }, +/area/fiorina/station/medbay) "fpB" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"fpM" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 +"fpN" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"fqg" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/lz/near_lzII) -"fpY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/briefcase/inflatable, -/turf/open/floor/prison{ - icon_state = "yellowfull" +/area/fiorina/station/central_ring) +"fqh" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, -/area/fiorina/station/lowsec) -"fqD" = ( -/obj/structure/stairs/perspective{ +/turf/open/floor/prison{ dir = 5; - icon_state = "p_stair_full" + icon_state = "whitegreen" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) "fqF" = ( /obj/effect/landmark{ icon_state = "hive_spawn"; @@ -8870,130 +8764,160 @@ /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, -/obj/effect/landmark/objective_landmark/medium, +"fqI" = ( +/obj/structure/machinery/space_heater, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"frt" = ( -/obj/structure/bed/chair/comfy, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"frw" = ( -/obj/structure/bed{ - icon_state = "abed" + icon_state = "darkredfull2" }, -/obj/item/storage/fancy/crayons, +/area/fiorina/station/research_cells) +"frc" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/research_cells) -"frY" = ( +/area/fiorina/station/civres_blue) +"frv" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"frM" = ( +/obj/effect/spawner/random/toolbox, +/obj/structure/surface/rack, +/obj/item/device/flashlight, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitepurplecorner" + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/transit_hub) +"frR" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" }, -/area/fiorina/station/research_cells) -"fsf" = ( -/obj/structure/bed/roller, -/obj/effect/spawner/random/gun/rifle/highchance, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/medbay) "fsk" = ( /obj/structure/machinery/space_heater, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"fsn" = ( -/obj/item/device/flashlight, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"ftq" = ( -/obj/item/stack/cable_coil/orange, +"ftb" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"ftv" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "red" +/area/fiorina/tumor/civres) +"ftd" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/security) -"ftH" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 }, -/obj/item/stool{ - pixel_x = 4; - pixel_y = 6 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/botany) +"fth" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"ftY" = ( -/obj/effect/landmark/xeno_spawn, +/area/fiorina/station/civres_blue) +"ftS" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"ftU" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"fum" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/platform_decoration{ - dir = 1 +"fun" = ( +/obj/item/weapon/gun/smg/mp5, +/obj/item/ammo_casing{ + icon_state = "casing_6_1" }, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"fuA" = ( -/obj/item/stack/sheet/wood, +/area/fiorina/station/telecomm/lz1_cargo) +"fuw" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"fuJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic{ + pixel_x = 3 + }, +/obj/item/trash/cigbutt{ + pixel_y = 8 + }, +/obj/item/trash/cigbutt{ + pixel_x = 4 + }, +/obj/item/paper_bin{ + pixel_x = -10; + pixel_y = 8 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security/wardens) +"fuO" = ( +/obj/item/clipboard, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"fvr" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkbrown2" + icon_state = "cell_stripe" }, /area/fiorina/station/park) -"fuF" = ( -/obj/structure/machinery/autolathe, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"fvH" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/tumor/civres) -"fvk" = ( -/obj/structure/barricade/metal/wired, +/area/fiorina/oob) +"fvK" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/power_ring) "fvL" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"fvY" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"fwg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/adv{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = 9; + pixel_y = 2 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/telecomm/lz1_cargo) "fwn" = ( /obj/structure/lattice, /obj/item/stack/sheet/metal, @@ -9003,73 +8927,69 @@ /obj/item/poster, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fwR" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gib2" - }, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"fwZ" = ( +"fwt" = ( +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/medical_decals{ - icon_state = "docdecal1" + icon_state = "triagedecaldir" }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"fwY" = ( +/obj/structure/barricade/metal/wired{ + health = 250; + icon_state = "metal_3" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"fxa" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"fxi" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison, +/area/fiorina/station/security) "fxt" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, /area/fiorina/tumor/ship) -"fxz" = ( -/obj/structure/pipes/standard/simple/visible{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"fxP" = ( +"fxL" = ( +/obj/structure/filingcabinet, /turf/open/floor/prison{ - icon_state = "yellowcorner" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"fxY" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/tumor/aux_engi) +"fxS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/surgical, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"fye" = ( -/obj/structure/surface/rack, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/lowsec) "fyi" = ( /turf/open/floor/wood, /area/fiorina/station/research_cells) +"fyt" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_3" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "fyy" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"fyA" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "green" - }, -/area/fiorina/tumor/aux_engi) "fyC" = ( /obj/structure/platform/kutjevo/smooth, /obj/structure/platform/kutjevo/smooth{ @@ -9077,53 +8997,27 @@ }, /turf/open/space, /area/fiorina/oob) +"fyL" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/fiorina/station/disco) "fyO" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"fyQ" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"fyT" = ( -/obj/item/trash/cigbutt/bcigbutt, -/obj/item/device/flashlight/lamp/tripod, +"fzp" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"fzb" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"fzs" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"fzt" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/barricade/wooden{ - dir = 4 + icon_state = "greenblue" }, +/area/fiorina/station/botany) +"fzC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/gun/shotgun/highchance, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "darkbrown2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/maintenance) "fzO" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -9132,29 +9026,16 @@ 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 - }, -/obj/effect/landmark/objective_landmark/close, +"fAf" = ( +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"fAr" = ( +/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ - dir = 10; + dir = 1; icon_state = "darkbrown2" }, -/area/fiorina/maintenance) -"fAs" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/bedsheet/green, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/aux_engi) "fAt" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now."; @@ -9186,17 +9067,21 @@ /obj/effect/spawner/random/gun/pistol/lowchance, /turf/open/floor/wood, /area/fiorina/station/park) -"fAV" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +"fAS" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"fAU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_y = 7 }, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" + icon_state = "bluefull" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/power_ring) "fAZ" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/drinks/bottle/holywater{ @@ -9205,76 +9090,117 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"fBc" = ( +"fBr" = ( +/obj/structure/closet/secure_closet/engineering_materials, /turf/open/floor/prison{ - dir = 10; - icon_state = "damaged1" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"fBd" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" +/area/fiorina/tumor/civres) +"fBD" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"fCf" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 }, -/area/fiorina/station/power_ring) -"fBg" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" +/obj/item/bedsheet/green, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/tumor/aux_engi) -"fBi" = ( -/obj/structure/inflatable/popped/door, -/obj/item/ammo_magazine/m56d, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"fBp" = ( -/obj/structure/closet/firecloset, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"fCr" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/maintenance) -"fBP" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"fCw" = ( +/obj/structure/machinery/vending/snack/packaged, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/tumor/civres) -"fCz" = ( -/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/civres_blue) "fCD" = ( /obj/item/stack/sheet/metal, /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"fCF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/cell/super{ + pixel_y = 12 + }, +/obj/item/cell/super, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"fCJ" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/fiorina/oob) +"fCW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "fCZ" = ( /obj/structure/closet/crate/medical, /obj/item/clothing/mask/cigarette/pipe, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"fDo" = ( -/obj/effect/landmark/objective_landmark/close, +"fDb" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"fDI" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8; - layer = 3.5 +/area/fiorina/station/security) +"fDi" = ( +/obj/structure/machinery/computer/arcade, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) +"fDE" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" }, +/area/fiorina/station/central_ring) +"fDJ" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/lz/near_lzI) "fDQ" = ( /obj/structure/window/framed/prison/reinforced/hull, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -9283,111 +9209,85 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"fEn" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) +"fEH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/station_alert, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "fEY" = ( /obj/structure/machinery/power/apc, /turf/open/floor{ icon_state = "delivery" }, /area/fiorina/station/power_ring) -"fFf" = ( -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "yellowfull" +"fFv" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + layer = 2.97; + pixel_y = -14 }, -/area/fiorina/station/lowsec) -"fFC" = ( -/obj/structure/bed/chair{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/gibspawner/human, +/area/fiorina/station/disco) +"fFw" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 10; + icon_state = "floor_marked" }, -/area/fiorina/station/park) +/area/fiorina/station/power_ring) "fFE" = ( /obj/item/tool/screwdriver, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fFU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +"fGi" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/station/medbay) -"fGb" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"fGe" = ( -/obj/structure/window/reinforced{ - dir = 8 + dir = 6; + icon_state = "darkbrown2" }, -/obj/structure/window/reinforced, +/area/fiorina/station/park) +"fGA" = ( +/obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/prison, /area/fiorina/station/security) -"fGp" = ( -/obj/structure/surface/rack, -/obj/item/handcuffs, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) -"fGB" = ( -/obj/structure/prop/structure_lattice{ +"fGW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/emails{ dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"fGL" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/tracker, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + icon_state = "bluefull" }, -/area/fiorina/station/disco) -"fGM" = ( -/obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" +/area/fiorina/station/power_ring) +"fHb" = ( +/obj/structure/monorail{ + name = "launch track" }, -/area/fiorina/station/flight_deck) -"fGY" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"fHo" = ( /turf/open/floor/prison{ - icon_state = "floorscorched2" + icon_state = "yellow" }, -/area/fiorina/tumor/civres) -"fHh" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ +/area/fiorina/station/lowsec) +"fHI" = ( +/obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"fHu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"fHy" = ( -/obj/structure/tunnel, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"fHB" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "fHK" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -9396,65 +9296,31 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"fHQ" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/curtain/shower, -/obj/structure/window{ - dir = 4 - }, -/obj/item/coin/uranium{ - desc = "You found one of the three uranium coins. It is entirely worthless." - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"fHU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, +"fIn" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, /area/fiorina/station/security) -"fHV" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 8 +"fIq" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "bee" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/sign/prop2{ + pixel_y = 32 }, -/area/fiorina/lz/near_lzII) -"fIj" = ( -/obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"fIv" = ( -/obj/item/shard{ - icon_state = "medium" +/area/fiorina/station/medbay) +"fIL" = ( +/obj/item/clothing/accessory/armband/cargo{ + desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; + name = "HEFA Order milita armband" }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"fII" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "blue" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/chapel) "fIT" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/prison, @@ -9471,19 +9337,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"fJx" = ( -/obj/item/storage/briefcase, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"fJO" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks, +"fJV" = ( +/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "fJW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/accessory/storage/webbing, @@ -9499,122 +9358,116 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"fKq" = ( -/obj/item/storage/firstaid/regular, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"fKr" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"fKv" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/fiorina/station/power_ring) -"fKF" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, +"fKn" = ( +/obj/item/stock_parts/manipulator/pico, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurple2" }, -/area/fiorina/station/power_ring) -"fLa" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/area/fiorina/tumor/servers) +"fKu" = ( +/obj/item/device/flashlight/flare, /turf/open/floor/prison{ dir = 8; icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) -"fLq" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "green" +/area/fiorina/station/telecomm/lz1_cargo) +"fKP" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" }, -/area/fiorina/tumor/servers) -"fLr" = ( -/obj/item/smallDelivery, -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"fLs" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"fKX" = ( +/obj/item/storage/backpack{ + pixel_x = -11; + pixel_y = 15 }, +/obj/item/trash/syndi_cakes, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"fLO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/radio{ - pixel_y = 8 +/area/fiorina/station/lowsec) +"fLb" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"fLu" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"fLR" = ( -/obj/item/device/flashlight/lamp/tripod, +"fLH" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/research_cells) "fLS" = ( /obj/structure/bed/chair, /turf/open/floor/wood, /area/fiorina/station/park) -"fMk" = ( -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/effect/decal/cleanable/blood, +"fLX" = ( +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"fMY" = ( -/obj/structure/reagent_dispensers/watertank{ - layer = 2.6 +/area/fiorina/station/civres_blue) +"fLY" = ( +/obj/structure/machinery/newscaster{ + pixel_y = 32 }, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"fNc" = ( +/area/fiorina/station/transit_hub) +"fMc" = ( /obj/structure/platform{ - dir = 4 + dir = 8; + layer = 2.5 }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"fNp" = ( -/obj/item/stack/sheet/metal, +/area/fiorina/tumor/ice_lab) +"fMn" = ( +/obj/structure/machinery/photocopier{ + pixel_y = 4 + }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) +"fNA" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"fNN" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"fOe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight/lamp, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/disco) "fOg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -9623,79 +9476,65 @@ name = "astroturf" }, /area/fiorina/station/park) -"fOo" = ( -/obj/structure/closet/crate/medical, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"fOi" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 6 }, -/area/fiorina/station/medbay) -"fOs" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = -13; + pixel_y = 13 }, -/area/fiorina/station/medbay) -"fOt" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"fOC" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) -"fOw" = ( -/obj/structure/bed/chair{ - dir = 1 +/area/fiorina/station/telecomm/lz1_cargo) +"fOK" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, +/area/fiorina/station/flight_deck) +"fOT" = ( /turf/open/floor/prison{ - dir = 6; + dir = 1; icon_state = "blue" }, /area/fiorina/station/power_ring) -"fOZ" = ( -/obj/structure/bed{ - icon_state = "abed" +"fPl" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) -"fPu" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, +"fPB" = ( +/turf/open/space, /area/fiorina/station/medbay) -"fPF" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, +"fQa" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/telecomm/lz1_cargo) -"fPZ" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/telecomm/lz1_tram) +"fQA" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + layer = 3.5; + pixel_y = 6 }, -/area/fiorina/station/medbay) -"fQx" = ( -/obj/item/reagent_container/food/drinks/bottle/tomatojuice, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/chapel) "fQB" = ( /obj/item/ammo_casing/shell{ icon_state = "shell_9_1" @@ -9703,36 +9542,68 @@ /obj/effect/spawner/random/gun/shotgun/highchance, /turf/open/floor/wood, /area/fiorina/station/park) +"fQI" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "fQV" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 }, /turf/open/space, /area/fiorina/oob) +"fQY" = ( +/obj/structure/machinery/portable_atmospherics/powered/pump, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"fRc" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "fRo" = ( /obj/structure/bed/chair, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fRG" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"fRq" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, +/area/fiorina/station/security) +"fSa" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"fSp" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/item/stack/sheet/metal{ + amount = 5 }, -/area/fiorina/station/chapel) -"fSe" = ( -/obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"fSl" = ( -/obj/item/disk/data, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) +/area/fiorina/lz/near_lzI) "fSq" = ( /obj/structure/machinery/door/airlock/almayer/marine{ dir = 1; @@ -9762,28 +9633,23 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"fSI" = ( -/obj/item/broken_device, +"fTd" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "green" }, -/area/fiorina/station/medbay) -"fSY" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/aux_engi) +"fTn" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/area/fiorina/tumor/ship) +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "fTs" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/power_ring) -"fTx" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) "fTz" = ( /obj/structure/closet, /obj/item/clothing/suit/poncho/red, @@ -9791,20 +9657,6 @@ /obj/item/clothing/suit/suspenders, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fTA" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docstripingdir" - }, -/obj/structure/bed/roller, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "fUd" = ( /obj/structure/barricade/plasteel{ dir = 4 @@ -9825,90 +9677,122 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"fUu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"fUF" = ( +"fUz" = ( /obj/structure/stairs/perspective{ + dir = 4; icon_state = "p_stair_full" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"fUC" = ( +/obj/structure/stairs/perspective, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"fUD" = ( +/obj/structure/dropship_equipment/mg_holder, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"fUP" = ( +/obj/structure/machinery/door/window/eastright{ + dir = 2 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/lz/near_lzI) "fUX" = ( /obj/structure/bedsheetbin, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"fUZ" = ( -/obj/structure/largecrate/supply, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"fVs" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/medbay) -"fVA" = ( -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" + dir = 10; + icon_state = "green" }, -/area/fiorina/tumor/aux_engi) -"fWc" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/chapel) +"fVY" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 + }, +/obj/item/stack/sheet/metal{ + amount = 5 }, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/ice_lab) -"fWC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder/black_random, +/area/fiorina/station/flight_deck) +"fWr" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "red" + }, +/area/fiorina/lz/near_lzII) +"fWs" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"fWy" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" }, /area/fiorina/station/power_ring) -"fWD" = ( -/obj/structure/machinery/recharge_station, +"fWH" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" + icon_state = "yellowfull" }, -/area/fiorina/maintenance) -"fWL" = ( -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 +/area/fiorina/station/disco) +"fWI" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, -/obj/structure/barricade/handrail{ - dir = 8 +/turf/open/space, +/area/fiorina/oob) +"fWV" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"fWS" = ( -/obj/structure/stairs/perspective, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"fXe" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +/area/fiorina/station/disco) +"fXo" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) -"fXv" = ( -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/disco) "fXB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/security) +"fXD" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"fXI" = ( +/turf/open/floor/prison{ + icon_state = "green" + }, +/area/fiorina/station/transit_hub) "fXL" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -9920,128 +9804,90 @@ }, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/servers) -"fXQ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +"fXW" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 8; + icon_state = "bluecorner" }, -/turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"fXS" = ( +"fYa" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/lowsec) -"fXT" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/toy/beach_ball, +/area/fiorina/station/medbay) +"fYf" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ icon_state = "yellowfull" }, /area/fiorina/station/disco) -"fYn" = ( -/obj/structure/bed/chair, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 +"fYo" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/turf/open/floor/prison{ - icon_state = "yellowfull" +/turf/open/floor/prison, +/area/fiorina/station/security) +"fYW" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/carpet, +/area/fiorina/station/security/wardens) +"fYY" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6" }, -/area/fiorina/station/disco) -"fYB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/donut_box/empty, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"fYD" = ( -/obj/structure/bed/chair/office/dark, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"fYV" = ( -/obj/structure/machinery/door/airlock/almayer/marine{ - dir = 1; - icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' +/area/fiorina/station/lowsec) +"fZc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigarettes/arcturian_ace{ + pixel_x = -4; + pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"fYW" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/carpet, -/area/fiorina/station/security/wardens) "fZd" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"fZe" = ( +/obj/item/tool/shovel/etool, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/civres_blue) +"fZz" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, +/area/fiorina/station/security) "fZD" = ( /obj/item/tool/warning_cone, /turf/open/floor/wood, /area/fiorina/station/park) -"gas" = ( -/obj/item/stack/rods, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"gaL" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/telecomm/lz1_tram) -"gaN" = ( -/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 - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"gbi" = ( -/obj/structure/inflatable/door, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +"fZT" = ( +/obj/structure/mirror{ + pixel_x = -29 }, -/area/fiorina/station/research_cells) -"gbn" = ( -/obj/structure/stairs/perspective{ +/obj/structure/sink{ dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"gbD" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 + pixel_x = -12; + pixel_y = 2 }, /turf/open/floor/prison{ - dir = 5; - icon_state = "blue" + icon_state = "sterile_white" }, /area/fiorina/station/civres_blue) -"gbP" = ( +"fZW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ dir = 8 @@ -10054,52 +9900,112 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) -"gbS" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/head/cmcap{ - pixel_x = -5; - pixel_y = 14 +"gag" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/item/clothing/glasses/mbcg{ - pixel_y = -14 +/area/fiorina/station/security) +"gaQ" = ( +/obj/structure/machinery/power/apc{ + dir = 4 }, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"gbU" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/security) +"gbf" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) -"gcr" = ( -/obj/item/tool/wirecutters/clippers, +/area/fiorina/station/power_ring) +"gbh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/civres) -"gde" = ( +/area/fiorina/station/medbay) +"gbk" = ( +/obj/item/trash/burger, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"gbv" = ( /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8; + pixel_x = -10; + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"gbF" = ( +/obj/item/clothing/gloves/botanic_leather, +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"gbO" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/item/trash/used_stasis_bag, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"gbR" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/area/fiorina/station/central_ring) -"gdn" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/fiberbush) -"gdt" = ( -/obj/structure/window/framed/prison/reinforced/hull, +/area/fiorina/station/disco) +"gbT" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"gbV" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"gcx" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"gcD" = ( +/obj/structure/kitchenspike, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) +"gdQ" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/chapel) +"gdS" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) "gec" = ( /obj/structure/prop/structure_lattice{ dir = 8; @@ -10118,6 +10024,14 @@ }, /turf/open/space, /area/fiorina/oob) +"ger" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "geF" = ( /obj/structure/lattice, /turf/open/floor/almayer_hull, @@ -10126,19 +10040,13 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/wood, /area/fiorina/station/chapel) -"geU" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, +"geT" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/ice_lab) "gfh" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -10154,19 +10062,6 @@ "gfo" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) -"gfp" = ( -/obj/structure/machinery/m56d_hmg/mg_turret/dropship, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"gfw" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/donut_box{ - pixel_y = 9 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "gfL" = ( /obj/structure/prop/souto_land/pole, /obj/structure/prop/souto_land/pole{ @@ -10175,10 +10070,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"gfN" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "ggd" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1" @@ -10196,42 +10087,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"ggp" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/boxing/yellow, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"ggB" = ( -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"ggG" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/machinery/space_heater, +"ggA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/spray/pepper, +/obj/item/clothing/glasses/sunglasses/sechud, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) -"ggQ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "redfull" }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/security) "ghg" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -10246,13 +10109,6 @@ }, /turf/open/space, /area/fiorina/oob) -"ghv" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) "ghw" = ( /obj/structure/bed/chair/dropship/pilot, /obj/effect/landmark/objective_landmark/close, @@ -10260,104 +10116,91 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"ghP" = ( +"ghz" = ( +/obj/structure/lz_sign/prison_sign, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"ghS" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"gir" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "green" + icon_state = "greenfull" }, -/area/fiorina/station/chapel) -"ghU" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/tumor/servers) +"giw" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"giA" = ( +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/security) "giX" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"gjg" = ( -/obj/structure/barricade/sandbags{ +"gjr" = ( +/obj/effect/landmark/static_comms/net_one, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"gjs" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "sandbag_0" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"gjj" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - pixel_y = 17 + pixel_y = 21 }, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"gjX" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"gkd" = ( -/obj/item/storage/wallet/random, +/area/fiorina/lz/near_lzII) +"gjz" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) -"gkm" = ( -/obj/structure/machinery/line_nexter, -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" + icon_state = "sterile_white" }, -/area/fiorina/station/security) -"gks" = ( +/area/fiorina/station/medbay) +"gjY" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"gkt" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "bluecorner" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"gky" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/area/fiorina/station/chapel) +"gkv" = ( +/obj/structure/platform_decoration{ + dir = 1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"gkZ" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" +/area/fiorina/tumor/ice_lab) +"gkC" = ( +/obj/structure/machinery/vending/cola, +/obj/structure/prop/souto_land/streamer{ + pixel_y = 24 }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, +/area/fiorina/station/park) +"gkE" = ( +/obj/structure/surface/rack, +/obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) "glj" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"glw" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) "glD" = ( /obj/structure/bed{ icon_state = "abed" @@ -10368,50 +10211,48 @@ /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"glH" = ( -/obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"glI" = ( -/obj/item/trash/cigbutt, +"gmg" = ( +/obj/structure/bed/chair/comfy, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"glW" = ( -/obj/structure/holohoop{ - pixel_y = 25 + icon_state = "darkyellow2" }, -/turf/open/floor/prison{ - icon_state = "yellow" +/area/fiorina/station/flight_deck) +"gmp" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/station/lowsec) -"gma" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"gmv" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/telecomm/lz1_tram) +"gmx" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" }, -/area/fiorina/station/park) -"gmy" = ( -/obj/structure/barricade/handrail/type_b, +/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" + dir = 1; + icon_state = "greenblue" }, -/area/fiorina/station/flight_deck) -"gmS" = ( -/obj/effect/decal/cleanable/blood/gibs, -/obj/effect/spawner/random/gun/shotgun/midchance, +/area/fiorina/station/botany) +"gmF" = ( +/obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison, /area/fiorina/station/security) +"gmG" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"gmN" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/obj/effect/spawner/random/gun/smg, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "gmT" = ( /obj/effect/landmark/xeno_spawn, /turf/open/organic/grass{ @@ -10419,178 +10260,110 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"gng" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"gnj" = ( -/obj/item/stack/folding_barricade, -/turf/open/floor/prison, -/area/fiorina/station/security) -"gnm" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/botany) -"gnz" = ( -/obj/item/tool/lighter/random{ - pixel_x = 14; - pixel_y = 13 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"gnR" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/lz/near_lzI) -"gnS" = ( -/obj/effect/spawner/random/gun/rifle, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"gnV" = ( +"gnG" = ( /obj/effect/decal/medical_decals{ - icon_state = "cryomid" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "docstripingdir" }, -/area/fiorina/station/medbay) -"goh" = ( -/obj/structure/pipes/standard/manifold/visible, +/obj/structure/bed/roller, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"gol" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/effect/landmark/objective_landmark/close, +"gnL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/rollingpin, +/obj/item/reagent_container/food/snacks/grown/carrot, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/tumor/civres) -"gom" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/civres_blue) +"gnQ" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"gnY" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/area/fiorina/station/medbay) -"goz" = ( +/obj/item/storage/bible/hefa, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrowncorners2" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/maintenance) -"goA" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/research_cells) +"goo" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/lz/near_lzII) "goG" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"goH" = ( -/obj/structure/surface/rack, -/obj/item/tool/mop, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"goM" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"gpr" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"gpq" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 - }, -/obj/structure/machinery/shower{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/lowsec) -"gpB" = ( -/obj/item/storage/bible/hefa, +/area/fiorina/station/telecomm/lz1_cargo) +"gpA" = ( +/obj/item/trash/pistachios, /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + icon_state = "whitegreen" }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/ice_lab) "gpG" = ( /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"gqd" = ( -/obj/item/tool/kitchen/utensil/pknife, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"gqe" = ( -/turf/open/floor/prison, -/area/fiorina/station/disco) -"gqH" = ( +"gpY" = ( +/obj/item/explosive/grenade/high_explosive/m15{ + pixel_x = -9; + pixel_y = -8 + }, +/obj/item/explosive/grenade/high_explosive/frag{ + pixel_x = 6; + pixel_y = 3 + }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrowncorners2" + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/tumor/servers) +"gqM" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, /area/fiorina/station/park) -"gqZ" = ( +"gqU" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/device/radio, -/obj/item/tool/pen/blue, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"grL" = ( -/obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison, -/area/fiorina/station/security) -"grO" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/item/paper/janitor, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/disco) +"grg" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"grA" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"gsd" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "gsL" = ( /obj/structure/platform, /obj/structure/platform{ @@ -10601,18 +10374,54 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"gte" = ( -/obj/item/shard{ - icon_state = "large" +"gsN" = ( +/obj/structure/closet, +/obj/effect/spawner/random/gun/shotgun/midchance, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"gsU" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"gsX" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"gtf" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) -"gto" = ( -/obj/structure/machinery/vending/coffee, +"gtg" = ( +/obj/structure/barricade/sandbags{ + dir = 4; + icon_state = "sandbag_0"; + pixel_y = 2 + }, +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"gtr" = ( +/obj/structure/bedsheetbin, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/research_cells) "gtH" = ( /obj/structure/safe, /obj/item/storage/beer_pack, @@ -10621,15 +10430,25 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"gtM" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 +"gtN" = ( +/obj/item/storage/beer_pack{ + pixel_y = 10 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 9; icon_state = "yellow" }, -/area/fiorina/station/disco) +/area/fiorina/station/lowsec) +"gtP" = ( +/obj/item/trash/uscm_mre, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"gtT" = ( +/obj/item/trash/eat, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzI) "guf" = ( /obj/structure/bed/chair{ dir = 4; @@ -10637,34 +10456,88 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"guB" = ( -/obj/item/ammo_magazine/m56d, -/obj/item/ammo_magazine/m56d, +"guv" = ( +/obj/item/packageWrap, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe" + icon_state = "darkyellow2" }, -/area/fiorina/station/central_ring) -"guG" = ( +/area/fiorina/lz/near_lzI) +"gux" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"guz" = ( /turf/open/floor/prison{ dir = 9; icon_state = "greenfull" }, +/area/fiorina/station/transit_hub) +"guU" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/civres) +"gve" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/servers) +"gvr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/pill_bottle/inaprovaline/skillless, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) -"guQ" = ( +"gvz" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, /turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "yellowfull" }, -/area/fiorina/station/power_ring) -"gvT" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/obj/effect/landmark/objective_landmark/medium, +/area/fiorina/station/disco) +"gvZ" = ( +/obj/item/stack/sheet/wood{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/tumor/aux_engi) -"gvX" = ( -/obj/structure/closet/secure_closet/security_empty, +/area/fiorina/tumor/servers) +"gwm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/gun/energy/taser, /turf/open/floor/prison{ icon_state = "redfull" }, @@ -10672,13 +10545,6 @@ "gws" = ( /turf/open/floor/plating, /area/fiorina/oob) -"gwz" = ( -/obj/effect/spawner/random/gun/pistol, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "gwH" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -10694,51 +10560,66 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"gwX" = ( -/obj/item/stool, -/obj/item/reagent_container/food/drinks/bottle/bluecuracao{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) "gxj" = ( /obj/structure/surface/table/woodentable, /obj/item/toy/dice/d20, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"gxx" = ( -/obj/item/packageWrap, -/obj/effect/decal/cleanable/blood, +"gxn" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + icon_state = "darkpurplefull2" }, /area/fiorina/lz/near_lzI) -"gxL" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 +"gxQ" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, +/area/fiorina/tumor/aux_engi) +"gxR" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"gyh" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"gyt" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"gyy" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"gxN" = ( -/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"gyi" = ( +/area/fiorina/station/transit_hub) +"gyA" = ( +/obj/structure/machinery/disposal, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/civres) "gyB" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ywflowers_2" @@ -10748,12 +10629,6 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"gyI" = ( -/obj/item/trash/candy, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) "gyJ" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -10762,111 +10637,136 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"gyU" = ( +"gyP" = ( +/obj/item/stack/sheet/wood{ + amount = 10 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/park) -"gyW" = ( -/turf/open/space, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) "gzb" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gzd" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/medbay) -"gzy" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +"gzh" = ( +/obj/structure/reagent_dispensers/water_cooler{ + density = 0; + pixel_x = -11; + pixel_y = 13 }, -/area/fiorina/station/telecomm/lz1_cargo) -"gzz" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/fiberbush) -"gzA" = ( -/obj/structure/machinery/gibber, -/obj/effect/decal/cleanable/blood{ - pixel_x = 8; - pixel_y = 10 - }, +/area/fiorina/station/power_ring) +"gzu" = ( +/obj/item/clothing/mask/cigarette/bcigarette, /turf/open/floor/prison{ - icon_state = "blue_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/botany) -"gzF" = ( +/area/fiorina/station/research_cells) +"gzN" = ( /obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) -"gzQ" = ( -/obj/structure/machinery/computer/crew, +/obj/item/toy/handcard/aceofspades, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/medbay) -"gAa" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"gAk" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ +/area/fiorina/station/research_cells) +"gAh" = ( +/obj/structure/prop/structure_lattice{ dir = 4 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, -/turf/open/space/basic, -/area/fiorina/oob) +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"gAn" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/station/park) "gAA" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"gAS" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" +"gAC" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"gAQ" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"gBo" = ( -/obj/structure/closet/emcloset, +"gBe" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/prison{ - dir = 6; + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"gBw" = ( +/obj/item/trash/chunk, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"gBx" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/fiberbush) +"gBN" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 9; icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"gCb" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 +"gBP" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) +"gBR" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"gBY" = ( +/obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "redfull" }, -/area/fiorina/station/disco) +/area/fiorina/station/chapel) "gCn" = ( /obj/structure/surface/table/woodentable, /obj/item/newspaper{ @@ -10890,22 +10790,16 @@ }, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/civres) -"gCX" = ( -/turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"gCY" = ( +"gCH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper, /turf/open/floor/prison{ - icon_state = "cell_stripe" - }, -/area/fiorina/station/flight_deck) -"gDt" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/station/medbay) +"gCK" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, @@ -10921,158 +10815,107 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"gDz" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"gDP" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"gEe" = ( -/obj/item/reagent_container/food/drinks/bottle/patron, +"gDI" = ( +/obj/structure/bed/chair/office/dark, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"gEv" = ( -/obj/structure/bed/roller, +/area/fiorina/tumor/ice_lab) +"gEq" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "platingdmg1" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/oob) "gEx" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"gEF" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"gET" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/mask/cigarette/cigar/tarbacks, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"gEU" = ( -/obj/structure/monorail{ +"gEX" = ( +/obj/structure/stairs/perspective{ dir = 4; - name = "launch track" - }, -/turf/open/space, -/area/fiorina/oob) -"gEW" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" + icon_state = "p_stair_full" }, -/area/fiorina/station/lowsec) -"gFc" = ( -/obj/effect/decal/cleanable/blood/drip, +/obj/structure/platform, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"gFe" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/fiberbush) +/area/fiorina/station/disco) "gFg" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gFq" = ( +"gFp" = ( +/obj/structure/inflatable/door, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/telecomm/lz1_tram) -"gFG" = ( +/area/fiorina/station/medbay) +"gFN" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "blue" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/station/civres_blue) -"gFK" = ( -/obj/item/stack/cable_coil, +/area/fiorina/station/research_cells) +"gFW" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" + dir = 6; + icon_state = "green" }, -/area/fiorina/tumor/servers) -"gGp" = ( -/obj/item/ammo_casing{ - icon_state = "casing_1" +/area/fiorina/tumor/aux_engi) +"gFZ" = ( +/obj/structure/barricade/wooden{ + dir = 1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"gGc" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/medbay) -"gGu" = ( -/obj/item/stack/rods, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) +/area/fiorina/station/disco) "gGx" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gGB" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"gGG" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"gHh" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/tumor/civres) -"gHb" = ( -/obj/structure/prop/structure_lattice{ - health = 300 +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells) +"gHn" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 }, -/obj/structure/prop/structure_lattice{ - pixel_y = 10 +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/tumor/aux_engi) -"gHc" = ( -/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "bluefull" }, -/area/fiorina/station/research_cells) -"gHh" = ( +/area/fiorina/station/power_ring) +"gHo" = ( /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"gHl" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/station/telecomm/lz1_tram) "gHy" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, @@ -11083,52 +10926,61 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"gHF" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryomid" +"gHC" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/obj/structure/platform{ + dir = 4 }, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"gHP" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 7; +"gIa" = ( +/obj/item/stool, +/obj/item/reagent_container/food/drinks/bottle/bluecuracao{ + pixel_x = 15; + pixel_y = 25 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"gIo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups{ + pixel_x = -3; pixel_y = 6 }, +/obj/item/storage/box/cups, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"gHW" = ( +/area/fiorina/station/power_ring) +"gIs" = ( +/obj/item/reagent_container/food/drinks/bottle/rum, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowcorners2" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/botany) "gIB" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"gIF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +"gID" = ( +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/oob) "gJu" = ( /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"gJG" = ( -/obj/item/stack/folding_barricade, +"gKg" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - dir = 8; - icon_state = "red" + icon_state = "floor_plate" }, /area/fiorina/station/security) "gKi" = ( @@ -11143,43 +10995,20 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"gKt" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/prop/souto_land/streamer{ - pixel_y = 24 - }, -/turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"gKu" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Residential Apartment" +"gKG" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 1; + icon_state = "blue" }, -/area/fiorina/tumor/servers) -"gKA" = ( -/obj/structure/platform_decoration, +/area/fiorina/station/chapel) +"gLk" = ( +/obj/item/stool, /turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"gKL" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/power_ring) "gLu" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -11192,64 +11021,54 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gLG" = ( -/obj/item/paper, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"gMw" = ( -/obj/structure/pipes/standard/tank/oxygen, +"gLK" = ( +/obj/structure/tunnel/maint_tunnel, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"gMJ" = ( -/obj/structure/barricade/deployable{ - dir = 4 + icon_state = "greenblue" }, +/area/fiorina/station/botany) +"gLV" = ( +/obj/item/clothing/head/welding, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/lowsec) -"gMV" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/tumor/civres) +"gNx" = ( +/obj/structure/platform{ + dir = 1 }, /obj/structure/platform{ - dir = 4 + dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"gNF" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 +/obj/structure/platform_decoration{ + dir = 5 }, -/obj/structure/machinery/shower{ - dir = 8 +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" }, /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"gNJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/lowsec) -"gNK" = ( -/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"gNW" = ( -/obj/item/bodybag, +/area/fiorina/tumor/servers) +"gNU" = ( +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/disco) "gNY" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ppflowers_2" @@ -11259,15 +11078,24 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"gOs" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"gOd" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"gOk" = ( +/obj/structure/cargo_container/grant/right{ + density = 0; + desc = "A huge industrial shipping container. You could slip just behind it."; + health = 5000; + layer = 4; + unacidable = 1 }, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/power_ring) "gOJ" = ( /obj/structure/closet/secure_closet/medical2{ req_access_txt = "100" @@ -11278,29 +11106,46 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"gPm" = ( -/obj/item/ammo_casing{ - icon_state = "casing_8" - }, +"gOU" = ( +/obj/item/bodybag, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) +"gPk" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"gPo" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "green" + }, +/area/fiorina/tumor/civres) +"gPp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) "gPs" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"gPO" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"gPE" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 10; + icon_state = "yellow" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/disco) "gPS" = ( /obj/item/stack/rods, /turf/open/floor/prison/chapel_carpet{ @@ -11308,28 +11153,26 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"gQh" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/candelabra{ - layer = 3.2; - pixel_x = 1; - pixel_y = 13 +"gPV" = ( +/obj/item/ammo_casing{ + icon_state = "casing_8" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/chapel) -"gQx" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" + dir = 10; + icon_state = "floor_plate" }, +/area/fiorina/station/telecomm/lz1_cargo) +"gQc" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"gQz" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/chapel) +/area/fiorina/station/medbay) "gQK" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -11340,24 +11183,31 @@ }, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/servers) -"gRm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" - }, +"gQL" = ( +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"gRf" = ( +/obj/structure/machinery/computer/crew, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"gRy" = ( -/obj/item/tool/shovel/etool, +"gRg" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/flight_deck) +"gRA" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "gRT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/sign/poster{ @@ -11368,20 +11218,6 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"gRV" = ( -/obj/structure/machinery/disposal, -/obj/item/tool/kitchen/rollingpin{ - pixel_y = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/station/civres_blue) "gRW" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -11390,7 +11226,9 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"gSD" = ( +"gSf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/explosive/grenade/incendiary/molotov, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 @@ -11398,34 +11236,24 @@ /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"gSG" = ( -/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 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"gSN" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "handblood" +/area/fiorina/station/lowsec) +"gSg" = ( +/obj/structure/platform, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/power_ring) +"gSC" = ( +/obj/item/prop/helmetgarb/gunoil, +/turf/open/floor/prison, +/area/fiorina/maintenance) +"gSK" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/transit_hub) "gSP" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -11435,6 +11263,12 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) +"gSX" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/park) "gTc" = ( /obj/item/storage/belt/shotgun/full/quackers, /obj/effect/spawner/gibspawner/human, @@ -11443,49 +11277,57 @@ name = "pool" }, /area/fiorina/station/park) -"gTw" = ( +"gTi" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + icon_state = "blue" }, -/area/fiorina/station/central_ring) -"gUf" = ( +/area/fiorina/station/chapel) +"gTy" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" + dir = 5; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/lz/near_lzI) +"gTN" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/ice_lab) +"gTW" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/transit_hub) "gUj" = ( /turf/closed/shuttle/ert{ icon_state = "stan3" }, /area/fiorina/tumor/ship) -"gUn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 +"gUu" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) +"gVc" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"gUx" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"gUH" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med, -/turf/closed/wall/prison, -/area/fiorina/station/medbay) -"gUO" = ( -/obj/item/tool/warning_cone, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/disco) "gVs" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/prison, @@ -11501,34 +11343,15 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gVA" = ( -/obj/item/frame/rack, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"gVR" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" +"gVT" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" }, -/area/fiorina/maintenance) -"gVX" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "darkpurple2" - }, -/area/fiorina/station/central_ring) -"gWf" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 1 - }, -/obj/item/frame/rack, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/flight_deck) "gWg" = ( /obj/structure/powerloader_wreckage, /obj/effect/decal/cleanable/blood/gibs/robot/limb, @@ -11546,82 +11369,56 @@ /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, /area/fiorina/station/disco) -"gWT" = ( -/obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison{ - dir = 4; - icon_state = "green" - }, -/area/fiorina/tumor/civres) -"gXi" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"gXt" = ( -/turf/open/floor/prison{ - icon_state = "platingdmg1" +"gXd" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_y = 21 }, +/turf/open/floor/prison, /area/fiorina/station/chapel) "gXu" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"gXD" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"gXH" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 2; - layer = 6; - name = "overhead pipe"; - pixel_x = -16; - pixel_y = 12 - }, +"gXF" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/tumor/servers) -"gXL" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"gXI" = ( +/obj/item/book/manual/atmospipes, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"gYD" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "whitepurple" }, -/area/fiorina/station/lowsec) -"gYA" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +/area/fiorina/station/research_cells) +"gYH" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced{ + dir = 8 }, +/obj/item/ammo_magazine/shotgun/beanbag, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + icon_state = "redfull" }, -/area/fiorina/station/botany) +/area/fiorina/station/security) +"gYM" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "gZc" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "4" @@ -11636,66 +11433,83 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"gZE" = ( +"gZg" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"gZT" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "panelscorched" - }, -/area/fiorina/station/transit_hub) -"haa" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 + icon_state = "bluefull" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"hab" = ( +/area/fiorina/station/power_ring) +"gZx" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_x = 6; pixel_y = 3 }, -/turf/open/floor/prison, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) -"hah" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"gZG" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, +/area/fiorina/station/civres_blue) +"gZM" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/research_cells) -"ham" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/area/fiorina/station/park) +"hae" = ( /turf/open/floor/prison{ - dir = 4; + dir = 8; icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) +"hao" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + pixel_y = 7 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "hay" = ( /turf/closed/shuttle/ert{ icon_state = "wy_leftengine" }, /area/fiorina/station/medbay) -"haU" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"haJ" = ( +/obj/item/disk, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/effect/decal/cleanable/blood, +/area/fiorina/tumor/servers) +"haQ" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "greenblue" + icon_state = "darkredfull2" }, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells) +"hbn" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) "hbo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/classic{ @@ -11726,56 +11540,34 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"hbq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 4 +"hbp" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"hbt" = ( +/obj/item/tool/screwdriver, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"hbC" = ( -/obj/structure/monorail{ - name = "launch track" + icon_state = "darkpurplefull2" }, -/turf/open/space, -/area/fiorina/oob) -"hcb" = ( +/area/fiorina/tumor/servers) +"hbH" = ( +/obj/item/stack/sandbags_empty/half, /turf/open/floor/prison{ - dir = 4; - icon_state = "greencorner" - }, -/area/fiorina/tumor/civres) -"hce" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/handcuffs{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = -2; - pixel_y = 11 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "darkyellow2" }, -/turf/open/floor/prison{ - icon_state = "redfull" +/area/fiorina/lz/near_lzI) +"hcs" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, -/area/fiorina/station/security) -"hcf" = ( -/obj/item/paper/carbon, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) "hcv" = ( /obj/item/stack/tile/plasteel{ pixel_x = 12; @@ -11786,40 +11578,88 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"hcB" = ( +/obj/structure/sign/poster{ + desc = "You are becoming hysterical."; + icon_state = "poster11"; + pixel_y = 32 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"hcY" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) "hds" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2-8" }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"hdv" = ( -/obj/item/tool/scythe, -/turf/open/floor/prison{ +"hdA" = ( +/obj/structure/barricade/wooden{ dir = 4; - icon_state = "blue_plate" + pixel_y = 4 }, -/area/fiorina/station/botany) -"heb" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"hdR" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, /area/fiorina/station/disco) -"heu" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" +"hej" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrown2" }, -/obj/item/reagent_container/food/snacks/meat, +/area/fiorina/maintenance) +"hek" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/weapon/baton, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + icon_state = "redfull" }, -/area/fiorina/station/botany) +/area/fiorina/station/security) +"heo" = ( +/obj/structure/closet/crate/trashcart, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/chapel) +"heA" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) "heO" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/civres_blue) +"heT" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "greenblue" + }, +/area/fiorina/station/botany) "hfc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -11838,91 +11678,65 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"hfl" = ( -/obj/item/device/pinpointer, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) "hfT" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/flight_deck) -"hgp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 4 - }, +"hgc" = ( +/obj/structure/largecrate/supply/medicine/medivend, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/oob) -"hgr" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/medbay) +"hgh" = ( +/obj/item/trash/burger, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"hgu" = ( -/obj/structure/barricade/handrail/type_b{ dir = 4; - layer = 3.5 + icon_state = "greenfull" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"hgz" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, +/area/fiorina/tumor/civres) +"hgA" = ( +/obj/item/ammo_magazine/smg/nailgun, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) +"hgD" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" + icon_state = "darkbrowncorners2" }, -/area/fiorina/tumor/civres) -"hgC" = ( +/area/fiorina/tumor/aux_engi) +"hgP" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 10; - icon_state = "green" + dir = 1; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/transit_hub) -"hgJ" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/park) "hgS" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" }, /area/fiorina/tumor/aux_engi) -"hhg" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"hhh" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +"hhu" = ( +/obj/structure/surface/rack, +/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/plating/prison, -/area/fiorina/station/power_ring) -"hhl" = ( -/obj/item/device/flashlight/flare/on, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"hhD" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/surface/rack, +/obj/item/clothing/gloves/latex, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"hhy" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" + icon_state = "sterile_white" }, -/area/fiorina/station/park) +/area/fiorina/station/medbay) "hhL" = ( /obj/effect/spawner/random/powercell, /obj/structure/disposalpipe/segment{ @@ -11934,71 +11748,55 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"hil" = ( +/obj/structure/surface/rack, +/obj/item/tool/plantspray/pests, +/obj/item/tool/plantspray/weeds, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) "hir" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"hiu" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/station/telecomm/lz1_tram) -"hix" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/boxing, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"hiG" = ( -/obj/item/storage/backpack/souto, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"hiK" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/disco) "hiO" = ( /turf/closed/shuttle/elevator{ dir = 4 }, /area/fiorina/tumor/aux_engi) -"hja" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 +"hiP" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) -"hjb" = ( -/obj/structure/closet/secure_closet/medical2, +/area/fiorina/station/medbay) +"hjp" = ( +/obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"hjr" = ( -/obj/structure/inflatable/popped/door, +/area/fiorina/tumor/ice_lab) +"hjB" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) +"hjC" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "hjE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced, @@ -12007,9 +11805,17 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"hjP" = ( +"hjM" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"hjR" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/transit_hub) "hjV" = ( /obj/structure/stairs/perspective, /turf/open/floor/plating/prison, @@ -12025,32 +11831,56 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"hkW" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"hll" = ( -/obj/item/tool/warning_cone, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"hko" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" }, -/area/fiorina/station/power_ring) -"hln" = ( -/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/park) -"hlq" = ( -/obj/structure/janitorialcart, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"hlK" = ( +/area/fiorina/station/medbay) +"hkA" = ( /turf/open/floor/prison{ icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/flight_deck) +"hkB" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"hkH" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"hkM" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/body, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"hlk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/cigarette, +/obj/item/storage/fancy/cigarettes/emeraldgreen{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"hlB" = ( +/obj/item/tool/kitchen/knife, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) "hlT" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -12059,80 +11889,69 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"hmd" = ( -/obj/structure/stairs/perspective{ +"hmq" = ( +/obj/item/device/flashlight, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"hmE" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ dir = 4; - icon_state = "p_stair_sn_full_cap" + icon_state = "whitegreen" }, -/obj/structure/platform{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"hmS" = ( +/obj/structure/monorail{ + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"hmg" = ( -/obj/structure/platform_decoration, +"hnh" = ( +/obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison, -/area/fiorina/station/disco) -"hmj" = ( -/obj/item/storage/firstaid/toxin, +/area/fiorina/station/power_ring) +"hnK" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"hmk" = ( -/turf/open/floor/prison{ - icon_state = "whitegreencorner" - }, -/area/fiorina/tumor/ice_lab) -"hmr" = ( -/obj/structure/bed/sofa/south/grey/right, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) -"hng" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"hnJ" = ( -/obj/item/clothing/under/stowaway, -/obj/structure/machinery/shower{ - pixel_y = 13 +/area/fiorina/station/park) +"hnM" = ( +/obj/item/shard{ + icon_state = "large" }, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/security) "hob" = ( /obj/item/phone{ pixel_y = 7 }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"hor" = ( -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 +"hoo" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" + }, +/area/fiorina/station/civres_blue) +"hox" = ( +/obj/structure/barricade/handrail{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"hoy" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/central_ring) +"hoC" = ( +/obj/item/trash/popcorn, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "hoH" = ( /obj/effect/decal/cleanable/cobweb{ desc = "Spun only by the terrifying space widow. Some say that even looking at it will kill you."; @@ -12140,24 +11959,10 @@ }, /turf/open/space, /area/fiorina/oob) -"hoN" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "casing_6" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"hoY" = ( -/obj/structure/surface/rack, -/obj/item/frame/table/almayer, -/obj/item/frame/table/almayer, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) +"hoT" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "hoZ" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) @@ -12168,17 +11973,12 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/security) -"hpr" = ( -/obj/item/device/binoculars/civ, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"hpn" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/aux_engi) "hpz" = ( /obj/structure/ice/thin/indestructible{ dir = 1; @@ -12187,32 +11987,23 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"hpJ" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/filtration/console{ - can_block_movement = 0; - pixel_y = 22 - }, -/obj/item/trash/used_stasis_bag, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"hpN" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "hpW" = ( /obj/item/stack/cable_coil/orange, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"hpX" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"hqb" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) "hqc" = ( /obj/structure/bed/chair/wood/normal, /turf/open/floor/carpet, @@ -12223,73 +12014,132 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"hqF" = ( -/obj/structure/prop/souto_land/pole{ +"hqG" = ( +/obj/structure/platform{ dir = 1 }, -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 24 +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 9; + icon_state = "whitegreen" }, -/area/fiorina/station/park) -"hqZ" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/toxin, +/area/fiorina/tumor/ice_lab) +"hqO" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/medbay) -"hrg" = ( -/obj/structure/barricade/handrail{ - dir = 4 +/area/fiorina/lz/near_lzII) +"hqX" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"hre" = ( +/obj/structure/platform_decoration{ + dir = 4 }, +/obj/item/device/flashlight, +/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"hrl" = ( +/obj/structure/bed/sofa/vert/grey, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "hro" = ( /obj/structure/girder, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"hrX" = ( -/obj/structure/largecrate/random/case/double, +"hrw" = ( /turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 4; + icon_state = "darkpurple2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/tumor/servers) +"hrz" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 2; + pixel_y = 21 + }, +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 2; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"hrA" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) +"hrB" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/prison, +/area/fiorina/station/security) +"hrL" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/obj/structure/machinery/shower{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/lowsec) "hsc" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"hsd" = ( -/obj/item/device/flashlight/flare, +"hsf" = ( +/obj/structure/bed/chair{ + dir = 8 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/telecomm/lz1_cargo) -"hss" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/park) +"hsl" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"hsz" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "p_stair_full" + pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"hsA" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/disco) "hsC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/southleft, @@ -12308,41 +12158,92 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) -"htc" = ( -/obj/item/tool/wrench, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +"htq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "htt" = ( /turf/closed/shuttle/ert, /area/fiorina/station/power_ring) -"htL" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard, +"htD" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"htO" = ( +/obj/item/ammo_casing{ + dir = 8; + icon_state = "casing_6" + }, +/obj/structure/barricade/metal{ + dir = 8; + health = 150; + icon_state = "metal_2" + }, +/obj/effect/spawner/random/gun/smg, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"htT" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) -"hue" = ( -/obj/effect/decal/cleanable/blood, +"htX" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" + }, +/area/fiorina/station/chapel) +"hub" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkbrowncorners2" + icon_state = "darkbrown2" }, /area/fiorina/station/park) "hul" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"huB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "huD" = ( /obj/item/tool/crowbar, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"huI" = ( -/obj/structure/reagent_dispensers/water_cooler, +"huG" = ( +/obj/item/tool/wirecutters, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/lowsec) +"huJ" = ( +/obj/structure/prop/almayer/computers/sensor_computer1{ + name = "computer" + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/lowsec) "hva" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -12361,99 +12262,74 @@ icon_state = "plate" }, /area/fiorina/station/civres_blue) -"hvh" = ( -/obj/item/stack/tile/plasteel{ - pixel_x = 3; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"hvi" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docstripingdir" - }, +"hvp" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"hvE" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "whitegreen" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/ice_lab) "hvF" = ( /obj/structure/grille, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"hvG" = ( -/obj/item/weapon/gun/rifle/m16, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/fiorina/station/security) -"hwn" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +"hvL" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"hwE" = ( -/obj/structure/tunnel/maint_tunnel, +"hwr" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 7; + pixel_y = 6 + }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 8; + icon_state = "blue" }, -/area/fiorina/tumor/servers) -"hxg" = ( +/area/fiorina/station/chapel) +"hwN" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 4; + icon_state = "yellow" }, -/area/fiorina/maintenance) -"hxi" = ( -/obj/item/roller, -/turf/open/floor/prison, /area/fiorina/station/lowsec) -"hxk" = ( -/obj/structure/platform{ - dir = 4 +"hwS" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/security/wardens) +"hxj" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "hxq" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) -"hxy" = ( -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"hxC" = ( -/turf/open/floor/prison{ - icon_state = "darkbrowncorners2" +"hxG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/area/fiorina/tumor/aux_engi) +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/space/basic, +/area/fiorina/oob) "hxJ" = ( /obj/structure/sign/poster{ icon_state = "poster12"; @@ -12470,57 +12346,71 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"hxU" = ( -/obj/item/shard{ - icon_state = "medium" - }, +"hyc" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrowncorners2" + }, +/area/fiorina/maintenance) +"hyo" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/station/chapel) -"hyz" = ( /turf/open/floor/prison{ - icon_state = "platingdmg1" + icon_state = "sterile_white" }, /area/fiorina/station/civres_blue) -"hyG" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/clothing/gloves/botanic_leather, +"hyq" = ( +/obj/structure/closet/crate/medical, +/obj/item/tool/surgery/bonegel, +/obj/item/tool/surgery/bonegel, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"hyR" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) +/area/fiorina/station/medbay) +"hys" = ( +/obj/structure/grille, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "hyT" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" }, /area/fiorina/tumor/aux_engi) -"hyX" = ( -/obj/structure/barricade/wooden{ - dir = 4 +"hzi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/processor{ + desc = "It CAN blend it."; + icon_state = "blender_e"; + name = "Blendomatic"; + pixel_x = -2; + pixel_y = 10 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "kitchen" }, /area/fiorina/station/civres_blue) -"hzq" = ( -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/structure/surface/table/reinforced/prison, +"hzv" = ( +/obj/structure/window/framed/prison, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) +"hzF" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "hzG" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8; @@ -12530,46 +12420,65 @@ icon_state = "wy4" }, /area/fiorina/station/medbay) -"hAp" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 2; - layer = 6; - name = "overhead pipe"; - pixel_x = -16; - pixel_y = 12 - }, +"hzL" = ( +/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" + icon_state = "darkbrowncorners2" }, -/area/fiorina/tumor/servers) -"hAL" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/area/fiorina/tumor/aux_engi) +"hAs" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -9; + pixel_y = 8 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 11; + pixel_y = 8 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 1; + pixel_y = 8 }, -/obj/item/weapon/gun/smg/mp5, -/obj/item/storage/belt/marine, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"hAI" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/security) -"hAY" = ( -/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/tumor/aux_engi) -"hBn" = ( -/obj/item/device/flashlight/lamp/tripod, +"hAP" = ( +/obj/item/clothing/under/stowaway, +/obj/structure/machinery/shower{ + pixel_y = 13 + }, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" + icon_state = "kitchen" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/lowsec) +"hAX" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/ice_lab) +"hBc" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"hBf" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) "hBF" = ( /obj/structure/window_frame/prison/reinforced, /obj/item/stack/sheet/glass/reinforced{ @@ -12577,127 +12486,116 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"hBI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/megaphone, +"hCc" = ( +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/park) +"hCh" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"hCk" = ( +/obj/item/poster, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"hBP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/phone{ - pixel_x = 7; - pixel_y = -16 + icon_state = "floor_plate" }, -/obj/item/phone{ - pixel_x = -3; - pixel_y = 16 +/area/fiorina/station/security) +"hCp" = ( +/obj/structure/prop/invuln{ + desc = "Floating cells are reserved for highly dangerous criminals. Whoever is out there is probably best left out there."; + icon = 'icons/obj/structures/doors/celldoor.dmi'; + icon_state = "door_closed"; + layer = 2.5; + name = "cell door" }, +/obj/structure/blocker/invisible_wall, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"hBX" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/area/fiorina/tumor/servers) +"hCR" = ( +/obj/item/stack/sheet/wood, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"hDb" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "kitchen" }, -/area/fiorina/station/medbay) -"hCc" = ( -/obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/park) -"hCd" = ( -/obj/structure/barricade/metal/wired, +/area/fiorina/station/civres_blue) +"hDl" = ( +/obj/structure/machinery/photocopier, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) -"hCS" = ( +/area/fiorina/station/medbay) +"hDm" = ( +/obj/item/trash/burger, /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/chapel) -"hCT" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/ice_lab) +"hDS" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/tumor/civres) -"hCX" = ( -/obj/effect/landmark/wo_supplies/storage/belts/knifebelt, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"hDq" = ( -/obj/effect/landmark/corpsespawner/engineer, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand/layer1, -/area/fiorina/tumor/civres) -"hDr" = ( -/obj/item/stool, -/turf/open/floor/prison{ - dir = 10; - icon_state = "damaged2" +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/station/lowsec) -"hDx" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"hDy" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" +/area/fiorina/station/power_ring) +"hDV" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" }, -/area/fiorina/station/medbay) -"hDL" = ( +/obj/item/stack/cable_coil/blue, /turf/open/floor/prison{ dir = 10; - icon_state = "darkyellow2" + icon_state = "sterile_white" }, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/station/medbay) "hEb" = ( /turf/closed/shuttle/ert{ icon_state = "wy20" }, /area/fiorina/station/medbay) +"hEk" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) "hEs" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/research_cells) -"hFe" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 - }, -/obj/structure/barricade/handrail/type_b{ - dir = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +"hEv" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/fiorina/tumor/ice_lab) -"hFn" = ( -/obj/structure/inflatable/popped/door, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"hEZ" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + icon_state = "platingdmg3" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/security) +"hFC" = ( +/obj/item/disk, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "hFH" = ( /obj/item/gift, /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -12706,34 +12604,49 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"hGz" = ( -/obj/item/clothing/gloves/botanic_leather, +"hFW" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 8; - icon_state = "greenblue" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/station/botany) -"hGC" = ( -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/research_cells) +"hGg" = ( +/obj/structure/sign/poster{ + desc = "You are becoming hysterical."; + icon_state = "poster11"; + pixel_x = -24 }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) +"hGn" = ( +/obj/structure/bed/sofa/vert/grey/bot, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"hGu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/vials/random, /turf/open/floor/prison{ dir = 10; - icon_state = "greenblue" + icon_state = "whitegreenfull" }, -/area/fiorina/station/botany) -"hGP" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) -"hGZ" = ( -/obj/item/stack/cable_coil, +/area/fiorina/station/medbay) +"hGy" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"hGW" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/telecomm/lz1_cargo) "hHc" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -12748,145 +12661,98 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"hHh" = ( -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) "hHq" = ( /obj/structure/closet/cabinet, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"hHv" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"hIe" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"hIo" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +"hHr" = ( +/obj/item/tool/warning_cone, /turf/open/floor/prison{ - dir = 1; + dir = 8; icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) -"hIu" = ( +/area/fiorina/station/park) +"hHC" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 4; + pixel_y = 24 + }, /obj/structure/bed/chair{ - dir = 8 + dir = 1 }, +/obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"hIR" = ( -/obj/structure/tunnel, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" + dir = 4; + icon_state = "darkbrown2" }, -/area/fiorina/station/civres_blue) -"hJc" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/area/fiorina/station/park) +"hHH" = ( +/obj/effect/decal/cleanable/blood{ + desc = "Watch your step."; + icon_state = "gib6" }, -/area/fiorina/tumor/aux_engi) -"hJw" = ( -/turf/open/floor/prison{ +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"hHX" = ( +/obj/structure/toilet{ dir = 4; - icon_state = "bluecorner" + pixel_y = 8 }, -/area/fiorina/station/civres_blue) -"hKE" = ( -/obj/structure/inflatable, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 10; + dir = 9; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"hKI" = ( -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"hKJ" = ( -/obj/structure/closet/emcloset, -/obj/item/storage/pill_bottle/kelotane/skillless, +"hIO" = ( +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"hKW" = ( -/obj/structure/closet/crate/science{ - density = 0; - icon_state = "open_science"; - opened = 1 +/area/fiorina/station/medbay) +"hIX" = ( +/obj/structure/machinery/power/apc{ + dir = 1 }, -/obj/item/organ/lungs, -/obj/structure/machinery/light/double/blue{ +/turf/open/floor/prison{ dir = 1; - pixel_y = 21 + icon_state = "green" }, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"hLt" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/area/fiorina/station/chapel) +"hJo" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, +/obj/item/reagent_container/food/drinks/flask/barflask, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/tumor/civres) -"hLy" = ( -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/research_cells) +"hKN" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "sterile_white" }, -/area/fiorina/lz/near_lzII) -"hLz" = ( -/turf/closed/wall/prison, -/area/fiorina/lz/near_lzII) -"hLK" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 8 +/area/fiorina/station/civres_blue) +"hKP" = ( +/obj/structure/platform{ + dir = 4 }, +/obj/item/tool/shovel/spade, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/botany) +"hLz" = ( +/turf/closed/wall/prison, /area/fiorina/lz/near_lzII) "hLM" = ( /obj/structure/sign/safety/bulkhead_door, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/fiberbush) -"hLO" = ( -/obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"hLX" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) "hMf" = ( /obj/item/tool/candle{ pixel_x = -2; @@ -12894,63 +12760,54 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"hMg" = ( -/obj/item/clothing/head/helmet/marine/specialist/hefa, -/turf/open/floor/prison, -/area/fiorina/station/park) -"hMK" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "pizzatime" +"hMj" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/power_ring) -"hMX" = ( -/obj/item/weapon/twohanded/spear, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"hMA" = ( +/obj/item/tool/crowbar, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreen" }, -/area/fiorina/station/research_cells) -"hNc" = ( +/area/fiorina/station/medbay) +"hMH" = ( /obj/item/newspaper, /turf/open/floor/prison{ dir = 4; icon_state = "red" }, /area/fiorina/lz/near_lzII) -"hNi" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"hMK" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "pizzatime" }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomright" +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/power_ring) +"hNj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups, +/obj/item/storage/fancy/cigarettes/arcturian_ace{ + pixel_x = -6; + pixel_y = 20 + }, +/obj/item/storage/fancy/cigarettes/arcturian_ace{ + pixel_x = 6; + pixel_y = 20 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/power_ring) +"hNU" = ( +/obj/structure/janitorialcart, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "hNY" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"hOg" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"hOz" = ( -/obj/item/clothing/accessory/armband/cargo{ - desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; - name = "HEFA Order milita armband" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "bluecorner" - }, -/area/fiorina/station/chapel) "hOA" = ( /obj/structure/sink{ dir = 8; @@ -12958,51 +12815,65 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"hOR" = ( -/obj/structure/platform{ - dir = 8 - }, +"hOG" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"hOQ" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/station/park) -"hOW" = ( /turf/open/floor/prison{ - icon_state = "floorscorched2" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"hPs" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +/area/fiorina/station/central_ring) +"hPi" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) +"hPq" = ( +/obj/structure/machinery/power/apc, /turf/open/floor/prison{ - icon_state = "yellow" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/station/lowsec) -"hPF" = ( -/obj/structure/reagent_dispensers/water_cooler{ - density = 0; - pixel_x = -8; - pixel_y = 16 +/area/fiorina/station/botany) +"hPu" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, +/area/fiorina/station/power_ring) +"hPL" = ( +/obj/item/tool/wrench, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"hPN" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"hPW" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/security) +"hPO" = ( +/obj/effect/spawner/random/gun/rifle/highchance, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/lz/near_lzI) "hPY" = ( /obj/structure/surface/rack, /turf/open/floor/wood, /area/fiorina/station/chapel) -"hQg" = ( -/obj/item/bedsheet, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/lowsec) "hQh" = ( /obj/structure/barricade/handrail/type_b{ dir = 8; @@ -13010,70 +12881,123 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"hQH" = ( -/obj/structure/closet/crate, +"hQj" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"hQk" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, /turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) +/area/fiorina/oob) +"hQM" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"hQQ" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"hQR" = ( +/obj/structure/barricade/metal/wired{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"hQT" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/obj/item/stack/barbed_wire, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"hRb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "hRs" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"hRV" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "hRX" = ( /turf/open/gm/river{ color = "#995555"; name = "pool" }, /area/fiorina/station/park) -"hSf" = ( -/obj/item/dogtag, +"hSk" = ( +/obj/structure/toilet, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "sterile_white" }, /area/fiorina/station/civres_blue) -"hSF" = ( -/obj/structure/surface/table/reinforced/prison, +"hSl" = ( +/obj/structure/platform, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/disco) +"hSo" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/obj/item/tool/crowbar/red, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) +"hSA" = ( +/obj/item/reagent_container/food/drinks/bottle/tomatojuice, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"hSG" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/tumor/fiberbush) "hSH" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"hSL" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "2" - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"hSR" = ( -/obj/structure/window/reinforced, -/turf/open/floor/prison, -/area/fiorina/station/security) -"hTc" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, +"hSO" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/central_ring) +/area/fiorina/lz/near_lzI) "hTf" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -13085,86 +13009,85 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) -"hTm" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 4 +"hTh" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/lz/near_lzII) -"hTr" = ( -/obj/structure/closet, -/obj/effect/spawner/random/gun/shotgun/midchance, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) +/area/fiorina/lz/near_lzI) +"hTo" = ( +/obj/item/smallDelivery, +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "hTs" = ( /turf/closed/shuttle/elevator{ dir = 10 }, /area/fiorina/station/civres_blue) -"hTt" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/ice_lab) -"hTG" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" +"hTy" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/central_ring) "hTM" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"hUf" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"hUh" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkpurple2" +"hTN" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/area/fiorina/tumor/ice_lab) +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/fiorina/oob) "hUi" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"hUH" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/structure/window/reinforced{ - dir = 8 +"hUj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"hUD" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greencorner" + }, +/area/fiorina/station/chapel) +"hUL" = ( +/obj/structure/sink{ + pixel_y = 23 + }, +/obj/item/paper_bin{ + pixel_x = -11; + pixel_y = -5 }, -/obj/item/storage/box/flashbangs, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "hUO" = ( /turf/open/floor/prison/chapel_carpet{ dir = 1; icon_state = "doubleside" }, /area/fiorina/maintenance) -"hUV" = ( -/obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"hVm" = ( -/obj/item/trash/cigbutt/bcigbutt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) "hVu" = ( /obj/item/stack/sheet/metal, /obj/structure/cable/heavyduty{ @@ -13172,15 +13095,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"hVz" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" - }, -/obj/item/reagent_container/food/snacks/meat, +"hVA" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/station/security) +/area/fiorina/station/research_cells) "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -13192,205 +13113,270 @@ /turf/closed/wall/prison, /area/fiorina/station/medbay) "hVS" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "lavendergrass_4" +/obj/structure/platform_decoration/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"hWb" = ( +/obj/structure/machinery/photocopier{ + pixel_y = 4 }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/turf/open/floor/prison{ + icon_state = "darkredfull2" }, -/area/fiorina/station/central_ring) -"hWB" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/security) +"hWi" = ( +/obj/structure/machinery/door/airlock/almayer/maint/autoname{ + dir = 1; + name = "\improper Null Hatch REPLACE ME"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"hWk" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 9; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/lz/near_lzI) +"hWv" = ( +/obj/structure/surface/rack, +/obj/item/tool/crowbar/red, +/obj/item/storage/pill_bottle/inaprovaline/skillless, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"hWz" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/botany) "hWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"hWJ" = ( -/obj/item/trash/sosjerky, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" +"hWG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/radio{ + pixel_y = 8 }, -/area/fiorina/station/flight_deck) -"hWU" = ( -/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"hXc" = ( +/area/fiorina/station/power_ring) +"hXF" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_y = 7 - }, +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"hXi" = ( -/obj/structure/surface/rack, +"hXG" = ( +/obj/structure/barricade/metal/wired{ + dir = 1 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "darkyellow2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/lz/near_lzI) +"hXN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/weapon/gun/pistol/heavy, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"hXX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "hXZ" = ( /turf/closed/shuttle/ert{ icon_state = "wy2" }, /area/fiorina/station/medbay) -"hYK" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"hYT" = ( -/obj/item/disk/botany, +"hYl" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/botany) -"hYV" = ( -/obj/structure/prop/resin_prop{ - dir = 4; - icon_state = "chair"; - pixel_y = 6 +/area/fiorina/station/medbay) +"hYs" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + layer = 2.97; + pixel_y = -14 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"hYx" = ( +/obj/item/tool/wet_sign, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = -1 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"hYX" = ( +/obj/structure/machinery/bot/medbot, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"hZp" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/medbay) +"hZf" = ( +/obj/structure/machinery/portable_atmospherics/powered/scrubber, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"hZi" = ( +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_tram) +"hZG" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "p_stair_sn_full_cap" + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "bluefull" }, -/area/fiorina/station/chapel) +/area/fiorina/station/power_ring) +"hZN" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" + }, +/area/fiorina/maintenance) "hZR" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"iah" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "cartridge_2" - }, +"iaa" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "darkyellow2" + icon_state = "cell_stripe" }, -/area/fiorina/station/flight_deck) -"iaO" = ( +/area/fiorina/station/disco) +"iad" = ( +/obj/item/device/multitool, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + dir = 9; + icon_state = "green" }, -/area/fiorina/tumor/servers) -"ibb" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" +/area/fiorina/tumor/civres) +"iaE" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/station/civres_blue) -"ibN" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/fiorina/station/lowsec) -"icj" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottom" + icon_state = "floor_plate" }, +/area/fiorina/tumor/aux_engi) +"ibl" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"ick" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" +/area/fiorina/lz/near_lzI) +"ibz" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/central_ring) -"icK" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibmid3" +/turf/open/floor/prison, +/area/fiorina/station/security) +"ibA" = ( +/obj/structure/barricade/metal/wired{ + health = 120; + icon_state = "metal_2" }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"icg" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "whitegreen" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/ice_lab) +"icu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/pizzabox/mushroom, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "icS" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/wood, /area/fiorina/station/park) +"icT" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"idb" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/chapel) "idi" = ( /obj/item/trash/sosjerky, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"idq" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"idE" = ( -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"idO" = ( -/obj/structure/tunnel/maint_tunnel, +"idj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/briefcase/inflatable, /turf/open/floor/prison{ - dir = 10; - icon_state = "greenblue" + icon_state = "yellowfull" }, -/area/fiorina/station/botany) -"idT" = ( -/obj/structure/barricade/wooden{ - dir = 4; - pixel_y = 4 +/area/fiorina/station/lowsec) +"idP" = ( +/obj/structure/platform{ + dir = 1 }, -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "whitegreen" + pixel_y = 21 }, -/area/fiorina/station/medbay) -"idV" = ( -/obj/structure/largecrate/random/secure, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"ied" = ( +"idS" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"iea" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "blue" + dir = 1; + icon_state = "whitegreencorner" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) "ieu" = ( /obj/structure/platform{ dir = 4 @@ -13407,21 +13393,23 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"ieU" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/close, +"ieA" = ( +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"ieW" = ( -/obj/structure/machinery/computer3/server/rack, -/obj/structure/barricade/handrail/type_b{ - dir = 4 +/area/fiorina/lz/near_lzI) +"ieJ" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) +/area/fiorina/tumor/fiberbush) +"ifc" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/tumor/civres) "ifk" = ( /obj/structure/platform_decoration{ dir = 4 @@ -13430,6 +13418,11 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"ifm" = ( +/turf/open/floor/prison{ + icon_state = "greencorner" + }, +/area/fiorina/tumor/civres) "ifp" = ( /obj/structure/surface/table/woodentable, /obj/structure/machinery/light/double/blue{ @@ -13440,24 +13433,10 @@ /obj/item/tool/wrench, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"ifq" = ( -/obj/item/stock_parts/micro_laser/ultra, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"ifs" = ( -/obj/structure/inflatable/popped, +"ifw" = ( +/obj/structure/bed/chair/comfy, /turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"ifI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/surgicaldrill, -/turf/open/floor/prison{ - icon_state = "yellowcorner" - }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/servers) "ifJ" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -13469,19 +13448,58 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"igA" = ( -/obj/effect/spawner/random/gun/smg, +"ifL" = ( +/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - dir = 8; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"igD" = ( -/obj/structure/largecrate/supply/medicine/iv, +/area/fiorina/tumor/servers) +"ifN" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/lz/near_lzI) +"ifP" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) +"igc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/powercell, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"ign" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/lz/near_lzI) +"igu" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" + }, +/area/fiorina/station/botany) "igQ" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/rank/janitor, @@ -13489,188 +13507,217 @@ /obj/item/clothing/head/bio_hood/janitor, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"iht" = ( +"igV" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"ihn" = ( +/obj/item/paper/crumpled, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/tumor/civres) +"ihp" = ( +/obj/structure/closet/crate/science{ + density = 0; + icon_state = "open_science"; + opened = 1 + }, +/obj/item/organ/lungs, /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + dir = 1; + pixel_y = 21 }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"ihv" = ( +/obj/item/stock_parts/matter_bin/super, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkpurple2" }, -/area/fiorina/station/civres_blue) +/area/fiorina/tumor/servers) "ihz" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"ihA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, +"ihB" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/power_ring) -"ihC" = ( -/obj/item/tool/wrench, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"iif" = ( -/obj/structure/bed/sofa/south/grey/left, +/area/fiorina/station/security) +"ihO" = ( +/obj/structure/machinery/computer/prisoner, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security/wardens) -"iin" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_y = 4 + icon_state = "redfull" }, +/area/fiorina/station/security) +"ihV" = ( +/obj/structure/blocker/invisible_wall, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/station/security) -"iir" = ( -/obj/item/ammo_magazine/shotgun/buckshot, +/area/fiorina/oob) +"iie" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/toxin, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) -"iiE" = ( -/obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/medbay) +"iiw" = ( +/obj/structure/monorail{ + dir = 6; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"iiz" = ( +/obj/structure/machinery/gibber, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 8; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"iiY" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/station/research_cells) -"iiP" = ( -/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/central_ring) +"ijd" = ( +/obj/item/trash/cigbutt, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "ijs" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"ijv" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"ijP" = ( -/obj/effect/decal/cleanable/blood/oil, +"ijt" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" + dir = 10; + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) -"ikq" = ( +/area/fiorina/station/park) +"ijC" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/research_cells) -"ikz" = ( +/area/fiorina/lz/near_lzI) +"ika" = ( /obj/structure/bed{ icon_state = "abed" }, -/obj/item/toy/beach_ball/holoball, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"ikA" = ( -/obj/item/reagent_container/food/drinks/coffee{ - name = "\improper paper cup" - }, +"ikt" = ( +/obj/structure/closet/bodybag, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "whitegreen" }, -/area/fiorina/station/lowsec) -"ilb" = ( -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" +/area/fiorina/station/medbay) +"ikF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + layer = 3.1; + pixel_x = -2; + pixel_y = 10 }, -/area/fiorina/station/park) -"ilh" = ( -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison, -/area/fiorina/station/security) -"ilv" = ( -/obj/item/ammo_magazine/smg/mp5, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellowcorners2" +/area/fiorina/lz/near_lzII) +"ikL" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"ilr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger{ + pixel_y = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"ilI" = ( /obj/structure/machinery/light/double/blue{ - pixel_y = -1 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "blue_plate" + icon_state = "redfull" + }, +/area/fiorina/station/security) +"ilM" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/botany) -"ilX" = ( -/obj/item/stack/folding_barricade, -/obj/structure/surface/table/woodentable/fancy, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) -"imn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/close, +"img" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"imp" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/area/fiorina/station/telecomm/lz1_tram) -"imt" = ( -/turf/open/floor/almayer, -/area/fiorina/tumor/ship) -"imw" = ( -/obj/structure/bed/roller, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "blue" }, -/area/fiorina/station/medbay) +/area/fiorina/station/civres_blue) +"imt" = ( +/turf/open/floor/almayer, +/area/fiorina/tumor/ship) "imz" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/corsat{ icon_state = "squares" }, /area/fiorina/station/civres_blue) -"imH" = ( -/obj/item/tool/shovel/etool, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"imL" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/cigarettes/arcturian_ace{ - pixel_x = -4; - pixel_y = 9 - }, +"imG" = ( +/obj/item/trash/chunk, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"inh" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"imI" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"imN" = ( +/obj/structure/filingcabinet/disk, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"ing" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/tumor/aux_engi) "inA" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 @@ -13678,25 +13725,63 @@ /obj/item/device/cassette_tape/hiphop, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"ioG" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "brflowers_1" +"inO" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/area/fiorina/tumor/aux_engi) +"ioc" = ( +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/lowsec) +"iox" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) +"ioE" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) "ioM" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/medbay) -"ioP" = ( -/obj/structure/bed/sofa/south/grey/left, +"ioS" = ( +/obj/item/storage/briefcase, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/medbay) +"ioV" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) +"ioW" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "ipa" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2; @@ -13709,22 +13794,37 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"ipy" = ( -/obj/effect/alien/weeds/node, +"ipz" = ( +/obj/item/device/flashlight, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"ipA" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"ipM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/pistol/heavy{ + pixel_y = 7 + }, +/obj/item/ammo_magazine/pistol/heavy{ + pixel_y = 12 }, -/area/fiorina/tumor/servers) -"ipJ" = ( -/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) -"iqt" = ( -/obj/item/fuelCell, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/medbay) +"ipV" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "iqB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/clothing/head/helmet/warden{ @@ -13734,35 +13834,6 @@ /obj/structure/machinery/computer/objective, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"iqR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"iqV" = ( -/obj/item/clothing/mask/cigarette/bcigarette, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"irx" = ( -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"iry" = ( -/obj/structure/janitorialcart, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) "irB" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/park) @@ -13773,113 +13844,37 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"irK" = ( -/obj/effect/spawner/random/gun/rifle/lowchance, +"irE" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5" + }, /turf/open/floor/prison{ - dir = 8; + dir = 4; icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) -"isi" = ( -/obj/item/tool/soap, -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 - }, -/obj/structure/machinery/shower{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/research_cells) -"isl" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"isB" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"isJ" = ( -/obj/structure/surface/rack, -/obj/item/key, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"isK" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"isL" = ( +"irQ" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"isP" = ( -/obj/item/trash/snack_bowl, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/civres_blue) "itd" = ( /obj/item/tool/lighter/random, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) -"iti" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gib2" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"itq" = ( -/obj/structure/machinery/reagentgrinder/industrial{ - pixel_y = 10 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/power_ring) -"itt" = ( -/obj/item/frame/rack, -/obj/item/stack/medical/bruise_pack, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "itv" = ( /obj/item/toy/handcard/uno_reverse_yellow, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"itC" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +"itK" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + icon_state = "platingdmg3" }, -/area/fiorina/station/park) +/area/fiorina/maintenance) "itN" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/park) @@ -13890,30 +13885,25 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"iuw" = ( -/obj/item/reagent_container/food/drinks/cans/souto/cherry, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"iuV" = ( -/obj/structure/curtain, +"iuz" = ( +/obj/vehicle/train/cargo/trolley, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"iuC" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"iuW" = ( -/obj/structure/prop/almayer/computers/sensor_computer1{ - name = "computer" + icon_state = "yellowfull" }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/lowsec) +"iuN" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.5 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 1; + icon_state = "blue" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/tumor/servers) "iuZ" = ( /obj/item/stack/rods, /obj/structure/machinery/light/double/blue{ @@ -13926,6 +13916,18 @@ /obj/effect/spawner/gibspawner/human, /turf/open/space/basic, /area/fiorina/oob) +"ivr" = ( +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, +/area/fiorina/station/power_ring) +"ivw" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "ivz" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -13934,54 +13936,47 @@ /obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/wood, /area/fiorina/station/park) -"ivB" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/tools/full, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"ivL" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"ivD" = ( +/obj/item/tool/weldingtool{ + pixel_x = 6; + pixel_y = -2 }, -/area/fiorina/station/transit_hub) -"ivM" = ( -/obj/structure/bed/chair, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"ivR" = ( -/obj/structure/machinery/optable{ - desc = "This maybe could be used for advanced medical procedures."; - name = "Exam Table" - }, -/obj/item/bedsheet/ce{ - desc = "It crinkles, aggressively."; - name = "sterile wax sheet" - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +/area/fiorina/tumor/servers) +"ivK" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) +/area/fiorina/maintenance) +"ivN" = ( +/obj/structure/window/reinforced, +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/attachment, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "iwf" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"iwK" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" +"iwi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison{ + icon_state = "bluefull" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/power_ring) +"iwu" = ( +/obj/item/newspaper, +/turf/open/floor/prison, +/area/fiorina/station/security) +"iwy" = ( +/obj/structure/bed/sofa/south/grey/right, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "iwT" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -13994,16 +13989,33 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"ixb" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "cartridge_2" +"iwZ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "Residential Archives" }, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrowncorners2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/tumor/civres) +"ixl" = ( +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"ixn" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"ixK" = ( +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/fiorina/station/botany) "iyc" = ( /obj/item/stack/rods/plasteel, /turf/open/auto_turf/sand/layer1, @@ -14012,25 +14024,30 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"iyq" = ( -/obj/structure/platform_decoration{ - dir = 4 +"iyk" = ( +/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 }, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe" + icon_state = "darkbrown2" }, /area/fiorina/station/park) -"iyu" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"iys" = ( +/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + icon_state = "kitchen" }, -/area/fiorina/station/botany) +/area/fiorina/station/power_ring) "iyS" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -14042,55 +14059,76 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"izJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/space_heater{ - pixel_x = -1; - pixel_y = 9 +"iyY" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/clothing/accessory/armband/cargo{ + desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; + name = "HEFA Order milita armband" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/power_ring) -"izP" = ( -/obj/structure/largecrate/random/secure, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" +/area/fiorina/station/chapel) +"izh" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "cell_stripe" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) +"izN" = ( +/obj/structure/machinery/computer/secure_data, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/security) "izZ" = ( /turf/closed/wall/prison, /area/fiorina/station/disco) +"iAq" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) +"iAr" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "iAA" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib5" }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"iAL" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"iAO" = ( -/obj/item/stack/sheet/wood, +"iAB" = ( /turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"iBi" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" + dir = 10; + icon_state = "darkpurple2" }, +/area/fiorina/station/central_ring) +"iBr" = ( +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"iBM" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 5; + icon_state = "greenblue" }, /area/fiorina/station/botany) "iBP" = ( @@ -14098,70 +14136,53 @@ icon_state = "stan25" }, /area/fiorina/oob) -"iCi" = ( -/obj/item/device/flashlight/lamp/tripod, +"iCf" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/boxing, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"iCo" = ( -/obj/structure/machinery/door/poddoor/almayer{ - density = 0; - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"iCC" = ( -/obj/item/storage/donut_box{ - pixel_y = 6 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"iCP" = ( -/obj/structure/machinery/disposal, -/obj/item/tool/kitchen/rollingpin{ - pixel_y = 8 - }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) -"iCR" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +/area/fiorina/station/lowsec) +"iCE" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/platform{ - dir = 8 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"iCN" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean2" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec) "iCU" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, /area/fiorina/station/disco) -"iDa" = ( -/obj/item/inflatable, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" +"iDg" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 }, -/area/fiorina/station/lowsec) -"iDo" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkbrown2" +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 }, -/area/fiorina/station/park) +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "iDq" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -14173,150 +14194,235 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"iDE" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +"iDA" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/obj/structure/barricade/wooden{ + dir = 8 + }, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"iEi" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +/area/fiorina/station/telecomm/lz1_cargo) +"iDK" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" }, -/obj/structure/platform{ - dir = 1 +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"iEz" = ( -/obj/item/weapon/gun/smg/mp5, -/obj/effect/decal/cleanable/blood, +/area/fiorina/station/botany) +"iDO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"iDQ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/effect/spawner/random/gun/rifle, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellow2" + icon_state = "greenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"iFj" = ( +/area/fiorina/station/chapel) +"iEl" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"iEA" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, +/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" + icon_state = "greenblue" }, -/area/fiorina/station/park) -"iFu" = ( +/area/fiorina/station/botany) +"iEF" = ( +/obj/item/tool/kitchen/utensil/fork, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"iEG" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, -/obj/item/reagent_container/food/drinks/flask/barflask, +/obj/item/reagent_container/glass/bottle/cyanide{ + pixel_x = -12; + pixel_y = 13 + }, /turf/open/floor/prison{ dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"iFg" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"iFz" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/ice_lab) +"iFB" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 5; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"iFD" = ( -/obj/structure/prop/structure_lattice{ +"iFC" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"iFP" = ( +/obj/structure/bed/chair{ dir = 4 }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"iGL" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +/area/fiorina/station/research_cells) +"iFZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/hugemushroomslice, +/obj/item/reagent_container/food/snacks/hugemushroomslice{ + pixel_y = 3 }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/turf/open/floor/prison{ + icon_state = "kitchen" }, +/area/fiorina/station/power_ring) +"iGw" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/civres_blue) -"iGW" = ( -/obj/structure/machinery/light/double/blue, +/area/fiorina/tumor/civres) +"iGx" = ( +/obj/structure/closet/crate/trashcart, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/servers) "iGX" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"iHn" = ( -/obj/item/frame/toolbox_tiles_sensor, -/obj/structure/surface/table/reinforced/prison, +"iHu" = ( +/obj/item/newspaper, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"iHB" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0" + }, +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkyellow2" }, -/area/fiorina/tumor/civres) -"iHJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - network = list("PRISON") +/area/fiorina/station/telecomm/lz1_cargo) +"iHT" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 8 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "redcorner" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"iHU" = ( -/obj/structure/barricade/metal{ - dir = 8; - health = 150; - icon_state = "metal_2" - }, +"iHW" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/ice_lab) -"iIS" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz2_maint) -"iIX" = ( -/obj/structure/bed/chair, -/obj/structure/prop/souto_land/pole, -/obj/structure/prop/souto_land/pole{ dir = 4; - pixel_y = 24 + icon_state = "greenblue" }, -/turf/open/floor/prison{ - icon_state = "darkbrown2" +/area/fiorina/station/botany) +"iIl" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, -/area/fiorina/station/park) -"iJf" = ( -/turf/open/floor/prison{ +/obj/structure/platform/stair_cut, +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "darkyellow2" + pixel_y = 21 }, +/turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"iJj" = ( -/obj/structure/platform_decoration{ - dir = 1 +"iIx" = ( +/obj/effect/decal/cleanable/blood{ + desc = "Watch your step."; + icon_state = "gib6" }, -/obj/structure/inflatable/popped, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"iJC" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/flight_deck) +"iIE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups, +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup"; + pixel_x = 8; + pixel_y = 16 }, -/area/fiorina/tumor/ice_lab) -"iJE" = ( -/obj/structure/stairs/perspective{ +/turf/open/floor/prison, +/area/fiorina/station/security) +"iIG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "p_stair_full" + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) +"iIS" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz2_maint) +"iIZ" = ( +/obj/item/stack/cable_coil, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, -/turf/open/floor/prison, /area/fiorina/tumor/servers) "iJF" = ( /obj/structure/surface/table/reinforced/prison, @@ -14328,232 +14434,170 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"iJG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications/simple, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"iJJ" = ( -/obj/item/reagent_container/food/drinks/bottle/orangejuice, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"iJM" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/telecomm/lz1_tram) -"iKf" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 8; - icon_state = "green" - }, -/area/fiorina/tumor/civres) "iKg" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"iKj" = ( -/obj/structure/machinery/newscaster{ - pixel_y = 32 +"iKs" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/chapel) +"iKy" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/spawner/random/gun/pistol, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"iKF" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/transit_hub) -"iKs" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/chapel) -"iKC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/shotgun/buckshot, +"iKI" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkyellowcorners2" }, -/area/fiorina/station/research_cells) -"iKG" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison, -/area/fiorina/station/park) -"iKT" = ( -/obj/structure/platform/kutjevo/smooth{ +/area/fiorina/station/telecomm/lz1_cargo) +"iKO" = ( +/obj/structure/barricade/wooden{ dir = 1 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/area/fiorina/station/medbay) +"iLl" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, -/turf/open/space/basic, -/area/fiorina/oob) -"iLy" = ( -/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - icon_state = "floorscorched2" + icon_state = "yellowfull" }, -/area/fiorina/station/security) +/area/fiorina/station/lowsec) "iLJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"iLQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/barbed_wire, -/obj/item/stack/barbed_wire, -/obj/item/stack/cable_coil/blue, -/obj/item/stack/cable_coil/blue, -/obj/item/stack/cable_coil/blue, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"iMm" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.5 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/tumor/servers) "iMo" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"iMF" = ( -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"iMq" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 8 }, -/area/fiorina/station/disco) -"iMM" = ( -/obj/structure/machinery/vending/hydronutrients, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"iMN" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4; + layer = 3.25 }, -/area/fiorina/station/botany) -"iMS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"iNw" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" - }, -/obj/item/reagent_container/food/snacks/meat, +"iNk" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) -"iNO" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/tumor/civres) +"iNt" = ( +/obj/item/device/whistle, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) "iOa" = ( /obj/structure/machinery/floodlight/landing/floor, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"iOe" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"iOt" = ( +"iON" = ( +/obj/structure/closet/bombcloset, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/civres_blue) -"iOE" = ( -/obj/structure/platform, +/area/fiorina/tumor/aux_engi) +"iOX" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/security) -"iOG" = ( -/obj/item/stack/sheet/wood, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "blue_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"iOJ" = ( +/area/fiorina/station/botany) +"iOY" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + dir = 6; + icon_state = "whitegreen" }, -/area/fiorina/station/disco) -"iPq" = ( -/obj/structure/machinery/washing_machine, -/obj/structure/machinery/washing_machine{ - pixel_y = 15 +/area/fiorina/tumor/ice_lab) +"iPv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 4 }, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "darkredfull2" }, -/area/fiorina/station/lowsec) +/area/fiorina/oob) "iPx" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"iPM" = ( +"iPz" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/donut_box/empty, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/medbay) -"iPV" = ( -/turf/open/floor/prison{ +/area/fiorina/station/security) +"iQj" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "red" - }, -/area/fiorina/lz/near_lzII) -"iPZ" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "delivery_outlet"; - layer = 6; - name = "overhead ducting"; - pixel_y = 33 + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/tumor/civres) -"iQu" = ( -/obj/structure/coatrack, -/obj/item/clothing/head/bowlerhat{ - pixel_y = 15 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +"iQz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) +"iQH" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "blue_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/botany) +"iQJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "iQK" = ( /obj/structure/disposalpipe/broken{ dir = 1 @@ -14561,182 +14605,214 @@ /obj/structure/disposalpipe/broken, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"iQP" = ( -/obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) "iRa" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"iRc" = ( +"iRn" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = 13 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"iRe" = ( -/obj/item/clothing/suit/chef/classic, -/obj/structure/bed/stool, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/station/civres_blue) -"iRy" = ( -/obj/structure/surface/rack, -/obj/item/storage/belt/gun/flaregun/full, -/obj/item/storage/belt/gun/flaregun/full, -/obj/item/storage/belt/gun/flaregun/full, -/turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/tumor/aux_engi) +"iRG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/chunk, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "iRH" = ( /obj/item/frame/firstaid_arm_assembly, /obj/structure/surface/table/woodentable, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"iSf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - pixel_y = 9 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"iSh" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/obj/structure/prop/structure_lattice{ +"iRI" = ( +/turf/open/floor/prison{ dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) -"iSi" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) -"iSn" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "whitegreencorner" }, +/area/fiorina/tumor/ice_lab) +"iSg" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/flight_deck) "iSu" = ( /turf/closed/wall/prison{ desc = "Come Meet Souto Man!"; icon_state = "rwall_s" }, /area/fiorina/station/park) -"iSG" = ( -/obj/effect/landmark/xeno_spawn, +"iSw" = ( +/obj/structure/machinery/disposal, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"iSQ" = ( +/area/fiorina/station/transit_hub) +"iSR" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/telecomm/lz1_cargo) -"iTe" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/oob) +"iSW" = ( +/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/plating/prison, -/area/fiorina/station/central_ring) +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/medbay) +"iTj" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/security) "iTm" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/station/civres_blue) -"iTw" = ( -/obj/item/stack/sheet/metal, +"iTr" = ( +/obj/structure/closet/basketball, +/obj/item/storage/pill_bottle/tramadol/skillless, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security) -"iTy" = ( -/obj/structure/machinery/photocopier, +/area/fiorina/station/research_cells) +"iTs" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) +"iTt" = ( +/obj/structure/machinery/landinglight/ds2, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"iTG" = ( -/obj/vehicle/train/cargo/trolley, +/area/fiorina/lz/near_lzII) +"iTE" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/station/flight_deck) +"iTJ" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "greenfull" + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"iTK" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/prison, +/area/fiorina/station/security) +"iUa" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" }, -/area/fiorina/station/transit_hub) -"iUy" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/medbay) +"iUc" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) +"iUr" = ( +/obj/item/shard{ + icon_state = "large"; + name = "ice shard" + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"iUB" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "iUO" = ( /obj/structure/platform{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"iVb" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +"iUS" = ( +/obj/structure/barricade/handrail/type_b, +/obj/structure/barricade/handrail/type_b{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_tram) -"iVt" = ( -/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison, +/area/fiorina/station/disco) +"iVo" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, /area/fiorina/station/park) "iVv" = ( /obj/structure/blocker/invisible_wall, /turf/open/space, /area/fiorina/oob) -"iVC" = ( -/obj/structure/platform{ - dir = 1 +"iVT" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"iWe" = ( +/obj/item/trash/candy, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"iWg" = ( -/obj/structure/surface/table/reinforced/prison, +"iWp" = ( +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup" + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/botany) +/area/fiorina/station/lowsec) "iWq" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -14748,155 +14824,131 @@ }, /turf/open/space, /area/fiorina/oob) -"iWy" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "blue" +"iWP" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/area/fiorina/tumor/servers) -"iWW" = ( -/obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"iXz" = ( -/obj/item/trash/cigbutt, /turf/open/floor/prison{ dir = 8; - icon_state = "blue" + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) -"iXL" = ( -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"iYq" = ( +/area/fiorina/station/central_ring) +"iXq" = ( +/obj/item/stool, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkpurple2" + dir = 4; + icon_state = "yellow" }, -/area/fiorina/tumor/ice_lab) -"iYI" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/lowsec) +"iXs" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/fiorina/station/transit_hub) -"iZn" = ( -/obj/structure/barricade/metal{ - health = 250; - icon_state = "metal_1" +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"iXJ" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 6; + icon_state = "blue" }, -/area/fiorina/tumor/ice_lab) -"iZt" = ( -/obj/structure/bed/chair/comfy, +/area/fiorina/station/civres_blue) +"iXV" = ( +/obj/structure/closet/l3closet/general, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"iYa" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "blue" + icon_state = "bluecorner" }, -/area/fiorina/station/civres_blue) -"iZA" = ( -/obj/structure/largecrate/random/barrel, -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/chapel) +"iYe" = ( +/obj/item/tool/wirecutters, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 1; + icon_state = "bluecorner" }, -/area/fiorina/station/park) -"iZV" = ( +/area/fiorina/station/power_ring) +"iYw" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) +"iYJ" = ( +/obj/structure/machinery/power/apc, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/research_cells) -"iZZ" = ( -/obj/structure/barricade/metal{ - health = 250; - icon_state = "metal_1" +/area/fiorina/tumor/civres) +"iZm" = ( +/obj/item/trash/chips, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkpurple2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/tumor/ice_lab) -"jae" = ( -/obj/structure/cargo_container/grant/left, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/servers) +"jaB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/area/fiorina/station/power_ring) -"jah" = ( -/obj/item/tool/crowbar, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"jal" = ( -/obj/structure/largecrate/supply/explosives/mortar_flare, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"jao" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"jas" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/baton, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = -6; - pixel_y = 12 +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/turf/open/space/basic, +/area/fiorina/oob) +"jbg" = ( +/obj/structure/holohoop{ + dir = 1 }, -/area/fiorina/station/research_cells) -"jax" = ( -/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/power_ring) -"jay" = ( -/obj/item/reagent_container/food/snacks/boiledegg, -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/lowsec) +"jbm" = ( +/obj/item/clothing/under/color/orange, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"jaR" = ( -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = 5; - pixel_y = 12 - }, +/area/fiorina/station/lowsec) +"jbq" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"jbk" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" +"jbu" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/area/fiorina/station/disco) -"jbx" = ( -/obj/structure/prop/almayer/computers/sensor_computer3, +/obj/structure/window/reinforced, +/turf/open/floor/prison, +/area/fiorina/station/security) +"jbF" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/storage/belt/shotgun, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "redfull" }, /area/fiorina/station/security) -"jbG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/shuttle/dropship/flight/lz2, -/turf/open/floor/prison, -/area/fiorina/lz/console_II) "jbU" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, @@ -14908,115 +14960,69 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"jcg" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, +"jci" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/medbay) "jcv" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/wood, /area/fiorina/station/park) -"jcB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stock_parts/subspace/amplifier{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/stock_parts/subspace/analyzer{ - pixel_x = -9; - pixel_y = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"jdc" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/multitool, +"jcF" = ( /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"jdh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 10 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"jdo" = ( -/obj/structure/machinery/washing_machine, -/obj/item/clothing/head/that{ - pixel_y = 10 + dir = 8; + pixel_x = -10; + pixel_y = -3 }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"jcG" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"jdX" = ( -/obj/item/clothing/under/shorts/red, +/area/fiorina/tumor/servers) +"jdn" = ( +/obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/central_ring) -"jeh" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +/area/fiorina/tumor/ice_lab) +"jew" = ( +/obj/structure/largecrate/supply/ammo, +/obj/item/storage/fancy/crayons, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, +/area/fiorina/station/telecomm/lz1_cargo) +"jeL" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) -"jeD" = ( -/obj/structure/machinery/gibber, -/obj/effect/decal/cleanable/blood{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"jeY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel/laser{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/tool/surgery/circular_saw{ - pixel_y = -2 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/telecomm/lz1_cargo) -"jfa" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - name = "\improper Fiorina Engineering Canteen Vendor" +/obj/structure/platform_decoration{ + dir = 5 }, /turf/open/floor/prison{ icon_state = "bluefull" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/chapel) "jfc" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -15026,12 +15032,6 @@ name = "pool" }, /area/fiorina/station/park) -"jfk" = ( -/obj/item/ammo_magazine/rifle/mar40/extended, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) "jfp" = ( /obj/structure/barricade/handrail, /obj/structure/barricade/handrail{ @@ -15041,92 +15041,113 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"jfD" = ( -/obj/item/weapon/gun/rifle/m16, -/obj/effect/decal/cleanable/blood, +"jft" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 + }, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"jfN" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, +/area/fiorina/station/flight_deck) +"jfO" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) -"jgl" = ( -/obj/structure/platform_decoration{ +/area/fiorina/station/central_ring) +"jfT" = ( +/obj/structure/platform{ dir = 4 }, -/obj/item/trash/used_stasis_bag, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/medbay) +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "jgu" = ( /turf/closed/wall/prison, /area/fiorina/station/park) -"jgN" = ( -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/effect/landmark/nightmare{ - insert_tag = "yardbasketball" +"jgz" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"jgW" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 +/area/fiorina/station/flight_deck) +"jgL" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/obj/item/bodybag/tarp/reactive, -/obj/item/bodybag/tarp/reactive, -/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"jhi" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 + dir = 9; + icon_state = "greenfull" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/area/fiorina/station/botany) +"jhl" = ( +/obj/structure/closet/emcloset, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/medbay) +"jhp" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/transit_hub) "jhG" = ( /turf/closed/shuttle/ert{ icon_state = "stan25" }, /area/fiorina/tumor/ship) -"jit" = ( +"jhN" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/item/clothing/suit/armor/bulletproof/badge, /turf/open/floor/prison{ - icon_state = "panelscorched" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/tumor/civres) -"jiJ" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_y = 21 +/area/fiorina/station/lowsec) +"jiq" = ( +/obj/structure/lz_sign/prison_sign, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"jis" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/platform_decoration{ + dir = 1 }, /turf/open/floor/prison, -/area/fiorina/station/chapel) +/area/fiorina/station/disco) +"jiz" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"jiA" = ( +/obj/item/storage/firstaid/regular, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) "jiV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/condiment/saltshaker, @@ -15140,20 +15161,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"jiW" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) -"jje" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) "jjg" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, @@ -15162,108 +15169,112 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"jjp" = ( +/obj/structure/largecrate/random/case, +/obj/item/storage/toolbox/emergency{ + pixel_y = 4 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "jjs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"jjH" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "jjM" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"jjS" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) "jjW" = ( /turf/open/floor/prison/chapel_carpet{ dir = 1; icon_state = "doubleside" }, /area/fiorina/station/chapel) -"jka" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) "jkg" = ( /obj/structure/largecrate/supply, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"jki" = ( -/obj/item/weapon/twohanded/spear, +"jkj" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/research_cells) -"jkZ" = ( -/obj/structure/barricade/handrail, +/area/fiorina/tumor/aux_engi) +"jkw" = ( +/obj/structure/machinery/computer/atmos_alert, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"jlg" = ( -/obj/structure/bed/chair{ - dir = 8 + icon_state = "floor_plate" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/tumor/fiberbush) +"jkW" = ( +/obj/structure/dropship_equipment/fulton_system, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"jlb" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/area/fiorina/station/medbay) +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "jlk" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/aux_engi) +"jln" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/card/id/silver/clearance_badge, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"jlq" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"jls" = ( +/obj/item/reagent_container/glass/bucket/janibucket, +/turf/open/floor/prison, +/area/fiorina/station/park) +"jlB" = ( +/obj/item/stack/nanopaste, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "jlH" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 }, /turf/open/space, /area/fiorina/oob) -"jlJ" = ( -/obj/effect/alien/weeds/node, -/obj/structure/prop/resin_prop{ - icon_state = "rack" - }, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"jlO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 10 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"jlI" = ( +/obj/structure/bed/sofa/south/grey, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"jlW" = ( -/obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" +/area/fiorina/station/disco) +"jlU" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + name = "\improper Fiorina Engineering Canteen Vendor" }, -/area/fiorina/station/telecomm/lz1_tram) -"jmm" = ( -/obj/effect/spawner/random/gun/rifle/highchance, /turf/open/floor/prison{ - icon_state = "damaged3" + icon_state = "bluefull" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) "jmp" = ( /obj/item/ammo_magazine/handful/shotgun/incendiary{ unacidable = 1 @@ -15284,52 +15295,23 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"jms" = ( -/obj/structure/bed{ - icon_state = "abed" +"jmv" = ( +/obj/structure/machinery/shower{ + dir = 4 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "kitchen" }, /area/fiorina/station/lowsec) -"jmy" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) "jmG" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/research_cells) -"jmM" = ( -/obj/structure/machinery/space_heater, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"jmO" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/obj/structure/reagent_dispensers/fueltank{ - layer = 2.6 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"jmV" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, +"jna" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "whitepurplecorner" }, -/area/fiorina/maintenance) +/area/fiorina/station/research_cells) "jnd" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -15338,24 +15320,35 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"jnr" = ( -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/medium, +"jnm" = ( +/obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"jnO" = ( +/area/fiorina/station/civres_blue) +"jnQ" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; - pixel_y = 13 + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"jnU" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) +"jnX" = ( +/obj/item/storage/pill_bottle/spaceacillin/skillless, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "jor" = ( /obj/effect/spawner/random/attachment, /obj/structure/disposalpipe/segment{ @@ -15379,47 +15372,21 @@ name = "astroturf" }, /area/fiorina/station/park) -"joy" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"joz" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"joD" = ( -/obj/item/trash/used_stasis_bag, -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" - }, +"joJ" = ( +/obj/structure/bed/roller, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"joU" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"joE" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/fiorina/station/park) -"joS" = ( -/obj/item/weapon/gun/rifle/mar40, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "jpc" = ( /obj/structure/barricade/wooden{ dir = 1 }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"jpl" = ( -/obj/item/clothing/under/CM_uniform, -/turf/open/floor/prison, -/area/fiorina/station/security) "jpt" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -15435,43 +15402,40 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) +"jpx" = ( +/obj/item/ammo_casing{ + icon_state = "casing_8" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "jpN" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/research_cells) -"jpR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder/black_random, -/obj/item/folder/red{ - pixel_x = 3; - pixel_y = 5 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"jpS" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 +"jpQ" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/tumor/ice_lab) -"jqg" = ( -/obj/structure/platform, +/area/fiorina/station/medbay) +"jpW" = ( +/obj/item/reagent_container/food/drinks/cans/souto/cherry, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/central_ring) "jqs" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -15494,136 +15458,129 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) -"jqH" = ( -/obj/structure/curtain, +"jqE" = ( +/obj/item/circuitboard/robot_module/janitor, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"jqM" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/station/power_ring) -"jqR" = ( -/obj/structure/barricade/wooden{ +/area/fiorina/station/botany) +"jri" = ( +/obj/structure/closet/secure_closet/freezer/fridge/groceries, +/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_y = 4 + pixel_x = 10; + pixel_y = -3 }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"jqX" = ( -/obj/structure/platform{ - dir = 8 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/tumor/civres) +"jrN" = ( +/turf/open/floor/prison{ + icon_state = "platingdmg1" }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"jre" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - pixel_y = 6 +/area/fiorina/tumor/aux_engi) +"jrO" = ( +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 9; + icon_state = "blue" }, -/area/fiorina/station/civres_blue) -"jrk" = ( +/area/fiorina/station/power_ring) +"jrT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, +/obj/item/clothing/accessory/holobadge/cord, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + icon_state = "darkredfull2" }, -/area/fiorina/maintenance) -"jrn" = ( -/obj/item/reagent_container/food/snacks/xenoburger, -/obj/item/reagent_container/food/snacks/xenoburger, -/obj/item/reagent_container/food/snacks/xenoburger, -/obj/structure/closet/crate/freezer, +/area/fiorina/lz/near_lzI) +"jsf" = ( +/obj/structure/closet/crate/trashcart, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"jru" = ( -/obj/structure/machinery/space_heater, +/area/fiorina/station/chapel) +"jsp" = ( +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"jrL" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/area/fiorina/tumor/civres) +"jsu" = ( +/obj/structure/surface/table/reinforced/prison{ + dir = 8; + flipped = 1 }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"jsn" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/fuelcell_recycler, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"jsD" = ( -/obj/structure/bedsheetbin{ - icon_state = "linenbin-empty" +/obj/item/storage/box/ids, +/obj/item/reagent_container/food/drinks/cans/souto/grape{ + pixel_x = 14; + pixel_y = 7 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"jsU" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 3; + pixel_y = 4 }, -/area/fiorina/station/lowsec) -"jsE" = ( -/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/civres_blue) "jta" = ( /obj/structure/bed{ icon_state = "psychbed" }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"jtv" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"jtF" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +"jtK" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"jum" = ( -/obj/item/toy/crayon/mime, +/area/fiorina/station/security) +"jtM" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"juE" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/spawner/random/pills/lowchance, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +/area/fiorina/tumor/aux_engi) +"juX" = ( +/obj/structure/machinery/door/poddoor/almayer{ + density = 0; + dir = 4 }, -/area/fiorina/station/botany) -"juS" = ( -/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"juW" = ( -/obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison, +/area/fiorina/station/park) +"jva" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"jvi" = ( +/obj/structure/closet/wardrobe/orange, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "jvm" = ( /obj/item/storage/surgical_tray, @@ -15636,17 +15593,6 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"jvp" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"jvu" = ( -/obj/item/stool, -/turf/open/floor/prison, -/area/fiorina/station/disco) "jvy" = ( /mob/living/simple_animal/hostile/carp{ desc = "He is late for work."; @@ -15654,28 +15600,6 @@ }, /turf/open/space, /area/fiorina/oob) -"jvB" = ( -/obj/structure/closet/firecloset, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"jvE" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"jvG" = ( -/obj/structure/inflatable/popped/door, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) "jwc" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -15686,50 +15610,42 @@ "jwK" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"jxa" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"jxy" = ( -/obj/structure/inflatable/door, +"jxc" = ( +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"jxm" = ( +/obj/item/trash/hotdog, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"jxN" = ( -/obj/structure/machinery/vending/coffee, +/area/fiorina/station/medbay) +"jyo" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/transit_hub) -"jxY" = ( -/turf/open/floor/prison{ - icon_state = "bluecorner" +/area/fiorina/station/power_ring) +"jyv" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/fiorina/station/civres_blue) -"jya" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "greenbluecorner" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"jyc" = ( -/obj/structure/bed/chair{ - dir = 8 +/area/fiorina/station/security) +"jyF" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"jyK" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" + icon_state = "yellow" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/lowsec) "jyM" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/plating/prison, @@ -15738,89 +15654,70 @@ /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"jyR" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"jzY" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"jAt" = ( -/obj/structure/platform/shiva, -/turf/open/floor/plating/prison, +"jyQ" = ( +/obj/item/device/flashlight, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/central_ring) -"jAx" = ( +"jyY" = ( +/obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/security) -"jAy" = ( -/obj/item/ammo_casing{ - icon_state = "cartridge_1" +/area/fiorina/tumor/servers) +"jzN" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) +"jzP" = ( +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) +"jAF" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison, /area/fiorina/station/medbay) "jAW" = ( /obj/structure/largecrate/supply/ammo, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"jBj" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkyellow2" +"jBn" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/lz/near_lzI) -"jBK" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"jBL" = ( -/obj/item/weapon/harpoon, -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"jBv" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 8 }, -/area/fiorina/station/disco) +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "jBQ" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/wood, /area/fiorina/station/park) -"jBS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/chapel) -"jCl" = ( +"jCe" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "damaged2" - }, -/area/fiorina/station/security) -"jCp" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 5; + icon_state = "darkpurple2" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/tumor/servers) "jCt" = ( /obj/structure/machinery/light/small{ dir = 4; @@ -15847,47 +15744,25 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"jCQ" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"jCU" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/combat, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"jDj" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"jDk" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue" +"jCO" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/chapel) -"jDL" = ( -/obj/structure/machinery/light/double/blue{ +/obj/structure/stairs/perspective{ dir = 1; - pixel_y = 21 + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"jDe" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/station/disco) "jDR" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -15895,192 +15770,193 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"jDX" = ( -/obj/item/trash/burger, +"jEa" = ( +/obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + dir = 1; + icon_state = "bluecorner" }, -/area/fiorina/tumor/civres) -"jEb" = ( +/area/fiorina/station/power_ring) +"jEr" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"jEy" = ( +/obj/structure/machinery/iv_drip, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"jEf" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +"jEz" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"jEl" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) -"jEC" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 3 - }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"jEG" = ( -/obj/structure/prop/resin_prop, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/civres) "jEK" = ( /obj/structure/bed/chair/office/light{ dir = 8 }, /turf/open/floor/wood, /area/fiorina/station/research_cells) -"jES" = ( -/obj/item/device/flashlight/lamp/tripod, +"jEQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/shuttle/dropship/flight/lz2, +/turf/open/floor/prison, +/area/fiorina/lz/console_II) +"jET" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec) +"jFh" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) "jFl" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"jFN" = ( -/obj/item/explosive/grenade/high_explosive/m15, -/obj/effect/decal/cleanable/blood/splatter, +"jFz" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ - icon_state = "panelscorched" + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) +"jFD" = ( +/obj/structure/barricade/metal{ + health = 250; + icon_state = "metal_1" + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/ice_lab) "jFO" = ( /obj/effect/landmark/nightmare{ insert_tag = "poolparty" }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/park) -"jGd" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"jFP" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"jGj" = ( -/obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"jGA" = ( -/turf/open/floor/prison, -/area/fiorina/station/botany) -"jGL" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/tumor/ice_lab) +"jGf" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"jGs" = ( +/obj/structure/toilet{ dir = 8; - pixel_x = -10; - pixel_y = 13 + pixel_y = 8 }, +/obj/structure/blocker/invisible_wall, /turf/open/floor/prison{ - dir = 8; + dir = 5; icon_state = "whitepurple" }, -/area/fiorina/station/research_cells) -"jGP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 +/area/fiorina/oob) +"jGz" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 }, +/obj/effect/spawner/random/tool, +/obj/item/clothing/gloves/combat, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) -"jGV" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 8; - pixel_y = 5 + icon_state = "darkpurplefull2" }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/area/fiorina/station/research_cells) +"jGC" = ( +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"jIm" = ( -/obj/item/frame/firstaid_arm_assembly, +/area/fiorina/station/power_ring) +"jHj" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"jIZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, +/area/fiorina/station/power_ring) +"jHp" = ( +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"jJb" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"jJe" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4 + dir = 9; + icon_state = "greenfull" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"jJh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/objective, +/area/fiorina/station/transit_hub) +"jHz" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, /area/fiorina/tumor/servers) -"jJF" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_y = 21 +"jHC" = ( +/obj/structure/surface/rack, +/obj/item/tool/lighter, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"jHD" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 17; - pixel_y = 21 +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/botany) +"jHU" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"jJG" = ( -/obj/item/stack/sheet/wood/medium_stack, -/obj/item/stack/sheet/wood/medium_stack, -/obj/structure/surface/rack, +"jHV" = ( +/obj/item/paper, +/obj/structure/inflatable/door, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "darkpurplefull2" }, -/area/fiorina/maintenance) -"jJM" = ( +/area/fiorina/station/research_cells) +"jIw" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/waterbottle, +/obj/structure/machinery/computer/cameras{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "darkredfull2" }, -/area/fiorina/station/disco) +/area/fiorina/station/security) +"jIz" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"jJb" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "jJS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/grape{ @@ -16108,32 +15984,30 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"jJT" = ( -/obj/item/stack/rods, -/turf/open/floor/prison, -/area/fiorina/station/security) -"jKb" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" +"jJZ" = ( +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/central_ring) +"jKv" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"jKm" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison, -/area/fiorina/station/security) -"jKG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 10 +/area/fiorina/station/telecomm/lz1_cargo) +"jKz" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "jKI" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -16148,66 +16022,37 @@ }, /turf/open/space, /area/fiorina/oob) -"jKL" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean_marked" - }, -/area/fiorina/station/power_ring) "jKR" = ( /obj/structure/machinery/shower{ dir = 4 }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) -"jLs" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"jLF" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison{ - dir = 5; - icon_state = "green" - }, -/area/fiorina/station/chapel) -"jLK" = ( -/obj/item/stack/sheet/metal, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "platingdmg1" +"jLe" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"jLC" = ( +/obj/item/ammo_casing{ + dir = 8; + icon_state = "cartridge_2" }, -/area/fiorina/station/security) -"jLN" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) -"jLS" = ( -/obj/structure/closet/bombcloset, -/obj/effect/spawner/random/gun/rifle/midchance, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" +"jLD" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + layer = 3.5 }, -/area/fiorina/station/flight_deck) -"jMe" = ( -/obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/power_ring) "jMf" = ( /obj/item/stack/tile/plasteel{ pixel_x = 5; @@ -16215,24 +16060,22 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"jMh" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) "jMk" = ( /obj/item/tool/screwdriver, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"jMz" = ( -/obj/structure/machinery/power/smes/buildable, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"jMA" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, +"jMv" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/power_ring) "jMH" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -16241,11 +16084,16 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"jNa" = ( +"jNi" = ( +/obj/item/ammo_casing{ + dir = 2; + icon_state = "casing_5" + }, /turf/open/floor/prison{ - icon_state = "darkpurple2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/ice_lab) "jNl" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Straight" @@ -16253,84 +16101,105 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"jNA" = ( -/obj/structure/bed/sofa/vert/grey/top, +"jNw" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + dir = 9; + icon_state = "blue" }, -/area/fiorina/station/transit_hub) -"jOr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/processor{ - desc = "It CAN blend it."; - icon_state = "blender_e"; - name = "Blendomatic"; - pixel_x = -2; - pixel_y = 10 +/area/fiorina/tumor/servers) +"jOb" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"jOd" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/civres_blue) -"jOt" = ( +/area/fiorina/station/flight_deck) +"jOv" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"jOY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = 11; - pixel_y = 14 +/obj/structure/window/reinforced{ + dir = 8 }, +/obj/item/stack/cable_coil, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/fiberbush) -"jOJ" = ( -/obj/structure/machinery/space_heater, +/area/fiorina/station/security) +"jPK" = ( +/turf/closed/shuttle/elevator{ + dir = 6 + }, +/area/fiorina/station/telecomm/lz1_cargo) +"jPM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) +"jPY" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Residential Apartment" }, -/area/fiorina/station/medbay) -"jOO" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/flight_deck) -"jOW" = ( -/obj/item/trash/eat, +/area/fiorina/tumor/servers) +"jQc" = ( +/obj/item/organ/lungs, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"jPz" = ( -/obj/effect/alien/weeds/node, +/area/fiorina/station/telecomm/lz1_cargo) +"jQs" = ( /turf/open/floor/prison{ - dir = 5; + dir = 8; icon_state = "whitegreen" }, -/area/fiorina/tumor/ice_lab) -"jPK" = ( -/turf/closed/shuttle/elevator{ - dir = 6 - }, -/area/fiorina/station/telecomm/lz1_cargo) -"jPO" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/medbay) +"jQy" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, -/obj/structure/barricade/wooden{ - dir = 8 +/area/fiorina/tumor/civres) +"jQS" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null }, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/security) "jRf" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/prison, @@ -16351,126 +16220,141 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"jRp" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, +"jRC" = ( /obj/structure/platform{ dir = 4 }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"jRF" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/central_ring) "jRL" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/disco) -"jRR" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - icon_state = "yellowfull" +"jSc" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/area/fiorina/station/lowsec) -"jSC" = ( -/obj/structure/largecrate/random/case/small, +/obj/item/reagent_container/food/drinks/flask/marine, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/research_cells) "jSD" = ( /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"jTe" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 +"jSE" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/trash/waffles, +/obj/item/stack/sheet/mineral/plastic, +/obj/item/stack/sheet/mineral/plastic, +/obj/item/stack/sheet/mineral/plastic, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"jSU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/area/fiorina/station/medbay) +"jSZ" = ( +/obj/structure/barricade/wooden{ + dir = 1 }, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/tumor/fiberbush) -"jTk" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"jTo" = ( +/obj/item/prop/helmetgarb/gunoil, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/telecomm/lz1_tram) -"jTG" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/medbay) +"jTD" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) "jTJ" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/lowsec) -"jUp" = ( -/obj/structure/window/reinforced/tinted, -/obj/item/storage/briefcase, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +"jTN" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 }, -/area/fiorina/lz/near_lzI) -"jUs" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 }, -/turf/open/floor/prison/chapel_carpet, -/area/fiorina/station/chapel) -"jUy" = ( -/obj/structure/machinery/sensortower, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/tumor/civres) -"jUz" = ( -/obj/structure/surface/table/reinforced/prison{ - flipped = 1 +/area/fiorina/station/power_ring) +"jUa" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"jUB" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/prison{ +/area/fiorina/tumor/ice_lab) +"jUs" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "whitegreen" + pixel_y = 21 }, -/area/fiorina/station/medbay) -"jUI" = ( -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/turf/open/floor/prison/chapel_carpet, +/area/fiorina/station/chapel) +"jUG" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, +/turf/open/floor/plating/prison, /area/fiorina/station/park) -"jUK" = ( +"jUP" = ( +/obj/item/trash/c_tube, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) -"jVC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_y = 4 +/area/fiorina/station/telecomm/lz1_cargo) +"jVj" = ( +/obj/structure/bed/chair, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "yellowfull" }, -/area/fiorina/oob) +/area/fiorina/station/disco) +"jVt" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "jVE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -16485,21 +16369,23 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"jVH" = ( +"jVM" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "darkbrown2" + icon_state = "green" }, -/area/fiorina/tumor/aux_engi) -"jVQ" = ( -/obj/structure/window/framed/prison/reinforced, +/area/fiorina/station/botany) +"jWg" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"jWk" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/area/fiorina/station/security) -"jVW" = ( -/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ + dir = 8; icon_state = "blue" }, /area/fiorina/station/power_ring) @@ -16512,10 +16398,32 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"jWB" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/fiorina/station/security) +"jWE" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) +"jWI" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"jWY" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/storage/fancy/cigar/tarbacks, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "jXj" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -16524,102 +16432,77 @@ /obj/structure/girder/reinforced, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"jXv" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison, -/area/fiorina/station/park) -"jXx" = ( -/turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/central_ring) "jXz" = ( /turf/closed/wall/prison, /area/fiorina/tumor/servers) -"jXB" = ( -/obj/structure/machinery/computer/cameras{ - network = list("omega") - }, -/obj/structure/surface/table/reinforced/prison, +"jXV" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"jXZ" = ( +/turf/closed/shuttle/elevator, +/area/fiorina/tumor/aux_engi) +"jYm" = ( +/obj/structure/machinery/constructable_frame, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"jXC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/pizzabox/mushroom, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"jXD" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +/area/fiorina/station/lowsec) +"jYn" = ( +/obj/structure/platform, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"jXO" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/transit_hub) +"jYs" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 }, -/area/fiorina/tumor/ice_lab) -"jXQ" = ( -/obj/structure/platform{ +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells) +"jYt" = ( +/obj/structure/barricade/metal/wired{ dir = 8 }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomleft" +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, +/area/fiorina/lz/near_lzI) +"jYK" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "kitchen" }, -/area/fiorina/station/medbay) -"jXZ" = ( -/turf/closed/shuttle/elevator, -/area/fiorina/tumor/aux_engi) -"jYd" = ( +/area/fiorina/station/civres_blue) +"jYM" = ( +/obj/item/trash/chips, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) +"jYU" = ( /obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_tram) +"jYV" = ( +/obj/structure/stairs/perspective{ + dir = 8; icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/plating/prison, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"jYs" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"jYB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"jYS" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzII) -"jZb" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/central_ring) "jZc" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -16629,58 +16512,43 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"jZx" = ( -/obj/effect/decal/cleanable/blood/drip, +"jZk" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"jZR" = ( -/obj/item/frame/rack, -/obj/structure/barricade/handrail/type_b{ - dir = 1 + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/station/telecomm/lz1_tram) +"kag" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"kau" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stool{ - pixel_y = 12 + dir = 4; + icon_state = "cell_stripe" }, +/area/fiorina/station/power_ring) +"kat" = ( /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/lowsec) -"kaB" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 +/area/fiorina/station/botany) +"kaw" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/structure/closet/bombcloset, +/obj/structure/platform, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"kaC" = ( -/obj/item/stack/cable_coil/random, -/turf/open/floor/prison{ - icon_state = "redfull" - }, /area/fiorina/station/security) -"kaH" = ( -/obj/structure/surface/rack, -/obj/item/tank/emergency_oxygen/engi, +"kaF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) +/area/fiorina/lz/near_lzI) "kaO" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -16696,14 +16564,12 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/aux_engi) -"kbg" = ( -/obj/structure/machinery/computer/drone_control, -/obj/structure/window/reinforced{ - dir = 4 +"kbh" = ( +/obj/item/explosive/grenade/incendiary/molotov, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/window/reinforced, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec) "kbi" = ( /obj/item/ammo_casing{ dir = 6; @@ -16712,130 +16578,48 @@ /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, /area/fiorina/station/park) -"kbA" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"kbO" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"kbT" = ( -/turf/open/floor/plating/prison, -/area/fiorina/tumor/fiberbush) -"kcn" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaltopleft" - }, +"kbj" = ( +/obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"kcw" = ( -/obj/structure/machinery/computer3/server/rack, -/obj/structure/window{ - dir = 4 + icon_state = "floor_plate" }, +/area/fiorina/station/telecomm/lz1_cargo) +"kbo" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"kcz" = ( -/obj/structure/platform{ - dir = 1 + dir = 8; + icon_state = "greenblue" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/botany) +"kbt" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop{ + pixel_x = 7; + pixel_y = -1 }, -/obj/structure/platform_decoration{ - dir = 5 +/obj/item/toy/bikehorn/rubberducky{ + desc = "He's already fed up with your bullshit face."; + name = "Dug the duck"; + pixel_x = -3; + pixel_y = 8 }, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"kcO" = ( -/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/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"kcP" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"kdb" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) -"kdk" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/phone{ - pixel_x = 6; - pixel_y = -15 - }, -/obj/item/phone{ - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"kdo" = ( -/obj/structure/platform_decoration, -/obj/structure/inflatable, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"kdw" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - desc = "So uh yeah, about that cat..."; - icon_state = "mwbloodyo"; - pixel_y = 6 - }, +"kbT" = ( +/turf/open/floor/plating/prison, +/area/fiorina/tumor/fiberbush) +"kdq" = ( +/obj/structure/machinery/vending/hydronutrients, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/botany) +"kds" = ( +/obj/item/clothing/suit/storage/hazardvest, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) -"kdG" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/tumor/servers) "kdK" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/carpet, @@ -16844,84 +16628,76 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzI) -"keo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) -"keF" = ( +"kfL" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/prison, +/area/fiorina/station/security) +"kfW" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/device/flash, -/turf/open/floor/prison{ - icon_state = "redfull" +/obj/item/ashtray/plastic, +/obj/item/clothing/mask/cigarette, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_y = 8 }, -/area/fiorina/station/security) -"keL" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 +/obj/structure/sign/nosmoking_1{ + pixel_y = 30 }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"kfY" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"kgp" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellow" }, -/area/fiorina/station/security/wardens) -"keV" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/effect/spawner/random/gun/rifle, +/area/fiorina/station/lowsec) +"kgG" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" + icon_state = "darkyellow2" }, -/area/fiorina/station/chapel) -"kfl" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/station/telecomm/lz1_cargo) +"kgN" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"kfA" = ( +/area/fiorina/station/lowsec) +"kgQ" = ( +/obj/item/stool, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) +"kgT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper/carbon, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/power_ring) -"kfF" = ( -/obj/item/stack/sheet/metal, -/obj/item/stack/sheet/metal, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"kfW" = ( +/area/fiorina/station/medbay) +"kgY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/clothing/mask/cigarette, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_y = 8 - }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 30 - }, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"kge" = ( -/obj/effect/spawner/random/gun/rifle/highchance, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/lz/near_lzI) -"kgP" = ( -/obj/item/tool/wrench, +/area/fiorina/station/botany) +"khd" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "khu" = ( @@ -16935,71 +16711,60 @@ icon_state = "squares" }, /area/fiorina/station/civres_blue) -"kic" = ( -/obj/structure/barricade/wooden{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"kik" = ( +"khw" = ( +/obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/security) -"kil" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) -"kiq" = ( +/area/fiorina/station/power_ring) +"khY" = ( +/obj/structure/closet/secure_closet/medical3, /turf/open/floor/prison{ - icon_state = "damaged2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/central_ring) -"kis" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/medbay) +"kid" = ( +/obj/item/ammo_casing{ + icon_state = "casing_8" }, -/turf/open/floor/prison{ - icon_state = "yellowfull" +/obj/structure/surface/table/reinforced/prison{ + dir = 4; + flipped = 1 }, -/area/fiorina/station/lowsec) -"kiE" = ( -/obj/structure/bed/chair, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"kiW" = ( -/obj/item/ammo_casing{ - icon_state = "casing_1" - }, +"kii" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 9; + icon_state = "whitegreen" }, -/area/fiorina/station/telecomm/lz1_cargo) -"kjo" = ( -/obj/item/device/flashlight, +/area/fiorina/tumor/ice_lab) +"kil" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) +"kiR" = ( +/obj/item/tool/weldpack, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"kiT" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "darkyellow2" + icon_state = "darkpurplefull2" }, -/area/fiorina/lz/near_lzI) -"kjz" = ( -/obj/item/trash/cigbutt/cigarbutt, +/area/fiorina/station/research_cells) +"kjt" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/station/flight_deck) -"kjA" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells) "kjP" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/northleft, @@ -17014,85 +16779,109 @@ name = "astroturf" }, /area/fiorina/station/park) -"kkk" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"kjX" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"kka" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"kke" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"kky" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +"kkU" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/space/basic, +/area/fiorina/oob) +"kle" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"klb" = ( -/obj/item/tool/wirecutters, +/area/fiorina/station/botany) +"klh" = ( +/obj/structure/machinery/vending/security, /turf/open/floor/prison{ - dir = 1; - icon_state = "bluecorner" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"klg" = ( -/obj/item/stack/sheet/cardboard, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/security) "klp" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; opacity = 0 }, /area/fiorina/tumor/ship) -"klv" = ( -/obj/item/device/flashlight/lamp/tripod, +"klt" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "kitchen" }, -/area/fiorina/station/disco) +/area/fiorina/station/power_ring) +"klB" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "klC" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"klG" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"klL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" +"klN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/donut_box{ + pixel_y = 6 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "bluefull" }, -/area/fiorina/station/chapel) -"kmB" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" +/area/fiorina/station/power_ring) +"kmm" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/area/fiorina/station/telecomm/lz1_tram) -"kmE" = ( -/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/station/park) -"kmL" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ - dir = 1; - icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' +/area/fiorina/station/disco) +"kmn" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security/wardens) +"kmL" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + dir = 1; + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) @@ -17104,58 +16893,70 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"kng" = ( -/obj/item/tool/stamp, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) +"knb" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "knh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"knt" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibup1" +"kny" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"knW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/station_alert{ + dir = 8 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/station/medbay) -"knu" = ( -/obj/structure/bed/chair{ - dir = 8 +/area/fiorina/tumor/ice_lab) +"knY" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + indestructible = 1; + name = "launch bay door" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/park) -"knv" = ( -/obj/structure/platform_decoration{ - dir = 1 +/area/fiorina/oob) +"kob" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_2" }, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"kny" = ( -/obj/item/stack/tile/plasteel{ - pixel_x = 5; - pixel_y = 5 + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"kov" = ( -/obj/item/stack/rods, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - density = 0; - dir = 4 +/area/fiorina/station/central_ring) +"kok" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" }, +/area/fiorina/station/transit_hub) +"kon" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/wood/medium_stack, /turf/open/floor/prison{ - icon_state = "platingdmg3" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/security) +/area/fiorina/maintenance) +"kor" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "kow" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -17173,23 +16974,45 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"koV" = ( -/obj/structure/platform{ - dir = 4 +"koH" = ( +/obj/structure/surface/table/almayer, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/tool/pen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/obj/structure/platform, +/area/fiorina/station/medbay) +"koK" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 + }, +/obj/structure/closet/bombcloset, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"koY" = ( /obj/structure/platform_decoration{ - dir = 6 + dir = 4 }, -/obj/structure/closet/emcloset, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"kpm" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "green" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/medbay) +"kpe" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "kpp" = ( /obj/item/trash/popcorn, /obj/structure/cable/heavyduty{ @@ -17197,55 +17020,74 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"kpN" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; - pixel_x = 1; - pixel_y = -1 - }, +"kpq" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"kqe" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform{ - dir = 8; - layer = 2.5 + icon_state = "whitegreen" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) -"kqr" = ( -/obj/item/ammo_magazine/smg/mp5, +/area/fiorina/tumor/ice_lab) +"kpu" = ( +/obj/structure/closet/wardrobe/orange, +/obj/item/explosive/mine/pmc, +/obj/effect/spawner/random/gun/smg, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"kpv" = ( +/obj/structure/pipes/standard/simple/visible{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"kqz" = ( /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"kpH" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"kpR" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/candelabra{ + layer = 3.2; + pixel_x = 1; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/station/chapel) +"kqy" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/ice_lab) "kqC" = ( /turf/closed/wall/prison, /area/fiorina/station/lowsec) -"kqF" = ( -/obj/effect/landmark/objective_landmark/far, +"kqJ" = ( +/obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) -"kqP" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/lz/near_lzI) +"krb" = ( +/obj/structure/bookcase/manuals/engineering, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/civres) "krn" = ( /obj/structure/barricade/handrail/type_b{ dir = 8; @@ -17255,51 +17097,35 @@ name = "astroturf" }, /area/fiorina/tumor/servers) -"krp" = ( -/obj/item/ammo_casing{ - icon_state = "casing_9_1" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "yellowcorner" - }, -/area/fiorina/station/lowsec) -"krr" = ( -/obj/structure/machinery/filtration/console, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"krG" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ +"krE" = ( +/obj/structure/bed/chair/comfy{ dir = 8 }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"krQ" = ( -/obj/item/trash/popcorn, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "darkyellow2" }, -/area/fiorina/station/disco) -"krT" = ( +/area/fiorina/station/flight_deck) +"ksu" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"ksk" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 10; + icon_state = "yellow" }, +/area/fiorina/station/disco) +"ksE" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"ksL" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, /area/fiorina/station/security) "ksV" = ( /obj/structure/barricade/handrail/type_b{ @@ -17310,80 +17136,45 @@ name = "astroturf" }, /area/fiorina/tumor/servers) -"kte" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/rollingpin, +"ksY" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"ktq" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/power_ring) -"kty" = ( -/obj/structure/prop/ice_colony/surveying_device, +/area/fiorina/station/park) +"ktv" = ( +/obj/item/trash/sosjerky, +/turf/open/floor/prison, +/area/fiorina/station/security) +"ktC" = ( +/obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "redfull" }, -/area/fiorina/tumor/servers) -"ktD" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/security) +"kue" = ( +/obj/structure/machinery/computer3/server/rack, +/obj/structure/window{ + dir = 4 }, -/area/fiorina/station/transit_hub) -"ktI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/poster, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, -/area/fiorina/station/research_cells) -"kul" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"kur" = ( -/obj/item/trash/chips, +/area/fiorina/tumor/servers) +"kvg" = ( /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; - pixel_y = 13 + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "darkpurplefull2" }, /area/fiorina/tumor/servers) -"kuS" = ( -/obj/structure/machinery/optable{ - desc = "This maybe could be used for advanced medical procedures."; - name = "Exam Table" - }, -/obj/item/bedsheet/ce{ - desc = "It crinkles, aggressively."; - name = "sterile wax sheet" - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) -"kuT" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "ywflowers_3" - }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"kvd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/golden_cup, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) "kvh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -17399,76 +17190,29 @@ name = "astroturf" }, /area/fiorina/station/park) -"kvm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) -"kvn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/energy/taser, +"kvu" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "kvx" = ( /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, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"kwm" = ( -/obj/structure/bed/chair/comfy, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"kwv" = ( -/obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"kwy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/hugemushroomslice, -/obj/item/reagent_container/food/snacks/hugemushroomslice{ - pixel_y = 3 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/power_ring) -"kwK" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_x = -5 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"kvT" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 7; + pixel_y = 6 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "blue" }, -/area/fiorina/station/medbay) +/area/fiorina/station/chapel) "kwL" = ( /obj/item/fuelCell, /obj/structure/platform, @@ -17483,61 +17227,89 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"kwZ" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "kxf" = ( /obj/item/stack/sheet/wood, /turf/open/floor/wood, /area/fiorina/station/park) -"kxo" = ( -/obj/structure/sign/poster{ - icon_state = "poster10"; - pixel_x = 32 +"kxl" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 + }, +/obj/structure/barricade/handrail/type_b{ + dir = 8 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"kxM" = ( -/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/ice_lab) "kxQ" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"kxV" = ( -/obj/item/device/motiondetector, +"kxU" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" + }, +/area/fiorina/station/transit_hub) +"kyd" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"kye" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_x = -5 +/area/fiorina/station/security/wardens) +"kyh" = ( +/obj/structure/platform_decoration{ + dir = 4 }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"kyF" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"kyl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_17"; - pixel_y = 13 +/area/fiorina/station/civres_blue) +"kyU" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = 1; + pixel_y = -1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/research_cells) "kyW" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"kyZ" = ( +/obj/item/clothing/under/CM_uniform, +/turf/open/floor/prison, +/area/fiorina/station/security) "kze" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Residential Apartment" @@ -17550,130 +17322,164 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"kzs" = ( +/obj/item/stack/sandbags/large_stack, +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" + }, +/area/fiorina/tumor/civres) +"kzx" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "kzz" = ( /obj/item/tool/shovel/etool, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"kzI" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 - }, -/obj/structure/blocker/invisible_wall, +"kzB" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ dir = 5; - icon_state = "whitepurple" - }, -/area/fiorina/oob) -"kzN" = ( -/turf/open/floor/prison{ - icon_state = "floorscorched2" - }, -/area/fiorina/station/security) -"kzO" = ( -/obj/structure/monorail{ - name = "launch track" + icon_state = "green" }, +/area/fiorina/station/chapel) +"kzL" = ( +/obj/structure/bed/sofa/south/grey/right, /obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, -/turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"kAo" = ( +"kzR" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard, +/obj/structure/machinery/computer/cameras{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/station/power_ring) -"kAr" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 4; - name = "launch track" +/area/fiorina/station/research_cells) +"kAc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/processor{ + desc = "It CAN blend it."; + icon_state = "blender_e"; + name = "Blendomatic"; + pixel_x = -2; + pixel_y = 10 }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) -"kAt" = ( -/obj/effect/spawner/random/gun/shotgun/highchance{ - mags_max = 0; - mags_min = 0 +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, -/turf/open/floor/prison, -/area/fiorina/station/chapel) +/area/fiorina/station/civres_blue) "kAO" = ( /obj/item/folder/yellow, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"kBm" = ( +/obj/item/device/multitool, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"kBt" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "kBE" = ( /obj/item/toy/bikehorn/rubberducky, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"kBV" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) -"kCg" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ +"kBX" = ( +/obj/structure/stairs/perspective{ dir = 4; - icon_state = "darkbrown2" + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"kCj" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/tumor/aux_engi) -"kCv" = ( -/obj/item/trash/cigbutt/ucigbutt, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) -"kCG" = ( -/obj/structure/reagent_dispensers/watertank, +"kCH" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + dir = 9; + icon_state = "darkbrown2" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/aux_engi) "kCI" = ( /obj/item/weapon/baseballbat/metal, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"kCK" = ( -/obj/item/trash/c_tube, +"kCN" = ( +/obj/structure/inflatable, +/obj/structure/barricade/handrail/type_b, +/obj/structure/barricade/handrail/type_b{ + dir = 8 + }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/medbay) +"kCS" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"kCT" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/obj/effect/spawner/random/gun/smg, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "kCY" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"kDg" = ( -/obj/item/trash/cigbutt/cigarbutt, +"kDa" = ( +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"kDj" = ( -/obj/structure/janitorialcart, -/obj/item/clothing/head/bio_hood/janitor{ - pixel_x = -4; - pixel_y = 5 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"kDq" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/park) +"kDw" = ( +/turf/open/floor/prison{ + icon_state = "darkyellowcorners2" }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/telecomm/lz1_cargo) "kDN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -17682,48 +17488,20 @@ name = "astroturf" }, /area/fiorina/station/park) -"kDO" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 12 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"kDW" = ( -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/structure/surface/rack, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) "kEj" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"kEp" = ( -/obj/structure/platform_decoration{ - dir = 1 +"kEx" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/turf/open/floor/prison, -/area/fiorina/station/park) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "kEy" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -17735,11 +17513,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"kEE" = ( -/turf/open/floor/prison{ - icon_state = "green" - }, -/area/fiorina/station/chapel) "kEZ" = ( /obj/item/stack/tile/plasteel{ pixel_x = 12; @@ -17747,77 +17520,67 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"kFa" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, +"kFd" = ( +/obj/structure/machinery/vending/hydronutrients, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/station/research_cells) -"kFH" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/station/botany) +"kGc" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/station/medbay) -"kFM" = ( -/obj/item/stack/sheet/metal{ - amount = 5 + icon_state = "darkyellow2" }, -/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"kGh" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +"kGd" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ dir = 8; - icon_state = "darkbrown2" + icon_state = "whitepurple" }, -/area/fiorina/station/park) -"kGi" = ( -/obj/structure/bed/chair/office/light, +/area/fiorina/station/research_cells) +"kGo" = ( +/obj/structure/machinery/power/apc, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"kGq" = ( -/obj/effect/decal/cleanable/blood/oil, +"kGB" = ( +/obj/structure/platform, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"kGu" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/sprays, +/area/fiorina/station/security) +"kGD" = ( +/obj/structure/largecrate/random/mini/med, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/botany) -"kGw" = ( +/area/fiorina/station/medbay) +"kGZ" = ( /obj/structure/platform{ dir = 1 }, -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - layer = 3.5 +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/platform_decoration{ + dir = 5 }, -/area/fiorina/station/power_ring) -"kGW" = ( -/obj/structure/largecrate/random/case, /turf/open/floor/prison, /area/fiorina/station/power_ring) "kHa" = ( /obj/item/storage/toolbox, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"kHc" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "kHf" = ( /obj/structure/platform_decoration{ dir = 1 @@ -17827,23 +17590,55 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"kHu" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryocell2deval" +"kHv" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, +/area/fiorina/station/power_ring) +"kHF" = ( /turf/open/floor/prison{ - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) "kHG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"kIc" = ( -/obj/structure/platform_decoration, -/obj/effect/spawner/random/toolbox, +"kHH" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/disco) +"kHI" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"kHS" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + layer = 2.97; + pixel_y = -14 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"kHZ" = ( +/obj/item/stack/folding_barricade, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"kIb" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "kIe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/engineering_particle_accelerator{ @@ -17857,6 +17652,22 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"kIg" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"kIh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "kIo" = ( /obj/structure/girder, /turf/open/floor/almayer{ @@ -17864,37 +17675,48 @@ icon_state = "plating" }, /area/fiorina/tumor/ship) -"kIF" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"kIA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"kIO" = ( +/obj/structure/machinery/vending/snack/packaged, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, +/area/fiorina/station/research_cells) +"kJd" = ( +/obj/item/tool/warning_cone, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/fiberbush) +/area/fiorina/station/park) "kJf" = ( /obj/item/tool/wrench, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"kJC" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, +"kJz" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/fuelcell_recycler, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"kJI" = ( -/obj/effect/decal/cleanable/blood{ - desc = "Watch your step."; - icon_state = "gib6" +"kJJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/disco) "kJS" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -17907,29 +17729,65 @@ name = "astroturf" }, /area/fiorina/tumor/servers) -"kJX" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"kJU" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, /turf/open/floor/prison, -/area/fiorina/station/disco) -"kKZ" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/station/security) +"kKd" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"kLo" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/chapel) +"kKs" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) +"kKt" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/baton, +/turf/open/floor/prison{ dir = 4; - pixel_x = 10; - pixel_y = -3 + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"kKP" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"kKQ" = ( +/obj/structure/platform/stair_cut/alt, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"kLs" = ( +/obj/vehicle/powerloader{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) +/area/fiorina/station/power_ring) +"kLz" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/civres_blue) "kLI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -17945,61 +17803,48 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"kLN" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop{ - pixel_x = 7; - pixel_y = -1 - }, -/obj/item/toy/bikehorn/rubberducky{ - desc = "He's already fed up with your bullshit face."; - name = "Dug the duck"; - pixel_x = -3; - pixel_y = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"kLQ" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"kLT" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"kLX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/phone, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"kLY" = ( -/obj/effect/decal/cleanable/blood/drip, +"kMm" = ( +/obj/structure/barricade/handrail, /turf/open/floor/prison{ - icon_state = "bluecorner" + icon_state = "floor_plate" }, -/area/fiorina/station/chapel) +/area/fiorina/station/central_ring) "kMq" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/civres_blue) +"kMC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/objective, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"kME" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/mineral/plastic, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "kMU" = ( /obj/effect/spawner/gibspawner/robot, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) -"kNl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"kMV" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 }, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/flight_deck) +"kNk" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "kNs" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/chapel_carpet{ @@ -18007,12 +17852,6 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"kNz" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) "kNB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/bottle/holywater{ @@ -18025,10 +17864,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ship) -"kNP" = ( -/obj/item/stack/medical/bruise_pack, -/turf/open/floor/prison, -/area/fiorina/station/security) "kNW" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -18046,144 +17881,150 @@ /obj/item/reagent_container/spray/cleaner, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"kOb" = ( +"kOu" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) "kOB" = ( /turf/open/organic/grass{ desc = "It'll get in your shoes no matter what you do."; name = "astroturf" }, /area/fiorina/station/civres_blue) -"kOM" = ( -/obj/structure/monorail{ - name = "launch track" +"kOV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/folder/black_random, +/obj/item/folder/red{ + pixel_x = 3; + pixel_y = 5 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"kOZ" = ( -/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 1; - icon_state = "bluecorner" + icon_state = "redfull" }, -/area/fiorina/station/power_ring) -"kPe" = ( -/obj/structure/largecrate/random, +/area/fiorina/station/security) +"kPf" = ( +/obj/structure/machinery/computer3/server/rack, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, /area/fiorina/tumor/servers) -"kPi" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - icon_state = "panelscorched" - }, -/area/fiorina/tumor/aux_engi) -"kPv" = ( -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/power_ring) "kPz" = ( /obj/structure/lattice, /turf/open/space, /area/fiorina/oob) -"kPC" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"kPJ" = ( -/obj/item/ammo_magazine/smg/nailgun, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) "kPY" = ( /turf/closed/wall/prison, /area/fiorina/tumor/fiberbush) -"kQY" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"kRt" = ( -/obj/structure/prop/structure_lattice{ +"kQr" = ( +/obj/structure/barricade/wooden{ dir = 4; - health = 300 + pixel_y = 4 }, -/obj/structure/prop/structure_lattice{ +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"kQy" = ( +/obj/item/frame/rack, +/obj/structure/barricade/handrail/type_b{ dir = 4; - layer = 3.1; - pixel_y = 10 + layer = 3.5 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, /area/fiorina/tumor/ice_lab) -"kRM" = ( -/obj/item/tool/warning_cone, +"kQG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/ricepudding, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"kSh" = ( -/turf/closed/shuttle/elevator{ - dir = 9 +/area/fiorina/tumor/servers) +"kQH" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, -/area/fiorina/station/telecomm/lz1_cargo) -"kSp" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" +/obj/effect/decal/cleanable/blood{ + icon_state = "gibarm_flesh" }, -/area/fiorina/station/medbay) -"kSI" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"kRO" = ( +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 2 }, -/area/fiorina/station/security) -"kSL" = ( -/obj/structure/platform, -/obj/item/clothing/gloves/botanic_leather, +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/structure/surface/rack, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) +"kSd" = ( +/obj/structure/toilet{ + pixel_y = 4 }, -/area/fiorina/station/botany) -"kSP" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"kSU" = ( +"kSe" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"kSh" = ( +/turf/closed/shuttle/elevator{ + dir = 9 }, /area/fiorina/station/telecomm/lz1_cargo) -"kTK" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical, +"kSB" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) +"kSD" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform{ + dir = 8; + layer = 2.5 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) +"kTs" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/maintenance) +"kTD" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) "kTL" = ( /obj/item/stack/rods, /obj/item/shard{ @@ -18191,6 +18032,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"kTW" = ( +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "kTY" = ( /obj/structure/machinery/defenses/sentry/premade/dumb{ dir = 4 @@ -18203,34 +18050,23 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"kUr" = ( +"kUo" = ( /obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"kUI" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/obj/item/device/radio{ + pixel_y = 8 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "bluefull" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/power_ring) "kUR" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/flight_deck) "kVg" = ( /obj/item/stack/cable_coil/blue, /turf/open/floor/plating/prison, @@ -18239,73 +18075,78 @@ /obj/structure/largecrate/random, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"kVz" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +"kVN" = ( +/obj/structure/window/framed/prison/reinforced, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "redfull" }, -/area/fiorina/tumor/ice_lab) -"kWj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/briefcase, +/area/fiorina/station/security) +"kVW" = ( +/obj/item/weapon/pole/wooden_cane, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"kWv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/handcuffs, +/turf/open/floor/prison, +/area/fiorina/station/security) +"kWx" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 3; + pixel_y = 4 }, -/area/fiorina/station/botany) -"kWn" = ( -/obj/structure/inflatable, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/lowsec) -"kWD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/deck/uno, +/area/fiorina/station/research_cells) +"kWL" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 10; + icon_state = "floor_marked" }, -/area/fiorina/station/botany) -"kWJ" = ( -/obj/item/tool/shovel/snow, -/obj/item/device/flashlight, -/obj/structure/surface/rack, +/area/fiorina/lz/near_lzII) +"kWS" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/tumor/ice_lab) -"kXw" = ( -/obj/item/circuitboard/machine/rdserver, +"kXk" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 5; + icon_state = "whitepurple" }, -/area/fiorina/tumor/servers) -"kXD" = ( -/obj/structure/window/framed/prison, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"kXH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -5; - pixel_y = -6 +/area/fiorina/station/research_cells) +"kXm" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/pistol/heavy, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -5; - pixel_y = -11 +/area/fiorina/station/medbay) +"kXs" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 }, -/obj/item/reagent_container/food/snacks/cherrypie{ - pixel_y = 7 +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) +/area/fiorina/tumor/aux_engi) +"kXD" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "kXR" = ( /obj/structure/machinery/light/small{ dir = 4; @@ -18314,47 +18155,60 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"kYM" = ( -/obj/item/stack/tile/plasteel, +"kYd" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/medbay) +"kYi" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "handblood" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"kYz" = ( +/obj/structure/closet/crate/medical, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) "kYZ" = ( /obj/structure/surface/table/woodentable, /obj/item/cell/super/empty, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"kZb" = ( -/obj/structure/machinery/vending/snack, +"kZl" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/flight_deck) +/area/fiorina/tumor/aux_engi) +"kZu" = ( +/obj/structure/toilet{ + pixel_y = 4 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = 2; + pixel_y = 25 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) "kZy" = ( /obj/item/clothing/mask/breath, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"kZI" = ( -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"kZQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/stamp/captain, -/obj/structure/machinery/processor{ - icon_state = "blender_jug_f_red"; - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) "kZS" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -18365,71 +18219,50 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) +"kZV" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "lag" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"lax" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"laD" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"laG" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ - density = 0; - pixel_y = 16 +"laz" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/maintenance) +/area/fiorina/lz/near_lzI) "laJ" = ( /obj/structure/airlock_assembly, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"laP" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/telecomm/lz1_tram) -"laZ" = ( -/obj/item/reagent_container/food/drinks/coffee{ - name = "\improper paper cup" - }, +"laK" = ( +/obj/item/stool, /turf/open/floor/prison{ - dir = 5; + dir = 10; icon_state = "yellow" }, -/area/fiorina/station/lowsec) -"lbe" = ( -/obj/item/stack/sheet/metal{ - amount = 5 +/area/fiorina/station/disco) +"laX" = ( +/obj/structure/toilet{ + dir = 8 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"lbk" = ( -/obj/effect/spawner/random/tech_supply, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "sterile_white" }, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/civres_blue) "lbt" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -18440,102 +18273,160 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"lbu" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "bee" +"lbz" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 1; + pixel_y = 8 }, -/obj/structure/sign/prop2{ - pixel_y = 32 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"lcu" = ( -/obj/structure/inflatable/popped/door, +/area/fiorina/station/power_ring) +"lbK" = ( +/obj/structure/platform, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"lbL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreencorner" + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"lbZ" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"lcH" = ( -/obj/structure/prop/structure_lattice{ +"lcm" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, -/obj/structure/prop/structure_lattice{ +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"lcn" = ( +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, +/area/fiorina/station/transit_hub) +"lco" = ( +/obj/item/stack/sandbags/large_stack, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"lcq" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/fiorina/oob) +"lcE" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"lcJ" = ( +/obj/effect/landmark/queen_spawn, +/turf/open/floor/prison{ dir = 4; - layer = 3.1; - pixel_y = 10 + icon_state = "whitegreencorner" }, -/turf/open/floor/prison, -/area/fiorina/maintenance) +/area/fiorina/tumor/ice_lab) +"ldd" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/stack/rods, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/station/chapel) "lde" = ( /obj/structure/prop/resin_prop{ icon_state = "coolanttank" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"ldm" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 +"ldj" = ( +/obj/item/weapon/harpoon, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" }, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"ldt" = ( -/obj/item/ammo_casing{ - icon_state = "casing_6" +/area/fiorina/station/disco) +"ldz" = ( +/obj/structure/bed{ + icon_state = "abed" }, +/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ - dir = 1; + dir = 10; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"ldy" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, +"ldF" = ( +/obj/structure/closet/emcloset, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"ldT" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "blue" }, -/obj/effect/landmark/corpsespawner/ua_riot, +/area/fiorina/station/power_ring) +"ldW" = ( +/obj/item/stack/sandbags, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "kitchen" }, -/area/fiorina/station/medbay) +/area/fiorina/station/power_ring) "ldZ" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"leq" = ( -/obj/effect/landmark/corpsespawner/prison_security, +/obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "red" }, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "lev" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) +"lex" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) "leF" = ( /obj/item/trash/cigbutt/ucigbutt, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"leR" = ( -/obj/item/device/whistle, +"leN" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"leZ" = ( +/obj/item/trash/cigbutt, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" @@ -18545,39 +18436,54 @@ /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"lfJ" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"lfS" = ( -/obj/structure/surface/table/reinforced/prison, +"lfX" = ( +/obj/structure/inflatable/door, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/tumor/ice_lab) -"lgy" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/research_cells) +"lge" = ( /turf/open/floor/prison{ - icon_state = "redfull" + dir = 5; + icon_state = "blue" }, -/area/fiorina/station/security) -"lhj" = ( -/obj/structure/platform{ - dir = 1 +/area/fiorina/station/civres_blue) +"lgx" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, +/area/fiorina/station/park) +"lgG" = ( +/obj/structure/coatrack, +/obj/item/clothing/suit/storage/CMB, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/transit_hub) -"lhQ" = ( +/area/fiorina/station/security) +"lgH" = ( /turf/open/floor/prison{ - dir = 5; icon_state = "green" }, /area/fiorina/tumor/civres) +"lgS" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/park) +"lhJ" = ( +/obj/item/weapon/gun/flamer, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/ammo_magazine/flamer_tank, +/obj/item/ammo_magazine/flamer_tank, +/obj/item/storage/pouch/flamertank, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"lhS" = ( +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "lhY" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -18591,42 +18497,20 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"lif" = ( -/obj/structure/closet/crate/bravo, -/obj/item/stack/sheet/metal/medium_stack, -/obj/item/stack/sheet/metal/medium_stack, -/obj/item/fuelCell, -/obj/item/stack/sheet/plasteel, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "bluefull" +"lit" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/power_ring) -"lik" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/transit_hub) "liA" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"liT" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/central_ring) -"liX" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) "liZ" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -18643,60 +18527,68 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"ljA" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"ljx" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"ljW" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 + icon_state = "floor_plate" }, +/area/fiorina/station/civres_blue) +"ljV" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison, +/area/fiorina/station/security) +"lkb" = ( +/obj/item/tool/kitchen/knife, +/obj/structure/bed/roller, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"lkr" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) -"ljZ" = ( -/obj/item/device/flashlight/flare, +"lku" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_rightengine" + }, +/area/fiorina/oob) +"lkA" = ( +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"lka" = ( -/obj/structure/bed/chair{ - dir = 8 - }, +/area/fiorina/station/security/wardens) +"lkM" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ dir = 4; - icon_state = "yellow" + icon_state = "darkyellowfull2" }, -/area/fiorina/station/lowsec) -"lku" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_rightengine" +/area/fiorina/tumor/servers) +"lkP" = ( +/obj/item/shard{ + icon_state = "medium" }, -/area/fiorina/oob) -"lle" = ( -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "redfull" }, -/area/fiorina/station/medbay) -"lll" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/aspen, +/area/fiorina/station/security) +"lkQ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"lld" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + dir = 8; + icon_state = "red" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/security) "lls" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -18707,40 +18599,31 @@ /obj/item/reagent_container/food/drinks/cans/souto/diet/cherry, /turf/open/floor/wood, /area/fiorina/station/park) -"llC" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; +"llE" = ( +/obj/structure/machinery/reagentgrinder/industrial{ pixel_y = 10 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) +"llJ" = ( +/obj/item/stack/rods, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + density = 0; + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"llG" = ( -/obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "platingdmg3" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/security) "llQ" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 }, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"llW" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) "lml" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -18756,259 +18639,287 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"lmr" = ( -/turf/open/floor/prison{ +"lmu" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "bluecorner" + pixel_y = 21 }, -/area/fiorina/station/chapel) -"lmy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/park) -"lmM" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/flight_deck) +"lnK" = ( +/turf/closed/wall/r_wall/prison, +/area/fiorina/station/telecomm/lz1_tram) +"loj" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"lmV" = ( -/turf/open/floor/prison, -/area/fiorina/tumor/fiberbush) -"lmX" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 + icon_state = "greenfull" }, -/obj/structure/mirror{ - pixel_x = -29 +/area/fiorina/tumor/civres) +"lou" = ( +/obj/item/ammo_box/magazine/misc/flares/empty{ + pixel_x = -1; + pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"lnf" = ( -/obj/structure/bed/chair/comfy{ +/area/fiorina/station/telecomm/lz1_cargo) +"loE" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"lnK" = ( -/turf/closed/wall/r_wall/prison, -/area/fiorina/station/telecomm/lz1_tram) -"lnU" = ( -/obj/item/stool, +/obj/structure/machinery/photocopier, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"lok" = ( +/area/fiorina/tumor/ice_lab) +"loP" = ( +/obj/structure/machinery/optable{ + desc = "This maybe could be used for advanced medical procedures."; + name = "Exam Table" + }, +/obj/item/bedsheet/ce{ + desc = "It crinkles, aggressively."; + name = "sterile wax sheet" + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "redfull" }, -/area/fiorina/oob) -"loy" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/effect/landmark/objective_landmark/close, +/area/fiorina/station/medbay) +"lpd" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "blue" }, -/area/fiorina/station/power_ring) -"lpf" = ( -/obj/item/storage/belt/marine, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/chapel) "lpl" = ( /turf/closed/shuttle/ert{ icon_state = "stan27" }, /area/fiorina/lz/near_lzI) -"lpm" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"lpp" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - layer = 2.97; - pixel_y = -14 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/disco) "lpr" = ( /obj/structure/barricade/wooden{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"lps" = ( -/obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"lpA" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"lpV" = ( -/obj/item/device/flashlight/lamp/tripod, +"lpw" = ( +/obj/effect/spawner/random/toolbox, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) -"lqi" = ( -/obj/effect/landmark/corpsespawner/engineer, +"lpH" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "bluecorner" + dir = 9; + icon_state = "green" }, -/area/fiorina/station/power_ring) -"lqo" = ( -/obj/structure/dropship_equipment/medevac_system, +/area/fiorina/station/chapel) +"lpS" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"lpW" = ( +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/telecomm/lz1_cargo) +"lpX" = ( +/obj/structure/machinery/door/airlock/prison/horizontal, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) +"lpZ" = ( +/obj/item/trash/boonie, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) +"lqa" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) "lqq" = ( /turf/open/floor/wood, /area/fiorina/station/chapel) -"lqB" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/structure/window/reinforced{ - dir = 4 +"lqC" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, -/obj/item/weapon/classic_baton, +/area/fiorina/lz/near_lzI) +"lqI" = ( /turf/open/floor/prison{ - icon_state = "redfull" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/security) -"lrm" = ( -/obj/structure/barricade/metal/wired{ - health = 250; - icon_state = "metal_3" +/area/fiorina/lz/near_lzI) +"lqJ" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_2" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"lro" = ( -/obj/item/stack/cable_coil/blue, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) +"lqN" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/effect/spawner/random/gun/rifle, /turf/open/floor/prison{ - icon_state = "whitegreencorner" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/telecomm/lz1_cargo) +"lri" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" + }, +/area/fiorina/station/transit_hub) "lrA" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"lrC" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/station/park) "lrE" = ( /obj/structure/bed, /obj/item/bedsheet/rd, /obj/item/toy/katana, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"lsf" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"lsl" = ( -/obj/item/tool/shovel, -/turf/open/floor/prison{ - dir = 6; - icon_state = "green" +"lrI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/milk{ + pixel_x = 2; + pixel_y = 3 }, -/area/fiorina/tumor/civres) -"lso" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/tumor/fiberbush) -"lsr" = ( -/obj/structure/machinery/vending/cola, +"lrV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/faxmachine, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/park) -"lsU" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_v" +/area/fiorina/station/security) +"lsn" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"lsO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/mineral/plastic/small_stack, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"lsR" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 }, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +/obj/structure/machinery/shower{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkyellow2" + icon_state = "kitchen" }, -/area/fiorina/station/telecomm/lz1_cargo) -"ltb" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/area/fiorina/station/lowsec) +"lsZ" = ( +/obj/item/tool/soap, +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/obj/structure/machinery/shower{ + dir = 8 }, -/obj/item/weapon/gun/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "kitchen" }, -/area/fiorina/station/security) -"ltu" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/station/research_cells) +"ltd" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"lte" = ( +/obj/structure/barricade/metal{ + dir = 4; + health = 85; + icon_state = "metal_1" }, -/area/fiorina/station/flight_deck) -"lty" = ( -/obj/item/toy/bikehorn, /turf/open/floor/prison{ dir = 1; icon_state = "darkbrown2" }, /area/fiorina/station/park) -"ltV" = ( +"ltz" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" + dir = 1; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"ltA" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, +/area/fiorina/tumor/aux_engi) +"ltQ" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/security) +"luf" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" }, -/area/fiorina/lz/near_lzI) -"luv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer3/laptop/secure_data, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"lun" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"lux" = ( +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "luy" = ( /obj/item/trash/candle, /turf/open/floor/prison/chapel_carpet{ @@ -19016,48 +18927,23 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"luH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 - }, -/obj/item/coin/gold{ - desc = "Coin op, in this place, in this year, localized entirely on this table? .... I uh, yes."; - name = "arcade token"; - pixel_x = -6; - pixel_y = 3 - }, +"luZ" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/flight_deck) -"luU" = ( -/obj/effect/spawner/random/gun/rifle/midchance, +/area/fiorina/tumor/ice_lab) +"lvf" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/aux_engi) "lvg" = ( /obj/item/trash/candle, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) -"lvh" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gib2" - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "lvi" = ( /obj/structure/sign/poster{ icon_state = "poster6"; @@ -19065,39 +18951,23 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"lvk" = ( -/obj/structure/bed/sofa/south/grey, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"lvs" = ( -/turf/open/floor/prison{ - icon_state = "green" - }, -/area/fiorina/tumor/civres) -"lvx" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) "lvy" = ( /turf/closed/shuttle/ert{ icon_state = "stan_rightengine" }, /area/fiorina/tumor/aux_engi) -"lvN" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = 5; - pixel_y = 12 +"lvD" = ( +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, -/obj/item/weapon/gun/pistol/heavy, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) +"lvV" = ( +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "lwd" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -19106,51 +18976,57 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"lwB" = ( -/obj/structure/platform, -/obj/structure/bed/chair{ +"lwn" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - layer = 2.7 + pixel_y = 21 }, -/turf/open/floor/prison{ - icon_state = "whitegreen" +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"lwp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/security_space_law{ + pixel_x = 8; + pixel_y = 1 }, -/area/fiorina/station/medbay) -"lwG" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" +/obj/item/book/manual/security_space_law{ + pixel_x = -4; + pixel_y = 4 }, -/area/fiorina/tumor/aux_engi) -"lwK" = ( -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/obj/item/book/manual/security_space_law{ + pixel_x = 3; + pixel_y = 5 }, -/area/fiorina/tumor/servers) -"lwO" = ( -/obj/structure/largecrate/supply/supplies/water, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"lxe" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/pistol/heavy, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + icon_state = "redfull" + }, +/area/fiorina/station/security) +"lwq" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/area/fiorina/station/medbay) -"lxk" = ( -/obj/structure/platform_decoration, /turf/open/floor/prison{ + dir = 1; icon_state = "whitegreen" }, -/area/fiorina/tumor/ice_lab) -"lyd" = ( -/obj/structure/surface/rack, -/obj/item/folder/black, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/central_ring) +"lwA" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/station/park) +"lxT" = ( +/obj/item/ammo_casing{ + dir = 8; + icon_state = "casing_6" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "lyf" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now."; @@ -19159,50 +19035,24 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"lyg" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/cups, -/obj/item/storage/fancy/cigarettes/arcturian_ace{ - pixel_x = -6; - pixel_y = 20 - }, -/obj/item/storage/fancy/cigarettes/arcturian_ace{ - pixel_x = 6; - pixel_y = 20 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"lyF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/guestpass{ - dir = 4; - reason = "Visitor" - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "lyJ" = ( /obj/item/tool/crowbar, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"lyX" = ( -/obj/structure/inflatable/popped/door, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"lzb" = ( -/obj/structure/platform_decoration{ - dir = 1 +"lyY" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" }, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"lzd" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/medbay) "lzm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced/tinted, @@ -19214,54 +19064,94 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) -"lzJ" = ( -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"lzO" = ( -/obj/structure/closet/firecloset/full, +"lzq" = ( +/obj/item/tool/wet_sign, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = -1 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"lzz" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/storage/fancy/crayons, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/tumor/ice_lab) -"lzW" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0" +/area/fiorina/station/research_cells) +"lzB" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" }, +/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"lzX" = ( +/area/fiorina/station/botany) +"lzE" = ( +/obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "floor_plate" }, +/area/fiorina/station/civres_blue) +"lzJ" = ( +/turf/open/floor/plating/prison, /area/fiorina/station/park) -"lAf" = ( -/obj/item/tool/crowbar, +"lzP" = ( +/obj/item/ammo_casing{ + dir = 8; + icon_state = "cartridge_2" + }, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 8; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/medbay) +/area/fiorina/station/park) "lAh" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/ice_lab) -"lAv" = ( -/obj/structure/sink{ - pixel_y = 15 +"lAn" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison{ + icon_state = "darkbrown2" }, -/obj/structure/mirror{ - pixel_y = 28 +/area/fiorina/station/park) +"lAE" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"lAM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"lAS" = ( -/turf/open/floor/prison, /area/fiorina/station/power_ring) +"lAN" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"lAQ" = ( +/obj/structure/machinery/vending/snack/packaged, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "lAV" = ( /obj/structure/bed/stool, /turf/open/floor/plating/prison, @@ -19271,48 +19161,60 @@ /obj/structure/machinery/door/window/northright, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"lBg" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) -"lBJ" = ( -/obj/structure/bed/chair{ +"lBb" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - layer = 2.8 + pixel_x = 10; + pixel_y = 13 }, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"lBY" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"lCm" = ( -/obj/item/ammo_casing{ - icon_state = "cartridge_1" +"lBE" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, +/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"lCs" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 +/area/fiorina/station/telecomm/lz1_cargo) +"lBI" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5_1" }, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/lowsec) -"lCw" = ( +"lBR" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/maintenance) +/area/fiorina/station/medbay) +"lBS" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"lCl" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/stamp/captain, +/obj/structure/machinery/processor{ + icon_state = "blender_jug_f_red"; + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) "lCz" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/random/barrel/green, @@ -19320,55 +19222,52 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"lCD" = ( -/obj/structure/closet/basketball, -/obj/item/storage/pill_bottle/tramadol/skillless, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"lCE" = ( -/obj/structure/platform{ +"lDo" = ( +/obj/item/storage/fancy/cigar, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"lDC" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/obj/item/tool/shovel/spade, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +/turf/open/space/basic, +/area/fiorina/oob) +"lDG" = ( +/obj/structure/machinery/computer/drone_control, +/obj/structure/window/reinforced{ + dir = 4 }, -/area/fiorina/station/botany) -"lCZ" = ( -/obj/effect/landmark/objective_landmark/medium, +/obj/structure/window/reinforced, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"lDU" = ( +/obj/item/stack/cable_coil, /turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"lDe" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 6 + icon_state = "floor_plate" }, +/area/fiorina/tumor/servers) +"lEd" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/station/park) -"lDm" = ( -/obj/structure/foamed_metal, +/area/fiorina/station/research_cells) +"lEg" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"lDC" = ( -/turf/closed/wall/prison, -/area/fiorina/station/central_ring) -"lEa" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +/area/fiorina/lz/near_lzII) +"lEk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "lEp" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -19390,233 +19289,322 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"lEz" = ( +"lEF" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ - dir = 4 + dir = 8 }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, -/area/fiorina/station/disco) -"lEI" = ( +/area/fiorina/station/security) +"lEL" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/park) "lFc" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/wood, /area/fiorina/station/park) -"lFj" = ( -/obj/effect/spawner/random/gun/pistol, +"lFg" = ( +/obj/item/paper, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/medbay) -"lFx" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/effect/landmark/corpsespawner/ua_riot, +/area/fiorina/station/research_cells) +"lFm" = ( +/obj/structure/bed/roller, +/obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"lFC" = ( -/obj/item/clothing/head/cmcap, +"lFo" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = 1 + }, /turf/open/floor/prison{ - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"lFO" = ( -/obj/structure/largecrate/supply/supplies/water, +/area/fiorina/lz/near_lzII) +"lFv" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"lFB" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "whitepurple" }, -/area/fiorina/station/telecomm/lz1_cargo) -"lGh" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 1 +/area/fiorina/station/research_cells) +"lFD" = ( +/obj/item/tool/crowbar/red, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"lFM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" }, -/area/fiorina/lz/near_lzI) -"lGm" = ( -/obj/structure/platform{ - dir = 1 +/area/fiorina/station/telecomm/lz1_tram) +"lFQ" = ( +/obj/structure/machinery/m56d_hmg/mg_turret/dropship, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"lFV" = ( +/obj/structure/machinery/space_heater, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"lHc" = ( -/obj/structure/bed{ - icon_state = "abed" +/area/fiorina/tumor/civres) +"lGL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -1 }, -/obj/item/card/id/visa, /turf/open/floor/prison{ - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/chapel) +"lHw" = ( +/obj/structure/barricade/handrail/type_b, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) "lHx" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"lHy" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"lHE" = ( +/obj/item/explosive/grenade/high_explosive/frag, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) -"lHB" = ( -/obj/effect/spawner/random/gun/rifle/lowchance, +/turf/open/floor/prison, +/area/fiorina/station/security) +"lIj" = ( +/obj/structure/prop/ice_colony/surveying_device, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "blue" + }, +/area/fiorina/tumor/servers) +"lIk" = ( +/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 }, -/area/fiorina/lz/near_lzI) -"lHL" = ( -/obj/structure/surface/rack, -/obj/item/device/flashlight, -/obj/effect/decal/cleanable/blood, -/obj/item/attachable/bipod, -/obj/item/device/multitool, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/medbay) +"lIl" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"lIt" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 4; + layer = 6; + name = "overhead pipe"; + pixel_y = 12 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "lIv" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" }, /area/fiorina/lz/near_lzI) -"lIx" = ( -/obj/item/tool/wet_sign, +"lIA" = ( +/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, -/area/fiorina/station/park) +/area/fiorina/tumor/aux_engi) +"lIC" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 8 + }, +/obj/structure/bed/chair/office/dark{ + dir = 4; + layer = 3.25 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "lIG" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/research_cells) +"lIH" = ( +/obj/structure/machinery/processor, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) "lIJ" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"lJa" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" +"lJf" = ( +/obj/structure/reagent_dispensers/fueltank/gas/hydrogen{ + layer = 2.6 }, -/area/fiorina/station/telecomm/lz1_cargo) -"lJm" = ( -/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) -"lJv" = ( -/obj/structure/platform, +/area/fiorina/lz/near_lzII) +"lJx" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"lJy" = ( -/obj/structure/platform{ - dir = 8 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 10 }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"lJI" = ( +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/power_ring) -"lKd" = ( +/area/fiorina/maintenance) +"lJS" = ( +/obj/structure/largecrate/supply/medicine/iv, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "sterile_white" }, -/area/fiorina/tumor/civres) -"lKt" = ( -/obj/structure/sign/poster{ - icon_state = "poster18"; - pixel_y = 32 +/area/fiorina/station/medbay) +"lKI" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"lKP" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "blue" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/chapel) "lLe" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"lLv" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) "lLE" = ( /obj/item/bedsheet/blue, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"lLP" = ( -/obj/structure/bookcase/manuals/research_and_development{ - pixel_y = 10 +"lLQ" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"lLS" = ( +/obj/structure/prop/resin_prop{ + icon_state = "sheater0" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"lLU" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/aux_engi) +"lMh" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "lMi" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"lMB" = ( -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"lMM" = ( +"lMq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + icon_state = "mwo"; + pixel_y = 6 + }, /turf/open/floor/prison{ - icon_state = "blue" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/tumor/servers) -"lNg" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/civres_blue) +"lMV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/station/power_ring) +"lNc" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"lNf" = ( +/obj/item/inflatable, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "lNv" = ( /obj/item/handcuffs/cable/pink, /turf/open/floor/prison/chapel_carpet{ @@ -19624,133 +19612,125 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"lNB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/sign/poster{ - desc = "Hubba hubba."; - icon_state = "poster3"; - name = "magazine"; - pixel_x = 6; - pixel_y = 8 +"lNP" = ( +/obj/structure/bed/roller, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"lNR" = ( +/obj/item/trash/cigbutt/ucigbutt, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"lOe" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/obj/structure/sign/poster{ - desc = "Hubba hubba."; - icon_state = "poster17"; - name = "magazine" +/area/fiorina/station/telecomm/lz1_tram) +"lOk" = ( +/obj/structure/curtain, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, -/obj/structure/sign/poster{ - desc = "The M41A is on the cover."; - icon_state = "poster15"; - name = "magazine"; - pixel_x = -5; - pixel_y = 5 +/area/fiorina/station/power_ring) +"lOm" = ( +/obj/structure/largecrate/random/case/small, +/obj/item/bodybag/tarp/reactive{ + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/medbay) +"lOx" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/security/wardens) -"lOa" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"lOy" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "damaged2" + icon_state = "darkyellow2" }, -/area/fiorina/station/lowsec) -"lOb" = ( -/obj/structure/closet/crate/internals, -/obj/item/tool/crew_monitor, +/area/fiorina/lz/near_lzI) +"lPA" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"lOo" = ( -/obj/structure/largecrate/random/case/double, +"lPE" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"lOB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 + icon_state = "kitchen" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/area/fiorina/station/power_ring) +"lQo" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/space/basic, -/area/fiorina/oob) -"lOE" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "blue" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/chapel) -"lPq" = ( -/obj/structure/prop/dam/crane, +/area/fiorina/station/transit_hub) +"lQJ" = ( +/obj/structure/closet/emcloset, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ - dir = 8; - icon_state = "floor_marked" + dir = 10; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/servers) -"lPV" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/maintenance) +"lQL" = ( +/obj/structure/machinery/space_heater, +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"lPW" = ( -/obj/structure/machinery/light/double/blue{ +/turf/open/floor/prison{ dir = 8; - pixel_x = -10; - pixel_y = 13 + icon_state = "whitegreen" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"lQd" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, +/area/fiorina/tumor/ice_lab) +"lRk" = ( +/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "damaged3" }, -/area/fiorina/station/power_ring) -"lQf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, +/area/fiorina/station/security) +"lRq" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "cell_stripe" }, /area/fiorina/station/park) -"lQZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/emails{ - pixel_y = 5 - }, +"lRr" = ( /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"lRe" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 + dir = 6; + icon_state = "blue" }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" +/area/fiorina/station/civres_blue) +"lRT" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/lz/near_lzI) +"lRW" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" }, -/area/fiorina/station/flight_deck) -"lRH" = ( -/obj/item/stack/cable_coil, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"lRI" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/civres_blue) +"lSb" = ( +/obj/structure/machinery/vending/snack, /turf/open/floor/prison, -/area/fiorina/station/park) -"lRT" = ( -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/lz/near_lzI) +/area/fiorina/tumor/aux_engi) "lSj" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ dir = 2; @@ -19758,22 +19738,19 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"lSY" = ( -/obj/effect/spawner/random/tool, +"lSq" = ( +/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"lTm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/photocopier, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"lSS" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 }, -/area/fiorina/tumor/ice_lab) +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "lTp" = ( /obj/structure/sink{ pixel_y = 15 @@ -19782,34 +19759,18 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"lUg" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"lTW" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 }, -/area/fiorina/station/botany) +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "lUi" = ( /turf/closed/shuttle/ert{ icon_state = "stan23" }, /area/fiorina/tumor/ship) -"lUp" = ( -/obj/structure/largecrate/random, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomright" - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) "lUs" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -19833,66 +19794,48 @@ icon_state = "plate" }, /area/fiorina/station/civres_blue) +"lUv" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "lUE" = ( /obj/structure/barricade/metal/wired{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"lVP" = ( -/obj/structure/machinery/constructable_frame, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "damaged2" +"lUZ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/lowsec) -"lWh" = ( -/obj/item/clothing/under/shorts/black, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"lWr" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/shiva, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"lWD" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + icon_state = "darkredfull2" }, +/area/fiorina/station/research_cells) +"lVA" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "greenblue" + icon_state = "cell_stripe" }, -/area/fiorina/station/botany) -"lXc" = ( -/obj/item/stool, +/area/fiorina/lz/near_lzII) +"lVQ" = ( +/obj/structure/inflatable/door, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" + icon_state = "whitegreencorner" }, -/area/fiorina/station/lowsec) -"lXf" = ( -/turf/open/floor/prison{ - icon_state = "bluecorner" +/area/fiorina/station/medbay) +"lWn" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 }, -/area/fiorina/station/power_ring) -"lXk" = ( -/obj/effect/spawner/random/toolbox, +/obj/item/tool/soap/nanotrasen, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/civres) "lXs" = ( /obj/item/book/manual/marine_law, /obj/item/book/manual/marine_law{ @@ -19916,148 +19859,95 @@ }, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"lYc" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"lYl" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"lYr" = ( -/obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"lYw" = ( -/obj/item/shard{ - icon_state = "large" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"lYj" = ( +/obj/structure/sink{ + pixel_y = 15 }, -/area/fiorina/station/security) -"lYA" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 +/obj/structure/mirror{ + pixel_y = 28 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "sterile_white" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/civres_blue) "lZf" = ( /turf/closed/shuttle/elevator{ dir = 10 }, /area/fiorina/tumor/aux_engi) -"lZA" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ - icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"lZC" = ( -/obj/structure/bed/chair{ - dir = 8 - }, +"lZm" = ( +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - icon_state = "darkbrowncorners2" - }, -/area/fiorina/maintenance) -"lZL" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 + dir = 4; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"lZo" = ( /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"mak" = ( -/obj/structure/machinery/shower{ + dir = 4; + pixel_x = 10; pixel_y = 13 }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/fiberbush) +"lZp" = ( /turf/open/floor/prison{ icon_state = "kitchen" }, /area/fiorina/station/lowsec) -"mam" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"lZs" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 2; + layer = 6; + name = "overhead pipe"; + pixel_x = -16; + pixel_y = 12 }, -/obj/structure/platform/stair_cut/alt, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"maC" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/faxmachine, /turf/open/floor/prison, -/area/fiorina/station/security) -"maE" = ( -/obj/item/device/motiondetector, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" +/area/fiorina/tumor/servers) +"lZA" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, -/area/fiorina/station/lowsec) -"mbc" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"mbe" = ( -/obj/effect/decal/cleanable/blood/xeno{ - icon_state = "xgib3" +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells) +"maA" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/tumor/ice_lab) +"maY" = ( +/obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/flight_deck) +/area/fiorina/tumor/servers) "mbg" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) -"mbi" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docstripingdir" - }, -/obj/item/stack/rods/plasteel, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) "mbp" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"mbz" = ( +/obj/item/ammo_box/magazine/M16, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "mbC" = ( /obj/item/clipboard, /turf/open/floor/plating/prison, @@ -20072,71 +19962,73 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"mbN" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"mcc" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) "mcr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stock_parts/matter_bin/super, /turf/open/floor/wood, /area/fiorina/station/park) -"mct" = ( -/obj/item/trash/kepler, +"mcH" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "blue" }, -/area/fiorina/station/medbay) -"mcE" = ( +/area/fiorina/tumor/servers) +"mcJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellowcorners2" + icon_state = "yellowfull" }, -/area/fiorina/lz/near_lzI) -"mcG" = ( -/obj/effect/landmark{ - icon_state = "hive_spawn"; - name = "xeno_hive_spawn" +/area/fiorina/station/disco) +"mdd" = ( +/obj/item/storage/toolbox/electrical, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) +"mdz" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"mdD" = ( +/obj/item/stool, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/tumor/aux_engi) -"mcN" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "bluefull" }, -/area/fiorina/lz/near_lzI) -"mcT" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 +/area/fiorina/station/civres_blue) +"mdG" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 24 }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkbrown2" }, -/area/fiorina/tumor/ice_lab) -"mdd" = ( -/obj/item/storage/toolbox/electrical, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) -"mdn" = ( -/obj/structure/machinery/recharge_station, +/area/fiorina/station/park) +"mdH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/card/id/guest{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/card/id/guest, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, /area/fiorina/station/security) "mdJ" = ( @@ -20146,18 +20038,22 @@ /obj/structure/platform/kutjevo/smooth, /turf/open/space, /area/fiorina/oob) -"mea" = ( -/obj/item/fuelCell, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/maintenance) -"med" = ( -/obj/structure/reagent_dispensers/watertank, +"mdS" = ( /turf/open/floor/prison{ + dir = 8; + icon_state = "greenbluecorner" + }, +/area/fiorina/station/botany) +"mdY" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "bluecorner" + pixel_x = 10; + pixel_y = 13 }, -/area/fiorina/station/power_ring) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) "mei" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -20172,51 +20068,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"mel" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"mey" = ( -/obj/item/trash/chunk, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"meF" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null - }, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"meG" = ( -/obj/structure/surface/rack, -/obj/item/tank/emergency_oxygen/engi, -/turf/open/floor/prison{ - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) -"meM" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"mfd" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) "mfe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/twohanded/sledgehammer{ @@ -20224,26 +20075,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"mfo" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) -"mft" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"mfK" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"mfF" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "darkyellow2" }, -/area/fiorina/station/transit_hub) +/area/fiorina/lz/near_lzI) "mfR" = ( /obj/structure/bed{ icon_state = "psychbed" @@ -20254,45 +20091,35 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"mfV" = ( -/obj/structure/inflatable/popped/door, +"mgh" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"mgC" = ( -/obj/structure/sign/poster{ - desc = "You are becoming hysterical."; - icon_state = "poster11"; - pixel_y = 32 + icon_state = "whitegreen" }, +/area/fiorina/tumor/ice_lab) +"mgz" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "sterile_white" }, -/area/fiorina/station/flight_deck) -"mgU" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "birthday" +/area/fiorina/station/research_cells) +"mgE" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) -"mhb" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" +/area/fiorina/lz/near_lzI) +"mgO" = ( +/obj/structure/window{ + dir = 8 }, -/area/fiorina/station/medbay) -"mhe" = ( -/obj/item/tool/wrench, +/obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/research_cells) +/area/fiorina/tumor/servers) "mho" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -20300,19 +20127,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"mhu" = ( -/obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"mhv" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) "mhM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -20324,64 +20138,33 @@ /obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/auto_turf/sand/layer1, /area/fiorina/station/flight_deck) -"mhW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/mask/cigarette, -/obj/item/storage/fancy/cigarettes/emeraldgreen{ - pixel_x = -4; - pixel_y = 9 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"mie" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 12 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/security/wardens) -"mii" = ( -/obj/item/weapon/pole/wooden_cane, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"miu" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - density = 0; - pixel_y = 16 - }, +"mhS" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"miB" = ( -/obj/structure/barricade/metal{ - health = 85; - icon_state = "metal_1" + icon_state = "greenblue" }, -/turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/botany) "miU" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/disco) -"miZ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"mjm" = ( +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup" }, -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/central_ring) +"mju" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "mjx" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) @@ -20391,61 +20174,66 @@ name = "pool" }, /area/fiorina/station/park) -"mjD" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 - }, +"mkn" = ( /turf/open/floor/prison{ - dir = 4; + dir = 6; icon_state = "darkyellow2" }, -/area/fiorina/station/flight_deck) -"mki" = ( -/obj/item/stack/sandbags_empty/half, +/area/fiorina/station/power_ring) +"mkI" = ( +/obj/structure/machinery/microwave{ + desc = "So uh yeah, about that cat..."; + icon_state = "mwbloodyo"; + pixel_y = 6 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"mlb" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + dir = 5; + icon_state = "whitegreen" }, -/area/fiorina/station/flight_deck) -"mky" = ( -/obj/item/storage/firstaid/regular, +/area/fiorina/tumor/ice_lab) +"mld" = ( +/obj/structure/machinery/photocopier, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"mkB" = ( +/area/fiorina/station/security) +"mlg" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrowncorners2" + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"mlu" = ( +/obj/structure/prop/invuln/minecart_tracks/bumper{ + dir = 1 }, -/area/fiorina/station/park) -"mli" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/telecomm/lz1_tram) +/area/fiorina/tumor/servers) "mlC" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/disco) -"mlM" = ( -/obj/structure/machinery/computer3/server/rack, -/obj/structure/barricade/handrail/type_b{ - dir = 8; - layer = 3.5 +"mlU" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"mmh" = ( -/obj/item/trash/burger, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/obj/item/tool/soap/syndie, +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/gun/special, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/tumor/civres) "mmp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stock_parts/matter_bin/adv{ @@ -20459,101 +20247,150 @@ /obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"mmP" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 10; - name = "launch track" +"mnd" = ( +/obj/structure/reagent_dispensers/water_cooler{ + density = 0; + pixel_x = -8; + pixel_y = 16 }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) -"mni" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) +"mnr" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, +/turf/open/floor/prison, +/area/fiorina/tumor/fiberbush) +"mns" = ( +/obj/item/stool, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) -"mnp" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/research_cells) "mny" = ( /turf/closed/wall/prison, /area/fiorina/station/flight_deck) -"moJ" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 +"mnJ" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/chapel) +"mnR" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/chapel) +"mom" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/surgicaldrill, +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, +/area/fiorina/station/lowsec) +"moK" = ( +/obj/item/clothing/under/shorts/red, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/central_ring) +"moQ" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "moW" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"mpb" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison, +/area/fiorina/station/park) "mpf" = ( /obj/structure/reagent_dispensers/fueltank/gas/hydrogen{ layer = 2.6 }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"mpr" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"mpB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/area/fiorina/station/power_ring) -"mpO" = ( -/obj/structure/machinery/power/smes/buildable{ - capacity = 1e+006; - dir = 1 +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"mpT" = ( -/obj/structure/platform{ - dir = 1 +/turf/open/space/basic, +/area/fiorina/oob) +"mpE" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/flight_deck) -"mqc" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, +/area/fiorina/station/botany) +"mpN" = ( +/obj/item/stock_parts/manipulator/pico, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkpurple2" }, -/area/fiorina/lz/near_lzII) -"mqo" = ( -/obj/structure/barricade/metal{ - health = 250; - icon_state = "metal_1" +/area/fiorina/tumor/servers) +"mpR" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"mpY" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/barricade/handrail/type_b{ + dir = 1 }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"mqB" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "red" }, -/area/fiorina/tumor/ice_lab) -"mqY" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 8 +/area/fiorina/station/security) +"mqJ" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"mqM" = ( +/obj/item/stack/sandbags_empty/half, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) +/area/fiorina/station/flight_deck) "mrk" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -20561,41 +20398,39 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"mrm" = ( -/obj/item/stack/tile/plasteel{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"mrn" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) "mrG" = ( /obj/structure/extinguisher_cabinet, /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/disco) -"mrO" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"mrI" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med, +/turf/closed/wall/prison, +/area/fiorina/station/medbay) +"mrK" = ( +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/telecomm/lz1_cargo) +"mrW" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/fiorina/station/disco) "mrX" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"msd" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "msj" = ( /obj/item/toy/crayon/orange, /turf/open/floor/plating/prison, @@ -20609,16 +20444,6 @@ icon_state = "plating" }, /area/fiorina/tumor/ship) -"mss" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_tram) "msu" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -20626,22 +20451,20 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"msv" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"msF" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/aux_engi) +"msH" = ( +/obj/item/tool/surgery/cautery, /turf/open/floor/prison{ - dir = 9; + dir = 8; icon_state = "yellow" }, /area/fiorina/station/lowsec) -"msS" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) "mtj" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -20650,122 +20473,159 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"mtk" = ( +"mtD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + pixel_y = 7 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreencorner" + icon_state = "bluefull" }, -/area/fiorina/tumor/ice_lab) -"mtm" = ( -/obj/effect/spawner/random/toolbox, +/area/fiorina/station/power_ring) +"mtG" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrowncorners2" }, -/area/fiorina/tumor/civres) -"mtr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/milk{ - pixel_x = 2; - pixel_y = 3 +/area/fiorina/station/park) +"mtP" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"mue" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 }, -/area/fiorina/tumor/fiberbush) -"muf" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"muB" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"muD" = ( +/obj/structure/tunnel, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/civres_blue) +"muX" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 }, -/area/fiorina/tumor/civres) -"muO" = ( -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"muT" = ( -/obj/item/device/flashlight/flare/on, /turf/open/floor/prison{ dir = 1; icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) -"muZ" = ( -/obj/item/storage/briefcase, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "mvl" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"mwL" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"mwU" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/obj/structure/disposalpipe/segment{ - icon_state = "delivery_outlet"; - layer = 6; - name = "overhead ducting"; - pixel_y = 33 - }, +"mvp" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"mxk" = ( -/obj/item/trash/tray, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/power_ring) -"mxn" = ( +"mvF" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + indestructible = 1; + name = "launch bay door" + }, +/turf/open/floor/plating/prison, +/area/fiorina/oob) +"mvV" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ dir = 4; - icon_state = "bluecorner" + icon_state = "whitegreen" }, -/area/fiorina/station/chapel) -"mxs" = ( -/obj/item/storage/belt/marine/quackers, -/obj/effect/spawner/gibspawner/human, -/turf/open/gm/river{ - color = "#990000"; - name = "pool" +/area/fiorina/tumor/ice_lab) +"mvY" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/tool, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"mwu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/station/park) -"mxz" = ( -/obj/item/bedsheet, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/lowsec) -"mxG" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ +"mwK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/open/space/basic, -/area/fiorina/oob) -"mxO" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/obj/item/phone{ + pixel_x = -3; + pixel_y = 10 }, -/obj/structure/barricade/handrail/type_b{ - dir = 1 +/obj/item/phone{ + pixel_x = 9; + pixel_y = -10 }, -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"mwP" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"mxc" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/lz/near_lzII) +"mxk" = ( +/obj/item/trash/tray, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/power_ring) +"mxm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/plantspray/pests, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"mxs" = ( +/obj/item/storage/belt/marine/quackers, +/obj/effect/spawner/gibspawner/human, +/turf/open/gm/river{ + color = "#990000"; + name = "pool" + }, +/area/fiorina/station/park) "mxQ" = ( /turf/closed/wall/prison, /area/fiorina/station/power_ring) @@ -20773,61 +20633,84 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/fiorina/station/chapel) -"myg" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +"myf" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"myi" = ( +/obj/item/tool/mop, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"myt" = ( +/area/fiorina/station/civres_blue) +"myj" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"myA" = ( +/obj/structure/bed/chair{ + dir = 4; + layer = 2.8 + }, +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison{ - dir = 10; - icon_state = "red" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"myO" = ( -/obj/structure/closet/firecloset/full, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/flight_deck) +"myH" = ( +/obj/item/storage/briefcase, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/transit_hub) +"myJ" = ( +/obj/structure/closet/bombcloset, +/obj/effect/spawner/random/gun/rifle/midchance, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 6; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"mzp" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "delivery_outlet"; - layer = 6; - name = "overhead ducting"; - pixel_y = 33 +/area/fiorina/station/flight_deck) +"myK" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/aux_engi) +"myQ" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) +"mzn" = ( +/obj/item/frame/firstaid_arm_assembly, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/civres_blue) "mzy" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"mzz" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +"mzJ" = ( +/obj/item/tool/lighter/random{ + pixel_x = 14; + pixel_y = 13 }, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"mzF" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, +/area/fiorina/station/power_ring) +"mzK" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreencorner" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/medbay) "mzS" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1; @@ -20841,99 +20724,81 @@ opacity = 0 }, /area/fiorina/oob) -"mAg" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 +"mAs" = ( +/obj/item/broken_device, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/medbay) +"mAt" = ( /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "greenbluecorner" }, -/area/fiorina/station/park) -"mAv" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0; - pixel_x = 10; - pixel_y = -8 +/area/fiorina/station/botany) +"mAK" = ( +/obj/structure/sign/poster{ + desc = "Hubba hubba."; + icon_state = "poster17"; + name = "magazine" }, -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +/obj/structure/sign/poster{ + desc = "Hubba hubba."; + icon_state = "poster3"; + name = "magazine"; + pixel_x = 6; + pixel_y = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"mAz" = ( -/obj/structure/closet/emcloset, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"mAA" = ( -/obj/item/storage/briefcase/inflatable, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"mAB" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/effect/landmark/objective_landmark/medium, +"mAN" = ( +/obj/item/toy/crayon/mime, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"mAE" = ( +/area/fiorina/station/power_ring) +"mAS" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - pixel_y = 11 - }, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"mAG" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 +/area/fiorina/tumor/ice_lab) +"mBG" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/obj/item/tool/soap/nanotrasen, +/area/fiorina/station/disco) +"mBJ" = ( +/obj/item/ammo_box/magazine/misc/flares/empty, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/civres) -"mBm" = ( -/obj/item/storage/briefcase, +/area/fiorina/tumor/ice_lab) +"mBZ" = ( +/obj/structure/machinery/disposal, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) -"mBy" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 + icon_state = "floor_plate" }, +/area/fiorina/station/security/wardens) +"mCe" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"mBV" = ( -/obj/structure/platform_decoration{ - dir = 8 + dir = 1; + icon_state = "cell_stripe" }, +/area/fiorina/station/lowsec) +"mCp" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 1; + icon_state = "blue" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/chapel) "mCA" = ( /obj/structure/prop/resin_prop, /turf/open/floor/plating/prison, @@ -20942,175 +20807,202 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/lowsec) -"mCG" = ( -/obj/structure/machinery/processor, -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" +"mCH" = ( +/obj/item/newspaper, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"mCR" = ( +/obj/structure/platform, +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 }, -/area/fiorina/station/botany) -"mCT" = ( -/obj/structure/surface/rack, -/obj/item/handcuffs/zip, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "whitegreen" }, -/area/fiorina/station/lowsec) -"mDi" = ( -/obj/structure/platform_decoration, +/area/fiorina/station/medbay) +"mDn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "green" }, -/area/fiorina/station/central_ring) -"mDs" = ( -/obj/item/stack/sandbags_empty/half, +/area/fiorina/tumor/servers) +"mDq" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, +/obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + dir = 4; + icon_state = "greenblue" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/botany) "mDz" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"mDV" = ( +"mDO" = ( +/obj/structure/bed{ + icon_state = "abed" + }, /turf/open/floor/prison{ - icon_state = "darkyellowcorners2" + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"mDS" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "redfull" }, -/area/fiorina/station/telecomm/lz1_cargo) -"mEb" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/prison, /area/fiorina/station/security) -"mEc" = ( +"mEn" = ( +/obj/structure/machinery/photocopier{ + pixel_y = 4 + }, /turf/open/floor/prison{ - icon_state = "darkbrowncorners2" + icon_state = "redfull" }, -/area/fiorina/station/park) -"mEv" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/station/security) +"mEJ" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) -"mEL" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket" +/obj/structure/window/reinforced{ + dir = 8 }, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/secure_data, /turf/open/floor/prison, -/area/fiorina/station/chapel) +/area/fiorina/station/security) "mEO" = ( /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"mFf" = ( -/obj/structure/surface/table/reinforced/prison, +"mEU" = ( /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/oob) -"mFh" = ( +/area/fiorina/station/disco) +"mEY" = ( +/obj/item/device/flashlight/on, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + dir = 1; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/medbay) -"mFm" = ( -/obj/item/tool/mop, +/area/fiorina/tumor/aux_engi) +"mFS" = ( +/obj/structure/cargo_container/grant/left, /turf/open/floor/prison{ icon_state = "floor_plate" }, +/area/fiorina/station/power_ring) +"mGf" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, /area/fiorina/station/civres_blue) -"mFv" = ( -/obj/structure/largecrate/random/mini/ammo, -/turf/open/floor/prison, +"mGr" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"mFz" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibmid1" +"mGN" = ( +/obj/structure/platform{ + dir = 8 }, +/obj/item/prop/almayer/handheld1, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"mGX" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"mGZ" = ( +/obj/item/trash/eat, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/structure/machinery/blackbox_recorder, +/obj/item/prop/almayer/flight_recorder/colony{ + pixel_x = -6; + pixel_y = 10 }, -/area/fiorina/station/medbay) -"mGe" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"mGx" = ( -/obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison, /area/fiorina/station/power_ring) "mHC" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) -"mHN" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) "mHR" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/aux_engi) -"mHZ" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 - }, -/obj/effect/landmark/objective_landmark/science, +"mHY" = ( +/obj/item/frame/rack, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"mIk" = ( -/obj/structure/bed/chair{ - dir = 4 + icon_state = "redfull" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/security) +"mIf" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/medbay) -"mIq" = ( -/obj/structure/barricade/handrail{ - dir = 8 +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) +"mIr" = ( +/obj/structure/bed{ + icon_state = "abed" }, +/obj/item/reagent_container/food/snacks/wrapped/barcardine, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/central_ring) +/area/fiorina/station/research_cells) "mIu" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"mIA" = ( -/obj/structure/bed{ - icon_state = "abed" +"mIQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + pixel_y = 6 }, -/obj/item/bedsheet/green, /turf/open/floor/prison{ dir = 10; - icon_state = "yellow" + icon_state = "kitchen" }, -/area/fiorina/station/lowsec) -"mIE" = ( +/area/fiorina/station/civres_blue) +"mJc" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"mJe" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) +/area/fiorina/tumor/aux_engi) +"mJg" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/storage/pill_bottle/inaprovaline/skillless, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "mJk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/aspen{ @@ -21130,39 +21022,39 @@ /obj/item/trash/kepler, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"mJy" = ( +"mJH" = ( +/obj/item/device/flashlight/flare/on, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"mJz" = ( -/obj/structure/closet/emcloset, +/area/fiorina/tumor/ice_lab) +"mKd" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 4; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"mKo" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) -"mJM" = ( -/obj/item/trash/uscm_mre, +"mKp" = ( +/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"mKt" = ( -/obj/item/storage/toolbox, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"mKy" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"mKG" = ( +/area/fiorina/station/security) +"mKx" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "floor_marked" + icon_state = "blue_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/botany) "mKS" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -21177,29 +21069,20 @@ }, /turf/open/space, /area/fiorina/oob) -"mLe" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +"mLm" = ( +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"mLB" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "floor_plate" }, +/area/fiorina/station/botany) +"mLL" = ( +/obj/item/tool/mop, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"mLE" = ( -/obj/structure/closet, -/obj/item/reagent_container/spray/cleaner, -/obj/item/stack/sheet/plasteel/small_stack, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/park) "mLP" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/smartfridge/drinks{ @@ -21207,55 +21090,38 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"mLS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, +"mLY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/botany) -"mMb" = ( -/obj/structure/machinery/photocopier{ - pixel_y = 4 + dir = 4; + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"mMa" = ( +/obj/structure/closet/emcloset, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"mMf" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/reagent_dispensers/water_cooler, +"mMh" = ( +/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"mMo" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"mMi" = ( +/obj/item/tool/weldpack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"mMq" = ( -/obj/item/trash/chips, +/area/fiorina/station/civres_blue) +"mMk" = ( +/obj/structure/prop/resin_prop, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/research_cells) +/area/fiorina/tumor/aux_engi) "mMH" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -21268,98 +21134,108 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"mNg" = ( +"mMP" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/spacecash/c10, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, +/obj/item/trash/plate, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/ice_lab) +"mNc" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/prison, +/area/fiorina/station/security) "mNh" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"mNj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, +"mNB" = ( +/obj/effect/decal/hefa_cult_decals/d32, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"mNN" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"mNn" = ( -/obj/structure/machinery/door/airlock/almayer/marine, +/area/fiorina/station/telecomm/lz1_cargo) +"mOf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/plastic, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) -"mNC" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/medbay) +"mOm" = ( +/obj/structure/platform{ + dir = 1 }, -/area/fiorina/station/power_ring) -"mNJ" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 +/obj/structure/platform{ + dir = 4 }, -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 +/obj/structure/platform_decoration{ + dir = 9 }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"mOn" = ( -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "greenblue" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"mOr" = ( -/obj/item/poster, +/area/fiorina/station/transit_hub) +"mOE" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 10; + icon_state = "bright_clean_marked" }, -/area/fiorina/station/research_cells) -"mOC" = ( -/obj/structure/closet/crate/medical, -/obj/effect/spawner/random/toolbox, +/area/fiorina/station/power_ring) +"mOI" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"mOF" = ( +/area/fiorina/station/lowsec) +"mOU" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"mPe" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ dir = 8; - icon_state = "bluecorner" + icon_state = "cell_stripe" }, -/area/fiorina/station/civres_blue) -"mOW" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 1 +/area/fiorina/station/medbay) +"mPf" = ( +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, +/area/fiorina/station/telecomm/lz1_cargo) +"mPg" = ( +/obj/item/trash/boonie, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"mPA" = ( -/obj/structure/barricade/wooden, +/area/fiorina/station/power_ring) +"mPn" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/power_ring) "mPW" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -21367,29 +21243,28 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) -"mQe" = ( -/obj/effect/decal/cleanable/blood, +"mPX" = ( /turf/open/floor/prison{ - icon_state = "greenblue" + dir = 5; + icon_state = "darkbrown2" }, -/area/fiorina/station/botany) -"mQn" = ( -/obj/structure/platform_decoration{ - dir = 1 +/area/fiorina/station/park) +"mQy" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null }, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"mQD" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 + icon_state = "redfull" }, -/obj/item/storage/toolbox/syndicate, +/area/fiorina/station/security) +"mQB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/lz/near_lzI) "mQG" = ( /obj/structure/barricade/handrail/type_b{ dir = 8; @@ -21399,90 +21274,60 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"mQZ" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"mRk" = ( -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/tool/warning_cone{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) -"mRz" = ( -/obj/item/ammo_casing{ - dir = 6; - icon_state = "casing_10_1" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"mRT" = ( -/obj/structure/platform{ +"mQV" = ( +/obj/item/tool/stamp, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"mRA" = ( +/obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/transit_hub) -"mRU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/surgery, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/medbay) +"mRM" = ( +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, +/turf/open/space, +/area/fiorina/oob) +"mRS" = ( /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) -"mSM" = ( -/obj/item/stack/tile/plasteel{ - pixel_x = 3; - pixel_y = 4 + dir = 5; + icon_state = "darkpurple2" }, +/area/fiorina/station/central_ring) +"mSk" = ( +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"mSo" = ( +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/research_cells) -"mSN" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/station/transit_hub) +"mSp" = ( +/obj/item/clothing/under/marine/ua_riot, +/obj/item/weapon/gun/rifle/m16, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"mSY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/atmos_alert, +/area/fiorina/station/security) +"mSP" = ( +/obj/effect/landmark/railgun_camera_pos, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"mSZ" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkbrown2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/aux_engi) "mTa" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -21495,130 +21340,128 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"mTq" = ( -/obj/structure/bed/chair{ - dir = 4; - layer = 2.8 - }, -/obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"mTy" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - indestructible = 1; - name = "launch bay door" - }, +"mTl" = ( +/obj/item/storage/box/gloves, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/oob) -"mTJ" = ( -/obj/item/stool, -/obj/item/trash/cigbutt{ - pixel_y = 8 + dir = 9; + icon_state = "greenfull" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/transit_hub) +"mTs" = ( +/obj/structure/barricade/wooden{ + dir = 4 }, -/area/fiorina/station/power_ring) +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) "mTM" = ( /obj/item/tool/warning_cone, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"mTS" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"mTX" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"mUk" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" +"mUd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/fiorina/station/medbay) -"mUr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/crayons, +/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) "mUA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"mUV" = ( -/obj/structure/closet/basketball, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"mVg" = ( +"mUK" = ( /obj/structure/window{ - dir = 8 + dir = 4 }, /obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, /area/fiorina/tumor/servers) -"mWg" = ( -/obj/structure/reagent_dispensers/fueltank, +"mVd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sign/poster{ + desc = "Hubba hubba."; + icon_state = "poster3"; + name = "magazine"; + pixel_x = 6; + pixel_y = 8 + }, +/obj/structure/sign/poster{ + desc = "Hubba hubba."; + icon_state = "poster17"; + name = "magazine" + }, +/obj/structure/sign/poster{ + desc = "The M41A is on the cover."; + icon_state = "poster15"; + name = "magazine"; + pixel_x = -5; + pixel_y = 5 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"mWi" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/obj/effect/spawner/random/gun/smg, -/obj/effect/landmark/objective_landmark/medium, +/area/fiorina/station/security/wardens) +"mVk" = ( +/obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"mWx" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/area/fiorina/station/telecomm/lz1_cargo) +"mVn" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/station/telecomm/lz1_tram) +"mVO" = ( +/obj/item/tool/extinguisher, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"mWF" = ( -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 +/area/fiorina/tumor/servers) +"mVY" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"mWV" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xtracks" +/area/fiorina/station/security) +"mWs" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 6 }, /turf/open/floor/prison{ dir = 1; - icon_state = "green" + icon_state = "darkbrown2" }, -/area/fiorina/station/chapel) +/area/fiorina/station/park) +"mWO" = ( +/obj/effect/spawner/random/tool, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"mWR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications/simple, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"mWS" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) "mWX" = ( /obj/structure/platform{ dir = 8 @@ -21635,158 +21478,75 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"mXe" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) "mXk" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"mXq" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 +"mXS" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null }, -/obj/structure/machinery/shower{ - dir = 8 +/obj/item/weapon/gun/launcher/grenade/m81, +/obj/item/storage/pill_bottle/kelotane, +/turf/open/floor/prison{ + icon_state = "redfull" }, +/area/fiorina/station/security) +"mYl" = ( +/obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"mXI" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +"mYy" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"mXT" = ( -/obj/structure/platform_decoration{ - dir = 8 + dir = 1; + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"mYG" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"mXY" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "blue" - }, -/area/fiorina/station/civres_blue) -"mYo" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"mYp" = ( -/obj/structure/bed{ - icon_state = "abed" +/area/fiorina/tumor/ship) +"mZo" = ( +/obj/item/tool/shovel, +/turf/open/auto_turf/sand/layer1, +/area/fiorina/tumor/civres) +"mZy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/storage/bible/hefa, +/obj/effect/spawner/random/gun/smg/lowchance, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"mYu" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 4 +"mZH" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/medbay) -"mYx" = ( -/obj/structure/tunnel/maint_tunnel, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) -"mYN" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"mYZ" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"mZo" = ( -/obj/item/tool/shovel, -/turf/open/auto_turf/sand/layer1, -/area/fiorina/tumor/civres) -"mZw" = ( -/obj/structure/prop/almayer/computers/sensor_computer1{ - name = "computer" - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) -"mZG" = ( -/obj/item/paper/crumpled/bloody, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"mZV" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/central_ring) "naf" = ( /turf/closed/shuttle/ert, /area/fiorina/oob) -"naj" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"naN" = ( -/obj/effect/decal/cleanable/blood, +"naI" = ( +/obj/item/clothing/under/color/orange, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellow" }, -/area/fiorina/station/disco) +/area/fiorina/station/lowsec) "naW" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) @@ -21794,84 +21554,87 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"nbo" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"nbv" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"nbU" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +"nbP" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/park) -"ncn" = ( +/area/fiorina/station/lowsec) +"ncb" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" + dir = 6; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/aux_engi) -"ncP" = ( +/area/fiorina/lz/near_lzI) +"ncj" = ( +/obj/item/device/flashlight/lamp/tripod, /obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"nck" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -5; + pixel_y = -11 + }, +/obj/item/reagent_container/food/snacks/cherrypie{ + pixel_y = 7 + }, +/turf/open/floor/prison{ dir = 4; - pixel_x = 10; - pixel_y = -1 + icon_state = "darkyellowfull2" }, +/area/fiorina/station/flight_deck) +"ncs" = ( +/obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/station/chapel) -"ncQ" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/botany) +"ncF" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"ndh" = ( -/obj/effect/decal/hefa_cult_decals/d32{ - icon_state = "4" +/area/fiorina/tumor/ice_lab) +"ncY" = ( +/obj/structure/bed/sofa/south/grey/right, +/obj/item/storage/briefcase{ + pixel_y = -2 }, -/obj/item/weapon/gun/shotgun/pump{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun) +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "ndl" = ( /obj/item/storage/box/cups, /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"nds" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = 11; - pixel_y = 14 - }, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +"ndD" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/largecrate/random/mini/chest/c, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"ndt" = ( -/obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"ndC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/faxmachine, +/area/fiorina/lz/near_lzII) +"ndQ" = ( +/obj/structure/machinery/recharge_station, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 5; + icon_state = "whitepurple" }, -/area/fiorina/station/security) +/area/fiorina/station/research_cells) "ndZ" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -21893,49 +21656,65 @@ name = "astroturf" }, /area/fiorina/station/park) -"nee" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +"nez" = ( +/obj/item/ammo_casing{ + dir = 6; + icon_state = "casing_5" }, /turf/open/floor/prison{ dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"nej" = ( -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, /area/fiorina/station/park) -"nes" = ( +"neE" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/prison, +/area/fiorina/station/security) +"neT" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"neY" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" + icon_state = "cell_stripe" }, -/area/fiorina/station/telecomm/lz1_tram) -"neD" = ( -/obj/effect/landmark/xeno_spawn, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" +/area/fiorina/station/central_ring) +"nfe" = ( +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_psycopath_l"; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_ketchup_l"; + pixel_x = 8; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_guilty_l"; + pixel_x = -12; + pixel_y = 2 }, -/area/fiorina/tumor/ice_lab) -"neH" = ( -/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) +"nfh" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 }, -/area/fiorina/station/research_cells) -"neX" = ( -/obj/structure/platform, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/lz/near_lzII) +"nfu" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "nfA" = ( /obj/structure/platform, /obj/item/stack/sheet/metal, @@ -21947,71 +21726,36 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"nfI" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) +"nfZ" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "nga" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; name = "synthetic vegetation" }, /area/fiorina/station/civres_blue) -"ngd" = ( -/obj/item/trash/hotdog, +"ngg" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"ngk" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"ngq" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"ngr" = ( -/obj/structure/platform_decoration, -/obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"ngG" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/effect/landmark/objective_landmark/close, +"ngn" = ( +/obj/structure/machinery/deployable/barrier, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"nhd" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 + icon_state = "redfull" }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"nhi" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, -/obj/effect/landmark/objective_landmark/medium, +/area/fiorina/station/security) +"ngF" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "whitepurple" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/research_cells) "nho" = ( /obj/structure/platform{ dir = 1 @@ -22022,23 +21766,25 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"nhz" = ( +"nhM" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.5 + }, /turf/open/floor/prison{ - icon_state = "whitepurplecorner" + dir = 1; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) +"nhX" = ( +/obj/structure/machinery/gibber, +/obj/effect/decal/cleanable/blood{ + pixel_x = -6; + pixel_y = 4 }, -/area/fiorina/station/research_cells) -"nhF" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "blue_plate" }, -/area/fiorina/station/medbay) -"nhR" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/botany) "nhY" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, @@ -22047,20 +21793,24 @@ /obj/structure/sign/safety/fire_haz, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"nie" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "repairpanelslz" + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"nim" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/lz/near_lzI) "nip" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"nis" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - layer = 2.97; - pixel_y = -14 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "niw" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -22069,25 +21819,37 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"njq" = ( -/obj/item/tool/weldpack, +"njg" = ( +/obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/civres_blue) -"njx" = ( -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"njC" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 +/area/fiorina/station/flight_deck) +"njm" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"nju" = ( +/obj/item/gift, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"njG" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) "njK" = ( @@ -22104,16 +21866,50 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"njT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/taperecorder{ - pixel_x = 8; - pixel_y = 8 +"njN" = ( +/obj/item/stock_parts/micro_laser/ultra, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"njY" = ( +/obj/structure/inflatable/popped, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"nkg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) +"nkF" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/fiorina/station/park) +"nkJ" = ( +/obj/structure/largecrate/supply/medicine/medkits, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"nkM" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) "nlw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -22130,12 +21926,43 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) +"nmh" = ( +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"nmi" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 1; + icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/research_cells) "nmm" = ( /turf/open/organic/grass{ name = "astroturf" }, /area/fiorina/station/research_cells) -"nmx" = ( +"nmy" = ( +/obj/structure/machinery/space_heater, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/tumor/ice_lab) +"nmK" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"nmL" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, @@ -22144,33 +21971,49 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"nmQ" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison, -/area/fiorina/station/research_cells) +"nmM" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "nmT" = ( /obj/item/toy/crayon/blue, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"nnx" = ( +"nnr" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"nny" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/emails{ - dir = 8; - pixel_x = -2; - pixel_y = 7 +/obj/item/trash/cigbutt/bcigbutt, +/turf/open/floor/prison{ + icon_state = "bluefull" }, +/area/fiorina/station/power_ring) +"nnC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"nnX" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" +/area/fiorina/station/power_ring) +"nnG" = ( +/obj/structure/platform{ + dir = 4 }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 6 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "noa" = ( /obj/structure/largecrate/supply/supplies/plasteel, /turf/open/floor/plating/prison, @@ -22181,27 +22024,22 @@ name = "astroturf" }, /area/fiorina/station/park) -"noY" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"nor" = ( +/obj/effect/decal/medical_decals{ + dir = 4; + icon_state = "triagedecaldir" }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"nph" = ( -/obj/item/stool, /turf/open/floor/prison{ - icon_state = "damaged2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) -"npp" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +/area/fiorina/station/medbay) +"noz" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/botany) +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "npx" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -22211,158 +22049,121 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"npz" = ( -/obj/structure/monorail{ - name = "launch track" +"nqL" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/spray/cleaner, +/obj/structure/machinery/power/apc{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"nqN" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/security) +"nrd" = ( +/obj/structure/platform{ + dir = 8 }, +/obj/structure/platform, /obj/structure/platform_decoration{ - dir = 1 + dir = 10 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_tram) -"npN" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/effect/spawner/random/gun/pistol, +/area/fiorina/station/botany) +"nre" = ( +/obj/item/stack/rods, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) +"nrn" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + dir = 5; + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) -"npV" = ( -/obj/structure/machinery/vending/snack, +/area/fiorina/maintenance) +"nrU" = ( +/obj/item/tool/pickaxe, +/obj/item/tool/pickaxe{ + pixel_y = 5 + }, +/obj/item/tool/pickaxe{ + pixel_y = 10 + }, +/obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/tumor/ice_lab) -"nql" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"nqs" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ +"nsm" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access, +/obj/structure/window/reinforced{ dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"nqL" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/spray/cleaner, -/obj/structure/machinery/power/apc{ - dir = 4 + health = 80 }, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"nqN" = ( -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/security) -"nqV" = ( -/obj/item/device/cassette_tape/nam, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"nre" = ( -/obj/item/stack/rods, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"nrq" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"nrI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/plantspray/pests, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"nrL" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 +"nss" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/machinery/m56d_hmg, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"nrR" = ( -/turf/open/floor/prison{ +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/research_cells) +"nsD" = ( +/obj/structure/prop/structure_lattice{ dir = 4; - icon_state = "green" - }, -/area/fiorina/station/transit_hub) -"nrY" = ( -/turf/open/floor/prison{ - icon_state = "bluecorner" + health = 300 }, -/area/fiorina/station/chapel) -"nsb" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"nsg" = ( +/area/fiorina/tumor/civres) +"ntc" = ( /turf/open/floor/prison{ - dir = 8; + dir = 4; icon_state = "green" }, /area/fiorina/tumor/civres) -"nsn" = ( -/obj/structure/janitorialcart, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"nsx" = ( -/obj/structure/closet/firecloset/full, -/obj/item/storage/pill_bottle/bicaridine/skillless, +"ntf" = ( +/obj/item/implanter/compressed, +/obj/structure/safe, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "redfull" }, -/area/fiorina/tumor/ice_lab) -"nsC" = ( -/obj/item/stack/sandbags_empty/half, +/area/fiorina/station/security) +"ntv" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec) +"ntw" = ( /turf/open/floor/prison{ - icon_state = "darkyellow2" + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzI) -"nsH" = ( -/obj/structure/platform, +"ntx" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/security) -"ntg" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_27"; - pixel_y = 6 +/area/fiorina/station/disco) +"ntE" = ( +/obj/structure/barricade/handrail/type_b, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) -"ntv" = ( -/obj/structure/window/framed/prison, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/disco) "ntH" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -22375,66 +22176,133 @@ }, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"nuE" = ( -/obj/structure/inflatable/popped, +"ntM" = ( +/obj/structure/machinery/space_heater, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"ntZ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"nub" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"nvz" = ( -/obj/structure/flora/pottedplant/random, +/area/fiorina/tumor/servers) +"nuo" = ( +/obj/structure/bed/sofa/south/grey/left, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security/wardens) +"nup" = ( +/obj/structure/barricade/handrail/type_b, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"nuN" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "sterile_white" }, -/area/fiorina/tumor/civres) -"nvC" = ( -/obj/structure/platform{ +/area/fiorina/station/medbay) +"nuX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) +"nvi" = ( +/obj/structure/barricade/wooden{ dir = 1 }, -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"nvn" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, +/area/fiorina/station/chapel) +"nvs" = ( /obj/structure/platform_decoration{ - dir = 9 + dir = 8 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" }, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/medbay) "nvD" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/botany) -"nvF" = ( -/obj/structure/machinery/vending/cigarette/colony, +"nvK" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"nvO" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/tumor/aux_engi) +"nvX" = ( +/turf/open/floor/prison{ dir = 8; - pixel_x = -10; - pixel_y = -3 + icon_state = "blue" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"nvZ" = ( -/obj/structure/machinery/vending/coffee, +/area/fiorina/station/power_ring) +"nwv" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/ice_lab) -"nwh" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docstripingdir" +/area/fiorina/tumor/aux_engi) +"nwS" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/obj/structure/bed/roller, +/area/fiorina/station/telecomm/lz1_tram) +"nwT" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/aux_engi) +"nxc" = ( +/obj/structure/sign/poster{ + icon_state = "poster18"; + pixel_y = 32 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "nxl" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -22445,61 +22313,66 @@ icon_state = "plate" }, /area/fiorina/station/civres_blue) -"nxH" = ( -/obj/item/trash/boonie, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"nxM" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0"; - pixel_y = 2 +"nxq" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 7; + pixel_y = 6 }, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"nyk" = ( -/obj/structure/machinery/power/geothermal, +/area/fiorina/station/chapel) +"nxW" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/obj/structure/barricade/wooden{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 1; - icon_state = "bluecorner" + icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"nyl" = ( -/obj/structure/window{ - dir = 1 +/area/fiorina/station/telecomm/lz1_cargo) +"nxY" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/gloves/latex, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "redfull" }, -/area/fiorina/tumor/servers) -"nyo" = ( +/area/fiorina/station/medbay) +"nyq" = ( /obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"nyy" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"nyD" = ( -/obj/structure/barricade/handrail{ - dir = 8 + icon_state = "whitegreen" }, +/area/fiorina/station/medbay) +"nyC" = ( +/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - dir = 8; - icon_state = "red" + icon_state = "floorscorched2" }, /area/fiorina/station/security) -"nyQ" = ( -/obj/structure/dropship_equipment/mg_holder, +"nyF" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/disco) +"nyO" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "nyS" = ( /obj/structure/platform{ dir = 4 @@ -22510,24 +22383,34 @@ /obj/item/tool/extinguisher/mini, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"nza" = ( -/obj/structure/machinery/deployable/barrier, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/security) -"nzm" = ( -/obj/structure/platform, +"nzf" = ( +/obj/structure/machinery/processor, +/obj/effect/decal/cleanable/blood{ + pixel_y = 20 + }, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"nzi" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"nzu" = ( +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"nzp" = ( -/obj/item/clothing/gloves/boxing/blue, +/area/fiorina/station/security/wardens) +"nzw" = ( +/obj/item/clothing/head/soft/yellow, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/servers) "nzI" = ( /obj/structure/largecrate/random, /turf/open/floor/wood, @@ -22548,156 +22431,125 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"nAr" = ( +"nAm" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) -"nBp" = ( -/obj/item/weapon/gun/smg/nailgun, -/obj/structure/surface/rack, +/area/fiorina/lz/near_lzII) +"nAs" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "yellowfull" }, -/area/fiorina/maintenance) -"nBu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, +/area/fiorina/station/lowsec) +"nAK" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/fiorina/station/lowsec) +"nBb" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"nBB" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/lz/near_lzI) -"nBG" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" +/area/fiorina/station/lowsec) +"nBt" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "4" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/item/weapon/gun/shotgun/pump{ + starting_attachment_types = list(/obj/item/attachable/stock/shotgun) }, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"nBK" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/botany) -"nBM" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/ammo_magazine/shotgun/beanbag, +"nBw" = ( /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"nBO" = ( -/obj/effect/spawner/random/powercell, -/turf/open/floor/prison{ - icon_state = "bluefull" + dir = 8; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) -"nBR" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 1 +"nCh" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"nCm" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/lz/near_lzI) -"nBV" = ( -/turf/open/floor/prison{ - icon_state = "darkpurple2" +"nCt" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "2" }, -/area/fiorina/tumor/servers) -"nCa" = ( -/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"nCl" = ( -/obj/structure/machinery/vending/cigarette/colony, +/area/fiorina/station/medbay) +"nCH" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"nCu" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"nCw" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/structure/barricade/wooden{ - dir = 8 + dir = 5; + icon_state = "yellow" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/disco) +"nCV" = ( +/obj/item/ammo_casing{ + icon_state = "casing_7_1" }, -/area/fiorina/station/telecomm/lz1_cargo) -"nCC" = ( -/obj/item/trash/candy, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "sterile_white" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/medbay) "nCX" = ( /turf/open/organic/grass{ name = "astroturf" }, /area/fiorina/station/park) -"nDJ" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, +"nDq" = ( +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"nDT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/handcuffs, -/turf/open/floor/prison, /area/fiorina/station/security) -"nDW" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform{ - dir = 8 +"nDr" = ( +/obj/structure/machinery/door/airlock/almayer/maint/autoname{ + name = "\improper Null Hatch REPLACE ME"; + req_access = null; + req_one_access = null }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"nDI" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "floor_plate" }, /area/fiorina/tumor/ice_lab) -"nEs" = ( +"nEh" = ( +/obj/item/device/flashlight, /turf/open/floor/prison{ - icon_state = "greencorner" + dir = 8; + icon_state = "blue" }, -/area/fiorina/tumor/civres) -"nEy" = ( -/obj/item/explosive/grenade/high_explosive/frag, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/civres_blue) +"nEB" = ( +/obj/item/device/flashlight, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/medbay) +"nEI" = ( +/obj/structure/machinery/deployable/barrier, /turf/open/floor/prison, /area/fiorina/station/security) "nEN" = ( @@ -22707,78 +22559,89 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"nFB" = ( +"nEP" = ( +/obj/structure/closet, +/obj/item/reagent_container/spray/cleaner, +/obj/item/stack/sheet/plasteel/small_stack, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"nEW" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/gift, -/turf/open/floor/wood, -/area/fiorina/station/park) -"nFI" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/obj/structure/machinery/computer/communications{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"nGk" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/tumor/ice_lab) +"nFb" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigarettes/emeraldgreen, +/obj/item/tool/lighter, /turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"nFc" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_1" + }, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"nFB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/gift, +/turf/open/floor/wood, +/area/fiorina/station/park) +"nFJ" = ( +/obj/structure/stairs/perspective{ dir = 4; - icon_state = "darkyellowfull2" + icon_state = "p_stair_full" }, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"nGq" = ( -/obj/structure/machinery/portable_atmospherics/powered/scrubber, +"nGp" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/disco) "nGy" = ( /obj/item/newspaper, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"nGz" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"nGI" = ( +"nGB" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/station/park) -"nGW" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" + dir = 6; + icon_state = "yellow" }, -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/station/disco) +"nGO" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"nGX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ - dir = 8; - icon_state = "commb" +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"nHb" = ( +/area/fiorina/station/disco) +"nGV" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "whitepurple" }, -/area/fiorina/station/chapel) +/area/fiorina/station/research_cells) +"nGZ" = ( +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "nHm" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/fancy/cigar, @@ -22787,29 +22650,23 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"nHG" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"nHH" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) "nHZ" = ( /turf/closed/shuttle/ert{ icon_state = "wy_rightengine" }, /area/fiorina/station/medbay) +"nIb" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/candelabra{ + layer = 3.2; + pixel_x = 1; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/station/transit_hub) "nIc" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -22827,74 +22684,41 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"nIf" = ( -/obj/structure/platform{ - dir = 4 +"nIw" = ( +/obj/structure/prop/almayer/computers/sensor_computer1{ + name = "computer" }, -/obj/item/stool, -/obj/item/clothing/shoes/slippers_worn, /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) -"nIh" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - density = 0; - dir = 4 + icon_state = "darkredfull2" }, -/turf/open/floor/prison, /area/fiorina/station/security) -"nIn" = ( -/obj/item/reagent_container/food/snacks/wrapped/booniebars, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"nIo" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - pixel_y = 6 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" +"nJq" = ( +/obj/structure/platform{ + dir = 1 }, -/area/fiorina/station/botany) -"nIq" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrowncorners2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"nIy" = ( -/obj/item/explosive/grenade/high_explosive/frag, +/area/fiorina/station/transit_hub) +"nJu" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"nJT" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"nID" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8; + icon_state = "whitegreen" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/medbay) +"nKf" = ( +/obj/structure/bed/chair{ + dir = 1 }, -/area/fiorina/lz/near_lzII) -"nJC" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"nJQ" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/smg/nailgun, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "bluefull" }, -/area/fiorina/maintenance) +/area/fiorina/station/power_ring) "nKl" = ( /obj/structure/platform{ dir = 1 @@ -22907,16 +22731,17 @@ }, /turf/open/gm/river/desert/deep, /area/fiorina/lz/near_lzII) -"nKq" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"nKo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + icon_state = "mwo"; + pixel_y = 6 }, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/civres_blue) +/area/fiorina/tumor/civres) "nKG" = ( /obj/item/stack/sheet/metal, /turf/open/floor/almayer{ @@ -22935,38 +22760,77 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"nLf" = ( -/obj/structure/bed/chair{ - dir = 8 +"nLS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -5; + pixel_y = -11 }, +/obj/item/reagent_container/food/snacks/doughslice, /turf/open/floor/prison{ dir = 4; - icon_state = "blue_plate" + icon_state = "darkyellowfull2" }, -/area/fiorina/station/botany) -"nLh" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/flight_deck) +"nLV" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan27" }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 +/area/fiorina/tumor/aux_engi) +"nMg" = ( +/obj/effect/landmark/static_comms/net_one, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, +/area/fiorina/station/telecomm/lz1_tram) +"nMi" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/transit_hub) -"nLl" = ( +/area/fiorina/station/medbay) +"nMm" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"nMn" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/gun/pistol/lowchance, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"nLV" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan27" +"nMp" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/botany) +"nMz" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/central_ring) +"nMI" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) "nMZ" = ( /obj/structure/ice/thin/indestructible, /obj/structure/prop/invuln{ @@ -22986,6 +22850,36 @@ /obj/structure/surface/rack, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"nNS" = ( +/obj/item/device/flashlight/flare, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"nOe" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"nOg" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) +"nOi" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "nOw" = ( /obj/structure/ice/thin/indestructible{ dir = 1; @@ -22994,6 +22888,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) +"nOy" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "nOz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -23003,21 +22901,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"nOF" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"nPa" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "nPj" = ( /obj/item/clothing/glasses/gglasses, /turf/open/space, @@ -23033,76 +22916,113 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"nPO" = ( -/obj/item/tool/pickaxe, -/obj/structure/platform{ - dir = 4 +"nQl" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docstripingdir" }, +/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/medbay) "nQq" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/prison, /area/fiorina/station/medbay) -"nQN" = ( +"nQu" = ( /turf/open/floor/prison{ - icon_state = "green" - }, -/area/fiorina/station/botany) -"nQS" = ( -/obj/structure/reagent_dispensers/water_cooler{ - density = 0; - pixel_x = -11; - pixel_y = 13 + icon_state = "floor_plate" }, +/area/fiorina/station/central_ring) +"nQE" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) -"nRb" = ( -/turf/open/floor/prison, -/area/fiorina/station/security/wardens) -"nRf" = ( -/obj/structure/largecrate/random/barrel/white, +/area/fiorina/tumor/ice_lab) +"nQF" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison, -/area/fiorina/station/security) -"nRI" = ( -/obj/structure/machinery/light/small{ - dir = 4; - pixel_x = 11; - pixel_y = 10 +/area/fiorina/lz/near_lzI) +"nQH" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"nSa" = ( +/area/fiorina/lz/near_lzII) +"nQJ" = ( /obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, +/obj/structure/sink{ + pixel_y = 32 + }, +/obj/item/tool/kitchen/knife/butcher, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "kitchen" }, -/area/fiorina/tumor/aux_engi) -"nSi" = ( -/obj/structure/machinery/door/window/eastright{ - dir = 2 +/area/fiorina/station/power_ring) +"nRQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -5; + pixel_y = -11 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/flight_deck) +"nRT" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"nRU" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"nSh" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "nSx" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/disco) -"nSz" = ( +"nSS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/dropper, +/obj/item/attachable/bipod, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/disco) +/area/fiorina/lz/near_lzI) "nSU" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/emergency, @@ -23113,20 +23033,33 @@ icon_state = "stan5" }, /area/fiorina/tumor/ship) -"nTD" = ( -/obj/structure/platform{ - dir = 8 +"nTv" = ( +/turf/open/floor/prison{ + icon_state = "bluecorner" }, -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/chapel) +"nTV" = ( +/obj/structure/machinery/autolathe/full, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/aux_engi) "nUb" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"nUe" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + req_one_access = null + }, +/turf/open/floor/prison, +/area/fiorina/station/park) +"nUm" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "nUr" = ( /obj/structure/ice/thin/indestructible, /obj/structure/prop/invuln{ @@ -23152,162 +23085,205 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"nUy" = ( -/obj/structure/machinery/door/morgue{ - dir = 2; - name = "Confession Booth" - }, +"nUJ" = ( +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"nUS" = ( +/obj/structure/machinery/computer3/server/rack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"nUF" = ( -/obj/structure/prop/resin_prop{ - icon_state = "rack" +/area/fiorina/tumor/servers) +"nVu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 }, -/obj/structure/machinery/light/double/blue, +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/tumor/aux_engi) -"nUJ" = ( -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"nVq" = ( +/area/fiorina/station/research_cells) +"nVE" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"nVN" = ( +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"nVA" = ( -/obj/structure/platform{ - dir = 4 + icon_state = "floor_plate" }, -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" +/area/fiorina/station/telecomm/lz1_cargo) +"nVR" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"nWh" = ( +/obj/item/tool/wrench, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"nWk" = ( +/obj/effect/spawner/random/gun/smg/midchance, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/ice_lab) -"nVH" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/park) +"nWv" = ( +/obj/item/reagent_container/food/drinks/coffee{ + name = "\improper paper cup" + }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"nWx" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"nWB" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "darkbrown2" }, -/area/fiorina/station/power_ring) +/area/fiorina/maintenance) "nWC" = ( /obj/item/clothing/shoes/yellow, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"nWK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"nWM" = ( +/obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "bluefull" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) "nXj" = ( /obj/structure/curtain/black, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"nXq" = ( -/turf/open/floor/prison{ - icon_state = "cell_stripe" - }, -/area/fiorina/station/disco) -"nYi" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ +"nXu" = ( +/obj/item/storage/backpack/satchel/lockable, +/turf/open/floor/prison, +/area/fiorina/station/security) +"nXE" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6_1" + }, +/obj/item/weapon/gun/smg/mp5, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"nXX" = ( +/obj/item/stack/medical/bruise_pack, +/turf/open/floor/prison, +/area/fiorina/station/security) +"nYi" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"nYk" = ( +"nYB" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) +"nYE" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"nYT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/barricade/handrail{ dir = 1; - icon_state = "green" + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/area/fiorina/station/botany) -"nYw" = ( +/turf/open/space/basic, +/area/fiorina/oob) +"nZB" = ( /turf/open/floor/prison{ - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"nYA" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/lz/near_lzII) +"nZI" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/flight_deck) "nZQ" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"nZT" = ( -/obj/effect/decal/cleanable/blood/xeno{ - icon_state = "xgib3" +"nZU" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, +/area/fiorina/station/flight_deck) +"oaa" = ( /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) -"oan" = ( -/obj/item/trash/semki, +"obh" = ( +/obj/structure/window/framed/prison/reinforced, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"oaI" = ( -/obj/structure/barricade/wooden{ - dir = 4; - pixel_y = 4 +/area/fiorina/station/security) +"oby" = ( +/obj/structure/platform{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/park) -"oaX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/supply_kit, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/botany) "obz" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"obE" = ( +/obj/structure/machinery/power/apc{ + start_charge = 0 + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "obI" = ( /obj/effect/landmark/nightmare{ insert_tag = "engineeroffice" }, /turf/closed/wall/prison, /area/fiorina/tumor/civres) -"obL" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"obT" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue" - }, -/area/fiorina/station/civres_blue) "occ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/lime{ @@ -23335,171 +23311,156 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"ocd" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"ocB" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/coin/uranium, -/obj/item/bedsheet/green, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"ocJ" = ( -/obj/structure/toilet{ - dir = 4; - pixel_y = 8 +"ode" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"odl" = ( +/obj/structure/tunnel/maint_tunnel, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"ocS" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 2; - layer = 6; - name = "overhead pipe"; - pixel_x = -16; - pixel_y = 12 + icon_state = "darkpurplefull2" }, +/area/fiorina/tumor/servers) +"ody" = ( +/obj/structure/machinery/autolathe, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"odg" = ( -/obj/structure/inflatable/popped/door, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"odH" = ( -/obj/item/trash/candle, /turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"odN" = ( -/obj/structure/bed/chair{ - dir = 8 + icon_state = "floor_plate" }, -/obj/effect/spawner/random/gun/rifle/midchance, +/area/fiorina/tumor/civres) +"odC" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "platingdmg1" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/civres) "odQ" = ( /obj/structure/largecrate/supply, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"oem" = ( -/obj/effect/landmark/objective_landmark/close, +"oer" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) -"oex" = ( -/obj/structure/bed/chair, +/area/fiorina/station/park) +"oev" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"oeN" = ( +/obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"oeT" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; dir = 4; + layer = 6; + name = "overhead pipe"; + pixel_y = 12 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"oeV" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + dir = 8; icon_state = "blue_plate" }, /area/fiorina/station/botany) -"oeG" = ( -/obj/structure/largecrate/random, -/obj/effect/spawner/random/powercell, -/obj/item/device/camera/oldcamera{ - pixel_y = 11 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"oeZ" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"ofb" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison, -/area/fiorina/station/security) -"ofo" = ( +"oeY" = ( /obj/effect/spawner/random/tool, -/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"ofl" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/disco) "ofq" = ( /turf/closed/shuttle/elevator{ dir = 10 }, /area/fiorina/station/telecomm/lz1_cargo) -"ofr" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/disco) "ofw" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/prison, /area/fiorina/station/transit_hub) -"ofy" = ( -/obj/structure/machinery/photocopier, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +"ofA" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"ofQ" = ( +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"oga" = ( +/obj/structure/bed{ + icon_state = "psychbed" }, -/area/fiorina/station/research_cells) -"ofF" = ( -/obj/structure/prop/souto_land/pole, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 5; + icon_state = "whitegreen" }, -/area/fiorina/station/park) -"ogd" = ( -/obj/structure/machinery/lapvend, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"ogo" = ( +/area/fiorina/station/medbay) +"ogf" = ( /obj/structure/monorail{ - dir = 9; name = "launch track" }, /turf/open/space, /area/fiorina/oob) -"ogr" = ( -/obj/item/stack/cable_coil/pink, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) +"ogs" = ( +/obj/structure/machinery/power/geothermal, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "ogM" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"ogX" = ( -/obj/vehicle/powerloader{ - dir = 8 - }, +"ohc" = ( +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"ohs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/goggles/lowchance, +/area/fiorina/station/security) +"ohl" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/fiorina/station/central_ring) +"ohx" = ( +/obj/item/tool/match, /turf/open/floor/prison{ icon_state = "redfull" }, @@ -23508,23 +23469,6 @@ /obj/structure/platform/kutjevo/smooth, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/ice_lab) -"ohI" = ( -/turf/open/floor/prison{ - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"ohN" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 - }, -/obj/structure/machinery/shower{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/research_cells) "ohY" = ( /obj/item/circuitboard/machine/pacman/super, /obj/structure/machinery/constructable_frame{ @@ -23532,48 +23476,72 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"oii" = ( -/obj/structure/inflatable/popped, +"oib" = ( +/obj/item/trash/hotdog, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"oiu" = ( +/area/fiorina/station/power_ring) +"oih" = ( +/obj/item/paper/crumpled/bloody, /turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) +"oiF" = ( +/obj/structure/filingcabinet, +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "bluecorner" + pixel_y = 21 }, -/area/fiorina/station/power_ring) -"oiR" = ( -/obj/effect/landmark/queen_spawn, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/tumor/aux_engi) -"oja" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +/area/fiorina/tumor/servers) +"oiV" = ( +/turf/open/floor/prison{ + icon_state = "darkpurple2" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/tumor/servers) +"oiX" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"ojf" = ( -/obj/structure/machinery/portable_atmospherics/powered/pump, +/area/fiorina/station/telecomm/lz1_cargo) +"ojc" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - icon_state = "whitepurple" + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"ojj" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 }, -/area/fiorina/station/research_cells) -"ojh" = ( -/obj/item/stack/rods/plasteel, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/telecomm/lz1_cargo) +"ojk" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"ojq" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "ojv" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -23585,6 +23553,14 @@ "ojK" = ( /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) +"ojW" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "okg" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 @@ -23594,6 +23570,13 @@ "okv" = ( /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"okE" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco) "okF" = ( /obj/structure/blocker/invisible_wall, /obj/structure/ice/thin/indestructible, @@ -23639,12 +23622,25 @@ }, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"okM" = ( -/obj/structure/machinery/vending/dinnerware, +"okG" = ( +/obj/structure/barricade/deployable{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "yellowfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec) +"okJ" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/machinery/shower{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/research_cells) "okT" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -23665,33 +23661,18 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"oli" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic{ - pixel_x = 3 - }, -/obj/item/trash/cigbutt{ - pixel_y = 8 - }, -/obj/item/trash/cigbutt{ - pixel_x = 4 - }, -/obj/item/paper_bin{ - pixel_x = -10; - pixel_y = 8 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security/wardens) -"olm" = ( -/obj/item/device/binoculars, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"olg" = ( +/obj/structure/closet/crate/delta{ + desc = "A crate with delta squad's symbol on it. Now how did that get here? The words 'HEFA was never real' are scrawled on it in black ink."; + name = "crate" }, -/area/fiorina/tumor/fiberbush) +/obj/item/ammo_box/magazine/shotgun/buckshot, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"olk" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "olo" = ( /obj/structure/machinery/disposal, /turf/open/organic/grass{ @@ -23707,42 +23688,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"olB" = ( -/obj/structure/tunnel/maint_tunnel, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) -"olC" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "greencorner" - }, -/area/fiorina/station/chapel) -"olG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/station_alert{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"olQ" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) -"olT" = ( -/obj/structure/machinery/computer3/server/rack, -/obj/structure/window{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) "omb" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/guestpass, @@ -23754,28 +23699,6 @@ }, /turf/open/space, /area/fiorina/oob) -"omi" = ( -/obj/structure/bed/sofa/south/grey/left, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security/wardens) -"omw" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean2" - }, -/area/fiorina/station/park) "omD" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/structure/cable/heavyduty{ @@ -23783,47 +23706,112 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"omF" = ( -/obj/structure/curtain/shower, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) "omI" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"ond" = ( -/obj/structure/machinery/computer3/server/rack, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +"omN" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/tumor/servers) -"onw" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/botany) +"omO" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "cell_stripe" }, -/area/fiorina/tumor/servers) -"onz" = ( -/obj/structure/machinery/optable{ - desc = "This maybe could be used for advanced medical procedures."; - name = "Exam Table" +/area/fiorina/station/medbay) +"onb" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) -"ooF" = ( +/area/fiorina/station/park) +"onh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) +"ont" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"onB" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/device/multitool, +/obj/item/device/multitool, +/obj/item/device/multitool, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"onW" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/research_cells) +"ooq" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"oou" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/head/cmcap{ + pixel_x = -5; + pixel_y = 14 + }, +/obj/item/clothing/glasses/mbcg{ + pixel_y = -14 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"oox" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) +"ooF" = ( /obj/structure/machinery/power/apc, /turf/open/floor/wood, /area/fiorina/station/park) +"ooO" = ( +/obj/item/storage/briefcase/inflatable, +/turf/open/floor/prison, +/area/fiorina/station/disco) "oph" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/bottle/holywater, @@ -23833,49 +23821,44 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"opy" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/prison{ +"opj" = ( +/obj/structure/sink{ dir = 4; - icon_state = "whitegreen" + pixel_x = 12 }, -/area/fiorina/station/medbay) -"opB" = ( -/obj/structure/machinery/constructable_frame, +/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"opC" = ( +"opM" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"opV" = ( -/obj/structure/bed{ - icon_state = "psychbed" + icon_state = "bluefull" }, +/area/fiorina/station/power_ring) +"opN" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"oqn" = ( +/area/fiorina/station/chapel) +"opP" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe" + icon_state = "greenblue" }, /area/fiorina/station/botany) -"oqu" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" +"oqG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/park) "orr" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -23889,77 +23872,112 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"ors" = ( -/obj/item/trash/candle, +"ort" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" + }, +/area/fiorina/station/chapel) +"orB" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"orC" = ( +/obj/structure/machinery/vending/sovietsoda, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/botany) +"orD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/surgery{ + name = "Lung Transplants for Dummies"; + pixel_y = 4 + }, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"orx" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" +"orV" = ( +/obj/item/tool/weldingtool, +/turf/open/auto_turf/sand/layer1, +/area/fiorina/tumor/civres) +"osv" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/station/medbay) -"orA" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"orG" = ( -/obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"osO" = ( -/obj/structure/inflatable/door, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + dir = 8; + icon_state = "darkbrowncorners2" }, +/area/fiorina/station/park) +"osN" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/cleanable/blood/gibs/limb, +/turf/open/floor/prison, /area/fiorina/station/lowsec) -"osR" = ( -/obj/item/trash/semki, +"osQ" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/bedsheet/green, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "yellow" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/lowsec) "osX" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"oti" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"otq" = ( -/obj/effect/decal/cleanable/blood/oil, +"ota" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - dir = 4; - icon_state = "bluecorner" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"otB" = ( -/obj/effect/decal/cleanable/blood/oil, +"otg" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + dir = 8; + icon_state = "darkpurple2" }, -/area/fiorina/lz/near_lzI) -"otG" = ( -/obj/item/tool/scythe, +/area/fiorina/tumor/servers) +"oty" = ( +/obj/structure/closet/bombcloset, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"otz" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/fancy/vials/random, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"otC" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/area/fiorina/station/botany) -"otP" = ( -/obj/item/stack/rods, /turf/open/floor/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/security/wardens) +"otK" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/fiorina/tumor/servers) "ouH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop{ @@ -23967,58 +23985,29 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"ouS" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +"ove" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/station/medbay) -"ovc" = ( -/obj/structure/sink{ +/turf/open/floor/prison, +/area/fiorina/station/park) +"ovk" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ dir = 4; - pixel_x = 12 - }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; - pixel_x = 1; - pixel_y = -1 + icon_state = "whitegreencorner" }, +/area/fiorina/tumor/ice_lab) +"ovq" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"ovj" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "ovr" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"ovB" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"ovC" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gib2" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) -"ovE" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellowcorners2" - }, -/area/fiorina/station/flight_deck) "ovJ" = ( /turf/open/floor/wood, /area/fiorina/station/medbay) @@ -24031,64 +24020,45 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"ovZ" = ( -/obj/structure/largecrate/supply/floodlights, +"owd" = ( +/obj/item/storage/backpack/souto, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"owp" = ( +/obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"own" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/structure/surface/rack, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"owv" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/iv_drip{ - pixel_y = 19 - }, -/obj/item/bedsheet/green, +/area/fiorina/lz/near_lzII) +"owS" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; + dir = 8; + pixel_x = -10; pixel_y = 13 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 8; + icon_state = "whitepurple" }, -/area/fiorina/station/medbay) -"owG" = ( -/obj/structure/machinery/landinglight/ds1, -/turf/open/floor/prison{ +/area/fiorina/station/research_cells) +"oxp" = ( +/obj/structure/platform{ dir = 4; - icon_state = "darkyellowfull2" + layer = 2 }, -/area/fiorina/lz/near_lzI) -"oxg" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"oxk" = ( -/obj/structure/inflatable/popped/door, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" + icon_state = "floor_plate" }, +/area/fiorina/tumor/ice_lab) +"oxv" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) "oxA" = ( /turf/closed/shuttle/ert{ icon_state = "stan22" @@ -24100,158 +24070,115 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"oxN" = ( -/obj/structure/machinery/vending/hydroseeds, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) "oxS" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/prison/chapel_carpet{ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"oxT" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"oxZ" = ( -/obj/structure/inflatable/popped, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"oxU" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/transit_hub) "oyd" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"oyg" = ( +"oyk" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"oyo" = ( +/obj/structure/flora/pottedplant/random, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/security/wardens) -"oys" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/area/fiorina/tumor/civres) +"oyy" = ( +/obj/structure/bed{ + icon_state = "abed" }, /turf/open/floor/prison{ - dir = 8; - icon_state = "green" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/station/chapel) +/area/fiorina/station/research_cells) "oyC" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/wood, /area/fiorina/station/park) -"ozg" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 +"oyJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 }, -/obj/structure/platform_decoration{ - dir = 9 +/turf/open/floor/wood, +/area/fiorina/station/park) +"oyO" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/structure/largecrate/random, +/obj/structure/platform, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "bright_clean_marked" }, /area/fiorina/station/power_ring) -"ozh" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, +"oyS" = ( +/obj/structure/bed/sofa/south/grey/left, +/turf/open/floor/prison, /area/fiorina/station/disco) -"ozH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/close, +"oyT" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/station/botany) -"oAa" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/clothing/accessory/armband/cargo{ - desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; - name = "HEFA Order milita armband" +/area/fiorina/station/park) +"oza" = ( +/obj/structure/largecrate/random/case/double, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/chapel) -"oAm" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" + dir = 10; + icon_state = "sterile_white" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"oAv" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"oAH" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"oAL" = ( -/obj/effect/decal/cleanable/blood/writing{ - icon_state = "u_psycopath_l"; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/blood/writing{ - icon_state = "u_ketchup_l"; - pixel_x = 8; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/blood/writing{ - icon_state = "u_guilty_l"; - pixel_x = -12; - pixel_y = 2 +"ozC" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"oAf" = ( +/obj/item/trash/boonie, /turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/power_ring) -"oAQ" = ( -/obj/item/shard{ - icon_state = "large"; - name = "ice shard" + dir = 10; + icon_state = "sterile_white" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/medbay) +"oAj" = ( +/obj/structure/machinery/bot/medbot{ + name = "Dr. O" }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"oAV" = ( -/obj/structure/platform{ - dir = 4 + dir = 10; + icon_state = "whitegreenfull" }, -/turf/open/floor/prison, -/area/fiorina/station/park) -"oBd" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/medbay) "oBj" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/prison, @@ -24264,48 +24191,81 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"oBP" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) "oCe" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/park) -"oCI" = ( -/obj/structure/platform_decoration{ +"oCn" = ( +/obj/structure/platform{ dir = 1 }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/station/park) "oDe" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"oDn" = ( -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"oDz" = ( -/obj/structure/bed/chair/comfy, +"oDg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/phone{ + pixel_x = 6; + pixel_y = -15 + }, +/obj/item/phone{ + pixel_y = 7 + }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"oDG" = ( -/obj/structure/barricade/wooden{ - dir = 4 +/area/fiorina/station/security) +"oDh" = ( +/obj/item/stack/rods, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"oDH" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" + icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) +"oDV" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"oEi" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) +"oEn" = ( +/obj/structure/closet/crate/bravo, +/obj/item/stack/sheet/metal/medium_stack, +/obj/item/stack/sheet/metal/medium_stack, +/obj/item/fuelCell, +/obj/item/stack/sheet/plasteel, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "oEs" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -24318,28 +24278,27 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"oEt" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/security_space_law{ - pixel_x = 3; - pixel_y = 5 +"oEu" = ( +/obj/structure/platform_decoration, +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "whitegreen" }, -/area/fiorina/station/security) +/area/fiorina/tumor/ice_lab) "oED" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"oEI" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"oEH" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/disco) +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "oEK" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -24354,92 +24313,125 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"oEY" = ( -/obj/item/explosive/grenade/incendiary/molotov, +"oEN" = ( +/obj/item/prop/almayer/comp_closed{ + pixel_x = -1 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"oEQ" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "red" + dir = 6; + icon_state = "blue" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) +"oEX" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/fiorina/station/botany) +"oFf" = ( +/obj/item/reagent_container/food/drinks/cans/aspen, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "oFk" = ( /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/almayer{ icon_state = "plate" }, /area/fiorina/tumor/ship) -"oFv" = ( +"oFp" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, /obj/structure/machinery/light/double/blue{ - pixel_y = -1 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ + dir = 1; icon_state = "yellow" }, -/area/fiorina/station/disco) +/area/fiorina/station/lowsec) "oFI" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"oFW" = ( -/obj/structure/platform, -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 +"oFO" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryotop" + }, +/obj/structure/pipes/standard/simple/visible{ + dir = 9 }, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"oGm" = ( +"oFU" = ( /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; - pixel_y = -3 + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 4; + icon_state = "greenblue" }, -/area/fiorina/tumor/civres) -"oGT" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/botany) +"oGg" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ - icon_state = "darkbrowncorners2" - }, -/area/fiorina/station/park) -"oGU" = ( -/obj/structure/surface/table/woodentable, -/obj/structure/machinery/recharger{ - pixel_y = 4 + dir = 4; + icon_state = "darkbrown2" }, -/turf/open/floor/carpet, -/area/fiorina/station/civres_blue) -"oHk" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_v" +/area/fiorina/tumor/aux_engi) +"oGy" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) -"oHn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/pill_bottle/imidazoline, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, /area/fiorina/tumor/ice_lab) -"oHI" = ( +"oGR" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" }, +/area/fiorina/lz/near_lzI) +"oGU" = ( +/obj/structure/surface/table/woodentable, +/obj/structure/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/fiorina/station/civres_blue) +"oHi" = ( +/obj/item/stool, +/turf/open/floor/prison, /area/fiorina/station/disco) +"oHm" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) "oHX" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -24448,6 +24440,13 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) +"oIg" = ( +/obj/structure/platform, +/obj/structure/reagent_dispensers/oxygentank{ + layer = 2.6 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "oIq" = ( /obj/structure/ice/thin/indestructible{ dir = 1; @@ -24460,19 +24459,49 @@ }, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"oIR" = ( +"oIz" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"oIE" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) +"oJd" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"oJl" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "bluecorner" + pixel_y = 21 }, -/area/fiorina/station/chapel) -"oJs" = ( -/obj/structure/machinery/photocopier, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/botany) +"oJm" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"oJK" = ( +/obj/structure/window/reinforced/tinted, +/obj/item/storage/briefcase, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/lz/near_lzI) "oJL" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -24487,43 +24516,31 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"oJO" = ( -/obj/structure/platform{ - dir = 4 +"oJN" = ( +/obj/structure/surface/table/reinforced/prison{ + flipped = 1 }, +/obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"oJU" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/station/medbay) +"oJY" = ( +/obj/item/stack/sandbags/large_stack, /turf/open/floor/prison{ - dir = 1; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"oJW" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"oKa" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" + dir = 6; + icon_state = "green" }, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"oKl" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/civres) +"oKf" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/transit_hub) +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "oKn" = ( /obj/structure/holohoop{ dir = 4; @@ -24541,60 +24558,71 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"oKQ" = ( -/obj/structure/machinery/floodlight{ - name = "Yard Floodlight" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) "oKV" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/station/civres_blue) -"oLd" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, +"oLF" = ( +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"oLB" = ( -/obj/structure/platform{ - dir = 8 + icon_state = "darkbrown2" }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_half_cap" +/area/fiorina/station/park) +"oLK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/objective, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"oMy" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 +/area/fiorina/tumor/servers) +"oLV" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"oLX" = ( +/obj/structure/surface/rack, +/obj/item/tank/emergency_oxygen/engi, +/turf/open/floor/prison{ + icon_state = "bluecorner" }, +/area/fiorina/station/power_ring) +"oMf" = ( +/obj/structure/bed/chair/comfy, /turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security/wardens) +"oMu" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison, +/area/fiorina/station/park) +"oMw" = ( +/obj/structure/toilet{ dir = 8; - icon_state = "darkyellow2" + pixel_y = 8 }, -/area/fiorina/lz/near_lzI) -"oMz" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = 1; + pixel_y = -1 }, -/area/fiorina/station/lowsec) -"oMR" = ( -/obj/item/paper, /turf/open/floor/prison{ - dir = 8; + dir = 5; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) +"oNu" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "oNx" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -24603,6 +24631,37 @@ name = "astroturf" }, /area/fiorina/station/research_cells) +"oNC" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"oOg" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"oOh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "oOi" = ( /obj/effect/decal/hefa_cult_decals/d32, /turf/open/floor/prison/chapel_carpet{ @@ -24610,75 +24669,75 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"oOs" = ( +"oOk" = ( +/obj/structure/platform, +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 + }, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkpurple2" + icon_state = "whitegreen" }, -/area/fiorina/station/central_ring) -"oOv" = ( -/obj/structure/barricade/wooden{ - dir = 8 +/area/fiorina/station/medbay) +"oOp" = ( +/obj/structure/machinery/power/smes/buildable{ + capacity = 1e+006; + dir = 1 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"oOK" = ( -/obj/item/device/multitool, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"oOw" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - dir = 9; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/civres_blue) +"oOU" = ( +/obj/structure/reagent_dispensers/water_cooler{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) "oOV" = ( /obj/structure/machinery/filtration/console{ pixel_y = 22 }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"oPC" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"oPJ" = ( -/obj/effect/decal/cleanable/blood/gibs, -/obj/item/ammo_magazine/rifle/mar40, +"oPn" = ( +/obj/structure/bed/roller, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/medbay) "oPN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"oPW" = ( -/obj/structure/closet/crate/medical, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/gloves/latex, +"oPR" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/disco) +"oPU" = ( +/turf/open/floor/prison, +/area/fiorina/station/park) "oPZ" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) -"oQz" = ( -/obj/item/prop/almayer/comp_closed{ - pixel_x = -1 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"oQF" = ( -/obj/effect/decal/cleanable/blood/oil, +"oQk" = ( +/obj/structure/inflatable/popped, /turf/open/floor/prison{ - dir = 8; - icon_state = "greenblue" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/botany) +/area/fiorina/station/medbay) "oQI" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; @@ -24688,57 +24747,71 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"oQY" = ( -/turf/open/floor/prison{ - icon_state = "darkredfull2" +"oQS" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/security) -"oRb" = ( -/obj/item/trash/boonie, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/disco) +"oRg" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "oRR" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/wood, /area/fiorina/station/park) -"oSo" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, +"oSn" = ( +/obj/structure/inflatable/door, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"oSK" = ( -/obj/structure/monorail{ - dir = 9; - name = "launch track" +"oSz" = ( +/obj/item/shard{ + icon_state = "medium" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"oSR" = ( -/obj/item/device/flashlight, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/research_cells) -"oTe" = ( +/area/fiorina/station/disco) +"oTa" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_y = 4 +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt{ + pixel_y = 8 }, +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"oTi" = ( +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"oTy" = ( +/obj/structure/prop/structure_lattice{ + health = 300 + }, +/obj/structure/prop/structure_lattice{ + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/station/security) -"oTl" = ( -/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/aux_engi) "oTz" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -24751,24 +24824,27 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) -"oTG" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) -"oTH" = ( -/obj/structure/bed/chair, +"oTP" = ( /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "darkyellow2" }, -/area/fiorina/station/security) -"oTU" = ( -/turf/open/floor/prison{ +/area/fiorina/station/telecomm/lz1_tram) +"oTS" = ( +/obj/structure/stairs/perspective{ dir = 4; - icon_state = "darkbrowncorners2" + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"oTT" = ( +/obj/structure/platform_decoration{ + dir = 8 }, +/turf/open/floor/prison, /area/fiorina/station/park) "oUg" = ( /turf/closed/wall/prison, @@ -24781,75 +24857,87 @@ /turf/open/space, /area/fiorina/oob) "oVk" = ( -/obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." - }, -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/central_ring) -"oVn" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"oVC" = ( +/obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - dir = 6; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"oWc" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/station/transit_hub) +"oWw" = ( /turf/open/floor/prison{ - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"oWz" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"oWB" = ( -/obj/structure/prop/structure_lattice{ dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 + icon_state = "darkbrowncorners2" }, +/area/fiorina/station/park) +"oWC" = ( +/obj/item/stack/sandbags/large_stack, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/disco) "oWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"oWV" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"oWG" = ( +/obj/item/ammo_casing{ + dir = 6; + icon_state = "casing_10_1" }, -/area/fiorina/tumor/aux_engi) -"oWW" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "redcorner" + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"oWY" = ( +/obj/structure/largecrate/random, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"oXb" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + icon_state = "redfull" }, /area/fiorina/station/security) -"oXE" = ( -/obj/item/newspaper, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"oXJ" = ( -/obj/structure/machinery/shower{ - dir = 8 +"oXg" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"oXk" = ( +/obj/structure/closet/secure_closet/personal, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"oXD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/aspen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) +"oXI" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "oXR" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -24867,46 +24955,65 @@ /obj/item/stock_parts/manipulator/nano, /turf/open/floor/wood, /area/fiorina/station/park) -"oYc" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 +"oYs" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/structure/barricade/handrail/type_b{ + dir = 1 }, -/area/fiorina/station/research_cells) -"oYm" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5" +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"oYG" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/obj/item/clothing/suit/armor/vest/security, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 4; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"oYH" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/chapel) +"oYW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"oYM" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/power_ring) -"oYX" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/tumor/servers) +"oZf" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) -"oZc" = ( +/area/fiorina/tumor/ice_lab) +"oZi" = ( +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison, +/area/fiorina/station/security) +"oZj" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - icon_state = "darkyellowcorners2" + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"oZk" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/ice_lab) +"oZx" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" }, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "oZy" = ( /obj/structure/platform{ @@ -24924,15 +25031,20 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"oZR" = ( +"oZS" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/eastright{ - dir = 1 +/obj/item/clipboard, +/turf/open/floor/prison{ + icon_state = "bluefull" }, +/area/fiorina/station/power_ring) +"oZU" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) +/area/fiorina/station/research_cells) "pab" = ( /obj/item/tool/weldpack{ pixel_x = 6 @@ -24943,70 +25055,69 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) +"pae" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "pah" = ( /obj/structure/platform{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"pan" = ( -/obj/item/reagent_container/food/snacks/meat, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"pat" = ( -/obj/item/clothing/accessory/armband/cargo{ - desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; - name = "HEFA Order milita armband" +"pai" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; + name = "\improper Fiorina Green Block Canteen Vendor" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"pax" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 + icon_state = "floor_plate" }, +/area/fiorina/station/lowsec) +"paF" = ( +/obj/item/tool/shovel/etool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"paQ" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/civres_blue) +"paI" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"paO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 }, -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/security) "pbp" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"pbC" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"pbF" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ +"pbv" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ dir = 4; - icon_state = "darkyellow2" + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/lz/near_lzI) -"pbS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/surgical_tray/empty, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "pbV" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -25021,66 +25132,34 @@ }, /turf/open/space, /area/fiorina/oob) -"pbZ" = ( -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, +"pbX" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" - }, -/area/fiorina/station/civres_blue) -"pcl" = ( -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 + icon_state = "red" }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/area/fiorina/station/security) +"pca" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/lowsec) +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "pcu" = ( /turf/open/floor/almayer_hull, /area/fiorina/oob) -"pcD" = ( -/obj/structure/bookcase/manuals/engineering, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) "pcK" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/drinks/cans/aspen, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"pdf" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"pdm" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"pdw" = ( -/obj/item/stack/rods, +"pcN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) "pdB" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -25088,156 +25167,191 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) -"pdV" = ( -/obj/structure/machinery/shower{ - dir = 8 +"pdN" = ( +/obj/structure/machinery/disposal, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"peh" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/chapel) +"pdP" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"pdX" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_1" }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, +/area/fiorina/station/central_ring) +"pen" = ( +/obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "green" }, -/area/fiorina/station/medbay) -"pes" = ( -/obj/structure/bed/chair, +/area/fiorina/station/transit_hub) +"peA" = ( +/obj/structure/machinery/computer/communications{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/servers) +"peP" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/area/fiorina/station/power_ring) -"peY" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "darkyellow2" }, -/area/fiorina/tumor/aux_engi) -"pfi" = ( -/obj/structure/monorail{ - dir = 6; - name = "launch track" +/area/fiorina/station/telecomm/lz1_cargo) +"pgb" = ( +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/ice_lab) +"pgx" = ( +/obj/structure/machinery/computer3/server/rack, +/obj/structure/window{ + dir = 8 }, -/turf/open/space, -/area/fiorina/oob) -"pfE" = ( -/obj/item/tool/wrench, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/lowsec) -"pfW" = ( -/obj/item/trash/cigbutt/cigarbutt, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"pgV" = ( -/obj/item/book/manual/atmospipes, +/area/fiorina/tumor/servers) +"pgQ" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 10; + icon_state = "blue" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/chapel) "phe" = ( /obj/structure/girder, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"phg" = ( -/obj/effect/spawner/random/tool, +"pho" = ( +/obj/item/stack/sheet/wood, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/research_cells) "phz" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"pie" = ( +"phC" = ( +/obj/item/newspaper, /turf/open/floor/prison{ - icon_state = "platingdmg3" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/transit_hub) -"pip" = ( -/obj/structure/platform_decoration{ +/area/fiorina/tumor/ice_lab) +"phQ" = ( +/obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"piy" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"piL" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "darkbrowncorners2" + icon_state = "whitegreen" }, -/area/fiorina/tumor/aux_engi) -"pjT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"pka" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/tumor/ice_lab) +"pim" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/lowsec) +"piw" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform_decoration{ + dir = 9 }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"pjf" = ( +/obj/item/ammo_magazine/rifle/m16, +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison{ - dir = 5; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"pkc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/dropper, -/obj/item/attachable/bipod, +/area/fiorina/station/security) +"pjg" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 9; + icon_state = "green" }, -/area/fiorina/lz/near_lzI) -"pkp" = ( -/obj/item/stack/cable_coil/cut, -/turf/open/floor/prison, /area/fiorina/tumor/servers) -"pkw" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +"pjE" = ( +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 8 }, -/obj/structure/platform{ +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -8 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"pjR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"pkG" = ( -/obj/item/stool, +/obj/item/phone{ + pixel_x = 7; + pixel_y = -16 + }, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 16 + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "floor_plate" }, +/area/fiorina/station/security) +"pjT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"pjW" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/tumor/ice_lab) +"pkB" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/lz/near_lzI) "pkM" = ( /obj/structure/largecrate/machine, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"plc" = ( -/obj/structure/machinery/computer/arcade, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"plr" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"plh" = ( /turf/open/floor/prison{ - icon_state = "blue_plate" + dir = 10; + icon_state = "greenblue" }, /area/fiorina/station/botany) "plu" = ( @@ -25247,83 +25361,78 @@ "plK" = ( /turf/closed/wall/prison, /area/fiorina/station/security/wardens) -"pmg" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"pma" = ( +/obj/structure/foamed_metal, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"pmo" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +/area/fiorina/station/civres_blue) +"pmn" = ( +/obj/structure/surface/rack, +/obj/item/poster, +/obj/item/poster, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) -"pmy" = ( -/obj/item/device/t_scanner, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/lz/near_lzI) +"pmv" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 2; + layer = 6; + name = "overhead pipe"; + pixel_x = -16; + pixel_y = 12 }, -/area/fiorina/station/civres_blue) -"pmM" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/park) -"pnc" = ( -/obj/structure/largecrate/random/case/double, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottom" +/area/fiorina/tumor/servers) +"pmC" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_v" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"pnv" = ( -/obj/structure/reagent_dispensers/watertank, +/area/fiorina/station/telecomm/lz1_cargo) +"pnh" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "greenblue" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/botany) -"pnA" = ( -/obj/item/toy/handcard/uno_reverse_blue, +/area/fiorina/tumor/servers) +"pnx" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"pnP" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/lowsec) "pnS" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) -"poo" = ( -/obj/item/tool/crowbar/red, +"poC" = ( +/obj/structure/machinery/photocopier, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"poD" = ( -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" + icon_state = "darkredfull2" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"ppb" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/fiorina/station/research_cells) +"ppq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/security) "ppG" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/plating/prison, @@ -25334,26 +25443,17 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"ppK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/donut_box{ - pixel_y = 6 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"ppO" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, +"ppQ" = ( +/obj/item/storage/briefcase, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"ppS" = ( +/obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + dir = 1; + icon_state = "green" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/transit_hub) "ppX" = ( /obj/structure/closet/secure_closet/medical2{ req_access_txt = "100" @@ -25363,29 +25463,13 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"ppY" = ( -/obj/structure/barricade/sandbags{ - dir = 4; - icon_state = "sandbag_0"; - pixel_y = 2 - }, -/obj/item/storage/pouch/tools/full, +"ppZ" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"pqq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreenfull" }, -/area/fiorina/station/transit_hub) +/area/fiorina/tumor/ice_lab) "pqz" = ( /obj/item/clothing/suit/storage/labcoat, /turf/open/organic/grass{ @@ -25396,19 +25480,18 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"pqG" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) "pqO" = ( /turf/closed/shuttle/ert{ icon_state = "stan20" }, /area/fiorina/tumor/ship) +"pqY" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "prh" = ( /obj/structure/girder/reinforced, /turf/open/floor/almayer{ @@ -25416,127 +25499,170 @@ icon_state = "plating" }, /area/fiorina/tumor/ship) -"pri" = ( -/obj/structure/machinery/space_heater, +"prC" = ( +/obj/structure/machinery/autolathe/medilathe/full, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/fiberbush) -"pry" = ( -/obj/structure/prop/resin_prop{ - icon_state = "coolanttank" +/area/fiorina/station/medbay) +"prG" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/surface/rack, +/obj/item/stack/flag/yellow, +/obj/item/stack/flag/yellow, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"prL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/space_heater{ + pixel_x = -1; + pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 10; + icon_state = "blue" }, -/area/fiorina/tumor/aux_engi) -"prP" = ( +/area/fiorina/station/power_ring) +"pse" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/item/ammo_casing{ + dir = 6; + icon_state = "casing_5" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"psm" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison, +/area/fiorina/station/security) +"pst" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) +"psx" = ( +/obj/structure/platform, /turf/open/floor/prison{ dir = 8; icon_state = "cell_stripe" }, -/area/fiorina/station/power_ring) -"pso" = ( -/obj/structure/platform{ - dir = 1 +/area/fiorina/station/botany) +"psL" = ( +/obj/structure/machinery/optable{ + desc = "This maybe could be used for advanced medical procedures."; + name = "Exam Table" }, -/obj/structure/platform{ - dir = 8 +/obj/item/bedsheet/ce{ + desc = "It crinkles, aggressively."; + name = "sterile wax sheet" }, -/obj/structure/platform_decoration{ - dir = 5 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"psO" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 2; - layer = 6; - name = "overhead pipe"; - pixel_x = -16; - pixel_y = 12 +/area/fiorina/station/medbay) +"psP" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "pte" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/power_ring) -"pty" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"pti" = ( +/obj/structure/machinery/vending/dinnerware, /turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"ptH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sink{ dir = 4; - icon_state = "greenfull" + pixel_x = 11 }, -/area/fiorina/tumor/civres) -"ptV" = ( -/obj/vehicle/train/cargo/trolley, +/obj/item/clothing/gloves/latex, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"ptZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/pill_bottle/russianRed{ - pixel_y = 9 + icon_state = "redfull" }, -/obj/item/storage/pill_bottle/kelotane/skillless, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) "puw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"puB" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 - }, +"puE" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"pvi" = ( +/obj/item/ammo_box/magazine/M16, /obj/item/stack/sheet/metal{ amount = 5 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/telecomm/lz1_cargo) -"puE" = ( -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/lz/near_lzI) +"pvz" = ( +/obj/structure/janitorialcart, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "pvD" = ( /turf/closed/wall/r_wall/prison_unmeltable{ desc = "A huge chunk of metal used to seperate rooms."; name = "metal wall" }, /area/fiorina/oob) -"pvT" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +"pvE" = ( +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, +/area/fiorina/station/lowsec) +"pvF" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) -"pwg" = ( -/obj/structure/platform/stair_cut/alt, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +"pwo" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"pwi" = ( -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, +/area/fiorina/station/flight_deck) +"pwC" = ( +/obj/effect/spawner/random/gun/rifle/highchance, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "damaged3" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/security) "pwL" = ( /obj/item/stack/tile/plasteel{ pixel_x = 12; @@ -25544,18 +25670,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"pwN" = ( -/obj/structure/barricade/handrail/type_b, +"pxf" = ( +/obj/structure/machinery/vending/snack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"pxa" = ( -/obj/item/circuitboard/machine/rdserver, -/turf/open/floor/prison{ - icon_state = "floorscorched1" - }, -/area/fiorina/tumor/servers) +/area/fiorina/station/flight_deck) "pxk" = ( /obj/structure/closet/cabinet, /obj/item/reagent_container/pill/cyanide, @@ -25563,58 +25683,43 @@ /obj/item/reagent_container/syringe, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"pxu" = ( -/obj/structure/machinery/vending/cola, +"pxr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/donut_box{ + pixel_y = 6 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/tumor/aux_engi) -"pxI" = ( -/obj/item/reagent_container/food/snacks/eat_bar, +/area/fiorina/station/security) +"pxL" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "whitegreen" + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) -"pxR" = ( -/obj/structure/closet/crate/trashcart, +/area/fiorina/maintenance) +"pxW" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/item/tool/pickaxe, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreen" }, -/area/fiorina/station/chapel) -"pya" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/tumor/ice_lab) +"pxX" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 1; + dir = 6; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"pyv" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) "pyK" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"pyW" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, -/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) "pzh" = ( /obj/item/toy/beach_ball, /turf/open/gm/river{ @@ -25622,102 +25727,44 @@ name = "pool" }, /area/fiorina/station/park) -"pzG" = ( +"pzE" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/power_ring) -"pzN" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/stool, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"pzQ" = ( -/obj/item/paper, -/obj/structure/inflatable/door, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"pzV" = ( -/obj/item/ammo_box/magazine/M16, -/obj/item/stack/sheet/metal{ - amount = 5 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"pAe" = ( -/obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ icon_state = "whitegreen" }, -/area/fiorina/tumor/ice_lab) -"pAt" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 - }, -/obj/item/stack/sheet/metal{ - amount = 5 - }, +/area/fiorina/station/medbay) +"pzL" = ( +/obj/item/ammo_magazine/m56d, +/obj/item/ammo_magazine/m56d, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) -"pAB" = ( -/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_x = 10; - pixel_y = 13 + icon_state = "cell_stripe" }, +/area/fiorina/station/central_ring) +"pAl" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"pAN" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 1 + dir = 8; + icon_state = "blue_plate" }, +/area/fiorina/station/botany) +"pAr" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"pAO" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" + icon_state = "darkbrownfull2" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, /area/fiorina/station/park) -"pBg" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"pBn" = ( -/obj/structure/surface/rack, +"pBb" = ( +/obj/structure/curtain/open/black, +/turf/open/floor/prison, +/area/fiorina/maintenance) +"pBe" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "green" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/chapel) "pBq" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/prison, @@ -25738,6 +25785,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"pBW" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "pCc" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -25750,110 +25804,61 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"pCF" = ( -/obj/structure/lz_sign/prison_sign, +"pCG" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"pCN" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/prison{ +"pCH" = ( +/obj/structure/monorail{ dir = 10; - icon_state = "kitchen" + name = "launch track" }, -/area/fiorina/tumor/civres) -"pCS" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"pCX" = ( -/obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) -"pCZ" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"pDg" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" +/area/fiorina/station/transit_hub) +"pCQ" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) -"pDH" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/random/gun/rifle/highchance, -/turf/open/floor/prison, -/area/fiorina/station/security) -"pDV" = ( -/obj/structure/bed{ - icon_state = "abed" +/obj/item/stool{ + pixel_x = 4; + pixel_y = 6 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) -"pEe" = ( -/obj/structure/largecrate/random, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_y = 13 +"pCX" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) +"pDo" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"pEw" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_tram) -"pEL" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/effect/spawner/random/gun/smg/lowchance, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "sterile_white" }, /area/fiorina/station/research_cells) -"pER" = ( -/obj/structure/closet/secure_closet/engineering_materials, +"pDQ" = ( +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"pEY" = ( -/obj/structure/barricade/sandbags{ - dir = 4; - icon_state = "sandbag_0"; - pixel_y = 2 - }, -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 + icon_state = "redfull" }, +/area/fiorina/station/security) +"pEt" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"pFg" = ( -/obj/structure/bed{ - icon_state = "abed" + dir = 9; + icon_state = "darkbrown2" }, -/obj/item/reagent_container/food/snacks/wrapped/barcardine, +/area/fiorina/maintenance) +"pFc" = ( +/obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) "pFi" = ( /obj/structure/platform_decoration{ dir = 8 @@ -25879,37 +25884,21 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"pFY" = ( -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"pGf" = ( -/obj/structure/platform{ - dir = 8 +"pFW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/prop/almayer/handheld1, -/obj/structure/surface/rack, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"pGg" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"pGi" = ( -/turf/open/floor/prison{ - icon_state = "darkyellow2" +/area/fiorina/station/power_ring) +"pGy" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, -/area/fiorina/station/telecomm/lz1_tram) -"pGv" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/fiorina/lz/near_lzII) +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) "pGH" = ( /turf/closed/shuttle/ert{ icon_state = "stan_white_t_up" @@ -25923,10 +25912,13 @@ name = "pool" }, /area/fiorina/station/park) -"pHc" = ( -/obj/effect/landmark/objective_landmark/close, +"pGS" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) "pHh" = ( @@ -25941,28 +25933,29 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"pHu" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"pIi" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform{ +"pHi" = ( +/obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/machinery/space_heater, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "floor_plate" }, /area/fiorina/tumor/ice_lab) -"pIo" = ( -/obj/structure/machinery/light/double/blue, +"pHx" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - icon_state = "blue" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/chapel) +/area/fiorina/station/lowsec) "pIs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -25982,68 +25975,55 @@ /obj/item/reagent_container/food/snacks/grown/apple/poisoned, /turf/open/floor/wood, /area/fiorina/station/park) -"pIK" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"pIX" = ( -/obj/structure/inflatable/door, +"pIw" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"pJa" = ( -/obj/structure/bed/chair/office/light{ +/area/fiorina/tumor/civres) +"pIA" = ( +/obj/structure/prop/structure_lattice{ dir = 4 }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"pJo" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/lz/near_lzI) +/turf/open/floor/prison, +/area/fiorina/station/park) +"pJc" = ( +/turf/open/floor/wood, +/area/fiorina/maintenance) "pJK" = ( /obj/structure/surface/rack, /obj/item/reagent_container/glass/bucket/mopbucket, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"pKd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, +"pJP" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "panelscorched" }, -/area/fiorina/station/medbay) -"pKh" = ( -/obj/item/stool{ - pixel_x = -4; +/area/fiorina/station/chapel) +"pKf" = ( +/obj/structure/machinery/washing_machine, +/obj/item/clothing/head/that{ pixel_y = 10 }, -/obj/structure/sign/poster{ - icon_state = "poster1"; - pixel_y = 32 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "sterile_white" }, -/area/fiorina/station/lowsec) -"pKz" = ( -/obj/structure/largecrate/random/barrel/blue, +/area/fiorina/station/civres_blue) +"pKu" = ( +/obj/item/tool/wet_sign, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/servers) "pKJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, /obj/structure/barricade/wooden{ @@ -26057,50 +26037,69 @@ name = "astroturf" }, /area/fiorina/station/park) +"pKO" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "2" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "pKY" = ( /obj/structure/cable/heavyduty{ icon_state = "2-4" }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"pLh" = ( -/obj/structure/bed/sofa/vert/grey/bot, +"pLj" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"pLE" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/washing_machine{ + pixel_y = 15 + }, /turf/open/floor/prison{ - icon_state = "green" + icon_state = "yellowfull" }, -/area/fiorina/station/transit_hub) -"pLk" = ( -/obj/structure/machinery/door/airlock/prison/horizontal, +/area/fiorina/station/lowsec) +"pLM" = ( +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 8; + icon_state = "blue" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/power_ring) "pLQ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"pMA" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"pLS" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 8; + icon_state = "greencorner" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/aux_engi) "pNj" = ( /obj/structure/bookcase, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"pNG" = ( +/obj/structure/closet/crate/science{ + density = 0; + icon_state = "open_science"; + opened = 1 + }, +/obj/item/organ/eyes, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "pNI" = ( /obj/item/stack/tile/plasteel{ pixel_x = 3; @@ -26108,46 +26107,27 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"pNV" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) -"pOd" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"pOm" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"pON" = ( -/obj/structure/closet, -/turf/open/floor/prison{ +"pOU" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) -"pPb" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/oob) +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "pPd" = ( /obj/structure/prop/resin_prop{ icon_state = "coolanttank" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"pPf" = ( -/obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison, -/area/fiorina/station/security) +"pPo" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) "pPG" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -26158,63 +26138,55 @@ }, /turf/closed/wall/prison, /area/fiorina/tumor/servers) -"pPQ" = ( -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"pQb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"pQh" = ( -/obj/item/trash/liquidfood, +"pQc" = ( +/obj/structure/closet/basketball, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/tumor/ice_lab) -"pQq" = ( -/obj/item/tool/warning_cone, +/area/fiorina/station/research_cells) +"pQs" = ( +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"pQz" = ( /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 8; + icon_state = "bluecorner" }, -/area/fiorina/station/lowsec) -"pQu" = ( -/obj/structure/holohoop{ - dir = 1 +/area/fiorina/station/civres_blue) +"pRa" = ( +/obj/structure/bed{ + icon_state = "abed" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 9; + icon_state = "whitepurple" }, -/area/fiorina/station/lowsec) -"pQD" = ( -/obj/structure/window/reinforced{ - dir = 1 +/area/fiorina/station/research_cells) +"pRp" = ( +/obj/structure/platform, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/transit_hub) +"pRx" = ( +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"pRn" = ( -/obj/item/paper/crumpled, +/area/fiorina/station/power_ring) +"pRz" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "red" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/power_ring) +"pRD" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) "pRG" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -26223,22 +26195,24 @@ /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 - }, -/obj/effect/landmark/objective_landmark/science, +"pSr" = ( +/obj/structure/pipes/standard/manifold/visible, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"pSJ" = ( -/turf/open/floor/wood, -/area/fiorina/maintenance) +"pSs" = ( +/obj/item/ammo_box/magazine/misc/flares{ + layer = 3.1; + pixel_y = 16 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "pSU" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/med_data/laptop, @@ -26247,14 +26221,6 @@ "pTj" = ( /turf/open/floor/plating/prison, /area/fiorina/station/security) -"pTA" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/fiorina/station/civres_blue) "pTR" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -26267,42 +26233,61 @@ dir = 5 }, /area/fiorina/station/telecomm/lz1_cargo) -"pUS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/clothing/mask/cigarette, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_y = 8 +"pUf" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 30 +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"pUo" = ( +/obj/structure/platform, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"pUG" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) -"pVq" = ( -/turf/open/floor/prison, /area/fiorina/station/research_cells) -"pVv" = ( -/obj/structure/platform{ - dir = 1 +"pUO" = ( +/obj/item/trash/boonie, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"pVw" = ( -/obj/structure/mirror{ - pixel_x = -32 +/area/fiorina/tumor/ice_lab) +"pVc" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) +"pVk" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/civres) +/area/fiorina/lz/near_lzI) +"pVD" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) "pVR" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/bible/hefa{ @@ -26311,24 +26296,31 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/fiorina/station/chapel) -"pWm" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/beer_pack{ - pixel_y = 7 - }, +"pVY" = ( +/obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) +"pWc" = ( +/obj/item/tool/crowbar/red, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) +"pWl" = ( +/obj/structure/machinery/power/geothermal, +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) "pWp" = ( /turf/closed/shuttle/ert{ icon_state = "stan8" }, /area/fiorina/tumor/ship) -"pWH" = ( -/obj/item/clipboard, -/turf/open/floor/prison, -/area/fiorina/station/park) "pWO" = ( /obj/item/stack/rods, /obj/structure/cable/heavyduty{ @@ -26336,22 +26328,39 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"pXj" = ( -/obj/item/tool/wet_sign, -/turf/open/floor/prison, -/area/fiorina/station/disco) +"pWX" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5" + }, +/obj/item/clothing/suit/armor/vest/security, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"pXt" = ( +/obj/item/reagent_container/food/snacks/wrapped/booniebars, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) "pXH" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) -"pXP" = ( -/obj/structure/bed/sofa/vert/grey/top, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"pXJ" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "pXY" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -26364,37 +26373,33 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"pYh" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"pYp" = ( -/obj/item/stack/sandbags/large_stack, +"pYz" = ( +/obj/structure/closet/emcloset, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/telecomm/lz1_cargo) -"pYI" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/bible/hefa, +/area/fiorina/maintenance) +"pYB" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "bluefull" }, -/area/fiorina/station/chapel) -"pYO" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison{ - icon_state = "darkyellowcorners2" +/area/fiorina/station/power_ring) +"pYD" = ( +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, -/area/fiorina/station/telecomm/lz1_cargo) -"pZb" = ( -/turf/open/floor/prison{ +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"pYL" = ( +/obj/structure/stairs/perspective{ dir = 8; - icon_state = "yellowcorner" + icon_state = "p_stair_full" }, -/area/fiorina/station/lowsec) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/botany) "pZm" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -26409,12 +26414,34 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"qam" = ( -/obj/structure/machinery/light/double/blue, +"pZn" = ( /turf/open/floor/prison{ - icon_state = "blue" + dir = 8; + icon_state = "yellowcorner" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/lowsec) +"pZp" = ( +/obj/item/tool/soap, +/obj/structure/machinery/shower{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/research_cells) +"qaA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"qaL" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "qaO" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -26426,6 +26453,14 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"qaT" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) "qbd" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations are the leading cause in asbestos related deaths for 3 years in a row."; @@ -26437,39 +26472,32 @@ "qbl" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzII) -"qbr" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "lavendergrass_2" - }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"qbu" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 +"qbn" = ( +/obj/structure/barricade/wooden{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"qbD" = ( +/area/fiorina/maintenance) +"qby" = ( +/obj/item/stack/sheet/metal{ + amount = 5 + }, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"qbI" = ( +/obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + pixel_y = 9 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"qbR" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) -"qbT" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" + icon_state = "kitchen" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/power_ring) "qbW" = ( /obj/item/tool/candle{ pixel_x = -6; @@ -26484,73 +26512,67 @@ /obj/item/stack/catwalk, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"qcv" = ( +"qcy" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" - }, -/area/fiorina/lz/near_lzII) -"qcK" = ( -/obj/effect/landmark/railgun_camera_pos, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"qcM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/skills{ - dir = 4 + dir = 10; + icon_state = "floor_plate" }, +/area/fiorina/station/telecomm/lz1_cargo) +"qcX" = ( +/obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"qcT" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/park) "qdd" = ( /obj/structure/grille, /obj/structure/lattice, /turf/open/space/basic, /area/fiorina/oob) -"qdB" = ( -/obj/structure/largecrate/random/secure, +"qdf" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"qdC" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/tumor/civres) +"qdE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/tool/pen, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, /area/fiorina/station/security) "qdJ" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"qeh" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/security/wardens) -"qeu" = ( -/obj/structure/toilet{ - pixel_y = 4 +"qes" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"qew" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 2; - layer = 6; - name = "overhead pipe"; - pixel_x = -16; - pixel_y = 12 +/area/fiorina/station/telecomm/lz1_tram) +"qet" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) +/area/fiorina/station/security) "qeC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -26567,18 +26589,23 @@ /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 +"qeN" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"qeR" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 }, -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_marked" }, -/area/fiorina/station/medbay) +/area/fiorina/station/park) "qeX" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 @@ -26596,39 +26623,17 @@ }, /turf/open/gm/river/desert/deep, /area/fiorina/lz/near_lzII) -"qfu" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" - }, -/area/fiorina/oob) -"qfE" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"qfI" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"qfU" = ( +"qfg" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"qfi" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenblue" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/botany) +/area/fiorina/station/telecomm/lz1_cargo) "qgd" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = 8; @@ -26646,33 +26651,28 @@ }, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/civres) -"qgq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/knife{ - pixel_x = 9 - }, -/obj/item/reagent_container/food/snacks/tomatomeat{ - pixel_x = -6 +"qgk" = ( +/obj/structure/barricade/metal/wired{ + dir = 1 }, -/obj/item/reagent_container/food/snacks/tomatomeat{ - pixel_x = -6; - pixel_y = 3 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, -/obj/item/reagent_container/food/snacks/tomatomeat{ - pixel_x = -6; - pixel_y = 6 +/area/fiorina/lz/near_lzI) +"qgv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/scalpel/laser{ + pixel_x = -5; + pixel_y = 12 }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "blue" +/obj/item/tool/surgery/circular_saw{ + pixel_y = -2 }, -/area/fiorina/station/power_ring) -"qgA" = ( -/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "qgB" = ( /obj/item/clothing/gloves/rainbow, /turf/open/floor/plating/prison, @@ -26681,238 +26681,190 @@ /obj/item/reagent_container/food/drinks/golden_cup, /turf/open/space, /area/fiorina/oob) -"qgS" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/item/stack/barbed_wire, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"qhB" = ( -/obj/effect/decal/cleanable/blood, -/obj/item/trash/kepler, -/turf/open/floor/prison, -/area/fiorina/station/security) -"qiq" = ( -/obj/item/trash/cigbutt, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) -"qit" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"qjc" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"qjg" = ( -/obj/item/tool/shovel/etool, +"qhk" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"qjp" = ( -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 - }, -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 + dir = 6; + icon_state = "darkbrown2" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"qjC" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/park) +"qhC" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gib2" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) -"qjY" = ( -/obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "yellow" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/station/lowsec) -"qkf" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - layer = 3.5; - pixel_y = 6 +/area/fiorina/station/medbay) +"qhD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + network = list("PRISON") }, /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" + icon_state = "redcorner" }, -/area/fiorina/station/transit_hub) -"qkg" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/wood, -/area/fiorina/station/park) -"qkk" = ( -/obj/structure/platform_decoration{ +/area/fiorina/station/power_ring) +"qhJ" = ( +/obj/structure/bed/chair/comfy{ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"qks" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 + dir = 8; + icon_state = "redcorner" }, -/obj/item/tool/pen, +/area/fiorina/station/power_ring) +"qhN" = ( /turf/open/floor/prison{ - icon_state = "redfull" + dir = 4; + icon_state = "redcorner" }, /area/fiorina/station/security) -"qkN" = ( +"qhP" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz2_maint) -"qkY" = ( -/obj/structure/bed{ - icon_state = "abed" +/obj/item/newspaper, +/obj/item/attachable/bipod, +/turf/open/floor/prison{ + icon_state = "darkyellow2" }, -/obj/effect/spawner/random/sentry/midchance, +/area/fiorina/lz/near_lzI) +"qhZ" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "platingdmg3" }, -/area/fiorina/station/lowsec) -"qlf" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" +/area/fiorina/station/transit_hub) +"qif" = ( +/obj/item/inflatable, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/chapel) +"qiq" = ( +/obj/item/trash/cigbutt, /turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"qmd" = ( -/obj/item/storage/toolbox/antag, -/turf/open/floor/prison{ - dir = 8; - icon_state = "green" +/area/fiorina/tumor/aux_engi) +"qiK" = ( +/obj/structure/platform{ + dir = 1 }, -/area/fiorina/tumor/civres) -"qms" = ( -/obj/structure/barricade/deployable{ - dir = 8 +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"qmz" = ( -/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"qmC" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 +"qjb" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/platform_decoration{ - dir = 5 +/area/fiorina/tumor/servers) +"qjh" = ( +/obj/item/reagent_container/food/snacks/boiledegg, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomright" +/area/fiorina/tumor/aux_engi) +"qjM" = ( +/obj/structure/inflatable, +/obj/structure/barricade/handrail/type_b{ + dir = 4 }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"qmO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 - }, -/obj/item/reagent_container/food/snacks/cheesyfries, -/turf/open/floor/prison{ +"qjR" = ( +/obj/structure/machinery/computer/station_alert{ dir = 4; - icon_state = "darkyellowfull2" + pixel_y = 5 }, -/area/fiorina/station/flight_deck) -"qmS" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/wood/medium_stack, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "floor_plate" }, -/area/fiorina/maintenance) -"qnc" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/tumor/aux_engi) +"qjX" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 5; - icon_state = "blue" + dir = 1; + icon_state = "greenblue" }, -/area/fiorina/station/power_ring) -"qnq" = ( -/obj/effect/landmark/xeno_spawn, +/area/fiorina/station/botany) +"qkg" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/wood, +/area/fiorina/station/park) +"qkn" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/tools/full, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"qkq" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "darkbrown2" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/tumor/aux_engi) -"qnu" = ( +/area/fiorina/oob) +"qkt" = ( +/obj/structure/bed/chair/office/dark, /turf/open/floor/prison{ dir = 10; - icon_state = "damaged1" + icon_state = "sterile_white" }, -/area/fiorina/station/disco) -"qnB" = ( -/obj/structure/monorail{ - dir = 6; - name = "launch track" +/area/fiorina/tumor/ice_lab) +"qkN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz2_maint) +"qlf" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" }, /turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) -"qnE" = ( -/obj/structure/barricade/metal{ - dir = 4; - health = 85; - icon_state = "metal_1" +/area/fiorina/station/civres_blue) +"qmj" = ( +/obj/structure/closet/emcloset, +/obj/item/weapon/nullrod{ + desc = "The explosive tip has been deactivated."; + force = 25; + icon_state = "hefasword"; + name = "de-activated HEFA Sword" }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"qmv" = ( +/obj/structure/monorail{ + dir = 10; + name = "launch track" }, -/area/fiorina/station/park) -"qnK" = ( -/obj/structure/surface/table/reinforced/prison, +/turf/open/space, +/area/fiorina/oob) +"qnb" = ( +/obj/structure/bed/roller, /turf/open/floor/prison{ dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"qny" = ( +/obj/item/tool/wirecutters/clippers, +/turf/open/floor/prison{ + dir = 9; icon_state = "greenfull" }, /area/fiorina/tumor/civres) -"qnQ" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/prison, -/area/fiorina/station/security) "qob" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -26922,44 +26874,45 @@ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"qos" = ( -/obj/structure/bed/chair{ - dir = 8 +"qoc" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/tumor/civres) +"qof" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/disco) +"qov" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/newspaper, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "qoG" = ( /obj/item/toy/crayon/rainbow, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"qoZ" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryotop" - }, -/obj/structure/pipes/standard/simple/visible{ - dir = 9 +"qph" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) -"qpa" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, +/area/fiorina/tumor/servers) +"qpk" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"qpw" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 3 + icon_state = "bluecorner" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/civres_blue) "qpB" = ( /obj/item/stack/cable_coil/blue, /turf/open/floor/plating/prison, @@ -26969,56 +26922,110 @@ icon_state = "stan_leftengine" }, /area/fiorina/station/power_ring) -"qqa" = ( -/obj/structure/platform{ - dir = 1 +"qpN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, -/obj/structure/platform{ - dir = 8 +/obj/item/coin/gold{ + desc = "Coin op, in this place, in this year, localized entirely on this table? .... I uh, yes."; + name = "arcade token"; + pixel_x = -6; + pixel_y = 3 }, -/obj/structure/platform_decoration{ - dir = 5 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/station/flight_deck) +"qpX" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"qqu" = ( -/obj/structure/surface/rack, -/obj/item/poster, -/obj/item/poster, +/area/fiorina/tumor/servers) +"qqc" = ( +/obj/structure/inflatable/popped, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, /turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"qqd" = ( +/obj/structure/stairs/perspective{ dir = 1; - icon_state = "darkyellow2" + icon_state = "p_stair_full" }, -/area/fiorina/lz/near_lzI) -"qqJ" = ( -/obj/item/stack/cable_coil, /turf/open/floor/prison, -/area/fiorina/station/disco) -"qqM" = ( -/obj/structure/closet/emcloset, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/security) +"qqC" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/area/fiorina/station/medbay) -"qqX" = ( -/obj/item/disk, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/servers) -"qqZ" = ( +/area/fiorina/station/research_cells) +"qqQ" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurplecorner" + dir = 5; + icon_state = "green" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/transit_hub) +"qqW" = ( +/obj/item/trash/cigbutt/cigarbutt, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"qre" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) +"qrn" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/medbay) +"qrt" = ( +/obj/effect/landmark/xeno_spawn, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "qrz" = ( /obj/item/explosive/plastic, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) +"qrI" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/item/reagent_container/food/snacks/sandwich{ + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"qrU" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"qsc" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "qso" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -27027,32 +27034,46 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"qtq" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) -"qty" = ( +"qss" = ( +/obj/structure/flora/pottedplant/random, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, /area/fiorina/tumor/civres) -"qtX" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" +"qsE" = ( +/obj/item/shard{ + icon_state = "large"; + name = "ice shard" + }, +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/oob) -"quk" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 5; + dir = 8; icon_state = "whitegreen" }, +/area/fiorina/tumor/ice_lab) +"qsF" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) +"qtP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/prop/helmetgarb/raincover, +/turf/open/floor/prison, /area/fiorina/station/medbay) +"qug" = ( +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "qun" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 @@ -27064,28 +27085,12 @@ name = "astroturf" }, /area/fiorina/station/park) -"quy" = ( -/obj/item/tool/wrench, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"quU" = ( -/obj/structure/filingcabinet{ - pixel_x = -8 - }, -/obj/structure/filingcabinet{ - pixel_x = 8 - }, -/obj/item/reagent_container/food/drinks/coffeecup{ - pixel_x = -7; - pixel_y = 11 - }, +"quL" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "bluefull" }, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) "qva" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/smg/mp5, @@ -27094,53 +27099,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"qvk" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"qvn" = ( -/obj/structure/monorail{ - dir = 10; - name = "launch track" - }, -/turf/open/space, -/area/fiorina/oob) -"qvx" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"qvL" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison{ - dir = 6; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"qwh" = ( -/obj/structure/barricade/wooden{ - dir = 4 +"qvN" = ( +/obj/structure/prop/resin_prop{ + icon_state = "rack" }, -/obj/structure/barricade/wooden, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"qwl" = ( -/obj/item/clothing/mask/cigarette/cigar/cohiba, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/servers) "qws" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "bee" @@ -27150,56 +27116,38 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"qwy" = ( -/obj/item/weapon/baton/cattleprod, +"qwG" = ( +/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"qwJ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 + dir = 6; + icon_state = "darkbrown2" }, +/area/fiorina/maintenance) +"qwH" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"qwU" = ( +/area/fiorina/station/lowsec) +"qwK" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrowncorners2" - }, -/area/fiorina/maintenance) -"qwZ" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" + icon_state = "floorscorched2" }, +/area/fiorina/station/civres_blue) +"qxx" = ( +/obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/station/central_ring) -"qxB" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 + dir = 10; + icon_state = "whitepurple" }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"qxL" = ( -/obj/item/toy/deck, +/area/fiorina/station/research_cells) +"qxy" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/servers) "qxN" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -27208,124 +27156,127 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"qyc" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"qyi" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +"qxP" = ( /turf/open/floor/prison{ + dir = 10; icon_state = "darkbrown2" }, -/area/fiorina/station/park) -"qyk" = ( -/obj/structure/machinery/power/port_gen/pacman, -/turf/open/floor/prison{ - dir = 5; - icon_state = "darkyellow2" +/area/fiorina/tumor/aux_engi) +"qxZ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/lz/near_lzI) -"qyB" = ( -/obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "yellowfull" }, -/area/fiorina/station/park) -"qyX" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/lowsec) +"qya" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/combat, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ dir = 1; - icon_state = "p_stair_sn_full_cap" + icon_state = "whitepurple" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/research_cells) +"qyq" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"qzl" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/machinery/shower{ - dir = 8 - }, +/area/fiorina/station/power_ring) +"qyM" = ( /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/research_cells) -"qzn" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" +/area/fiorina/station/disco) +"qzb" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/tumor/ice_lab) -"qzy" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"qzo" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/prison, +/area/fiorina/station/security) +"qzM" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"qzB" = ( -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -5; - pixel_y = -11 +"qzZ" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 }, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) -"qzI" = ( -/obj/item/tool/crowbar/red, +/area/fiorina/station/disco) +"qAe" = ( +/obj/item/trash/eat, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"qzS" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"qzW" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" +/area/fiorina/station/telecomm/lz1_cargo) +"qAk" = ( +/obj/item/shard{ + icon_state = "medium" }, -/area/fiorina/tumor/aux_engi) -"qzX" = ( -/obj/structure/machinery/photocopier{ - pixel_y = 4 +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, +/area/fiorina/tumor/servers) +"qAl" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) -"qBh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/handcard/aceofspades, +/area/fiorina/station/medbay) +"qAQ" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/research_cells) -"qBk" = ( -/obj/item/reagent_container/food/drinks/cans/aspen, +/area/fiorina/tumor/aux_engi) +"qBe" = ( +/turf/open/floor/prison, +/area/fiorina/station/disco) +"qBf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/lowsec) -"qBs" = ( -/obj/item/tool/mop{ - pixel_y = 23 +/area/fiorina/station/central_ring) +"qBj" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/item/storage/briefcase, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/security/wardens) "qBB" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -27342,24 +27293,31 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"qBG" = ( -/obj/structure/inflatable/popped/door, -/obj/item/stack/barbed_wire, -/obj/effect/decal/cleanable/blood/oil, +"qBI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"qBQ" = ( -/obj/item/storage/secure/briefcase{ - pixel_x = 9; - pixel_y = 18 + icon_state = "darkredfull2" }, +/area/fiorina/station/research_cells) +"qBS" = ( +/obj/item/circuitboard/mecha/gygax/targeting, +/obj/structure/surface/rack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/civres) +"qBT" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "qCa" = ( /obj/structure/prop/resin_prop{ dir = 1; @@ -27368,50 +27326,48 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"qCs" = ( -/obj/structure/largecrate/random/case/small, +"qCk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -5; + pixel_y = -11 + }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "bluefull" }, -/area/fiorina/tumor/aux_engi) -"qCw" = ( -/obj/structure/inflatable/popped/door, -/obj/item/ammo_casing{ - icon_state = "casing_1" +/area/fiorina/station/civres_blue) +"qCx" = ( +/obj/item/reagent_container/food/drinks/sillycup, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"qCE" = ( +/obj/structure/machinery/computer/emails{ + dir = 1; + pixel_y = 4 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"qCK" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, +/area/fiorina/station/lowsec) "qCW" = ( /turf/closed/shuttle/elevator{ dir = 6 }, /area/fiorina/tumor/aux_engi) -"qDc" = ( -/obj/structure/monorail{ - dir = 9; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"qDd" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"qDi" = ( -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -5; - pixel_y = -6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) "qDn" = ( /obj/item/stool, /obj/structure/sign/poster{ @@ -27423,72 +27379,56 @@ icon_state = "doubleside" }, /area/fiorina/maintenance) -"qDo" = ( -/obj/structure/janitorialcart, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"qDy" = ( -/obj/item/reagent_container/glass/bucket/janibucket, -/turf/open/floor/prison, -/area/fiorina/station/park) -"qDD" = ( +"qDq" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; + dir = 8; + pixel_x = -10; pixel_y = -3 }, -/obj/structure/largecrate/random/case, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"qDG" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"qDH" = ( -/obj/structure/bookcase{ - icon_state = "book-5" - }, +/area/fiorina/station/telecomm/lz1_tram) +"qDZ" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"qDI" = ( -/obj/structure/toilet{ - dir = 4; - pixel_y = 8 +"qEk" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"qDY" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 + icon_state = "floor_plate" }, +/area/fiorina/station/security/wardens) +"qEl" = ( +/obj/structure/closet/bodybag, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"qEn" = ( -/obj/structure/barricade/wooden, +/area/fiorina/station/medbay) +"qEs" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "whitepurple" + icon_state = "yellowcorner" }, -/area/fiorina/station/research_cells) -"qFg" = ( -/obj/item/stack/rods, +/area/fiorina/station/lowsec) +"qEC" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"qFf" = ( +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/prison{ + icon_state = "kitchen" }, /area/fiorina/station/power_ring) "qFi" = ( @@ -27502,109 +27442,108 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"qFs" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "qFE" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 }, /turf/open/space/basic, /area/fiorina/oob) -"qFQ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/barricade/handrail/type_b{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"qGl" = ( -/obj/structure/largecrate/random/barrel/yellow, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +"qFO" = ( +/obj/structure/barricade/wooden{ + dir = 8 }, /turf/open/floor/prison{ dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"qGn" = ( -/turf/open/floor/corsat{ - icon_state = "plate" + icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"qGX" = ( -/obj/structure/prop/structure_lattice{ - health = 300 +"qGe" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 }, -/obj/structure/prop/structure_lattice{ - layer = 3.1; - pixel_y = 10 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/lz/near_lzI) +"qGf" = ( +/obj/item/tool/scythe, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/tumor/aux_engi) -"qHC" = ( +/area/fiorina/station/botany) +"qGh" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/chapel) +"qGn" = ( +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"qGy" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"qGB" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"qGO" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"qGP" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) "qHG" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 25 }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"qHK" = ( -/obj/item/gift, -/turf/open/floor/prison{ - icon_state = "darkbrown2" +"qHX" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/area/fiorina/station/park) -"qHZ" = ( -/obj/item/tool/warning_cone, +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, /turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"qIk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - layer = 3.5 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) +/area/fiorina/station/security) "qIq" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"qIy" = ( -/obj/item/tool/match, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"qIO" = ( -/obj/item/stock_parts/manipulator/pico, -/turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"qIZ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"qIT" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket" }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "blue" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/chapel) "qJf" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/blue{ @@ -27632,15 +27571,32 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"qJJ" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 +"qJl" = ( +/obj/structure/bedsheetbin{ + icon_state = "linenbin-empty" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 8; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/lowsec) +"qJr" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/fiberbush) +"qJv" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/weapon/gun/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "qJK" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -27658,37 +27614,74 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"qKs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/spray/pepper, -/obj/item/clothing/glasses/sunglasses/sechud, +"qJP" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"qKF" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/chapel) +"qJQ" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"qJR" = ( +/obj/item/disk/data, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"qKq" = ( +/obj/structure/machinery/computer/arcade, +/obj/item/toy/syndicateballoon{ + anchored = 1; + pixel_x = 12; + pixel_y = 25 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + layer = 2.8; + pixel_x = 15; + pixel_y = 5 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/flight_deck) +"qKx" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "qKT" = ( /obj/item/stack/rods/plasteel, /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzII) -"qLp" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"qLa" = ( +/obj/item/weapon/baseballbat/metal, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/fiorina/station/chapel) +"qLi" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"qLv" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison, -/area/fiorina/tumor/servers) -"qLz" = ( -/obj/structure/machinery/autolathe/medilathe/full, +/area/fiorina/station/transit_hub) +"qLH" = ( +/obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/lz/near_lzI) "qLI" = ( /obj/item/storage/toolbox, /obj/structure/machinery/light/double/blue{ @@ -27700,65 +27693,79 @@ icon_state = "plate" }, /area/fiorina/station/civres_blue) -"qLJ" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "qLN" = ( /obj/item/storage/toolbox/mechanical/green, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"qMV" = ( +"qMi" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"qMs" = ( +/obj/item/stack/cable_coil/green, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"qMI" = ( +/turf/open/floor/prison{ + icon_state = "damaged3" + }, +/area/fiorina/station/security) +"qNj" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, /obj/structure/platform_decoration{ - dir = 1 + dir = 10 }, +/obj/structure/closet/firecloset/full, /turf/open/floor/prison{ dir = 10; - icon_state = "blue" + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"qNu" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/clothing/accessory/storage/holster, +/obj/structure/window/reinforced{ + dir = 4 }, -/area/fiorina/station/power_ring) -"qNm" = ( -/obj/structure/closet/secure_closet/engineering_materials, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "redfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/security) "qNv" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"qNw" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"qNS" = ( -/obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"qNy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, -/area/fiorina/tumor/civres) -"qNW" = ( -/obj/structure/platform_decoration, +/obj/item/reagent_container/food/snacks/cheesyfries, /turf/open/floor/prison{ - icon_state = "darkbrowncorners2" - }, -/area/fiorina/station/park) -"qOd" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/station/flight_deck) +"qNF" = ( /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "qOk" = ( @@ -27771,18 +27778,11 @@ /obj/structure/grille, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"qOy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer3/laptop/secure_data, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"qOG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/cups, +"qOu" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "damaged3" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/disco) "qON" = ( /obj/item/stack/cable_coil/cyan, /turf/open/floor/plating/prison, @@ -27799,17 +27799,13 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"qOY" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, +"qPa" = ( +/obj/item/device/motiondetector, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec) "qPb" = ( /turf/open/organic/grass{ desc = "It'll get in your shoes no matter what you do."; @@ -27820,32 +27816,42 @@ /obj/item/ammo_magazine/smg/nailgun, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) -"qPC" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"qPL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/powercell, +/obj/item/storage/syringe_case/burn{ + pixel_x = -10; + pixel_y = 8 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"qPG" = ( -/obj/structure/machinery/washing_machine, /turf/open/floor/prison{ - icon_state = "sterile_white" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/civres_blue) -"qPT" = ( -/obj/structure/bed/chair/comfy, +/area/fiorina/station/research_cells) +"qQa" = ( /turf/open/floor/prison{ - icon_state = "blue" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/civres_blue) -"qQf" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" +/area/fiorina/station/central_ring) +"qQb" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/tumor/aux_engi) +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) +"qQd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 10 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "qQj" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -27859,6 +27865,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"qQy" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) "qQA" = ( /obj/item/reagent_container/food/drinks/bottle/holywater{ desc = "A flask of the holy HEFA grenade oil."; @@ -27868,15 +27883,30 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"qQO" = ( -/obj/item/tool/wet_sign, +"qQM" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, /turf/open/floor/prison, -/area/fiorina/tumor/servers) -"qQU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/prop/helmetgarb/raincover, +/area/fiorina/station/disco) +"qRa" = ( +/obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) +"qRf" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/toy/beach_ball/holoball, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "qRg" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -27895,90 +27925,83 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"qRD" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"qSg" = ( -/obj/structure/machinery/bot/medbot{ - name = "Dr. O" - }, +"qRK" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"qSv" = ( -/obj/structure/machinery/vending/snack/packaged, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 + dir = 6; + icon_state = "darkpurple2" }, +/area/fiorina/station/central_ring) +"qRS" = ( +/obj/item/trash/candy, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"qTa" = ( -/turf/open/floor/prison{ +/area/fiorina/station/telecomm/lz1_cargo) +"qRW" = ( +/obj/structure/stairs/perspective{ dir = 8; - icon_state = "cell_stripe" + icon_state = "p_stair_ew_full_cap" }, -/area/fiorina/station/security) -"qTp" = ( -/obj/structure/sink{ - pixel_y = 23 +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"qSm" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"qSy" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + pixel_y = 17 }, -/obj/item/prop/helmetgarb/rabbitsfoot{ - pixel_y = 22 +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"qSz" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, -/obj/item/reagent_container/food/drinks/bottle/kahlua{ - pixel_x = 5; - pixel_y = 25 +/area/fiorina/station/lowsec) +"qSA" = ( +/obj/item/trash/candy, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, +/area/fiorina/tumor/ice_lab) +"qTe" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"qTt" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "yellow" }, -/area/fiorina/station/medbay) -"qTr" = ( -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/disco) +"qTx" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/tumor/ice_lab) -"qTy" = ( -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = -9; - pixel_y = 8 - }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 11; - pixel_y = 8 + icon_state = "whitegreenfull" }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 1; - pixel_y = 8 +/area/fiorina/station/medbay) +"qTQ" = ( +/obj/structure/platform_decoration, +/obj/item/reagent_container/food/drinks/sillycup, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/flight_deck) +"qTW" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) -"qUe" = ( -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/item/ammo_casing/shell{ - icon_state = "shell_9_1" - }, -/obj/structure/barricade/metal{ - health = 250; - icon_state = "metal_1" - }, -/turf/open/floor/prison, -/area/fiorina/station/park) "qUo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -27998,532 +28021,355 @@ name = "astroturf" }, /area/fiorina/station/park) -"qUp" = ( -/obj/effect/landmark{ - icon_state = "hive_spawn"; - name = "xeno_hive_spawn" +"qUw" = ( +/obj/item/device/multitool, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"qUC" = ( +/obj/item/ammo_casing{ + dir = 2; + icon_state = "casing_5" }, -/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 1; icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) -"qUx" = ( -/obj/item/stack/tile/plasteel, +/area/fiorina/station/park) +"qVW" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/station/park) +"qXj" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "kitchen" }, +/area/fiorina/station/lowsec) +"qXM" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"qUQ" = ( -/obj/item/stack/cable_coil, +"qYZ" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"qUZ" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" + icon_state = "darkpurplefull2" }, -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +/area/fiorina/tumor/servers) +"qZc" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"qVe" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; - name = "\improper Fiorina Green Block Canteen Vendor" +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"qVq" = ( -/obj/item/ammo_box/magazine/misc/flares{ - layer = 3.1; - pixel_y = 16 +/area/fiorina/station/telecomm/lz1_cargo) +"qZv" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/tumor/ice_lab) -"qVt" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/central_ring) +"raC" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ dir = 8; - pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/telecomm/lz1_tram) -"qVD" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"qVF" = ( -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/botany) -"qWa" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/random/gun/rifle/lowchance, -/turf/open/floor/prison{ - dir = 9; icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) -"qWf" = ( -/obj/item/trash/popcorn, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"qWi" = ( -/obj/structure/largecrate/guns/merc, -/obj/item/toy/deck/uno, +"raL" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"qWw" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 4; - pixel_y = 24 - }, -/obj/structure/bed/chair{ - dir = 1 + icon_state = "bluefull" }, -/obj/effect/landmark/corpsespawner/security/liaison, +/area/fiorina/station/civres_blue) +"raP" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/park) -"qWB" = ( -/obj/structure/largecrate/random, +/area/fiorina/station/medbay) +"rbp" = ( +/obj/structure/closet/crate/medical, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"qWO" = ( -/obj/item/tool/weldingtool, -/turf/open/auto_turf/sand/layer1, -/area/fiorina/tumor/civres) -"qXl" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, +/area/fiorina/station/medbay) +"rbv" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"qXM" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/civres) -"qXP" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/station/chapel) -"qYc" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "darkpurplefull2" }, +/area/fiorina/tumor/servers) +"rbI" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"qYq" = ( -/obj/effect/decal/cleanable/blood{ - desc = "Watch your step."; - icon_state = "gib6" - }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"qZa" = ( -/obj/item/shard{ - icon_state = "large"; - name = "ice shard" - }, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 5; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/ice_lab) -"qZh" = ( -/obj/structure/platform_decoration, -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" +/area/fiorina/lz/near_lzI) +"rbK" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"rbW" = ( +/obj/structure/cargo_container/grant/right{ + health = 5000; + unacidable = 1 }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"rbZ" = ( +/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"qZx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - layer = 3.5; - pixel_y = 6 + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/medbay) +"rcc" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"qZL" = ( -/obj/structure/machinery/computer/arcade, -/obj/item/toy/syndicateballoon{ - anchored = 1; - pixel_x = 12; - pixel_y = 25 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - layer = 2.8; - pixel_x = 15; - pixel_y = 5 + dir = 4; + icon_state = "blue_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"qZW" = ( +/area/fiorina/station/botany) +"rce" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/wy_mre{ - pixel_x = 5; - pixel_y = 2 +/obj/structure/reagent_dispensers/water_cooler{ + pixel_y = 11 }, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) -"rac" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"rcg" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"rcl" = ( +/obj/structure/monorail{ + name = "launch track" }, -/turf/open/space/basic, -/area/fiorina/oob) -"rar" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/machinery/constructable_frame{ + icon_state = "box_1" }, -/obj/structure/window/reinforced, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"rcE" = ( +/obj/structure/inflatable/popped/door, +/obj/item/stack/barbed_wire, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/ice_lab) -"raD" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 + dir = 6; + icon_state = "whitegreen" }, +/area/fiorina/station/medbay) +"rcI" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/limb, /turf/open/floor/prison{ dir = 4; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"raF" = ( -/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"; - registered_name = "John Forklift" + icon_state = "whitegreencorner" }, +/area/fiorina/station/medbay) +"rdi" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"rbD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/transit_hub) +"rdo" = ( /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 1; + icon_state = "greenbluecorner" }, -/area/fiorina/station/security) -"rbE" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/botany) +"rdt" = ( +/obj/structure/platform_decoration{ + dir = 1 }, -/area/fiorina/station/medbay) -"rbK" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/plating/prison, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"rcu" = ( -/obj/item/clothing/under/color/orange, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"rcG" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"red" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"rdS" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"rdX" = ( +"rez" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp/green, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" +/obj/structure/machinery/computer/cameras{ + dir = 4 }, -/area/fiorina/tumor/civres) -"rev" = ( /turf/open/floor/prison{ - icon_state = "blue" + icon_state = "darkredfull2" }, -/area/fiorina/station/power_ring) -"reD" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/station/disco) +"reZ" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0" }, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"reO" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"rfa" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "rfd" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/prison, /area/fiorina/tumor/ice_lab) -"rfo" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"rfq" = ( -/obj/structure/bed/chair{ - dir = 8 - }, +"rfe" = ( +/obj/structure/surface/rack, +/obj/item/tool/mop, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"rfD" = ( -/obj/structure/barricade/wooden, +"rft" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"rfG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical/green, -/obj/effect/landmark/objective_landmark/close, -/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{ - name = "\improper prison food"; - pixel_y = 9 + icon_state = "greenblue" }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/botany) +"rfQ" = ( +/obj/effect/spawner/random/tech_supply, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/research_cells) -"rfR" = ( -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" +/turf/open/floor/prison, +/area/fiorina/station/security) +"rgc" = ( +/obj/item/device/binoculars/civ, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec) "rgg" = ( /obj/item/tool/candle{ pixel_x = -2 }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"rgD" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +"rhf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "cell_stripe" + }, +/area/fiorina/station/research_cells) +"rhh" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, -/area/fiorina/station/lowsec) -"rhF" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/transit_hub) +"rhH" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/area/fiorina/station/power_ring) -"rhK" = ( -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/tumor/aux_engi) -"rib" = ( -/obj/item/trash/cigbutt/cigarbutt, +/area/fiorina/station/research_cells) +"rie" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 1; + dir = 8; icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"ril" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/cigarettes/emeraldgreen, -/obj/item/tool/lighter, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"riu" = ( -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 1; - pixel_y = 8 - }, +"riP" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/tumor/aux_engi) "rja" = ( /turf/closed/wall/prison, /area/fiorina/station/civres_blue) -"rjn" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, +"rjy" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"rjz" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/effect/decal/cleanable/blood{ - icon_state = "gibarm_flesh" + dir = 10; + icon_state = "kitchen" }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"rjE" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/area/fiorina/tumor/civres) +"rjP" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" + icon_state = "floor_plate" }, /area/fiorina/station/medbay) -"rjM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/surgery{ - name = "Lung Transplants for Dummies"; - pixel_y = 4 - }, +"rki" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"rkb" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/machinery/light/double/blue{ +/area/fiorina/tumor/civres) +"rko" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"rkp" = ( +/obj/structure/toilet{ dir = 4; - pixel_x = 10; - pixel_y = 13 + pixel_y = 8 }, -/obj/effect/landmark/objective_landmark/medium, +/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/maintenance) -"rkh" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/cleanable/blood/gibs/up, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, /area/fiorina/station/lowsec) -"rkr" = ( +"rkv" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "greenblue" + dir = 8; + icon_state = "greencorner" }, -/area/fiorina/station/botany) -"rkB" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/chapel) +"rkF" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, -/obj/item/device/flashlight, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/telecomm/lz1_cargo) "rkH" = ( /obj/structure/grille, /obj/structure/lattice, /turf/open/space, /area/fiorina/oob) -"rkQ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/stack/rods, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/chapel) "rkR" = ( /obj/item/clothing/glasses/science, /turf/open/space, @@ -28532,33 +28378,12 @@ /obj/item/stack/cable_coil/green, /turf/open/floor/wood, /area/fiorina/station/chapel) -"rlC" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/chapel) -"rmb" = ( -/obj/structure/machinery/shower{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/research_cells) -"rmg" = ( -/obj/structure/largecrate/random/case, +"rlP" = ( +/obj/structure/largecrate/supply, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) "rmh" = ( /obj/structure/surface/rack, /obj/item/storage/bag/trash, @@ -28568,46 +28393,22 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"rmA" = ( -/turf/open/floor/prison{ - icon_state = "platingdmg3" - }, -/area/fiorina/station/security) -"rmG" = ( -/obj/item/ammo_casing{ - icon_state = "casing_5" - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +"rmX" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/station/flight_deck) -"rmI" = ( /obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomleft" - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"rmS" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_v" - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8 }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"rmZ" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 }, -/area/fiorina/station/telecomm/lz1_cargo) +/obj/structure/largecrate/random, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "rna" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 @@ -28618,210 +28419,264 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"rol" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" +"rnl" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 }, -/turf/open/floor/plating/prison, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) -"roo" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = 1 +"rnn" = ( +/obj/structure/largecrate/supply/explosives/mortar_flare, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"rnE" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"rnM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/crayons, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"roi" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 9 }, -/area/fiorina/lz/near_lzII) -"ror" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/research_cells) -"rov" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" +/area/fiorina/station/park) +"rot" = ( +/obj/structure/barricade/metal{ + health = 250; + icon_state = "metal_1" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + dir = 6; + icon_state = "darkpurple2" }, /area/fiorina/tumor/ice_lab) -"rox" = ( -/obj/structure/platform_decoration, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 +"roE" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"roF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/machinery/computer/cameras{ + dir = 8 }, -/area/fiorina/station/disco) -"roC" = ( -/obj/item/tool/weldpack, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"roN" = ( -/obj/structure/closet/crate/medical, -/obj/item/tool/surgery/bonegel, -/obj/item/tool/surgery/bonegel, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"roS" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/security) +"roH" = ( +/obj/structure/machinery/photocopier{ + pixel_y = 4 + }, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "darkredfull2" }, -/area/fiorina/station/power_ring) -"roY" = ( +/area/fiorina/oob) +"roQ" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"rpf" = ( +/obj/structure/grille, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/research_cells) -"rpe" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar/red, -/obj/item/storage/pill_bottle/inaprovaline/skillless, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"rqL" = ( -/obj/structure/surface/rack, +"rpt" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"rpL" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"rrb" = ( -/obj/structure/reagent_dispensers/water_cooler, +"rpT" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5" + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"rqh" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"rqq" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"rqA" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/fiorina/tumor/servers) +"rqC" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"rqG" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/security/wardens) -"rrj" = ( -/obj/item/clothing/under/color/orange, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/civres_blue) +"rqY" = ( +/obj/structure/filingcabinet/disk, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) +"rrs" = ( +/obj/item/stack/rods/plasteel, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "rru" = ( /obj/effect/spawner/random/goggles/midchance, /turf/open/organic/grass{ name = "astroturf" }, /area/fiorina/station/research_cells) -"rrP" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - dir = 4; - icon_state = "green" - }, -/area/fiorina/station/chapel) -"rsh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/mask/cigarette/weed{ - icon_state = "ucigoff" +"rrD" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/lowsec) +/area/fiorina/lz/near_lzI) +"rsg" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/fiorina/station/park) "rsp" = ( /obj/item/toy/crayon/purple, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"rss" = ( +"rsH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"rsz" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"rsQ" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/tumor/civres) -"rsE" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/obj/structure/platform_decoration{ + dir = 10 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"rsW" = ( +/area/fiorina/station/power_ring) +"rsR" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"rth" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 + dir = 5; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"rsU" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) -"rtM" = ( +"rtc" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"rtw" = ( /obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 + icon_state = "pottedplant_22"; + layer = 2.8 }, +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security/wardens) -"rue" = ( -/obj/structure/monorail{ - dir = 10; - name = "launch track" +/area/fiorina/station/flight_deck) +"rty" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"ruv" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "green" + dir = 5; + icon_state = "blue" }, -/area/fiorina/station/chapel) -"ruy" = ( +/area/fiorina/station/civres_blue) +"rtP" = ( +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/ice_lab) -"ruB" = ( -/obj/effect/decal/medical_decals{ - dir = 4; - icon_state = "triagedecaldir" +/area/fiorina/station/medbay) +"rur" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, +/area/fiorina/station/park) +"ruu" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "darkbrown2" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/aux_engi) "ruD" = ( /turf/open/floor/wood, /area/fiorina/oob) -"ruE" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) "ruJ" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -28833,53 +28688,22 @@ }, /turf/closed/wall/prison, /area/fiorina/tumor/servers) -"rvf" = ( -/obj/effect/decal/cleanable/blood/tracks/footprints{ - dir = 1; - icon_state = "human2" - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"rvu" = ( -/obj/structure/toilet, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/fiorina/station/civres_blue) -"rvR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/adv{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = 9; - pixel_y = 2 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"rvW" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison{ - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) "rwj" = ( /obj/structure/barricade/plasteel, /turf/open/organic/grass{ name = "astroturf" }, /area/fiorina/station/park) -"rwt" = ( -/obj/effect/decal/cleanable/blood, +"rwm" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitepurple" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells) "rwu" = ( /obj/structure/bed/chair{ dir = 1 @@ -28892,99 +28716,89 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"rxh" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"rwK" = ( +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, +/area/fiorina/station/lowsec) +"rwQ" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + dir = 8; + icon_state = "greenblue" }, -/area/fiorina/station/park) +/area/fiorina/station/botany) +"rxg" = ( +/turf/open/floor/prison{ + icon_state = "redcorner" + }, +/area/fiorina/station/security) "rxr" = ( /obj/structure/bed/chair/office/light{ dir = 8 }, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"rxu" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "lavendergrass_3" +"rxL" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/area/fiorina/station/central_ring) -"rxz" = ( -/obj/structure/curtain/open/black, -/turf/open/floor/prison, -/area/fiorina/maintenance) -"rym" = ( -/obj/structure/inflatable/popped/door, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"ryt" = ( -/obj/structure/window/framed/prison/reinforced, -/turf/open/floor/prison, -/area/fiorina/station/security) -"ryx" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/area/fiorina/tumor/aux_engi) +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"rxM" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "ryJ" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"ryN" = ( +"rzp" = ( /turf/open/floor/prison{ - dir = 5; - icon_state = "whitegreen" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "rzt" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"rzR" = ( -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 8; - icon_state = "bluecorner" +"rzF" = ( +/obj/structure/holohoop{ + pixel_y = 25 }, -/area/fiorina/station/power_ring) -"rAa" = ( -/obj/item/pamphlet/skill/powerloader, -/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"rAk" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 + icon_state = "yellow" }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/lowsec) "rAm" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"rAt" = ( -/obj/structure/barricade/wooden, +"rAw" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/research_cells) "rAK" = ( @@ -28999,36 +28813,20 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"rAQ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" +"rAU" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/medbay) -"rAW" = ( -/obj/structure/largecrate/random, -/obj/structure/barricade/wooden, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"rBa" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/stack/cable_coil, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/civres) +"rAY" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, /area/fiorina/station/security) "rBr" = ( /obj/item/device/flashlight/lamp/tripod, @@ -29039,6 +28837,15 @@ icon_state = "plate" }, /area/fiorina/station/civres_blue) +"rBu" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) "rBz" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -29048,13 +28855,15 @@ "rBF" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/flight_deck) -"rBR" = ( -/obj/effect/decal/cleanable/blood/oil, +"rCe" = ( +/obj/structure/platform{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 6; + icon_state = "yellow" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/disco) "rCq" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/plating/prison, @@ -29065,102 +28874,49 @@ }, /turf/open/floor/wood, /area/fiorina/station/lowsec) -"rCL" = ( -/obj/structure/machinery/optable{ - desc = "This maybe could be used for advanced medical procedures."; - name = "Exam Table" - }, -/obj/item/bedsheet/ce{ - desc = "It crinkles, aggressively."; - name = "sterile wax sheet" - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) -"rCO" = ( +"rDu" = ( /obj/structure/stairs/perspective{ dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) -"rDl" = ( -/obj/item/trash/hotdog, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"rDm" = ( -/obj/item/tool/crowbar/red, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"rEe" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/botany) -"rEg" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 + icon_state = "p_stair_full" }, -/obj/item/storage/fancy/cigarettes/blackpack, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" +/obj/structure/platform, +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 }, -/area/fiorina/station/research_cells) -"rEm" = ( -/obj/item/tool/weldingtool, /turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"rEH" = ( -/turf/open/floor/prison{ - icon_state = "platingdmg1" - }, -/area/fiorina/oob) -"rFr" = ( -/obj/structure/barricade/wooden{ - dir = 4; - pixel_y = 4 - }, -/turf/open/floor/prison{ - icon_state = "damaged3" - }, -/area/fiorina/station/central_ring) +/area/fiorina/station/medbay) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/chapel_carpet{ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"rFH" = ( -/obj/structure/largecrate/random, +"rFw" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"rFF" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/central_ring) -"rFT" = ( -/obj/item/ammo_casing{ - icon_state = "casing_7_1" +/area/fiorina/tumor/ice_lab) +"rGc" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/tumor/ice_lab) +"rGe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer3/laptop/secure_data, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/medbay) "rGf" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/station/disco) @@ -29183,32 +28939,22 @@ name = "astroturf" }, /area/fiorina/station/park) -"rGV" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"rHd" = ( -/obj/item/stock_parts/manipulator/pico, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"rHj" = ( -/obj/structure/surface/table/reinforced/prison{ - flipped = 1 +"rHf" = ( +/obj/structure/machinery/optable{ + desc = "This maybe could be used for advanced medical procedures."; + name = "Exam Table" }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"rHh" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, +/area/fiorina/station/chapel) "rHr" = ( /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, @@ -29217,59 +28963,58 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"rHx" = ( +"rHV" = ( +/obj/structure/bed/chair, /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/civres_blue) -"rIo" = ( +/area/fiorina/tumor/servers) +"rHX" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/station/chapel) -"rIC" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/tumor/ice_lab) +"rIr" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"rIy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/phone{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/security) "rIE" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"rII" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "rIS" = ( /obj/structure/sign/poster{ icon_state = "poster6" }, /turf/closed/wall/prison, /area/fiorina/station/medbay) -"rIW" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "red" - }, -/area/fiorina/station/security) -"rIX" = ( +"rJc" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/chapel) "rJh" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/prison, @@ -29280,18 +29025,22 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"rJK" = ( +"rJF" = ( /turf/open/floor/prison{ - icon_state = "blue" + icon_state = "floor_plate" }, /area/fiorina/station/chapel) "rJO" = ( /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"rJT" = ( -/obj/item/storage/bag/trash, +"rJW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/lz/near_lzI) "rJZ" = ( /obj/item/stack/cable_coil/green, /turf/open/floor/plating/prison, @@ -29306,102 +29055,94 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"rKB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/rifle/m16, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"rKO" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"rKd" = ( +/obj/item/stool, +/obj/structure/sign/poster{ + icon_state = "poster14"; + pixel_y = 32 }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"rKS" = ( -/obj/item/tool/wrench, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkpurple2" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/tumor/servers) -"rKX" = ( -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/lowsec) +"rKm" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" - }, -/area/fiorina/station/civres_blue) -"rKZ" = ( -/obj/item/storage/toolbox/electrical, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"rLb" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"rLC" = ( -/obj/structure/window{ - dir = 4 + icon_state = "redfull" }, -/obj/item/circuitboard/machine/rdserver, +/area/fiorina/station/security) +"rKs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"rLJ" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/chapel) -"rLT" = ( -/obj/structure/machinery/photocopier, +/area/fiorina/station/power_ring) +"rKy" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "greenblue" }, -/area/fiorina/station/medbay) -"rMg" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/area/fiorina/station/botany) +"rKA" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + icon_state = "blue" }, +/area/fiorina/station/civres_blue) +"rKG" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 8; + icon_state = "blue_plate" }, -/area/fiorina/tumor/civres) -"rMt" = ( -/obj/item/shard{ - icon_state = "medium" +/area/fiorina/station/botany) +"rLA" = ( +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/station/botany) +"rLG" = ( +/turf/open/floor/prison{ + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"rLJ" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/chapel) +"rMo" = ( +/obj/effect/landmark/objective_landmark/far, +/obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/tumor/servers) -"rME" = ( -/obj/structure/machinery/bot/medbot, +/area/fiorina/maintenance) +"rMq" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"rMP" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"rMS" = ( -/obj/structure/largecrate/random/secure, +"rMw" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" + dir = 5; + icon_state = "yellow" }, -/area/fiorina/station/medbay) +/area/fiorina/station/disco) +"rMT" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) "rMY" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -29423,46 +29164,25 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"rNp" = ( -/obj/item/reagent_container/glass/bucket/mopbucket, -/obj/item/tool/mop, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"rNF" = ( -/obj/item/stack/sandbags/large_stack, +"rNK" = ( +/obj/effect/spawner/random/gun/pistol/lowchance, /turf/open/floor/prison{ - dir = 6; - icon_state = "green" - }, -/area/fiorina/tumor/civres) -"rOa" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"rOm" = ( -/obj/structure/platform_decoration{ - dir = 4 + dir = 1; + icon_state = "darkbrown2" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"rOo" = ( -/obj/structure/monorail{ - dir = 9; - name = "launch track" +/area/fiorina/station/park) +"rNV" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/civres) "rOu" = ( /obj/structure/closet, /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"rOE" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) "rOI" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now."; @@ -29471,27 +29191,39 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"rON" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/storage/pill_bottle/kelotane/skillless, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/park) -"rPh" = ( +"rOL" = ( +/obj/structure/machinery/floodlight{ + name = "Yard Floodlight" + }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"rPu" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 1 +/area/fiorina/station/central_ring) +"rPd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/metal/medium_stack, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"rPf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/transit_hub) +"rPD" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "rPI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/cherry{ @@ -29519,20 +29251,16 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"rPQ" = ( -/obj/structure/sign/poster{ - desc = "You are becoming hysterical."; - icon_state = "poster11"; - pixel_x = -24 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "rPS" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"rPW" = ( +/obj/effect/spawner/random/gun/rifle/lowchance, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzI) "rPZ" = ( /obj/item/shard{ icon_state = "medium" @@ -29545,24 +29273,19 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"rQm" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/obj/structure/platform_decoration, +"rQu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/cable_coil/orange, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"rQF" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/maintenance) +"rQB" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "greencorner" + icon_state = "sterile_white" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/lowsec) "rQK" = ( /obj/item/bananapeel{ name = "tactical banana peel" @@ -29571,45 +29294,34 @@ icon_state = "squares" }, /area/fiorina/station/medbay) -"rQP" = ( -/obj/structure/machinery/power/terminal{ - dir = 8 - }, +"rQN" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "bluecorner" + dir = 6; + icon_state = "darkbrown2" }, /area/fiorina/station/power_ring) -"rRb" = ( -/obj/item/shard{ - icon_state = "large" - }, +"rRg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison{ icon_state = "darkpurplefull2" }, /area/fiorina/tumor/servers) -"rRO" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 - }, -/obj/structure/machinery/light/double/blue{ +"rRo" = ( +/turf/open/floor/prison{ dir = 1; - pixel_y = 21 + icon_state = "darkyellow2" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"rRT" = ( -/obj/item/clothing/under/color/orange, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/telecomm/lz1_tram) +"rRz" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/area/fiorina/station/security) -"rSh" = ( -/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 1; + icon_state = "blue" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/civres_blue) "rSr" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -29617,19 +29329,38 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"rSM" = ( -/obj/structure/inflatable/popped, +"rSN" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/machinery/autolathe/full{ + layer = 2.98 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"rSU" = ( +/obj/structure/barricade/sandbags{ + dir = 4; + icon_state = "sandbag_0"; + pixel_y = 2 + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"rTd" = ( +/obj/item/ammo_casing{ + icon_state = "casing_5" + }, /turf/open/floor/prison{ + dir = 8; icon_state = "whitegreen" }, -/area/fiorina/station/medbay) -"rTb" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/tumor/ice_lab) +"rTD" = ( +/obj/effect/spawner/random/powercell, +/turf/open/floor/prison{ + icon_state = "bluefull" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/power_ring) "rTH" = ( /obj/structure/sign/prop1{ layer = 2.5; @@ -29637,57 +29368,78 @@ }, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"rTL" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +"rTV" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibup1" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"rUc" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/lz/near_lzI) -"rUr" = ( -/obj/structure/monorail{ - dir = 4; - name = "launch track" +/area/fiorina/station/medbay) +"rTZ" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurplecorner" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/research_cells) +"rUf" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/fiorina/tumor/servers) "rUA" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"rUL" = ( -/obj/item/stack/cable_coil/green, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"rUQ" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_y = 21 }, -/area/fiorina/tumor/civres) -"rUT" = ( -/obj/item/shard{ - icon_state = "medium" +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 17; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/security) -"rUY" = ( -/obj/structure/platform_decoration, +/area/fiorina/station/medbay) +"rVi" = ( +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 6; + icon_state = "darkyellow2" }, -/area/fiorina/station/disco) -"rVy" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/flight_deck) +"rVp" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) +"rVL" = ( +/obj/structure/largecrate/supply, +/turf/open/floor/prison{ dir = 1; - icon_state = "p_stair_full" + icon_state = "yellow" }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/lowsec) "rVM" = ( /obj/structure/closet/crate/miningcar, /obj/structure/barricade/wooden{ @@ -29700,125 +29452,133 @@ /obj/item/reagent_container/food/drinks/cans/beer, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"rVS" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"rVQ" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"rVV" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"rWt" = ( +/obj/item/stack/cable_coil/cut, +/turf/open/floor/prison, /area/fiorina/tumor/servers) -"rVZ" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"rWQ" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 2; + layer = 6; + name = "overhead pipe"; + pixel_x = -16; + pixel_y = 12 }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"rXt" = ( +/obj/structure/surface/rack, +/obj/item/device/camera, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"rWi" = ( -/obj/structure/machinery/vending/sovietsoda, +/area/fiorina/tumor/fiberbush) +"rYw" = ( +/obj/item/trash/liquidfood, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/botany) -"rWB" = ( -/obj/structure/closet/boxinggloves, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"rWX" = ( -/turf/open/floor/prison{ - icon_state = "damaged3" +/area/fiorina/tumor/ice_lab) +"rYy" = ( +/obj/item/stool{ + pixel_x = -4; + pixel_y = 10 }, -/area/fiorina/station/disco) -"rWZ" = ( -/obj/item/weapon/gun/rifle/m16, -/obj/item/ammo_casing{ - dir = 6; - icon_state = "casing_5" +/obj/structure/sign/poster{ + icon_state = "poster1"; + pixel_y = 32 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 1; + icon_state = "yellow" }, -/area/fiorina/station/telecomm/lz1_cargo) -"rXz" = ( -/obj/structure/pipes/unary/freezer{ - icon_state = "freezer_1" +/area/fiorina/station/lowsec) +"rYK" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"rYY" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/filtration/console{ + can_block_movement = 0; + pixel_y = 22 }, +/obj/item/trash/used_stasis_bag, +/turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"rXT" = ( -/obj/structure/machinery/vending/cigarette/colony, +"rZe" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" + icon_state = "redfull" }, -/area/fiorina/lz/near_lzI) -"rYC" = ( -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" +/area/fiorina/station/security/wardens) +"rZi" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_rightengine" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"rYJ" = ( -/obj/structure/reagent_dispensers/watertank, +/area/fiorina/station/power_ring) +"rZI" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/aux_engi) -"rZa" = ( -/obj/structure/barricade/metal/wired{ +/area/fiorina/station/medbay) +"rZN" = ( +/obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) -"rZh" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +/area/fiorina/station/flight_deck) +"rZO" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"rZi" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_rightengine" +/turf/open/floor/prison{ + icon_state = "redfull" }, -/area/fiorina/station/power_ring) -"rZr" = ( -/obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/security) "rZP" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/aux_engi) -"sad" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" +"saL" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -9; + pixel_y = 8 }, -/area/fiorina/station/disco) -"saI" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 11; + pixel_y = 8 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 1; + pixel_y = 8 }, -/area/fiorina/tumor/aux_engi) -"saQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/pill_bottle/inaprovaline/skillless, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/station/power_ring) "sbf" = ( /obj/effect/landmark/corpsespawner/prisoner, /turf/open/gm/river{ @@ -29826,88 +29586,64 @@ name = "pool" }, /area/fiorina/station/park) -"sbg" = ( -/obj/item/trash/cigbutt, +"sbF" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "red" }, -/area/fiorina/station/medbay) -"sbj" = ( -/obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"sbp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, +/area/fiorina/station/security) +"sbL" = ( +/obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"sbM" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 +/area/fiorina/tumor/ice_lab) +"sbU" = ( +/obj/item/trash/pistachios, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"sbW" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + dir = 4; + icon_state = "greenbluecorner" }, -/area/fiorina/station/disco) -"sbQ" = ( +/area/fiorina/station/botany) +"scp" = ( /obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"sbY" = ( -/obj/structure/inflatable, -/obj/structure/barricade/handrail/type_b, -/obj/structure/barricade/handrail/type_b{ - dir = 8 - }, +/obj/item/trash/uscm_mre, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"scg" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/lowsec) -"sct" = ( -/obj/structure/closet/crate/delta{ - desc = "A crate with delta squad's symbol on it. Now how did that get here? The words 'HEFA was never real' are scrawled on it in black ink."; - name = "crate" - }, -/obj/item/ammo_box/magazine/shotgun/buckshot, +"scG" = ( +/obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison, -/area/fiorina/station/medbay) -"scw" = ( -/obj/item/storage/beer_pack{ - pixel_y = 10 - }, -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/flight_deck) +"scH" = ( +/obj/structure/machinery/washing_machine, /turf/open/floor/prison{ - icon_state = "yellow" + icon_state = "sterile_white" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/civres_blue) "scM" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/telecomm/lz1_tram) -"scU" = ( -/obj/structure/window/reinforced{ - dir = 4 +"scS" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 8; + layer = 3.5 }, -/obj/item/storage/briefcase, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security/wardens) +/area/fiorina/station/disco) "scZ" = ( /obj/structure/platform, /obj/structure/platform{ @@ -29918,21 +29654,24 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"sde" = ( -/obj/item/tool/kitchen/utensil/fork, +"sda" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"sdr" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"sdg" = ( -/obj/item/implanter/compressed, -/obj/structure/safe, -/obj/effect/landmark/objective_landmark/science, + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"sdE" = ( +/obj/item/storage/wallet/random, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/security) +/area/fiorina/tumor/civres) "sdK" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -29942,47 +29681,68 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"sdR" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"sdV" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "sdY" = ( /obj/structure/largecrate/random, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/station/civres_blue) -"sel" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) -"seu" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" +"seh" = ( +/obj/item/reagent_container/glass/bucket/janibucket, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/area/fiorina/station/civres_blue) +"set" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"seF" = ( +/obj/structure/monorail{ + dir = 6; + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "seW" = ( /turf/closed/shuttle/ert{ icon_state = "stan_r_w" }, /area/fiorina/tumor/ship) -"seY" = ( -/obj/item/frame/rack, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +"sfe" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "sfi" = ( /obj/structure/platform_decoration{ dir = 1 @@ -29991,6 +29751,18 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"sfn" = ( +/obj/structure/disposalpipe/segment{ + icon_state = "delivery_outlet"; + layer = 6; + name = "overhead ducting"; + pixel_y = 33 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/tumor/civres) "sfs" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/fancy/candle_box, @@ -29999,29 +29771,69 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"sfw" = ( +"sfu" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec) +"sfI" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/aux_engi) "sfW" = ( /obj/structure/platform{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"sgb" = ( -/obj/item/ammo_box/magazine/misc/flares/empty, +"sfZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/baton, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = -6; + pixel_y = 12 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"sga" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 + }, +/obj/structure/barricade/metal/wired, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/flight_deck) +"sgt" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) "sgw" = ( /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"sgJ" = ( +/obj/structure/surface/rack, +/obj/item/storage/belt/gun/flaregun/full, +/obj/item/storage/belt/gun/flaregun/full, +/obj/item/storage/belt/gun/flaregun/full, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "sha" = ( /obj/item/storage/bible/hefa{ pixel_y = 3 @@ -30030,91 +29842,86 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"shq" = ( -/obj/structure/machinery/space_heater, +"shh" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "kitchen" }, -/area/fiorina/tumor/ice_lab) -"shC" = ( -/obj/structure/machinery/autolathe/full, +/area/fiorina/station/research_cells) +"shH" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"sia" = ( +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "floor_plate" }, /area/fiorina/tumor/aux_engi) -"shG" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +"sig" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/gloves/latex, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/medbay) -"siz" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 + icon_state = "floor_plate" }, +/area/fiorina/tumor/fiberbush) +"siy" = ( +/obj/item/stack/cable_coil, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"siR" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 + icon_state = "floor_plate" }, -/obj/item/tool/soap/syndie, -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random/gun/special, -/obj/effect/landmark/objective_landmark/far, +/area/fiorina/station/power_ring) +"siB" = ( +/obj/item/poster, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) -"sjc" = ( -/obj/structure/barricade/sandbags{ - dir = 8; - icon_state = "sandbag_0" + dir = 9; + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"siE" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ - icon_state = "darkyellow2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/telecomm/lz1_cargo) -"sjl" = ( -/obj/item/stack/nanopaste, -/turf/open/floor/prison{ +/area/fiorina/tumor/aux_engi) +"siK" = ( +/obj/structure/prop/resin_prop{ dir = 1; - icon_state = "blue" + icon_state = "chair"; + pixel_y = 6 }, -/area/fiorina/station/civres_blue) -"sjn" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"siW" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"sjd" = ( /obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"sjJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger{ + pixel_y = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/ice_lab) -"sjw" = ( +/area/fiorina/station/security) +"sjM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/prison{ - icon_state = "whitegreencorner" + icon_state = "redfull" }, -/area/fiorina/station/medbay) -"sjx" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "sjR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -30127,60 +29934,114 @@ name = "astroturf" }, /area/fiorina/station/park) -"skM" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "repairpanelslz" +"sjT" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 2; + layer = 6; + name = "overhead pipe"; + pixel_x = -16; + pixel_y = 12 }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"skO" = ( -/obj/item/trash/cigbutt, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"slG" = ( -/obj/structure/machinery/disposal, +/area/fiorina/tumor/servers) +"sjX" = ( +/obj/item/reagent_container/blood, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "greenbluecorner" }, -/area/fiorina/station/power_ring) -"slM" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/trash/waffles, -/obj/item/stack/sheet/mineral/plastic, -/obj/item/stack/sheet/mineral/plastic, -/obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"sma" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/station/botany) +"sjZ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + icon_state = "yellowfull" }, +/area/fiorina/station/lowsec) +"skj" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"skG" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "blue" }, -/area/fiorina/tumor/ice_lab) -"smh" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +/area/fiorina/tumor/servers) +"slc" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/park) +"slh" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"sli" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/prison{ icon_state = "floor_plate" }, +/area/fiorina/station/telecomm/lz1_cargo) +"sls" = ( +/obj/structure/pipes/standard/tank/oxygen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"slR" = ( +/obj/effect/decal/cleanable/blood{ + desc = "Watch your step."; + icon_state = "gib6" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"slT" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"smj" = ( +/obj/structure/barricade/handrail/type_b, +/turf/open/floor/prison, /area/fiorina/station/disco) -"smq" = ( -/obj/structure/closet/emcloset, +"sms" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "bluecorner" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/civres_blue) "smv" = ( /obj/item/trash/used_stasis_bag{ desc = "Wow, instant sand. They really have everything in space."; @@ -30188,68 +30049,40 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"smz" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"smX" = ( -/obj/item/stock_parts/matter_bin/super, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkpurple2" +"smR" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, -/area/fiorina/tumor/servers) -"snp" = ( -/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"snq" = ( +/area/fiorina/lz/near_lzI) +"snr" = ( /obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4 }, -/area/fiorina/station/park) -"sns" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison, -/area/fiorina/station/security) -"snO" = ( +/obj/item/stool, /turf/open/floor/prison{ - dir = 6; - icon_state = "blue" + icon_state = "bluefull" }, -/area/fiorina/station/power_ring) -"soc" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" +/area/fiorina/station/civres_blue) +"snW" = ( +/obj/structure/prop/resin_prop{ + icon_state = "rack" }, -/obj/effect/spawner/random/gun/rifle, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"sol" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "darkbrownfull2" }, +/area/fiorina/tumor/aux_engi) +"soj" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/botany) "sov" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -30262,15 +30095,14 @@ /obj/item/clothing/suit/armor/det_suit, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"soQ" = ( -/obj/structure/bed{ - icon_state = "abed" - }, +"spb" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/botany) "spl" = ( /obj/item/stack/sheet/metal, /obj/structure/barricade/handrail{ @@ -30280,17 +30112,52 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"sqg" = ( -/turf/open/floor/prison{ +"spm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + pixel_y = 9 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/security) +"spA" = ( +/obj/structure/stairs/perspective{ dir = 8; - icon_state = "whitegreen" + 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 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"spH" = ( +/obj/structure/disposalpipe/segment{ + icon_state = "delivery_outlet"; + layer = 6; + name = "overhead ducting"; + pixel_y = 33 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"sql" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +"spR" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) "sqx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -30298,60 +30165,62 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"sqB" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/station/park) "sqC" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, /area/fiorina/station/lowsec) -"sru" = ( +"sqR" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/plasteel/medium_stack, -/obj/item/reagent_container/food/drinks/flask/vacuumflask{ - pixel_x = 7; - pixel_y = 22 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, +/obj/effect/spawner/random/supply_kit, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"srz" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"srp" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"srt" = ( +/obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/civres) "srI" = ( /obj/item/tool/crowbar/red, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"srQ" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"ssb" = ( +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"ssc" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ywflowers_2" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "sso" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/bag/plants, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"ssD" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - indestructible = 1; - name = "launch bay door" - }, -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) +"ssC" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "ssJ" = ( /obj/structure/lattice, /obj/structure/platform/kutjevo/smooth{ @@ -30359,123 +30228,191 @@ }, /turf/open/space, /area/fiorina/oob) +"ssM" = ( +/obj/structure/janitorialcart, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) "ssO" = ( /obj/item/ashtray/glass, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"ssR" = ( +/obj/item/clothing/under/shorts/black, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/central_ring) "sta" = ( /obj/structure/machinery/door/airlock/almayer/marine{ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"stq" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"stf" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"stw" = ( +/obj/structure/machinery/line_nexter, +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, -/obj/structure/machinery/light/double/blue, +/area/fiorina/station/security) +"stC" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 9; - icon_state = "yellow" + icon_state = "greenfull" }, -/area/fiorina/station/disco) -"stX" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "darkbrown2" +/area/fiorina/tumor/civres) +"stP" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 }, -/area/fiorina/tumor/aux_engi) -"suj" = ( -/obj/structure/barricade/wooden{ - dir = 1 +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"stU" = ( +/obj/structure/sign/poster{ + icon_state = "poster7"; + pixel_x = -26; + pixel_y = 6 }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"sun" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" + icon_state = "floor_plate" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/medbay) +"sue" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/tracker, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, -/turf/open/floor/plating/prison, /area/fiorina/station/disco) -"suB" = ( -/obj/structure/dropship_equipment/fulton_system, +"suq" = ( +/obj/item/stool, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, +/area/fiorina/station/lowsec) +"suX" = ( /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"suE" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/area/fiorina/station/central_ring) +"suY" = ( +/obj/item/device/cassette_tape/nam, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/reagent_container/glass/bottle/robot/antitoxin, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, +/area/fiorina/station/medbay) +"svc" = ( +/obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkredfull2" }, /area/fiorina/station/security) +"sve" = ( +/obj/item/explosive/grenade/phosphorus, +/obj/item/explosive/grenade/phosphorus, +/obj/item/explosive/grenade/phosphorus, +/obj/structure/surface/rack, +/obj/item/explosive/grenade/phosphorus, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "svh" = ( /obj/structure/machinery/computer/telecomms/monitor, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"svo" = ( -/obj/structure/grille, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"svF" = ( -/obj/structure/blocker/invisible_wall, +"svN" = ( +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/obj/structure/machinery/shower{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + icon_state = "kitchen" + }, +/area/fiorina/station/lowsec) +"svP" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"svW" = ( +/obj/structure/surface/rack, +/obj/item/clothing/gloves/latex, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/oob) -"svG" = ( -/obj/structure/machinery/portable_atmospherics/powered/pump, -/turf/open/floor/prison, /area/fiorina/station/medbay) "swg" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/space, /area/fiorina/oob) -"swh" = ( -/obj/structure/machinery/power/geothermal, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"sws" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +"swj" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/tumor/civres) +"swJ" = ( +/obj/item/tool/shovel/snow, +/obj/item/device/flashlight, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"syf" = ( -/obj/structure/inflatable, -/obj/structure/barricade/handrail/type_b{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"swT" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"syF" = ( -/obj/structure/machinery/microwave{ - desc = "So uh yeah, about that cat..."; - icon_state = "mwbloodyo"; - pixel_y = 6 +/area/fiorina/tumor/ice_lab) +"sxc" = ( +/obj/item/weapon/gun/rifle/mar40, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/lowsec) +"sxk" = ( +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/servers) +"sxE" = ( +/turf/open/floor/prison{ + icon_state = "redcorner" + }, +/area/fiorina/station/power_ring) +"sxH" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"syj" = ( +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security) "syG" = ( /obj/item/tool/wirecutters/clippers, /turf/open/organic/grass{ @@ -30500,78 +30437,67 @@ /obj/structure/sign/safety/fridge, /turf/closed/wall/prison, /area/fiorina/station/power_ring) -"szK" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/wood, -/area/fiorina/station/park) -"szQ" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"sAe" = ( -/obj/effect/spawner/random/gun/smg, +"sze" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 1; + icon_state = "greencorner" }, -/area/fiorina/station/research_cells) -"sAk" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/civres) +"szs" = ( +/obj/item/clothing/accessory/armband/cargo{ + desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; + name = "HEFA Order milita armband" }, -/area/fiorina/station/power_ring) -"sAv" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"sAx" = ( -/obj/structure/bed{ - icon_state = "abed" + dir = 4; + icon_state = "bluecorner" }, -/obj/effect/spawner/random/goggles/lowchance, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" +/area/fiorina/station/chapel) +"szD" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" }, -/area/fiorina/station/research_cells) -"sAK" = ( +/turf/open/floor/prison, +/area/fiorina/station/security) +"szK" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/wood, +/area/fiorina/station/park) +"szP" = ( +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"sAp" = ( /obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"sAF" = ( +/obj/item/inflatable, /turf/open/floor/prison{ dir = 1; - 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 + icon_state = "yellow" }, -/obj/item/reagent_container/syringe{ - pixel_x = 3; - pixel_y = -3 +/area/fiorina/station/lowsec) +"sBf" = ( +/obj/structure/platform{ + dir = 1 }, -/obj/item/reagent_container/glass/bottle/spaceacillin{ - pixel_x = 6; - pixel_y = 12 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/effect/landmark/objective_landmark/science, /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{ - dir = 10; - icon_state = "floor_plate" +/area/fiorina/station/park) +"sBj" = ( +/obj/structure/barricade/metal{ + health = 85; + icon_state = "metal_1" }, -/area/fiorina/station/telecomm/lz1_cargo) +/turf/open/floor/prison, +/area/fiorina/station/park) "sBA" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -30579,58 +30505,57 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"sCh" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/card/id/silver/clearance_badge, +"sBM" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"sCj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - icon_state = "mwo"; - pixel_y = 6 + dir = 4; + icon_state = "whitegreencorner" }, +/area/fiorina/station/medbay) +"sBO" = ( +/obj/structure/machinery/power/apc, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "whitegreenfull" }, -/area/fiorina/station/civres_blue) -"sCo" = ( +/area/fiorina/station/medbay) +"sBW" = ( /obj/structure/platform{ - dir = 1 + dir = 8 }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"sBY" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"sCB" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/area/fiorina/station/park) +"sCe" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/tumor/aux_engi) -"sDp" = ( -/obj/structure/largecrate/random, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"sDF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - pixel_y = 7 +/area/fiorina/station/chapel) +"sCH" = ( +/obj/item/frame/rack, +/obj/item/clothing/under/marine/ua_riot, +/turf/open/floor/prison{ + icon_state = "redfull" }, +/area/fiorina/station/security) +"sDn" = ( +/obj/structure/inflatable/popped/door, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -30638,98 +30563,162 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"sDV" = ( +"sDR" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints{ + dir = 1; + icon_state = "human2" + }, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "yellowfull" }, -/area/fiorina/station/central_ring) -"sEi" = ( +/area/fiorina/station/lowsec) +"sDS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/rifle/m16, /turf/open/floor/prison{ - dir = 8; icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) -"sED" = ( -/turf/open/floor/prison{ - icon_state = "damaged2" - }, -/area/fiorina/station/disco) "sEO" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzII) -"sFf" = ( -/obj/item/tool/crowbar/red, -/turf/open/floor/prison, -/area/fiorina/station/security) -"sFn" = ( -/obj/structure/machinery/door/window/northleft{ - dir = 4 +"sFd" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "greenblue" }, +/area/fiorina/station/botany) +"sFo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security/wardens) -"sFI" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "Residential Archives" +/area/fiorina/station/park) +"sFr" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 8 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"sFN" = ( +/area/fiorina/station/flight_deck) +"sFH" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/chem_dispenser/soda, +/obj/item/folder/red{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/folder/red{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/tool/stamp, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/lowsec) +"sFY" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"sGa" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison{ icon_state = "floor_plate" }, +/area/fiorina/station/disco) +"sGg" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/item/stack/cable_coil, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"sGb" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" +"sGk" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 }, +/obj/item/newspaper, +/obj/item/bedsheet/green, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/disco) -"sGu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/bottle/spaceacillin{ - pixel_x = -6; - pixel_y = 4 +/area/fiorina/station/medbay) +"sGx" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/research_cells) +/area/fiorina/tumor/aux_engi) +"sGC" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/station/civres_blue) "sGI" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/wood, /area/fiorina/station/park) -"sHb" = ( -/obj/structure/platform_decoration{ - dir = 4 +"sGX" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/mre_pack/meal4{ + name = "\improper prison food"; + pixel_y = 9 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"sHe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stock_parts/subspace/amplifier{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/stock_parts/subspace/analyzer{ + pixel_x = -9; + pixel_y = 8 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) -"sHw" = ( -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +/area/fiorina/station/power_ring) +"sHj" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "yellowcorner" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/lowsec) -"sHH" = ( -/turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/research_cells) +"sHL" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"sHM" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryocell2deval" + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "sHO" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -30739,121 +30728,135 @@ }, /turf/open/space, /area/fiorina/oob) -"sHQ" = ( -/obj/structure/largecrate/random/case/double, +"sIg" = ( +/obj/item/device/pinpointer, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"sII" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "\improper Mentor's Guide Bookcase" +/area/fiorina/station/telecomm/lz1_cargo) +"sIh" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) -"sIJ" = ( -/obj/structure/extinguisher_cabinet, -/turf/closed/wall/r_wall/prison, -/area/fiorina/lz/near_lzI) -"sIQ" = ( -/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/civres) -"sIT" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 4 + icon_state = "redfull" }, +/area/fiorina/station/security) +"sIj" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzII) -"sJc" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/area/fiorina/station/flight_deck) +"sIk" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "kitchen" }, /area/fiorina/station/lowsec) -"sJl" = ( -/obj/structure/largecrate/random/barrel/white, +"sIs" = ( +/obj/item/weapon/gun/smg/nailgun, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/maintenance) +"sIz" = ( +/obj/structure/machinery/computer/emails{ + pixel_y = 6 + }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/park) +"sIC" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/civres) +"sII" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "\improper Mentor's Guide Bookcase" + }, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) +"sIJ" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall/prison, +/area/fiorina/lz/near_lzI) "sJu" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"sJw" = ( +"sJy" = ( +/obj/item/ammo_casing{ + icon_state = "casing_9_1" + }, /turf/open/floor/prison{ - icon_state = "floorscorched1" + dir = 8; + icon_state = "yellowcorner" }, -/area/fiorina/station/chapel) +/area/fiorina/station/lowsec) +"sJB" = ( +/obj/item/stack/folding_barricade, +/turf/open/floor/prison, +/area/fiorina/station/security) "sJN" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzI) -"sJT" = ( -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"sKn" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"sKq" = ( +"sJP" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"sKP" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8 +/area/fiorina/station/lowsec) +"sKr" = ( +/obj/item/storage/secure/briefcase{ + pixel_x = 9; + pixel_y = 18 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"sKS" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 +/area/fiorina/station/lowsec) +"sKt" = ( +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "yellowfull" }, -/area/fiorina/station/disco) -"sLl" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" +/area/fiorina/station/lowsec) +"sKu" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"sKY" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"sLo" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 1 +"sLu" = ( +/obj/structure/prop/almayer/computers/sensor_computer1{ + name = "computer" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "darkredfull2" }, /area/fiorina/lz/near_lzI) "sLx" = ( @@ -30866,26 +30869,29 @@ }, /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) -"sLT" = ( -/obj/item/tool/weldingtool, +"sMe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/security_space_law{ + pixel_x = 3; + pixel_y = 5 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/station/civres_blue) -"sMj" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 +/area/fiorina/station/security) +"sMX" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"sMo" = ( -/obj/item/clothing/under/marine/ua_riot, -/obj/item/weapon/gun/rifle/m16, +/area/fiorina/tumor/aux_engi) +"sMY" = ( +/obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/botany) "sNb" = ( /obj/item/device/radio, /turf/open/organic/grass{ @@ -30893,43 +30899,54 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"sNd" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, +"sNg" = ( +/obj/structure/closet/firecloset/full, +/obj/item/storage/pill_bottle/bicaridine/skillless, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"sNu" = ( -/obj/structure/bed/chair{ +"sNi" = ( +/obj/item/device/flashlight, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) +"sNj" = ( +/obj/structure/barricade/metal/wired{ dir = 8 }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" +/obj/item/stack/sheet/metal{ + amount = 5 }, -/area/fiorina/maintenance) -"sNK" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) "sNN" = ( /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"sNT" = ( -/obj/effect/spawner/random/gun/pistol/lowchance, +"sNQ" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_tram) +"sNU" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "darkbrown2" + icon_state = "red" }, -/area/fiorina/station/park) +/area/fiorina/station/security) "sOf" = ( /obj/item/clothing/mask/cigarette/weed{ icon_state = "ucigoff" @@ -30945,21 +30962,16 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"sOn" = ( -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security/wardens) -"sOp" = ( -/obj/effect/decal/cleanable/blood{ - desc = "Watch your step."; - icon_state = "gib6" +"sOj" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/telecomm/lz1_cargo) +/turf/open/floor/prison, +/area/fiorina/station/security) "sOs" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/almayer{ @@ -30967,84 +30979,110 @@ icon_state = "plating" }, /area/fiorina/tumor/ship) -"sPk" = ( -/obj/structure/stairs/perspective{ +"sOM" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "p_stair_full" + pixel_y = 21 }, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"sPC" = ( -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 22 +/area/fiorina/station/central_ring) +"sPh" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, +/area/fiorina/lz/near_lzI) +"sPi" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "blue" + icon_state = "darkyellowcorners2" }, -/area/fiorina/station/civres_blue) -"sQK" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibdown1" +/area/fiorina/station/telecomm/lz1_cargo) +"sPt" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/structure/platform/shiva, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"sPJ" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/area/fiorina/station/medbay) -"sQL" = ( -/obj/structure/platform, -/turf/open/gm/river{ - color = "#995555"; - name = "pool" +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/fiorina/station/park) -"sRb" = ( -/obj/item/trash/candy, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +/area/fiorina/tumor/civres) +"sQr" = ( +/obj/structure/janitorialcart, +/obj/item/clothing/head/bio_hood/janitor{ + pixel_x = -4; + pixel_y = 5 }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"sQy" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/random/gun/pistol/midchance, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "redfull" }, -/area/fiorina/station/medbay) -"sRg" = ( -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/security) +"sQz" = ( +/obj/structure/closet/emcloset, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"sRk" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/station/park) -"sRH" = ( -/obj/item/pamphlet/engineer, -/obj/structure/closet, +/area/fiorina/tumor/ice_lab) +"sQC" = ( +/obj/structure/surface/rack, /obj/item/handcuffs, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ icon_state = "darkredfull2" }, +/area/fiorina/station/security) +"sQL" = ( +/obj/structure/platform, +/turf/open/gm/river{ + color = "#995555"; + name = "pool" + }, +/area/fiorina/station/park) +"sRv" = ( +/obj/item/clothing/shoes/marine/upp_knife, +/turf/open/floor/prison, /area/fiorina/station/lowsec) -"sRV" = ( +"sRE" = ( +/obj/structure/platform, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) +"sRJ" = ( +/obj/structure/machinery/constructable_frame, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/security) -"sSJ" = ( -/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ - dir = 8; - icon_state = "floor_marked" + dir = 10; + icon_state = "damaged2" }, /area/fiorina/station/lowsec) +"sSM" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "sSY" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -31056,16 +31094,17 @@ }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) -"sTa" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "red" - }, -/area/fiorina/station/security) "sTd" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"sTm" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "sTu" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -31075,34 +31114,86 @@ /obj/structure/blocker/invisible_wall, /turf/open/space, /area/fiorina/station/medbay) -"sTB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"sTw" = ( +/obj/structure/barricade/wooden{ + dir = 8 }, -/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"sTI" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"sTV" = ( +/area/fiorina/station/medbay) +"sTK" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/telecomm/lz1_cargo) +"sTU" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"sUc" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"sUe" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "sUl" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"sUq" = ( -/obj/item/stack/sheet/metal/medium_stack, +"sUr" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/bible/hefa, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/chapel) +"sUt" = ( +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison, +/area/fiorina/station/park) +"sUV" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" + }, +/area/fiorina/tumor/aux_engi) "sUX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/organic/grass{ @@ -31115,63 +31206,36 @@ icon_state = "squares" }, /area/fiorina/station/civres_blue) -"sVa" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" - }, -/turf/open/floor/prison{ +"sVd" = ( +/obj/structure/stairs/perspective{ dir = 8; - icon_state = "blue" + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/civres_blue) -"sVi" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/botany) "sVv" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 }, /turf/open/space, /area/fiorina/oob) -"sVy" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/obj/item/trash/barcardine, +"sVS" = ( +/obj/item/trash/pistachios, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"sVD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/pamphlet/skill/powerloader, +"sVT" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"sVM" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) -"sVN" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"sVP" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" + icon_state = "sterile_white" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/ice_lab) "sVU" = ( /obj/structure/largecrate/machine, /obj/item/reagent_container/food/drinks/cans/aspen{ @@ -31179,80 +31243,147 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"sWu" = ( -/obj/structure/bed/chair{ - dir = 4 +"sVW" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, +/area/fiorina/tumor/aux_engi) +"sVZ" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) -"sWF" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/station/botany) +"sWb" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 }, -/obj/structure/platform{ - dir = 4 +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/ice_lab) +"sWe" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) +"sWl" = ( +/obj/structure/bed/roller, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"sWr" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"sWw" = ( +/obj/item/storage/bag/trash, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"sWX" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/research_cells) +"sXa" = ( +/obj/structure/machinery/filtration/console, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"sXe" = ( +/turf/open/floor/prison, +/area/fiorina/station/research_cells) "sXi" = ( /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"sXy" = ( -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"sXt" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) +"sXP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/hardpoint/support/flare_launcher{ + pixel_x = -1; + pixel_y = 5 }, -/area/fiorina/station/chapel) -"sYe" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" + icon_state = "darkyellow2" }, -/area/fiorina/station/central_ring) +/area/fiorina/lz/near_lzI) "sYn" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"sYM" = ( -/obj/effect/decal/cleanable/blood, +"sYy" = ( +/obj/item/ammo_casing{ + icon_state = "casing_1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"sYB" = ( /turf/open/floor/prison{ + dir = 9; icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/telecomm/lz1_tram) "sYP" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"sZr" = ( -/obj/structure/largecrate/random/secure, +"sZt" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) +"sZZ" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"tam" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/area/fiorina/station/telecomm/lz1_cargo) +"tad" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"tai" = ( +/obj/structure/bed/chair, +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 }, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/storage/belt/shotgun, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "darkbrown2" }, -/area/fiorina/station/security) +/area/fiorina/station/park) +"taj" = ( +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "tan" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/oob) @@ -31262,108 +31393,135 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"tax" = ( -/obj/item/clothing/under/color/orange, +"taI" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"taX" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 + icon_state = "darkpurplefull2" }, +/area/fiorina/station/research_cells) +"taL" = ( +/obj/item/clothing/under/color/orange, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/security) +"taS" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) "taY" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/space/basic, /area/fiorina/lz/near_lzI) -"tbs" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"tbC" = ( +"tbd" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - dir = 5; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"tbZ" = ( -/obj/structure/filingcabinet, +/area/fiorina/tumor/ship) +"tbj" = ( +/obj/item/stack/sandbags_empty/half, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"tcl" = ( -/obj/structure/largecrate/random/mini/med, +/area/fiorina/station/flight_deck) +"tbm" = ( +/obj/item/stack/cable_coil, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/medbay) -"tcJ" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/tumor/servers) +"tbG" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, +/area/fiorina/tumor/servers) +"tco" = ( +/obj/item/paper/crumpled/bloody/csheet, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"tcO" = ( +/area/fiorina/lz/near_lzII) +"tcB" = ( +/obj/effect/alien/weeds/node, /turf/open/floor/prison{ - dir = 8; - icon_state = "bluecorner" + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) +"tcD" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gib2" + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"tcL" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "bluefull" }, /area/fiorina/station/chapel) -"tdb" = ( +"tcW" = ( +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8; + pixel_x = -10; + pixel_y = -3 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"tde" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"tdo" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/area/fiorina/station/central_ring) +"tdq" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/area/fiorina/station/park) -"tdA" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "redcorner" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"tdG" = ( -/obj/item/storage/backpack/satchel/lockable, -/turf/open/floor/prison, -/area/fiorina/station/security) -"tdZ" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/park) -"tef" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - layer = 2.5 +"tdr" = ( +/obj/structure/prop/resin_prop{ + dir = 4; + icon_state = "chair"; + pixel_y = 6 }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "tel" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/medbay) +"teq" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/botany) "tet" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -31374,19 +31532,42 @@ icon_state = "plate" }, /area/fiorina/station/telecomm/lz1_cargo) -"teH" = ( -/obj/structure/platform_decoration, +"teu" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"teI" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"teK" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/area/fiorina/station/park) -"teT" = ( -/obj/item/paper/crumpled, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"tfl" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"tfw" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) "tfx" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -31400,130 +31581,223 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"tgc" = ( -/obj/item/tool/wet_sign, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"tgv" = ( -/obj/structure/machinery/computer/emails{ - pixel_y = 6 +"tge" = ( +/obj/structure/machinery/vending/coffee, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 }, -/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/medbay) "tgB" = ( /obj/structure/barricade/wooden{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"the" = ( -/turf/open/floor/prison{ - icon_state = "floorscorched1" - }, -/area/fiorina/station/security) -"thi" = ( +"tgK" = ( +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe" + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) +"tgL" = ( +/obj/structure/machinery/portable_atmospherics/powered/scrubber, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"thz" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/lockbox/vials{ + pixel_x = -4; + pixel_y = 4 }, -/area/fiorina/tumor/aux_engi) -"thU" = ( -/obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"tih" = ( -/obj/item/tool/warning_cone, +/area/fiorina/station/lowsec) +"thI" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"tik" = ( -/obj/structure/barricade/handrail/type_b{ - layer = 3.5 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, +/area/fiorina/station/civres_blue) +"thV" = ( +/obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/prison{ - dir = 1; + dir = 4; icon_state = "blue" }, +/area/fiorina/station/power_ring) +"tii" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"til" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/item/stool, +/obj/item/clothing/shoes/slippers_worn, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) -"tiW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/chunk, +"tir" = ( +/obj/item/ammo_magazine/rifle/m16, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/security) +"tis" = ( +/obj/structure/inflatable, +/obj/structure/barricade/handrail/type_b, +/obj/structure/barricade/handrail/type_b{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"tiM" = ( +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "tiX" = ( /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"tjo" = ( -/obj/structure/machinery/vending/coffee/simple, +"tiY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "floorscorched2" + }, +/area/fiorina/tumor/civres) +"tiZ" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) -"tjM" = ( -/obj/structure/platform_decoration{ - dir = 4 +"tja" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"tji" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + layer = 2.5 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"tjp" = ( +/obj/item/tool/warning_cone, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"tjw" = ( +/obj/structure/platform_decoration, +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"tjR" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/machinery/shower{ + dir = 1; + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/research_cells) +"tkd" = ( +/obj/structure/filingcabinet, +/obj/structure/filingcabinet{ + pixel_x = 16 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"tkg" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"tjQ" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/station/park) +"tkj" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "green" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/chapel) -"tjU" = ( +/area/fiorina/station/park) +"tkP" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) +"tkZ" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; + dir = 8; + pixel_x = -10; pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 8; + icon_state = "whitepurple" }, -/area/fiorina/tumor/servers) -"tke" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/research_cells) +"tle" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 }, -/obj/structure/machinery/constructable_frame{ - icon_state = "box_1" +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"tkk" = ( -/obj/structure/machinery/light/double/blue, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"tld" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"tlp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - pixel_y = 7 +/area/fiorina/tumor/civres) +"tlj" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "tlq" = ( @@ -31542,24 +31816,46 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"tlM" = ( -/obj/item/device/flashlight/lamp/tripod, +"tlC" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/power_ring) +"tlF" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) +"tlJ" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "tlQ" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"tlS" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) "tlV" = ( /obj/structure/machinery/space_heater, /obj/item/device/flashlight/lamp{ @@ -31567,13 +31863,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"tmi" = ( -/obj/item/device/flashlight, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) +"tmo" = ( +/obj/structure/stairs/perspective, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) "tmx" = ( /obj/structure/bed/chair{ dir = 1 @@ -31585,6 +31878,30 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"tmF" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"tmI" = ( +/obj/effect/alien/weeds/node, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) +"tmL" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) +"tmX" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/prison, +/area/fiorina/station/park) "tna" = ( /obj/structure/bed/sofa/pews{ dir = 4 @@ -31595,102 +31912,29 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) -"tnd" = ( -/obj/structure/largecrate/supply/medicine/medkits, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"tng" = ( -/obj/structure/computerframe, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) -"tnj" = ( -/obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison{ - dir = 9; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"tno" = ( -/obj/item/stack/sheet/cardboard, +"tnw" = ( +/obj/effect/landmark/queen_spawn, /turf/open/floor/prison{ dir = 1; - icon_state = "yellow" + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) -"tnr" = ( -/obj/effect/landmark/survivor_spawner, +/area/fiorina/tumor/aux_engi) +"tnY" = ( +/obj/structure/platform_decoration, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"tnA" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"tnH" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"tnP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/pills/lowchance, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) "tob" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; name = "Residential Apartment" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"tom" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 - }, -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"tov" = ( -/obj/effect/spawner/random/gun/smg/midchance, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"toE" = ( -/turf/open/floor/carpet, -/area/fiorina/station/civres_blue) -"toJ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) +"toE" = ( +/turf/open/floor/carpet, +/area/fiorina/station/civres_blue) "tpa" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -31711,91 +31955,116 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"tpO" = ( -/obj/structure/machinery/microwave{ - desc = "There's two of them."; - pixel_y = 5 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - desc = "Holy shit"; - pixel_y = 18 - }, -/obj/item/storage/pill_bottle/kelotane/skillless{ - desc = "Don't touch -Dr. O"; - pixel_x = 6; - pixel_y = 31 +"tpw" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, +/obj/structure/largecrate/random/case, /turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"tpz" = ( +/obj/item/paper/carbon, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) +"tpE" = ( +/obj/item/tank/jetpack/carbondioxide, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) +"tpF" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" + }, +/area/fiorina/tumor/aux_engi) "tpY" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"tqa" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"tpZ" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" }, -/turf/open/space/basic, -/area/fiorina/oob) -"tqM" = ( -/obj/structure/filingcabinet, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/tumor/aux_engi) -"tqN" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/processor{ - desc = "It CAN blend it."; - icon_state = "blender_e"; - name = "Blendomatic"; - pixel_x = -2; - pixel_y = 10 +/area/fiorina/station/medbay) +"tql" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + icon_state = "greenblue" }, -/area/fiorina/station/civres_blue) -"tqQ" = ( +/area/fiorina/station/botany) +"tqw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"tqx" = ( +/obj/structure/prop/resin_prop{ + icon_state = "rack" + }, +/obj/item/storage/toolbox, +/obj/item/storage/toolbox, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellowcorners2" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/lz/near_lzI) -"tqR" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/tumor/servers) +"tqP" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" +/obj/structure/platform/kutjevo/smooth{ + dir = 4 }, -/turf/open/floor/prison{ +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail{ dir = 1; - icon_state = "whitegreen" + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/area/fiorina/station/medbay) +/turf/open/space/basic, +/area/fiorina/oob) "trl" = ( /obj/item/trash/buritto, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"trB" = ( -/obj/effect/decal/cleanable/blood/oil, +"trJ" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"trH" = ( -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 + icon_state = "darkpurple2" }, +/area/fiorina/station/central_ring) +"trN" = ( +/obj/item/stack/barbed_wire, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"trR" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/item/storage/fancy/cigarettes/blackpack, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "trS" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -31803,47 +32072,73 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) +"tsc" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + indestructible = 1; + name = "launch bay door" + }, +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/oob) "tsf" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/donut_box{ + pixel_y = 9 }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"tsi" = ( -/obj/structure/barricade/metal/wired, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/station/lowsec) -"tsu" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/station/power_ring) +"tsr" = ( +/obj/structure/pipes/unary/freezer{ + icon_state = "freezer_1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/medbay) +"tss" = ( +/obj/structure/bookcase/manuals/engineering, /turf/open/floor/prison{ dir = 9; - icon_state = "blue" + icon_state = "greenfull" }, -/area/fiorina/station/power_ring) -"tsQ" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/tumor/civres) +"tst" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/oob) +"tsA" = ( +/obj/structure/barricade/metal{ + dir = 8; + health = 150; + icon_state = "metal_2" }, -/turf/open/floor/prison, -/area/fiorina/station/park) -"tts" = ( -/obj/structure/machinery/landinglight/ds2, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/ice_lab) +"tsH" = ( +/obj/structure/tunnel, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/tumor/fiberbush) +"tsN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 }, -/area/fiorina/lz/near_lzII) -"ttK" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/security) "tuf" = ( /obj/item/clothing/shoes/jackboots{ name = "Awesome Guy" @@ -31859,52 +32154,12 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"tuo" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"tur" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"tuB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/pen/blue/clicky, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"tuD" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"tuH" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/structure/bed/chair{ - dir = 1; - layer = 2.8 - }, +"tuA" = ( /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/disco) +/area/fiorina/station/telecomm/lz1_tram) "tuX" = ( /obj/structure/platform{ dir = 1 @@ -31917,119 +32172,95 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"tvu" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"tvI" = ( -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"tvM" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"tvU" = ( +"tvi" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_27"; - layer = 3.1; - pixel_x = -2; - pixel_y = 10 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"tvX" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/chapel) +/area/fiorina/tumor/ice_lab) "twb" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/maintenance) -"twd" = ( -/obj/effect/decal/cleanable/blood, +"twR" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/park) -"twB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 +/area/fiorina/tumor/ice_lab) +"txb" = ( +/obj/structure/window/framed/prison/reinforced{ + opacity = 1 }, +/obj/structure/machinery/door/poddoor/shutters/almayer, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"twL" = ( -/obj/vehicle/train/cargo/trolley, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"txS" = ( -/obj/item/stack/sandbags, -/turf/open/floor/prison{ - icon_state = "kitchen" +/area/fiorina/station/chapel) +"txf" = ( +/obj/structure/prop/almayer/computers/sensor_computer1{ + name = "computer" }, -/area/fiorina/station/power_ring) -"tyb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/lockbox/vials{ - pixel_x = -4; - pixel_y = 4 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/station/lowsec) -"tyk" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/prison{ +/area/fiorina/station/research_cells) +"txh" = ( +/obj/structure/bed/sofa/vert/grey, +/turf/open/floor/prison, +/area/fiorina/station/security) +"txY" = ( +/obj/structure/prop/souto_land/streamer{ dir = 1; - icon_state = "whitepurple" + pixel_y = 24 }, -/area/fiorina/station/research_cells) -"tyO" = ( -/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/botany) -"tyQ" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 + dir = 8; + icon_state = "darkbrown2" }, +/area/fiorina/station/park) +"tyj" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "blue" + }, +/area/fiorina/station/chapel) +"tyt" = ( +/obj/item/ammo_casing{ + dir = 8; + icon_state = "cartridge_2" }, -/area/fiorina/station/power_ring) -"tzj" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "greencorner" + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) +"tyC" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 }, -/area/fiorina/tumor/civres) -"tzx" = ( -/obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) +"tyJ" = ( +/obj/item/reagent_container/food/snacks/xenoburger, +/obj/item/reagent_container/food/snacks/xenoburger, +/obj/item/reagent_container/food/snacks/xenoburger, +/obj/structure/closet/crate/freezer, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) "tzy" = ( /obj/item/ammo_magazine/smg/mp5, /obj/structure/extinguisher_cabinet{ @@ -32037,19 +32268,33 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"tzF" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" +"tzM" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/obj/structure/platform{ +/turf/open/floor/prison, +/area/fiorina/station/disco) +"tzN" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 4 }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"tzU" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"tzW" = ( +/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkbrown2" }, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/aux_engi) "tAb" = ( /obj/structure/surface/rack, /obj/item/storage/backpack/general_belt{ @@ -32058,115 +32303,54 @@ /obj/item/storage/backpack/general_belt, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"tAf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"tAk" = ( -/obj/item/weapon/gun/rifle/m16, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"tAI" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ +"tAj" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"tBa" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/disco) -"tBe" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 - }, -/obj/item/device/flashlight/flare, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"tBt" = ( -/obj/item/newspaper, -/turf/open/floor/prison{ - icon_state = "green" + pixel_y = 21 }, -/area/fiorina/station/transit_hub) -"tBy" = ( /turf/open/floor/prison{ dir = 4; icon_state = "cell_stripe" }, -/area/fiorina/station/telecomm/lz1_tram) -"tBD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 4 +/area/fiorina/station/medbay) +"tAE" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"tAR" = ( +/obj/structure/surface/rack, +/obj/item/tool/extinguisher, +/obj/item/tool/crowbar{ + pixel_x = 5; + pixel_y = -5 }, +/obj/item/tool/crowbar, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "tBP" = ( /obj/structure/machinery/shower{ dir = 1 }, /turf/open/floor/interior/plastic, /area/fiorina/station/research_cells) -"tBR" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, +"tCv" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"tBU" = ( -/obj/item/paper/crumpled/bloody/csheet, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzII) -"tCf" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"tCj" = ( -/obj/structure/machinery/power/apc{ - dir = 8 + icon_state = "greenfull" }, +/area/fiorina/tumor/civres) +"tCH" = ( +/obj/item/stack/folding_barricade, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"tCu" = ( -/obj/item/frame/rack, -/obj/item/clothing/under/marine/ua_riot, -/turf/open/floor/prison{ - icon_state = "redfull" - }, /area/fiorina/station/security) "tCZ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -32189,6 +32373,12 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"tDC" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) "tDE" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -32204,28 +32394,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"tDY" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/item/tool/pickaxe, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"tEb" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) -"tEj" = ( -/obj/item/device/flashlight/lamp/tripod, +"tEA" = ( +/obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/chapel) "tEH" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, @@ -32237,9 +32411,25 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"tFu" = ( -/obj/effect/decal/cleanable/blood/oil, +"tEX" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/transit_hub) +"tEY" = ( +/obj/structure/machinery/newscaster{ + pixel_y = 32 + }, /turf/open/floor/prison, +/area/fiorina/station/security) +"tFo" = ( +/obj/structure/reagent_dispensers/watertank{ + layer = 2.6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "tFA" = ( /obj/structure/platform{ @@ -32247,67 +32437,67 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"tGi" = ( +"tFY" = ( +/obj/structure/platform, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, /obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"tGl" = ( -/obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/lz/near_lzII) -"tGF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/newspaper, -/obj/item/attachable/bipod, /turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"tGO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ - dir = 1 + dir = 6; + icon_state = "whitegreen" }, +/area/fiorina/station/medbay) +"tGU" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/pill_bottle/tramadol/skillless, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"tHh" = ( +/area/fiorina/station/medbay) +"tGY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/atmos_alert{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18"; + pixel_y = 12 }, -/area/fiorina/tumor/fiberbush) +/turf/open/floor/plating/prison, +/area/fiorina/station/security/wardens) "tHl" = ( /obj/structure/inflatable, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"tHr" = ( -/obj/effect/decal/cleanable/blood/oil, +"tHw" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) -"tHs" = ( +"tHF" = ( +/obj/structure/platform{ + dir = 8 + }, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/security) -"tHu" = ( -/obj/structure/inflatable, +/area/fiorina/station/medbay) +"tHJ" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "whitepurple" + dir = 9; + icon_state = "darkbrown2" }, -/area/fiorina/station/research_cells) +/area/fiorina/maintenance) "tHL" = ( /obj/structure/blocker/invisible_wall, /turf/closed/shuttle/ert{ @@ -32315,29 +32505,29 @@ opacity = 0 }, /area/fiorina/station/medbay) -"tHP" = ( -/obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellow2" +"tIf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 }, -/area/fiorina/station/telecomm/lz1_cargo) -"tHU" = ( -/obj/structure/monorail{ - dir = 5; - name = "launch track" +/turf/open/floor/prison{ + icon_state = "kitchen" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"tHX" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryomid" +/area/fiorina/station/power_ring) +"tIn" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/prison, +/area/fiorina/station/chapel) +"tIp" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/obj/structure/platform/kutjevo/smooth{ + dir = 4 }, -/area/fiorina/station/medbay) +/turf/open/space/basic, +/area/fiorina/oob) "tIC" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations are the leading cause in asbestos related deaths for 3 years in a row."; @@ -32349,43 +32539,44 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"tII" = ( -/obj/item/reagent_container/food/drinks/bottle/rum, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"tIK" = ( -/obj/item/tool/screwdriver, -/turf/open/floor/prison{ - dir = 10; - icon_state = "green" - }, -/area/fiorina/tumor/civres) "tIU" = ( /obj/item/tool/candle, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) -"tJe" = ( +"tIW" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "green" + icon_state = "darkyellow2" }, -/area/fiorina/station/chapel) -"tJn" = ( -/obj/item/tool/wirecutters, -/obj/structure/platform/shiva{ - dir = 1 +/area/fiorina/lz/near_lzI) +"tJw" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"tJM" = ( -/obj/item/prop/helmetgarb/riot_shield, +/area/fiorina/station/medbay) +"tJC" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"tJH" = ( +/obj/item/reagent_container/food/drinks/coffee, +/turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) +"tJQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/cigarette/cigar/tarbacks, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/chapel) "tJR" = ( /obj/structure/machinery/computer/cameras/wooden_tv{ pixel_y = 7 @@ -32393,12 +32584,6 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"tJT" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/central_ring) "tJU" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light/double/blue{ @@ -32411,15 +32596,16 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"tKs" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 7; - pixel_y = 6 +"tKk" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/turf/open/floor/prison, -/area/fiorina/station/chapel) +/obj/item/reagent_container/food/snacks/wrapped/barcardine, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "tKv" = ( /obj/structure/machinery/computer/secure_data{ dir = 8 @@ -32427,130 +32613,89 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"tLd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ +"tKN" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" + }, +/turf/open/floor/prison{ dir = 4; - pixel_y = 5 + icon_state = "green" }, +/area/fiorina/tumor/civres) +"tLk" = ( +/obj/item/paper/crumpled, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) "tLC" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"tLT" = ( -/obj/item/reagent_container/food/drinks/bottle/sake, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"tLY" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"tMe" = ( -/turf/open/floor/prison{ - icon_state = "redcorner" - }, -/area/fiorina/station/power_ring) -"tMn" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/transit_hub) -"tMr" = ( -/obj/item/toy/deck, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +"tMb" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 }, -/area/fiorina/station/research_cells) -"tMx" = ( -/obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "darkbrown2" }, -/area/fiorina/station/security) -"tMz" = ( -/obj/structure/closet/crate/bravo, -/obj/item/stack/sheet/metal/medium_stack, -/obj/item/stack/sheet/metal/medium_stack, -/obj/item/fuelCell, -/obj/item/stack/sheet/plasteel, +/area/fiorina/station/park) +"tMs" = ( +/obj/item/weapon/gun/smg/mp5, +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/power_ring) -"tMA" = ( -/obj/structure/machinery/fuelcell_recycler, -/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"tMF" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 +"tMS" = ( +/obj/effect/alien/weeds/node, +/obj/structure/prop/resin_prop{ + icon_state = "rack" }, -/obj/structure/platform_decoration{ - dir = 8 +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"tMU" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"tML" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/cell/super{ - pixel_y = 12 - }, -/obj/item/cell/super, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, /area/fiorina/tumor/civres) -"tMP" = ( -/obj/structure/machinery/disposal, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"tNs" = ( -/obj/structure/platform_decoration, +"tMV" = ( +/obj/structure/closet/firecloset/full, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"tNt" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/cigbutt/bcigbutt, +/area/fiorina/station/medbay) +"tNf" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) -"tNu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/hardpoint/support/flare_launcher{ - pixel_x = -1; - pixel_y = 5 +/area/fiorina/tumor/ice_lab) +"tNF" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null }, +/obj/item/weapon/gun/smg/mp5, +/obj/item/storage/belt/marine, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"tNS" = ( -/obj/structure/machinery/portable_atmospherics/powered/scrubber, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "redfull" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/security) "tNV" = ( /obj/item/stack/sheet/wood, /turf/open/floor/plating/prison, @@ -32558,39 +32703,23 @@ "tOc" = ( /turf/open/floor/wood, /area/fiorina/station/disco) -"tOo" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) "tOp" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"tOr" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) "tOG" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/pill_bottle/kelotane/skillless, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"tOK" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) +"tOM" = ( +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"tOP" = ( +/obj/structure/platform, +/obj/structure/closet/radiation, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "tOS" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/item/reagent_container/food/snacks/grown/eggplant{ @@ -32601,26 +32730,6 @@ name = "astroturf" }, /area/fiorina/station/park) -"tOZ" = ( -/obj/effect/spawner/random/toolbox, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"tPi" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) "tPz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -32633,279 +32742,196 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"tPN" = ( -/obj/structure/window/framed/prison/reinforced/hull, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) -"tPP" = ( -/obj/effect/landmark/objective_landmark/medium, +"tPA" = ( +/obj/structure/largecrate/supply/medicine/iv, /turf/open/floor/prison{ - dir = 9; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"tPB" = ( +/turf/open/floor/prison{ + dir = 6; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"tPQ" = ( +"tPC" = ( /turf/open/floor/prison{ - icon_state = "platingdmg1" + icon_state = "darkyellowcorners2" }, -/area/fiorina/station/security) -"tQi" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 1; - pixel_y = 24 +/area/fiorina/station/flight_deck) +"tPN" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/maintenance) +"tQk" = ( +/obj/item/shard{ + icon_state = "medium" }, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/tumor/servers) "tQm" = ( /obj/item/trash/boonie, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"tQn" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/fiberbush) -"tQq" = ( +"tQB" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"tRH" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/botany) +"tSl" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison{ - dir = 8; - icon_state = "greencorner" + icon_state = "yellowfull" }, -/area/fiorina/tumor/civres) -"tQs" = ( -/obj/effect/decal/cleanable/blood/drip, +/area/fiorina/station/lowsec) +"tSm" = ( /turf/open/floor/prison{ dir = 8; icon_state = "greenblue" }, /area/fiorina/station/botany) -"tQB" = ( -/obj/structure/window/framed/prison/reinforced/hull, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"tQJ" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"tQL" = ( +"tSL" = ( /obj/structure/platform{ dir = 1 }, /obj/structure/platform{ - dir = 8 + dir = 4 }, /obj/structure/platform_decoration{ - dir = 5 + dir = 9 }, +/obj/structure/largecrate/random, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"tRa" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"tRt" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" - }, -/obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison{ - dir = 1; - icon_state = "greenblue" - }, -/area/fiorina/station/botany) -"tRH" = ( -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/botany) -"tSi" = ( -/obj/structure/bed/sofa/vert/grey/top, +"tSY" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"tSn" = ( -/turf/open/floor/prison{ - icon_state = "cell_stripe" +/area/fiorina/station/transit_hub) +"tTm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stool{ + pixel_y = 12 }, -/area/fiorina/station/medbay) -"tST" = ( -/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"tTr" = ( -/obj/structure/platform_decoration{ - dir = 1 + icon_state = "yellowfull" }, +/area/fiorina/station/lowsec) +"tTv" = ( +/obj/item/stack/sandbags/large_stack, /turf/open/floor/prison{ dir = 8; - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) -"tTu" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkyellow2" }, -/area/fiorina/station/security) +/area/fiorina/station/telecomm/lz1_cargo) "tTA" = ( /obj/structure/prop/souto_land/pole{ dir = 1 }, /turf/open/floor/wood, /area/fiorina/station/park) -"tTK" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_7" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"tTM" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"tTV" = ( -/obj/effect/decal/cleanable/blood/oil, +"tTB" = ( +/obj/item/clothing/gloves/boxing/green, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"tUe" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 + dir = 6; + icon_state = "yellow" }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/central_ring) +"tTI" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/medical_decals{ + dir = 4; + icon_state = "triagedecaldir" }, -/area/fiorina/station/botany) -"tUr" = ( -/obj/structure/closet/toolcloset, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/maintenance) +/area/fiorina/station/medbay) "tUs" = ( /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"tUA" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/explosive/grenade/incendiary/molotov, -/obj/effect/landmark/objective_landmark/close, -/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, -/area/fiorina/station/medbay) -"tVt" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 +"tUC" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"tVu" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_v" + dir = 4; + icon_state = "darkyellow2" }, +/area/fiorina/lz/near_lzI) +"tUD" = ( +/obj/structure/closet, /turf/open/floor/prison{ dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"tVB" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "casing_6" - }, -/obj/structure/barricade/metal{ - dir = 8; - health = 150; - icon_state = "metal_2" +/area/fiorina/station/flight_deck) +"tUG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical/green, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, -/obj/effect/spawner/random/gun/smg, +/area/fiorina/maintenance) +"tUS" = ( +/obj/item/explosive/grenade/high_explosive/frag, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"tVf" = ( +/obj/structure/closet/crate/bravo, +/obj/item/stack/sheet/metal/medium_stack, +/obj/item/stack/sheet/metal/medium_stack, +/obj/item/fuelCell, +/obj/item/stack/sheet/plasteel, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "bluefull" }, -/area/fiorina/station/park) -"tVG" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/power_ring) +"tVI" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/research_cells) "tVV" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"tVX" = ( -/obj/structure/window/reinforced/tinted, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/lz/near_lzI) -"tVZ" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"tWe" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, +"tVY" = ( +/obj/structure/machinery/power/smes/buildable, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"tWf" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/central_ring) +"tWh" = ( +/obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"tWo" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/botany) +"tWs" = ( +/obj/item/toy/deck, /turf/open/floor/prison{ - icon_state = "greenblue" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/botany) -"tWq" = ( +/area/fiorina/station/research_cells) +"tWz" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, +/obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, /area/fiorina/station/power_ring) "tWI" = ( @@ -32915,31 +32941,32 @@ }, /turf/open/space, /area/fiorina/oob) -"tXi" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +"tXt" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/storage/box/pillbottles, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/security) -"tXQ" = ( -/turf/open/floor/prison{ - icon_state = "platingdmg1" +/area/fiorina/station/transit_hub) +"tXD" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/tumor/servers) -"tYc" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_v" +/obj/structure/platform{ + dir = 4 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) +"tXT" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - icon_state = "darkyellow2" + icon_state = "redfull" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/security) "tYd" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -32950,100 +32977,136 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"tYr" = ( -/obj/structure/platform{ - dir = 4 +"tYg" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/tumor/servers) +"tYt" = ( +/obj/structure/bed/roller, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "tYw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/civres) -"tYx" = ( -/obj/structure/surface/rack, -/obj/item/tool/lighter, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"tZo" = ( -/obj/item/newspaper, -/turf/open/floor/prison, -/area/fiorina/station/security) -"tZs" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 8 +"tYD" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"tYQ" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/lz/near_lzII) -"tZN" = ( -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/botany) +"tYU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/tumor/ice_lab) +"tZe" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/tumor/servers) -"tZS" = ( /turf/open/floor/prison{ - icon_state = "platingdmg1" + icon_state = "yellowfull" }, -/area/fiorina/tumor/civres) -"tZV" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 8 +/area/fiorina/station/lowsec) +"tZk" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/tumor/aux_engi) +"tZz" = ( +/obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "darkredfull2" }, /area/fiorina/lz/near_lzI) +"tZO" = ( +/obj/item/frame/rack, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "tZW" = ( /obj/item/tool/wet_sign, /turf/open/floor/almayer{ icon_state = "plate" }, /area/fiorina/tumor/ship) -"tZX" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "uap" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uat" = ( +"uaL" = ( +/obj/item/stack/sheet/wood, /turf/open/floor/prison{ dir = 8; icon_state = "darkbrown2" }, -/area/fiorina/maintenance) +/area/fiorina/station/park) +"uaM" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" + }, +/area/fiorina/tumor/aux_engi) "ubc" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"ubk" = ( +"ubh" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - icon_state = "floorscorched1" + icon_state = "kitchen" }, -/area/fiorina/tumor/aux_engi) -"ubH" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/lowsec) +"ubo" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/structure/surface/rack, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/security) +/area/fiorina/station/power_ring) +"ubA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) "ubN" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; opacity = 0 }, /area/fiorina/tumor/aux_engi) +"ubP" = ( +/turf/open/floor/prison, +/area/fiorina/station/security) "ubQ" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -33052,65 +33115,84 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"ubT" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +"ubX" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + dir = 5; + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) -"uch" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/tumor/ice_lab) +"uci" = ( +/obj/effect/spawner/random/tool, +/obj/structure/surface/rack, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "ucj" = ( /turf/closed/shuttle/ert{ icon_state = "stan25" }, /area/fiorina/station/power_ring) -"ucr" = ( +"ucu" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" + icon_state = "redfull" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/security) +"ucN" = ( +/obj/structure/tunnel, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) "ucS" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/telecomm/lz1_tram) -"uds" = ( -/obj/item/ammo_casing{ - dir = 2; - icon_state = "casing_5" - }, +"udj" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) +"udt" = ( +/obj/structure/barricade/handrail{ dir = 1; - icon_state = "darkbrown2" + pixel_y = 2 }, -/area/fiorina/station/park) -"udY" = ( -/obj/structure/platform{ +/obj/structure/barricade/handrail{ dir = 8 }, -/obj/item/prop/almayer/flight_recorder, /turf/open/floor/prison, +/area/fiorina/station/security) +"udB" = ( +/obj/structure/bed/roller, +/obj/effect/spawner/random/gun/rifle/highchance, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) -"ued" = ( -/obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." +"udE" = ( +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, -/turf/closed/wall/prison, -/area/fiorina/station/central_ring) -"uef" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, +/area/fiorina/lz/near_lzI) +"uen" = ( +/obj/item/weapon/gun/rifle/m16, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/telecomm/lz1_cargo) "uep" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, @@ -33123,121 +33205,150 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"ueA" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"ueI" = ( +/obj/structure/filingcabinet, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"ueF" = ( -/obj/structure/largecrate/random/barrel/yellow, +"ueP" = ( +/obj/item/paper/crumpled, /turf/open/floor/prison{ - icon_state = "yellow" + icon_state = "redfull" + }, +/area/fiorina/station/security) +"ueX" = ( +/obj/structure/bookcase{ + icon_state = "book-5" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/station/medbay) +"ufE" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, /area/fiorina/station/lowsec) -"ufo" = ( +"ufL" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"ufN" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, +/area/fiorina/tumor/aux_engi) +"ufR" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/fiorina/station/research_cells) +"ugg" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison, /area/fiorina/station/lowsec) -"ufX" = ( -/obj/item/reagent_container/food/drinks/sillycup, +"ugk" = ( /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/power_ring) -"ugC" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/aux_engi) +"ugm" = ( +/obj/structure/prop/resin_prop{ + icon_state = "coolanttank" }, -/area/fiorina/tumor/servers) -"ugH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/servers) -"ugT" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"ugU" = ( -/obj/structure/machinery/portable_atmospherics/canister/nitrogen, +"ugq" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibdown1" + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/lowsec) -"uhb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/sillycup{ - pixel_x = -5; - pixel_y = 10 +/area/fiorina/station/medbay) +"ugv" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/fiorina/oob) +"ugP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ pixel_x = 1; - pixel_y = -1 + pixel_y = 3 }, +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"uhd" = ( +/area/fiorina/station/power_ring) +"ugT" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/aux_engi) +"uha" = ( +/obj/structure/prop/resin_prop{ + icon_state = "sheater0" + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkpurple2" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/servers) +/area/fiorina/tumor/aux_engi) "uhm" = ( /obj/structure/window_frame/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"uhH" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 4 - }, +"uhA" = ( +/obj/structure/closet/bodybag, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"uin" = ( -/obj/item/ammo_box/magazine/misc/flares/empty{ - pixel_x = -1; - pixel_y = 7 + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/research_cells) +"uhX" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "whitegreen" }, -/area/fiorina/station/telecomm/lz1_cargo) -"uix" = ( -/obj/structure/bed/chair/office/dark, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"uiK" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" +/area/fiorina/station/medbay) +"uia" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/botany) +"uiD" = ( +/obj/structure/barricade/wooden{ + dir = 8 }, -/area/fiorina/station/medbay) -"uiR" = ( -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/park) "uiV" = ( /obj/structure/platform{ dir = 4 @@ -33250,6 +33361,19 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"ujb" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"ujo" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "ujs" = ( /obj/item/shard{ icon_state = "large"; @@ -33259,109 +33383,76 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"ujC" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/fiorina/station/civres_blue) -"ujJ" = ( -/obj/structure/monorail{ - dir = 5; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) -"ujO" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 - }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 8 - }, +"ujz" = ( +/obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked" - }, -/area/fiorina/station/park) -"ukk" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 + icon_state = "floor_plate" }, -/obj/effect/spawner/random/pills/lowchance, +/area/fiorina/station/telecomm/lz1_cargo) +"ukg" = ( +/obj/item/trash/candle, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" + icon_state = "darkyellow2" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/telecomm/lz1_cargo) "ukr" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, /turf/open/organic/grass{ - name = "astroturf" - }, -/area/fiorina/station/park) -"ukz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/gun/pistol/midchance, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"ukI" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreencorner" + name = "astroturf" }, -/area/fiorina/tumor/ice_lab) -"ukN" = ( -/obj/structure/bed/chair{ - dir = 1 +/area/fiorina/station/park) +"uky" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreen" }, -/area/fiorina/station/security) +/area/fiorina/tumor/ice_lab) "ukR" = ( /obj/structure/window/framed/prison/reinforced/hull, /obj/structure/window/framed/prison/reinforced/hull, /turf/open/space/basic, /area/fiorina/lz/near_lzI) -"ulJ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"ulc" = ( +/obj/item/paper, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 8; + icon_state = "whitepurple" }, -/area/fiorina/station/lowsec) -"ulW" = ( -/obj/structure/prop/almayer/computers/sensor_computer2, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +/area/fiorina/station/research_cells) +"ume" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = 11; + pixel_y = 14 }, -/area/fiorina/tumor/servers) -"umq" = ( -/obj/structure/barricade/wooden{ - dir = 4 +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, +/obj/structure/largecrate/random/mini/chest/c, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) +"umg" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "blue" }, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/civres_blue) +"umm" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "umy" = ( /obj/structure/prop/resin_prop{ dir = 4; @@ -33370,6 +33461,20 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"umz" = ( +/obj/item/trash/kepler, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"umI" = ( +/obj/item/clothing/gloves/boxing/blue, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) "umW" = ( /obj/structure/bed/sofa/pews, /turf/open/floor/wood, @@ -33378,52 +33483,102 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"unc" = ( -/obj/structure/coatrack, -/obj/item/clothing/suit/storage/CMB, +"uno" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"unp" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) +"unu" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, +/turf/open/floor/prison, /area/fiorina/station/security) -"unW" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 +"unz" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced{ + dir = 8 }, +/obj/item/storage/box/flashbangs, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "redfull" }, -/area/fiorina/station/research_cells) -"uod" = ( -/obj/structure/largecrate/random/barrel/white, +/area/fiorina/station/security) +"unA" = ( +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, +/area/fiorina/station/civres_blue) +"unF" = ( +/obj/item/tool/wirecutters, +/obj/structure/platform/shiva{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"uou" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 + }, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"uol" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 4 +/area/fiorina/station/disco) +"uoH" = ( +/obj/structure/barricade/sandbags{ + dir = 4; + icon_state = "sandbag_0"; + pixel_y = 2 }, +/obj/item/storage/pouch/tools/full, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "yellow" }, -/area/fiorina/lz/near_lzI) -"upt" = ( +/area/fiorina/station/disco) +"upf" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) +"upr" = ( /obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) -"upF" = ( -/obj/structure/machinery/processor{ - desc = "It CAN blend it."; - icon_state = "blender_e"; - name = "Blendomatic"; +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"upw" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" + }, +/area/fiorina/lz/near_lzII) +"upK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + layer = 3.1; pixel_x = -2; pixel_y = 10 }, -/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + dir = 4; + icon_state = "redcorner" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/power_ring) "upM" = ( /obj/structure/disposalpipe/broken, /turf/open/floor/plating/prison, @@ -33432,118 +33587,107 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, /area/fiorina/station/security/wardens) -"uqa" = ( -/obj/item/clothing/accessory/armband/cargo{ - desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; - name = "HEFA Order milita armband" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"uqo" = ( -/obj/effect/landmark/queen_spawn, +"upY" = ( +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"uqd" = ( +/obj/item/pamphlet/skill/powerloader, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreencorner" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/tumor/ice_lab) -"uqp" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 8 +/area/fiorina/station/medbay) +"uqj" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"urc" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + dir = 10; + icon_state = "bright_clean2" }, -/area/fiorina/station/disco) -"uri" = ( -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"urw" = ( -/obj/structure/machinery/vending/snack/packaged, +/area/fiorina/station/park) +"uqV" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) +"urv" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "urJ" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"urS" = ( -/obj/item/trash/chunk, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"usa" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "green" - }, -/area/fiorina/station/chapel) "usg" = ( /obj/effect/spawner/random/attachment, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"usq" = ( -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"usz" = ( -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"usA" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"utf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "uts" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"utC" = ( -/obj/item/stool, +"utw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/research_cells) +"utG" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison{ dir = 1; - icon_state = "cell_stripe" + icon_state = "yellow" }, -/area/fiorina/station/flight_deck) -"utV" = ( -/obj/structure/machinery/light/double/blue{ +/area/fiorina/station/lowsec) +"utL" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison{ dir = 1; - pixel_y = 21 + icon_state = "darkbrown2" }, +/area/fiorina/station/park) +"utW" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 5; + dir = 1; icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) +"uud" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"uuk" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"uuG" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/washing_machine{ + pixel_y = 15 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) "uuJ" = ( /obj/structure/holohoop{ dir = 8; @@ -33568,93 +33712,86 @@ /obj/item/prop/helmetgarb/gunoil, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uvh" = ( -/obj/structure/barricade/wooden{ - dir = 4 - }, +"uvn" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkyellow2" }, -/area/fiorina/station/research_cells) -"uvi" = ( -/obj/structure/reagent_dispensers/watertank, +/area/fiorina/station/telecomm/lz1_cargo) +"uvu" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 1; + icon_state = "redcorner" }, -/area/fiorina/station/park) -"uvy" = ( -/obj/effect/landmark{ - icon_state = "hive_spawn"; - name = "xeno_hive_spawn" +/area/fiorina/station/power_ring) +"uvF" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 }, -/obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreencorner" +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/tumor/ice_lab) -"uvG" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno/down, +/turf/open/floor/prison, +/area/fiorina/maintenance) +"uvS" = ( +/obj/structure/blocker/invisible_wall, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "whitepurple" }, -/area/fiorina/station/medbay) -"uvM" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"uwg" = ( -/obj/effect/spawner/random/tool, +/area/fiorina/oob) +"uvV" = ( +/obj/structure/coatrack, /turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"uvZ" = ( +/obj/structure/prop/structure_lattice{ dir = 4; - icon_state = "whitegreencorner" + health = 300 }, -/area/fiorina/tumor/ice_lab) +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/civres_blue) +"uwb" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "uwk" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) -"uwI" = ( -/obj/structure/machinery/power/smes/buildable{ - capacity = 1e+006; - dir = 1 +"uws" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) +"uwT" = ( +/obj/structure/sign/poster{ + icon_state = "poster10"; + pixel_x = 32 }, -/area/fiorina/tumor/aux_engi) -"uwP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison, -/area/fiorina/tumor/servers) -"uwY" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) -"uxa" = ( -/obj/effect/decal/cleanable/blood/splatter, +/area/fiorina/station/power_ring) +"uxd" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"uxi" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"uxp" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) "uxv" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -33666,52 +33803,51 @@ name = "pool" }, /area/fiorina/station/park) -"uxO" = ( -/obj/effect/landmark/objective_landmark/far, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"uxY" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"uyb" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"uyd" = ( -/obj/item/stack/sheet/metal, +"uye" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"uym" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) -"uyq" = ( +/area/fiorina/station/security) +"uyp" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"uyw" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison{ icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"uyr" = ( -/obj/item/device/flashlight/lamp/tripod, +"uyC" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/machinery/shower{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "green" + icon_state = "kitchen" }, -/area/fiorina/station/chapel) +/area/fiorina/station/research_cells) "uyM" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"uyN" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/fiberbush) "uza" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibup1" @@ -33719,64 +33855,35 @@ /obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"uzd" = ( +"uzi" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/disco) +/area/fiorina/tumor/aux_engi) "uzw" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"uzO" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 +"uzy" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/structure/largecrate/random/secure, /turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"uzX" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"uAd" = ( -/obj/item/clothing/gloves/boxing/green, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, -/area/fiorina/station/central_ring) -"uAi" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/item/clothing/suit/armor/bulletproof/badge, -/turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"uAv" = ( +/area/fiorina/station/civres_blue) +"uzG" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "blue" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/civres_blue) -"uAG" = ( -/obj/structure/inflatable, +/area/fiorina/tumor/aux_engi) +"uAg" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + dir = 1; + icon_state = "whitegreencorner" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/ice_lab) "uAX" = ( /obj/effect/decal/hefa_cult_decals/d32, /turf/open/floor/prison/chapel_carpet{ @@ -33791,136 +33898,116 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uBS" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/tumor/servers) -"uBW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/cigbutt, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"uCa" = ( -/obj/structure/platform{ - dir = 8 +"uBV" = ( +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"uCu" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"uCO" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/obj/structure/barricade/metal/wired, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"uCz" = ( -/obj/structure/sink{ - pixel_y = 23 +/area/fiorina/station/power_ring) +"uCX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/item/paper_bin{ - pixel_x = -11; - pixel_y = -5 +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) +"uDX" = ( +/obj/structure/prop/structure_lattice{ + health = 300 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/obj/structure/prop/structure_lattice{ + pixel_y = 10 }, -/area/fiorina/station/medbay) -"uCD" = ( /turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/aux_engi) +"uEh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/guestpass{ + dir = 4; + reason = "Visitor" }, -/area/fiorina/station/research_cells) -"uCW" = ( -/obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/station/chapel) +/area/fiorina/station/power_ring) "uEj" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"uEm" = ( +"uEy" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ dir = 4; - icon_state = "red" + icon_state = "cell_stripe" }, -/area/fiorina/station/security) -"uEN" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/tumor/servers) +"uEM" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xtracks" }, -/area/fiorina/lz/near_lzII) -"uFc" = ( -/obj/structure/closet/secure_closet/security, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/disco) -"uFh" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" +/area/fiorina/station/chapel) +"uEY" = ( +/obj/structure/machinery/power/smes/buildable{ + capacity = 1e+006; + dir = 1 }, -/area/fiorina/station/lowsec) -"uFE" = ( -/obj/item/stack/sandbags_empty/half, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/flight_deck) -"uFM" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 4; - flipped = 1 +/area/fiorina/tumor/aux_engi) +"uFd" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/obj/structure/barricade/wooden{ + dir = 8 }, -/area/fiorina/station/medbay) -"uFX" = ( /turf/open/floor/prison{ - dir = 6; - icon_state = "darkpurple2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"uGb" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 +/area/fiorina/station/telecomm/lz1_cargo) +"uFg" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "birthday" }, -/obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"uGq" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryomid" +/area/fiorina/station/power_ring) +"uFs" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/obj/structure/machinery/light/double/blue, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) +"uFC" = ( +/obj/structure/barricade/metal/wired, /turf/open/floor/prison{ - icon_state = "whitegreen" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) "uGu" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "3" @@ -33930,14 +34017,24 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"uGD" = ( -/obj/item/tool/kitchen/knife, -/obj/structure/bed/roller, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"uGM" = ( -/turf/open/floor/prison, -/area/fiorina/station/park) +"uGI" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzI) +"uGL" = ( +/obj/item/trash/used_stasis_bag{ + desc = "Wow, instant sand. They really have everything in space."; + name = "Insta-Sand! bag" + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "uGT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -33945,73 +34042,40 @@ "uGY" = ( /turf/closed/wall/prison, /area/fiorina/station/security) -"uHL" = ( -/obj/item/stool{ - pixel_x = -4; - pixel_y = 23 +"uHl" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) +"uIg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/lowsec) -"uHX" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ +/area/fiorina/maintenance) +"uIB" = ( +/obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"uIa" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"uIb" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"uIl" = ( -/obj/structure/machinery/cryo_cell, -/obj/structure/pipes/standard/cap/hidden, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"uIu" = ( -/obj/item/storage/toolbox/electrical, -/obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"uIA" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, +"uIL" = ( /obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10 + pixel_y = -1 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"uIG" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 +/obj/structure/bed/chair{ + dir = 1; + layer = 2.8 }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/turf/open/floor/prison, -/area/fiorina/tumor/civres) +/area/fiorina/station/disco) "uIS" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, @@ -34024,49 +34088,93 @@ }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"uJj" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"uJk" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"uJi" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, /turf/open/floor/prison{ icon_state = "yellowfull" }, +/area/fiorina/station/disco) +"uJp" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) -"uJM" = ( +"uJG" = ( +/obj/item/ammo_casing{ + icon_state = "casing_10_1" + }, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrowncorners2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/maintenance) -"uJX" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/park) -"uKh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/secure_data{ - dir = 8 +/area/fiorina/station/medbay) +"uJQ" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"uJR" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "ppflowers_2" }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) +"uKb" = ( +/obj/item/stack/tile/plasteel, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/station/flight_deck) "uKx" = ( /turf/closed/shuttle/ert, /area/fiorina/lz/near_lzI) -"uLd" = ( -/obj/structure/foamed_metal, +"uKE" = ( +/obj/item/clipboard, /turf/open/floor/prison, -/area/fiorina/station/civres_blue) +/area/fiorina/station/park) +"uKK" = ( +/obj/structure/bed/roller, +/obj/item/bedsheet/green, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"uKX" = ( +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/fiorina/station/security/wardens) +"uLf" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) +"uLj" = ( +/obj/effect/decal/cleanable/blood/gibs/robot/limb, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"uLq" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/telecomm/lz1_tram) "uLr" = ( /obj/vehicle/powerloader, /obj/structure/platform{ @@ -34077,28 +34185,36 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uLH" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) "uLJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/station_alert, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"uLX" = ( -/obj/structure/machinery/computer/arcade, +"uLM" = ( +/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/structure/surface/table/woodentable/fancy, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/station/medbay) +/area/fiorina/station/chapel) +"uLV" = ( +/obj/item/bedsheet, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/lowsec) +"uMc" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/prison, +/area/fiorina/station/security) +"uMm" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) "uMq" = ( /obj/structure/machinery/light/small{ dir = 4; @@ -34111,56 +34227,108 @@ "uMw" = ( /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"uMH" = ( -/obj/item/ammo_magazine/smg/mp5, +"uMN" = ( +/obj/item/trash/semki, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"uNM" = ( -/turf/closed/wall/prison, -/area/fiorina/tumor/aux_engi) -"uNR" = ( -/obj/item/stack/cable_coil, +/area/fiorina/station/power_ring) +"uMT" = ( /turf/open/floor/prison{ - icon_state = "darkpurple2" + icon_state = "cell_stripe" + }, +/area/fiorina/station/medbay) +"uMZ" = ( +/obj/structure/disposalpipe/segment{ + color = "#c4c4c4"; + dir = 4; + layer = 6; + name = "overhead pipe"; + pixel_y = 20 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, +/turf/open/floor/prison, /area/fiorina/tumor/servers) -"uNX" = ( -/obj/effect/landmark/xeno_spawn, +"uNm" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/random/gun/rifle/highchance, +/turf/open/floor/prison, +/area/fiorina/station/security) +"uNp" = ( +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/prison{ - icon_state = "darkbrowncorners2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"uOb" = ( -/obj/structure/platform_decoration{ - dir = 8 +/area/fiorina/station/transit_hub) +"uNs" = ( +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) +"uNG" = ( +/obj/structure/machinery/power/apc{ + dir = 1 }, -/obj/item/stack/cable_coil, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"uOR" = ( -/obj/structure/platform_decoration{ - dir = 4 +/area/fiorina/lz/near_lzII) +"uNI" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) +"uNM" = ( +/turf/closed/wall/prison, +/area/fiorina/tumor/aux_engi) +"uOu" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) +"uOx" = ( +/obj/effect/decal/hefa_cult_decals/d32{ + icon_state = "bee" }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"uPg" = ( -/obj/item/circuitboard/mecha/gygax/targeting, -/obj/structure/surface/rack, +/area/fiorina/tumor/servers) +"uOC" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, +/area/fiorina/tumor/servers) +"uOM" = ( +/obj/structure/curtain, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"uPz" = ( -/obj/structure/closet/firecloset/full, +/area/fiorina/station/power_ring) +"uOP" = ( +/obj/item/newspaper, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"uPi" = ( +/obj/item/device/binoculars, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/tumor/fiberbush) +"uPl" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "uPA" = ( /obj/structure/platform{ dir = 1 @@ -34173,15 +34341,18 @@ }, /turf/open/gm/river/desert/deep, /area/fiorina/lz/near_lzII) -"uPD" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 +"uPX" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, +/area/fiorina/tumor/civres) +"uQk" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/fiberbush) "uQE" = ( /obj/item/stack/tile/plasteel{ pixel_x = 3; @@ -34189,70 +34360,49 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"uQF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/emails{ - dir = 4 - }, +"uQJ" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" + dir = 4; + icon_state = "blue" }, -/area/fiorina/station/medbay) -"uRe" = ( -/obj/effect/landmark/survivor_spawner, +/area/fiorina/tumor/servers) +"uQT" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 6; + icon_state = "whitegreen" }, -/area/fiorina/station/disco) -"uRu" = ( -/turf/open/floor/prison{ +/area/fiorina/tumor/ice_lab) +"uRv" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "yellow" + pixel_x = 10; + pixel_y = -3 }, +/turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"uRK" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) -"uRO" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "green" - }, -/area/fiorina/station/chapel) -"uRX" = ( -/obj/item/tool/shovel/spade, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"uRY" = ( -/obj/item/ammo_magazine/rifle/mar40, +"uRF" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "yellow" + icon_state = "whitegreencorner" }, -/area/fiorina/station/lowsec) -"uSb" = ( -/obj/structure/barricade/wooden{ +/area/fiorina/station/medbay) +"uRI" = ( +/turf/open/floor/prison{ dir = 4; - pixel_y = 4 + icon_state = "darkbrowncorners2" }, +/area/fiorina/maintenance) +"uRT" = ( +/obj/item/device/flashlight, /turf/open/floor/prison{ dir = 10; - icon_state = "damaged1" - }, -/area/fiorina/station/central_ring) -"uSo" = ( -/obj/item/poster, -/turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreenfull" }, +/area/fiorina/tumor/ice_lab) +"uRZ" = ( +/obj/item/trash/barcardine, +/turf/open/floor/prison, /area/fiorina/station/security) "uSA" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -34263,87 +34413,133 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"uST" = ( +"uSU" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) +"uSX" = ( +/obj/item/tool/kitchen/utensil/pknife, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"uSY" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/vehicle/powerloader/ft, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"uTb" = ( /obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"uTr" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/turf/open/floor/prison{ dir = 8; - pixel_x = -10; - pixel_y = -3 + icon_state = "whitegreen" }, +/area/fiorina/tumor/ice_lab) +"uTs" = ( +/obj/item/stack/rods, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/civres) -"uSY" = ( -/obj/structure/platform{ - dir = 8 +/area/fiorina/tumor/aux_engi) +"uTt" = ( +/obj/item/device/flashlight/flare, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" }, -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/telecomm/lz1_cargo) +"uTw" = ( +/obj/item/weapon/gun/rifle/mar40, +/turf/open/floor/prison{ + icon_state = "bluefull" }, -/obj/vehicle/powerloader/ft, -/turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uTi" = ( +"uTA" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison{ dir = 8; - icon_state = "darkyellowcorners2" + icon_state = "blue" }, -/area/fiorina/station/telecomm/lz1_cargo) -"uTk" = ( -/obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison, /area/fiorina/station/power_ring) -"uTp" = ( -/obj/structure/bed/chair, +"uTR" = ( +/obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"uTS" = ( -/obj/item/stock_parts/micro_laser/ultra, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"uTX" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" +/area/fiorina/tumor/aux_engi) +"uVk" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_v" }, -/area/fiorina/tumor/servers) -"uUT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/card/id/gold{ - pixel_x = 2; - pixel_y = 4 +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "darkyellow2" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/telecomm/lz1_cargo) "uVn" = ( /turf/closed/shuttle/ert{ icon_state = "stan_inner_w_1" }, /area/fiorina/tumor/ship) -"uVo" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"uVv" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) "uVD" = ( /turf/open/floor/corsat{ icon_state = "squares" }, /area/fiorina/station/medbay) -"uVQ" = ( -/obj/item/device/flashlight/lamp/tripod, +"uVH" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_v" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"uVL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/power_ring) +"uVO" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "uVX" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4; @@ -34357,20 +34553,34 @@ /obj/item/trash/candy, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"uWg" = ( -/obj/effect/decal/cleanable/blood, +"uWe" = ( +/obj/structure/bed/chair{ + dir = 4 + }, /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/tumor/aux_engi) -"uWs" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/area/fiorina/station/botany) +"uWA" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"uWO" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/station/park) "uWQ" = ( /obj/structure/platform{ dir = 8 @@ -34381,42 +34591,6 @@ }, /turf/open/gm/river/desert/deep, /area/fiorina/lz/near_lzII) -"uWS" = ( -/obj/item/ammo_casing{ - icon_state = "casing_8" - }, -/obj/structure/surface/table/reinforced/prison{ - dir = 4; - flipped = 1 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"uXa" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"uXc" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottom" - }, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"uXm" = ( -/obj/item/inflatable/door, -/obj/item/inflatable/door, -/obj/item/inflatable/door, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "uXn" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now."; @@ -34428,12 +34602,6 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"uXu" = ( -/obj/item/stock_parts/matter_bin/super, -/turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) "uXw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/skills, @@ -34448,58 +34616,71 @@ "uXD" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ship) -"uXM" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +"uXK" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/prison{ + icon_state = "bluefull" }, +/area/fiorina/station/power_ring) +"uXP" = ( +/obj/item/reagent_container/food/drinks/bottle/pwine, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) -"uXW" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 +/area/fiorina/tumor/civres) +"uXY" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + pixel_y = 32 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "kitchen" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/civres) +"uYi" = ( +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"uYo" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) "uYx" = ( /obj/structure/prop/resin_prop{ icon_state = "coolanttank" }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"uYR" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"uYS" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 }, -/area/fiorina/station/security/wardens) -"uZe" = ( -/obj/item/stack/sheet/wood, -/turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"uZt" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 7; + pixel_y = 6 }, -/area/fiorina/station/research_cells) -"uZn" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrown2" }, -/area/fiorina/station/security/wardens) -"uZr" = ( -/obj/structure/prop/resin_prop{ - icon_state = "sheater0" +/area/fiorina/station/park) +"uZu" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "uZA" = ( @@ -34507,235 +34688,188 @@ icon_state = "stan2" }, /area/fiorina/tumor/ship) -"uZD" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "delivery_outlet"; - layer = 6; - name = "overhead ducting"; - pixel_y = 33 - }, +"uZP" = ( +/obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) -"uZM" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/telecomm/lz1_cargo) "uZX" = ( /obj/structure/curtain, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"vaj" = ( -/obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"vaO" = ( -/obj/structure/window/reinforced, -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/attachment, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"vbd" = ( -/obj/structure/machinery/washing_machine, -/obj/structure/machinery/washing_machine{ - pixel_y = 15 - }, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"vbe" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +"uZZ" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 }, +/obj/item/device/flashlight/flare, /turf/open/floor/prison{ dir = 8; - icon_state = "whitegreen" + icon_state = "darkyellow2" }, -/area/fiorina/station/central_ring) -"vbl" = ( +/area/fiorina/station/telecomm/lz1_cargo) +"vao" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"vaC" = ( /obj/structure/closet/bombcloset, -/obj/effect/landmark/objective_landmark/medium, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/stack/sheet/mineral/plastic, +/obj/item/stack/sheet/mineral/plastic, +/obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"vbn" = ( -/obj/item/ammo_box/magazine/M16, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"vbt" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 8; - flipped = 1 - }, -/obj/item/storage/box/ids, -/obj/item/reagent_container/food/drinks/cans/souto/grape{ - pixel_x = 14; - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"vbF" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) "vbG" = ( /obj/structure/prop/structure_lattice{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"vbY" = ( -/obj/item/ammo_casing{ - dir = 6; - icon_state = "casing_5" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) +"vbV" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "vcf" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" }, /area/fiorina/oob) -"vco" = ( +"vci" = ( +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - dir = 5; - icon_state = "darkpurple2" + icon_state = "floor_plate" }, -/area/fiorina/tumor/servers) -"vcr" = ( -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/medbay) +"vcq" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 +/area/fiorina/station/botany) +"vcu" = ( +/obj/structure/platform_decoration{ + dir = 1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/disco) -"vcy" = ( -/obj/structure/platform_decoration{ - dir = 8 +"vcv" = ( +/obj/item/tool/screwdriver, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "vcC" = ( /obj/item/stack/rods, /turf/open/space, /area/fiorina/oob) -"vdG" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, +"vcN" = ( +/obj/structure/largecrate/random/case, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/medbay) -"vdI" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" +/area/fiorina/station/park) +"vdn" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_2" }, -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) -"vdZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 +/area/fiorina/station/medbay) +"vds" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, -/obj/item/frame/firstaid_arm_assembly, -/obj/item/stack/nanopaste{ - pixel_x = 11; - pixel_y = 6 +/area/fiorina/station/lowsec) +"vdH" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security/wardens) -"vea" = ( -/obj/effect/decal{ - icon = 'icons/obj/items/policetape.dmi'; - icon_state = "engineering_h"; - layer = 2.5; - pixel_y = -11 + icon_state = "blue_plate" }, +/area/fiorina/station/botany) +"vdJ" = ( +/obj/effect/spawner/random/gun/smg, /turf/open/floor/prison{ dir = 8; - icon_state = "darkyellow2" + icon_state = "green" }, -/area/fiorina/station/flight_deck) -"vee" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 +/area/fiorina/tumor/civres) +"vdN" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, -/obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/station/telecomm/lz1_cargo) +"vdW" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"vei" = ( +/area/fiorina/station/disco) +"vel" = ( +/obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/civres) "vem" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1" }, /area/fiorina/lz/near_lzI) -"ven" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryomid" +"vev" = ( +/obj/structure/monorail{ + name = "launch track" }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + layer = 3; + opacity = 0 }, -/area/fiorina/station/medbay) -"veB" = ( -/obj/structure/machinery/light/double/blue, +/area/fiorina/oob) +"veJ" = ( +/obj/item/clothing/head/helmet/marine/specialist/hefa, +/turf/open/floor/prison, +/area/fiorina/station/park) +"veP" = ( +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - icon_state = "yellow" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/lowsec) -"veM" = ( -/obj/item/stock_parts/micro_laser/ultra, +/area/fiorina/tumor/aux_engi) +"veR" = ( +/obj/structure/inflatable, /turf/open/floor/prison{ - icon_state = "darkpurple2" + dir = 10; + icon_state = "whitegreen" }, -/area/fiorina/tumor/servers) +/area/fiorina/station/medbay) +"veW" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) "vfz" = ( /obj/item/storage/box/donkpockets, /obj/structure/surface/table/reinforced/prison, @@ -34745,86 +34879,121 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"vfJ" = ( -/obj/structure/bed/sofa/south/grey/left, +"vfL" = ( +/obj/item/storage/box/flashbangs, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "vfM" = ( /turf/closed/shuttle/ert{ icon_state = "stan27" }, /area/fiorina/station/power_ring) -"vfQ" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/park) -"vfR" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" +"vfO" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" }, -/obj/structure/platform{ - dir = 8 +/area/fiorina/station/lowsec) +"vgi" = ( +/obj/item/stack/rods, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) -"vgP" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"vgS" = ( -/obj/item/stack/sheet/metal, +/area/fiorina/station/civres_blue) +"vgw" = ( +/obj/item/storage/toolbox/antag, /turf/open/floor/prison{ + dir = 8; + icon_state = "green" + }, +/area/fiorina/tumor/civres) +"vgC" = ( +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "whitepurple" + pixel_y = 21 }, -/area/fiorina/station/research_cells) -"vha" = ( -/obj/structure/closet/crate/miningcar{ - name = "\improper materials storage bin" +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"vgL" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/storage/pill_bottle/alkysine, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/turf/open/floor/prison{ + icon_state = "redfull" }, -/obj/item/reagent_container/food/snacks/meat, +/area/fiorina/station/security) +"vhd" = ( +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, /turf/open/floor/prison{ - icon_state = "greenblue" + icon_state = "darkredfull2" }, -/area/fiorina/station/botany) -"vhe" = ( -/obj/structure/closet/wardrobe/orange, -/obj/item/clothing/under/color/orange, +/area/fiorina/lz/near_lzI) +"vhk" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"vhy" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/telecomm/lz1_cargo) "vhB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) -"vhC" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison{ - icon_state = "greenblue" - }, -/area/fiorina/station/botany) "vhI" = ( /turf/open/gm/river{ color = "#990000"; name = "pool" }, /area/fiorina/station/park) -"viH" = ( -/obj/item/clipboard, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, +"viL" = ( +/obj/item/stock_parts/micro_laser/ultra, +/turf/open/floor/prison, /area/fiorina/tumor/servers) -"viV" = ( -/obj/structure/monorail{ - dir = 5; - name = "launch track" +"viX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) +"vja" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "vjl" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/tool, @@ -34836,28 +35005,10 @@ icon_state = "leftengine_1" }, /area/fiorina/station/power_ring) -"vjz" = ( -/obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) "vjG" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"vjH" = ( -/obj/structure/machinery/computer/communications{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/tumor/servers) "vjR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/prison, @@ -34874,67 +35025,67 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"vky" = ( -/turf/open/floor/prison{ +"vki" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 + }, +/obj/item/bedsheet/green, +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "blue" + pixel_x = 10; + pixel_y = 13 }, -/area/fiorina/station/civres_blue) -"vkC" = ( -/obj/structure/inflatable/popped/door, /turf/open/floor/prison{ + dir = 4; icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"vkM" = ( -/obj/item/reagent_container/food/drinks/bottle/pwine, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"vkZ" = ( -/obj/structure/platform{ - dir = 8 +"vkt" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"vli" = ( -/obj/structure/bed/chair/comfy, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"vlK" = ( +/obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/disco) -"vlm" = ( -/obj/structure/machinery/power/apc{ - dir = 4 + dir = 9; + icon_state = "whitegreen" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"vlt" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks, +/area/fiorina/station/medbay) +"vlN" = ( +/obj/structure/surface/rack, +/obj/item/frame/table/almayer, +/obj/item/frame/table/almayer, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"vlT" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/tumor/civres) +"vlO" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 10; - icon_state = "darkyellow2" + dir = 4; + icon_state = "cell_stripe" }, -/area/fiorina/station/telecomm/lz1_tram) -"vlX" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 +/area/fiorina/station/central_ring) +"vlS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + pixel_y = 9 }, -/obj/item/clothing/gloves/combat, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison{ +/obj/structure/machinery/light/double/blue{ dir = 1; - icon_state = "whitepurple" + pixel_y = 21 }, -/area/fiorina/station/research_cells) +/turf/open/floor/prison, +/area/fiorina/station/security) +"vlU" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "vmj" = ( /obj/effect/landmark/nightmare{ insert_tag = "podholder" @@ -34943,53 +35094,83 @@ icon_state = "leftengine_1" }, /area/fiorina/station/medbay) -"vmr" = ( -/obj/item/device/flashlight/lamp/tripod, +"vmt" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) +"vmL" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/station/medbay) -"vmH" = ( -/obj/item/tool/mop, +/area/fiorina/station/telecomm/lz1_cargo) +"vmT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"vmW" = ( -/obj/structure/reagent_dispensers/water_cooler{ - density = 0; - pixel_x = -8; - pixel_y = 16 +/area/fiorina/tumor/aux_engi) +"vnl" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/structure/barricade/wooden{ + dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 10; + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/telecomm/lz1_cargo) "vnr" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/telecomm/lz1_cargo) -"voa" = ( -/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 +"vnA" = ( +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 2 }, -/obj/item/phone{ - pixel_x = -3; - pixel_y = 10 +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 5 }, -/obj/item/phone{ - pixel_x = 9; - pixel_y = -10 +/obj/item/tool/warning_cone{ + pixel_x = -4; + pixel_y = 8 }, +/obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/security) +/area/fiorina/maintenance) +"vnG" = ( +/turf/open/floor/prison, +/area/fiorina/maintenance) +"vnM" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) +"voh" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) +"voi" = ( +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/station/park) "voq" = ( /obj/structure/machinery/computer/secure_data{ dir = 1 @@ -34997,95 +35178,80 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"voS" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"vpk" = ( -/obj/item/trash/used_stasis_bag{ - desc = "Wow, instant sand. They really have everything in space."; - name = "Insta-Sand! bag" +"vov" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"vpB" = ( -/obj/effect/alien/weeds/node, +/area/fiorina/station/transit_hub) +"voI" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"vpJ" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" + icon_state = "bluefull" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"vqb" = ( -/obj/structure/platform, +/area/fiorina/station/power_ring) +"voK" = ( /obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"vqg" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ - icon_state = "whitegreen" + icon_state = "p_stair_sn_full_cap" }, -/area/fiorina/tumor/ice_lab) -"vqi" = ( /obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) +"voO" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "yellow" }, /area/fiorina/station/lowsec) -"vqM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/tomatosoup, +"voP" = ( +/obj/structure/dropship_equipment/medevac_system, /turf/open/floor/prison{ - icon_state = "blue" + dir = 10; + icon_state = "floor_marked" }, /area/fiorina/station/power_ring) -"vqZ" = ( -/obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +"voV" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6_1" }, -/area/fiorina/tumor/aux_engi) -"vrc" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"vrf" = ( +/area/fiorina/station/lowsec) +"vpN" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) +"vql" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/donut_box{ - pixel_y = 6 +/obj/effect/spawner/random/tool, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"vro" = ( -/obj/item/device/flashlight/lamp/tripod, +/area/fiorina/station/transit_hub) +"vqs" = ( +/obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkredfull2" }, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) +"vqW" = ( +/obj/item/stack/sheet/cardboard, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "vrp" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Corner" @@ -35093,170 +35259,173 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/station/research_cells) -"vrw" = ( -/obj/structure/machinery/vending/snack/packaged, +"vrA" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/park) +/area/fiorina/lz/near_lzI) "vrF" = ( /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, -/obj/effect/landmark/objective_landmark/close, +"vrH" = ( +/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/security) -"vrN" = ( -/obj/structure/monorail{ - name = "launch track" +/area/fiorina/station/research_cells) +"vrO" = ( +/obj/structure/closet/secure_closet/engineering_materials, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - indestructible = 1; - name = "launch bay door" +/area/fiorina/tumor/aux_engi) +"vrR" = ( +/obj/structure/platform_decoration, +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 }, -/turf/open/floor/plating/prison, -/area/fiorina/oob) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) +"vrS" = ( +/obj/item/reagent_container/food/snacks/donkpocket, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/transit_hub) "vrT" = ( /obj/structure/platform{ dir = 1 }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"vrX" = ( -/obj/item/newspaper, +"vsr" = ( +/obj/structure/barricade/handrail, /turf/open/floor/prison{ - icon_state = "whitepurplecorner" + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"vsc" = ( -/turf/open/floor/prison{ - icon_state = "floorscorched1" - }, -/area/fiorina/station/civres_blue) -"vsg" = ( -/obj/structure/closet/emcloset, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison{ - dir = 10; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"vsq" = ( -/obj/effect/decal/cleanable/blood, +"vsL" = ( +/obj/structure/prop/dam/crane, /turf/open/floor/prison{ dir = 8; - icon_state = "darkyellowcorners2" + icon_state = "floor_marked" }, -/area/fiorina/station/telecomm/lz1_cargo) -"vsz" = ( -/obj/structure/machinery/light/double/blue, +/area/fiorina/tumor/servers) +"vsM" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells) "vsT" = ( /obj/structure/cable/heavyduty{ icon_state = "1-8" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"vtf" = ( -/obj/structure/machinery/vending/cigarette/colony, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"vtc" = ( +/obj/structure/toilet{ + dir = 4 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/civres_blue) +"vtk" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/ammo_casing/shell{ + icon_state = "shell_9_1" + }, +/obj/structure/barricade/metal{ + health = 250; + icon_state = "metal_1" + }, +/turf/open/floor/prison, +/area/fiorina/station/park) "vtl" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/wood, /area/fiorina/station/park) -"vtn" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" +"vtr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/beaker{ + pixel_x = -5; + pixel_y = 15 }, -/area/fiorina/station/medbay) -"vtG" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/obj/item/reagent_container/glass/beaker{ + pixel_x = 5; + pixel_y = 2 }, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"vtJ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/area/fiorina/tumor/ice_lab) +"vts" = ( +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand/layer1, +/area/fiorina/tumor/civres) +"vtX" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/telecomm/lz1_cargo) -"vub" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 +/area/fiorina/station/disco) +"vuK" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/prison, +/area/fiorina/station/security) +"vuS" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"vuT" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "bright_clean2" }, -/area/fiorina/station/civres_blue) -"vuc" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/area/fiorina/station/power_ring) +"vuV" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) -"vuE" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"vuW" = ( -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = -9; - pixel_y = 8 - }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 11; - pixel_y = 8 - }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 1; - pixel_y = 8 +/area/fiorina/station/power_ring) +"vuX" = ( +/obj/structure/platform_decoration{ + dir = 4 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"vvk" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) +/area/fiorina/station/park) "vvp" = ( /obj/item/tool/candle{ pixel_x = 5; @@ -35275,120 +35444,128 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) -"vvX" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" +"vvT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + desc = "So uh yeah, about that cat..."; + icon_state = "mwbloodyo"; + pixel_y = 6 }, -/area/fiorina/station/disco) -"vwc" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/park) +/area/fiorina/station/civres_blue) "vwt" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"vwx" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"vwD" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/servers) "vwM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"vxp" = ( +"vwN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + pixel_y = 6 + }, /turf/open/floor/prison{ - icon_state = "yellow" + dir = 1; + icon_state = "blue_plate" }, -/area/fiorina/station/disco) -"vxr" = ( -/obj/item/newspaper, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"vxs" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_inner_w_2" +/area/fiorina/station/botany) +"vwX" = ( +/obj/structure/barricade/wooden{ + dir = 8 }, -/area/fiorina/tumor/ship) -"vxV" = ( /turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"vxm" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; icon_state = "greenblue" }, /area/fiorina/station/botany) -"vyu" = ( -/obj/item/clothing/suit/storage/hazardvest, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) -"vyz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/goggles/lowchance, +"vxs" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_inner_w_2" + }, +/area/fiorina/tumor/ship) +"vxu" = ( +/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) -"vyA" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/prop/souto_land/pole{ - dir = 1 +"vxz" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + indestructible = 1; + name = "launch bay door" }, -/obj/structure/prop/souto_land/pole{ +/turf/open/floor/prison{ dir = 8; - pixel_y = 24 + icon_state = "cell_stripe" }, +/area/fiorina/oob) +"vxI" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/prison{ - icon_state = "darkbrown2" + icon_state = "darkbrownfull2" }, /area/fiorina/station/park) -"vyF" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"vyu" = ( +/obj/item/clothing/suit/storage/hazardvest, +/turf/open/floor/wood, +/area/fiorina/station/civres_blue) +"vyv" = ( +/obj/structure/platform_decoration{ + dir = 1 }, +/obj/structure/inflatable/popped, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) -"vyU" = ( -/obj/effect/decal/cleanable/blood, +/area/fiorina/station/medbay) +"vyw" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) -"vyX" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" +"vyK" = ( +/obj/structure/barricade/sandbags{ + dir = 1; + icon_state = "sandbag_0" }, -/area/fiorina/station/botany) -"vza" = ( -/obj/effect/decal/cleanable/blood/gibs, -/obj/effect/spawner/random/gun/rifle, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/telecomm/lz1_cargo) "vzh" = ( /obj/structure/foamed_metal, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"vzk" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) "vzn" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -35400,6 +35577,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"vzp" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "vzB" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ indestructible = 1; @@ -35407,48 +35592,60 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"vzT" = ( +/obj/item/frame/toolbox_tiles_sensor, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/civres) "vzU" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_3"; opacity = 0 }, /area/fiorina/tumor/ship) -"vzZ" = ( -/obj/item/device/flashlight/lamp/tripod, +"vAU" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/obj/structure/barricade/wooden, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" + icon_state = "sterile_white" }, -/area/fiorina/station/flight_deck) -"vAi" = ( -/obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"vAZ" = ( -/obj/item/stack/sheet/metal, +/area/fiorina/station/research_cells) +"vAX" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"vBc" = ( -/obj/structure/surface/table/reinforced/prison{ dir = 8; - flipped = 1 + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"vBa" = ( +/obj/structure/machinery/shower{ + dir = 4 }, -/obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "kitchen" }, /area/fiorina/station/research_cells) -"vBO" = ( -/obj/effect/decal/cleanable/blood{ - layer = 3 +"vBF" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/medbay) +"vBH" = ( +/obj/item/storage/firstaid/regular, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "vBP" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 @@ -35456,74 +35653,81 @@ /obj/structure/lattice, /turf/open/space/basic, /area/fiorina/oob) -"vBQ" = ( -/obj/structure/platform{ - dir = 1 - }, +"vBX" = ( /turf/open/floor/prison, -/area/fiorina/station/medbay) -"vBV" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/transit_hub) +"vBZ" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/medbay) -"vBY" = ( -/obj/item/stack/sheet/metal, +/obj/structure/platform, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"vCl" = ( +/obj/item/tool/shovel/spade, /turf/open/floor/prison{ dir = 1; - icon_state = "blue" + icon_state = "blue_plate" }, -/area/fiorina/station/civres_blue) -"vCv" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 +/area/fiorina/station/botany) +"vCm" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"vCT" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +/area/fiorina/station/botany) +"vCu" = ( +/obj/item/storage/bible/hefa, +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" + }, +/area/fiorina/station/chapel) +"vCL" = ( +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 2; + pixel_y = 21 }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitepurple" + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) -"vDc" = ( -/obj/structure/bed/sofa/south/grey/left, -/obj/item/reagent_container/food/snacks/sandwich{ - pixel_y = 2 +/area/fiorina/station/medbay) +"vCQ" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 7; + pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) -"vDj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/sink{ dir = 4; - pixel_x = 11 + icon_state = "blue" }, -/obj/item/clothing/gloves/latex, -/turf/open/floor/prison{ - icon_state = "redfull" +/area/fiorina/station/chapel) +"vDf" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/medbay) -"vDx" = ( -/obj/item/clothing/shoes/marine/upp_knife, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"vDK" = ( -/obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/transit_hub) +"vDL" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "vDO" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -35542,32 +35746,21 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"vED" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"vEF" = ( -/obj/item/circuitboard/robot_module/janitor, -/turf/open/floor/prison, -/area/fiorina/station/disco) "vEK" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/power_ring) -"vEX" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 +"vFc" = ( +/obj/item/tool/warning_cone, +/obj/structure/barricade/metal{ + dir = 8; + health = 150; + icon_state = "metal_2" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/disco) +/area/fiorina/station/park) "vFi" = ( /obj/structure/window_frame/prison, /obj/item/shard{ @@ -35597,71 +35790,55 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"vFF" = ( -/obj/item/trash/candy, +"vFA" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "darkpurple2" + }, +/area/fiorina/tumor/servers) +"vFS" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" }, /area/fiorina/tumor/ice_lab) -"vFQ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"vFV" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/tumor/civres) +/area/fiorina/station/lowsec) "vFY" = ( /obj/item/reagent_container/glass/bucket, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"vGe" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/security) -"vGv" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 - }, -/obj/structure/largecrate/random, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"vGO" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/disco) -"vGV" = ( -/obj/item/shard{ - icon_state = "large" +"vGM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, +/obj/item/reagent_container/food/snacks/eat_bar, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 4; - icon_state = "greenfull" - }, -/area/fiorina/station/transit_hub) -"vHG" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"vHK" = ( -/obj/structure/barricade/wooden{ - dir = 8 + icon_state = "darkyellowfull2" }, +/area/fiorina/station/flight_deck) +"vHo" = ( /turf/open/floor/prison{ - icon_state = "darkbrown2" + dir = 5; + icon_state = "blue" }, -/area/fiorina/station/park) -"vHR" = ( -/obj/item/tool/screwdriver, +/area/fiorina/tumor/servers) +"vHD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/cigbutt, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "bluefull" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/power_ring) "vHU" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin{ @@ -35670,23 +35847,26 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"vIF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - icon_state = "mwo"; - pixel_y = 6 +"vHX" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/obj/structure/disposalpipe/segment{ + icon_state = "delivery_outlet"; + layer = 6; + name = "overhead ducting"; + pixel_y = 33 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"vII" = ( +/area/fiorina/tumor/ice_lab) +"vIG" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "whitepurple" + icon_state = "platingdmg2" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/security) "vJh" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, @@ -35697,23 +35877,22 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/transit_hub) -"vJp" = ( -/obj/item/ammo_magazine/smg/mp5, -/obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"vJq" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreencorner" +"vJo" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/area/fiorina/tumor/ice_lab) -"vJD" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/medbay) +"vJL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "vJN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/electrical{ @@ -35722,46 +35901,47 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"vKj" = ( -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 +"vKz" = ( +/obj/item/stack/sheet/metal{ + amount = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "darkyellow2" }, -/area/fiorina/station/security) +/area/fiorina/lz/near_lzI) "vKP" = ( /obj/structure/surface/rack, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/wood, /area/fiorina/station/security/wardens) +"vLe" = ( +/obj/structure/closet/toolcloset, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) "vLH" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/wood, /area/fiorina/station/park) -"vLV" = ( -/obj/item/inflatable, -/obj/structure/surface/table/reinforced/prison, +"vLO" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/chapel) -"vMb" = ( -/obj/structure/machinery/photocopier{ - pixel_y = 4 - }, +/area/fiorina/station/central_ring) +"vLX" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/security) -"vMh" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" + dir = 9; + icon_state = "greenfull" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) +/area/fiorina/tumor/civres) "vMk" = ( /obj/structure/machinery/vending/snack/packaged, /turf/open/organic/grass{ @@ -35769,96 +35949,60 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) +"vMs" = ( +/obj/structure/machinery/vending/hydroseeds, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/fiorina/station/botany) "vMK" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/power_ring) -"vMQ" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "green" - }, -/area/fiorina/station/chapel) -"vMS" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"vMN" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/station/power_ring) -"vMX" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" - }, -/area/fiorina/station/central_ring) -"vNq" = ( -/turf/closed/wall/r_wall/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"vNr" = ( -/obj/structure/prop/souto_land/streamer{ - dir = 8; - pixel_y = 24 - }, -/obj/structure/bed/chair{ - dir = 1 + dir = 5; + icon_state = "darkbrown2" }, -/turf/open/floor/prison, /area/fiorina/station/park) -"vNt" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, +"vMT" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "green" + dir = 4; + icon_state = "darkyellowfull2" }, -/area/fiorina/station/chapel) -"vNx" = ( +/area/fiorina/station/flight_deck) +"vNd" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) -"vNF" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "greencorner" - }, -/area/fiorina/station/chapel) -"vNY" = ( -/obj/item/tool/kitchen/utensil/pfork, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"vOj" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/security) -"vOp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 +/obj/item/toy/beach_ball, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, +/area/fiorina/station/disco) +"vNq" = ( +/turf/closed/wall/r_wall/prison, +/area/fiorina/station/telecomm/lz1_cargo) +"vOm" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "cell_stripe" }, -/area/fiorina/station/park) -"vOz" = ( -/obj/effect/decal/cleanable/blood/oil, +/area/fiorina/station/botany) +"vOD" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, -/area/fiorina/station/flight_deck) +/area/fiorina/lz/near_lzI) +"vOO" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "green" + }, +/area/fiorina/station/chapel) "vOP" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -35869,222 +36013,263 @@ }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) -"vPa" = ( -/obj/item/tool/soap, -/turf/open/floor/prison{ - icon_state = "kitchen" +"vOZ" = ( +/obj/structure/largecrate/supply/supplies/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"vPF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/prize/honk{ + anchored = 1; + layer = 2.9; + pixel_x = -1; + pixel_y = 13 }, -/area/fiorina/station/lowsec) -"vPk" = ( -/obj/structure/window/framed/prison, +/obj/structure/barricade/handrail/type_b, /turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"vPA" = ( -/obj/structure/machinery/landinglight/ds2/delayone, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/flight_deck) "vPM" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" +/obj/structure/platform_decoration/kutjevo{ + dir = 8 }, -/area/fiorina/station/central_ring) +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "vPR" = ( /turf/closed/shuttle/ert{ icon_state = "stan1" }, /area/fiorina/tumor/ship) -"vQr" = ( -/obj/structure/barricade/sandbags{ +"vQi" = ( +/obj/item/clothing/gloves/botanic_leather, +/turf/open/floor/prison{ dir = 4; - icon_state = "sandbag_0"; - pixel_y = 2 - }, -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 + icon_state = "blue_plate" }, +/area/fiorina/station/botany) +"vQC" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/storage/pill_bottle/kelotane/skillless, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"vQN" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/area/fiorina/station/park) +"vQJ" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + density = 0; + pixel_y = 16 }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"vRj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + dir = 1; + icon_state = "darkbrown2" }, -/area/fiorina/station/research_cells) +/area/fiorina/maintenance) +"vRk" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"vRu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/fiorina/oob) "vRA" = ( /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) -"vSk" = ( +"vRF" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/cups{ - pixel_x = -3; - pixel_y = 6 +/obj/item/pamphlet/skill/powerloader, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/obj/item/storage/box/cups, +/area/fiorina/station/medbay) +"vRH" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, +/area/fiorina/tumor/ice_lab) +"vRP" = ( +/obj/item/trash/cigbutt/cigarbutt, +/turf/open/floor/prison, /area/fiorina/station/power_ring) -"vTl" = ( -/obj/item/stack/rods, +"vSC" = ( +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -5; + pixel_y = -6 + }, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/station/civres_blue) +"vSW" = ( +/obj/structure/closet/crate/internals, +/obj/item/tool/crew_monitor, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"vTq" = ( +/obj/structure/prop/resin_prop, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) "vTv" = ( /turf/closed/shuttle/elevator{ dir = 5 }, /area/fiorina/station/civres_blue) -"vTB" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 20 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 +"vTA" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"vTT" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 20 +/area/fiorina/station/flight_deck) +"vTI" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"vUa" = ( -/obj/structure/inflatable, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/transit_hub) +"vTL" = ( +/obj/item/trash/hotdog, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"vTM" = ( +/obj/item/storage/donut_box{ + pixel_y = 6 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"vTR" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) "vUf" = ( /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"vUn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +"vUl" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/washing_machine{ + pixel_y = 15 }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) "vUv" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced, /obj/item/reagent_container/food/snacks/donut/normal, /turf/open/floor/plating/prison, /area/fiorina/station/security) -"vUE" = ( -/obj/structure/machinery/computer/prisoner, +"vUF" = ( +/obj/item/tool/screwdriver, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 10; + icon_state = "green" }, -/area/fiorina/station/security) +/area/fiorina/tumor/civres) +"vUP" = ( +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) +"vUZ" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) "vVi" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"vVu" = ( -/obj/structure/surface/rack, -/obj/item/ammo_box/magazine/nailgun, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) -"vVJ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"vVx" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) +"vVN" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/fiorina/station/transit_hub) -"vVR" = ( -/obj/structure/extinguisher_cabinet, -/turf/closed/wall/prison, -/area/fiorina/station/central_ring) +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) "vWe" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/medbay) -"vWs" = ( -/obj/structure/machinery/light/double/blue, +"vWj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper, /turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/station/power_ring) -"vWE" = ( -/obj/structure/platform_decoration{ - dir = 8 + dir = 1; + icon_state = "darkpurple2" }, +/area/fiorina/tumor/servers) +"vWL" = ( +/obj/item/stock_parts/matter_bin/super, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"vWI" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "darkpurple2" }, -/turf/open/floor/prison{ - icon_state = "yellowfull" +/area/fiorina/tumor/servers) +"vXk" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, -/area/fiorina/station/disco) -"vXi" = ( -/obj/item/storage/briefcase, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 4; + icon_state = "blue_plate" }, +/area/fiorina/station/botany) +"vXl" = ( +/obj/structure/surface/rack, +/obj/item/folder/black, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, /area/fiorina/station/medbay) -"vXr" = ( -/obj/structure/machinery/disposal, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/station/civres_blue) -"vXB" = ( -/obj/item/shard{ - icon_state = "large" - }, +"vXy" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/medbay) -"vXS" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + dir = 6; + icon_state = "green" }, -/turf/open/floor/wood, -/area/fiorina/station/civres_blue) +/area/fiorina/tumor/civres) "vXT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -36095,84 +36280,35 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"vYA" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" - }, -/area/fiorina/station/disco) -"vYE" = ( -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "lavendergrass_1" - }, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) -"vYL" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"vYM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/aspen, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) -"vYP" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/machinery/shower{ - dir = 1; - pixel_y = -1 - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/fiorina/station/research_cells) -"vZc" = ( -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 20 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, +"vYX" = ( +/obj/item/roller, /turf/open/floor/prison, -/area/fiorina/tumor/servers) -"vZx" = ( -/obj/item/trash/cigbutt, +/area/fiorina/station/lowsec) +"vYY" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + layer = 3.5; + pixel_y = 6 + }, /turf/open/floor/prison{ dir = 4; - icon_state = "blue" + icon_state = "greenfull" }, -/area/fiorina/station/power_ring) -"vZz" = ( +/area/fiorina/station/transit_hub) +"vZs" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) +/area/fiorina/tumor/servers) "vZD" = ( /obj/item/storage/box/donkpockets, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"vZU" = ( -/obj/item/paper/crumpled, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) +"vZL" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) "vZV" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -36182,24 +36318,10 @@ "vZX" = ( /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"war" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"waz" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/disco) +"wam" = ( +/obj/item/stack/medical/bruise_pack, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) "waN" = ( /obj/structure/platform{ dir = 1 @@ -36212,23 +36334,16 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"waP" = ( -/obj/structure/largecrate/random/case, -/obj/structure/machinery/light/double/blue, +"waQ" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 10; + icon_state = "darkyellow2" }, -/area/fiorina/station/park) +/area/fiorina/station/power_ring) "waU" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"wbn" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/aux_engi) "wbp" = ( /obj/item/inflatable, /turf/open/organic/grass{ @@ -36236,21 +36351,14 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"wby" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"wbr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/medbay) "wbB" = ( /obj/structure/computerframe, /obj/structure/machinery/light/double/blue{ @@ -36270,12 +36378,39 @@ "wbI" = ( /turf/open/floor/wood, /area/fiorina/station/park) -"wcm" = ( -/obj/structure/bed/chair, +"wbL" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/item/prop/almayer/comp_open{ + pixel_y = 6 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"wbP" = ( +/obj/item/storage/toolbox, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"wbW" = ( +/obj/item/reagent_container/food/snacks/meat, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"wcB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/gun/pistol/midchance, /turf/open/floor/prison{ - icon_state = "greenblue" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/servers) +"wcC" = ( +/obj/structure/closet/basketball, +/obj/item/storage/pill_bottle/bicaridine/skillless, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "wcP" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, @@ -36284,99 +36419,81 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"wcX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/hypospray, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +"wdl" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4 }, -/area/fiorina/station/botany) -"wdA" = ( -/obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzI) -"wdX" = ( -/obj/structure/prop/almayer/computers/mapping_computer, +/area/fiorina/station/disco) +"wdo" = ( +/obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkredfull2" + dir = 4; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) +"wdL" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"wef" = ( -/turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"wek" = ( -/obj/effect/landmark/monkey_spawn, +"wdU" = ( +/obj/structure/foamed_metal, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/civres_blue) -"wen" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; - name = "\improper arcade tickets"; - pixel_x = -7; - pixel_y = 7 - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"wew" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/structure/surface/rack, +"wef" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells) +"wet" = ( +/obj/item/stack/sandbags/large_stack, /turf/open/floor/prison{ - dir = 5; + dir = 1; icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) -"weH" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 8 - }, -/obj/structure/bed/chair/office/dark{ +/area/fiorina/station/telecomm/lz1_cargo) +"weB" = ( +/obj/structure/machinery/light/double/blue{ dir = 4; - layer = 3.25 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + pixel_x = 10; + pixel_y = 13 }, -/area/fiorina/tumor/ice_lab) -"weK" = ( -/obj/structure/platform_decoration{ - dir = 1 +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/transit_hub) +"weE" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrowncorners2" + icon_state = "panelscorched" }, -/area/fiorina/station/park) -"weN" = ( -/obj/structure/largecrate/random/case, +/area/fiorina/oob) +"weM" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "yellow" }, -/area/fiorina/tumor/aux_engi) -"weQ" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/lowsec) +"weV" = ( +/obj/structure/sink{ dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison{ - icon_state = "floor_plate" + pixel_x = -12; + pixel_y = 2 }, -/area/fiorina/station/security) -"weS" = ( -/obj/structure/machinery/processor, -/obj/effect/decal/cleanable/blood{ - pixel_y = 20 +/obj/structure/mirror{ + pixel_x = -29 }, /turf/open/floor/prison{ - icon_state = "blue_plate" + icon_state = "sterile_white" }, -/area/fiorina/station/botany) +/area/fiorina/station/civres_blue) "weX" = ( /obj/structure/barricade/metal{ health = 250; @@ -36384,30 +36501,51 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"wfi" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "green" +"wfc" = ( +/obj/structure/machinery/disposal, +/obj/item/tool/kitchen/rollingpin{ + pixel_y = 8 }, -/area/fiorina/station/chapel) -"wfp" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ - dir = 8 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, +/area/fiorina/station/civres_blue) +"wfo" = ( +/obj/structure/coatrack, +/obj/item/clothing/head/bowlerhat{ + pixel_y = 15 + }, +/obj/structure/machinery/light/double/blue{ dir = 4; - icon_state = "darkyellowfull2" + pixel_x = 10; + pixel_y = -3 }, -/area/fiorina/lz/near_lzI) -"wfy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, -/obj/item/tool/stamp, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" }, /area/fiorina/tumor/civres) +"wfu" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"wfw" = ( +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 + }, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, +/area/fiorina/station/central_ring) "wfV" = ( /obj/effect/landmark/monkey_spawn, /turf/open/organic/grass{ @@ -36425,114 +36563,137 @@ }, /turf/open/space, /area/fiorina/oob) -"wgH" = ( +"wgq" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 4; + icon_state = "greenfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/civres) +"wgs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/beret/eng{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/engineering_guide{ + pixel_x = -4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/fiorina/tumor/civres) +"wgO" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/park) "whf" = ( /turf/closed/shuttle/elevator{ dir = 4 }, /area/fiorina/station/civres_blue) -"whp" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"whu" = ( -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/tumor/civres) -"whL" = ( +"whl" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/tumor/aux_engi) -"whR" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"wir" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +"whr" = ( +/obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"wiQ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/radio{ - pixel_x = -6; - pixel_y = 16 + dir = 10; + icon_state = "kitchen" }, -/obj/item/device/radio{ - pixel_x = 6; - pixel_y = 7 +/area/fiorina/station/civres_blue) +"whu" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/tumor/civres) +"wis" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"wjk" = ( +/area/fiorina/station/disco) +"wiR" = ( +/obj/structure/surface/rack, +/obj/item/key, +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ - dir = 5; - icon_state = "blue" - }, -/area/fiorina/station/chapel) -"wjx" = ( -/obj/structure/barricade/deployable{ - dir = 1 + dir = 10; + icon_state = "whitegreen" }, +/area/fiorina/station/medbay) +"wjC" = ( +/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + dir = 9; + icon_state = "darkbrown2" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/aux_engi) "wjH" = ( /obj/item/stack/barbed_wire, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) +"wjO" = ( +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/prison_security, +/turf/open/floor/prison, +/area/fiorina/station/park) +"wjT" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_7" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "wkd" = ( /obj/structure/machinery/status_display, /turf/closed/wall/prison, /area/fiorina/station/medbay) -"wkp" = ( -/obj/structure/machinery/iv_drip, +"wkg" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/down, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) -"wkD" = ( -/obj/structure/largecrate/random/case/double, +"wky" = ( +/obj/structure/tunnel/maint_tunnel, /turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"wkZ" = ( +/area/fiorina/tumor/aux_engi) +"wkA" = ( /turf/open/floor/prison{ dir = 8; icon_state = "cell_stripe" }, -/area/fiorina/station/disco) -"wlp" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/area/fiorina/station/power_ring) +"wkL" = ( +/obj/structure/bed/chair/comfy, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 6; + icon_state = "darkyellow2" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/flight_deck) +"wln" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/tumor/ice_lab) +"wlv" = ( +/obj/item/trash/barcardine, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "wly" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzII) -"wlz" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/civres) "wlG" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -36542,33 +36703,29 @@ /obj/item/bedsheet/blue, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"wlR" = ( -/obj/item/bodybag, -/obj/item/bodybag{ - pixel_y = 2 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/medbay) "wmd" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/fiberbush) -"wmp" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +"wmm" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" + icon_state = "blue" }, -/area/fiorina/station/civres_blue) -"wmG" = ( -/obj/structure/inflatable, -/obj/structure/barricade/handrail/type_b, +/area/fiorina/station/power_ring) +"wmx" = ( +/obj/item/stack/folding_barricade, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 8; + icon_state = "red" }, -/area/fiorina/station/medbay) +/area/fiorina/station/security) +"wnh" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "wnq" = ( /obj/item/tool/match, /turf/open/floor/plating/plating_catwalk/prison, @@ -36579,68 +36736,78 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"wnz" = ( +"wnD" = ( /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) -"wnB" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "darkpurple2" +/area/fiorina/tumor/fiberbush) +"wnM" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = -3 }, -/area/fiorina/station/central_ring) -"wnW" = ( -/obj/structure/toilet{ - pixel_y = 4 +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = 2; - pixel_y = 25 +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/fiorina/maintenance) +"woh" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"wot" = ( -/obj/item/weapon/baseballbat/metal, +"wol" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/chapel) -"woI" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/effect/landmark/objective_landmark/close, +/area/fiorina/tumor/ice_lab) +"wou" = ( +/obj/structure/machinery/light/double/blue, /turf/open/floor/prison{ dir = 10; - icon_state = "kitchen" + icon_state = "whitegreenfull" }, -/area/fiorina/station/civres_blue) -"wpf" = ( -/obj/structure/bed/chair/comfy, +/area/fiorina/tumor/ice_lab) +"wow" = ( +/obj/structure/closet/crate/medical, +/obj/effect/spawner/random/toolbox, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/flight_deck) -"wpp" = ( -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkyellow2" +/area/fiorina/station/medbay) +"wps" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/power_ring) -"wpu" = ( -/obj/item/tool/soap, -/obj/structure/machinery/shower{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, +/area/fiorina/station/transit_hub) +"wpy" = ( /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 1; + icon_state = "greencorner" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/chapel) "wpD" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -36664,64 +36831,117 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"wqx" = ( -/obj/item/tool/wrench, +"wqs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/poster, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/power_ring) -"wqM" = ( -/obj/structure/platform, -/obj/structure/closet/radiation, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"wrQ" = ( +/area/fiorina/station/research_cells) +"wqz" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 + }, +/obj/item/clothing/gloves/combat, /turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurplecorner" + dir = 9; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) +"wqY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, /area/fiorina/station/research_cells) "wrR" = ( /turf/closed/wall/prison, /area/fiorina/station/botany) -"wsy" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - indestructible = 1; - name = "launch bay door" +"wrT" = ( +/obj/item/shard{ + icon_state = "large" }, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"wsw" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "darkpurplefull2" }, -/area/fiorina/oob) -"wsN" = ( -/obj/item/tool/surgery/cautery, +/area/fiorina/station/research_cells) +"wsz" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "yellow" + icon_state = "darkbrown2" + }, +/area/fiorina/tumor/aux_engi) +"wsM" = ( +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/area/fiorina/station/lowsec) -"wsY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/pizzabox/margherita, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"wtx" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_y = 11 +/area/fiorina/tumor/ice_lab) +"wsX" = ( +/obj/item/trash/snack_bowl, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) +"wtm" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/plating/prison, +/area/fiorina/oob) +"wty" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced{ + dir = 4 }, +/obj/item/weapon/classic_baton, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "redfull" + }, +/area/fiorina/station/security) +"wua" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "bluecorner" + }, +/area/fiorina/station/power_ring) +"wun" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" + }, +/area/fiorina/tumor/ice_lab) +"wuz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 }, -/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" = ( @@ -36744,67 +36964,35 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"wuP" = ( -/obj/structure/machinery/power/apc, +"wuN" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) -"wuT" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 + icon_state = "darkbrownfull2" }, +/area/fiorina/tumor/aux_engi) +"wuW" = ( +/obj/item/tool/warning_cone, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"wvf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - pixel_y = 9 - }, -/obj/item/ammo_magazine/rifle/m16{ - current_rounds = 0 - }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"wvu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/disco) "wvH" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/chapel_carpet{ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"wvS" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, +"wvL" = ( +/obj/item/tool/wrench, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"wvU" = ( +/obj/structure/largecrate/supply/explosives/mines, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/telecomm/lz1_cargo) "wvY" = ( /obj/item/reagent_container/food/snacks/eat_bar, /obj/structure/machinery/light/double/blue{ @@ -36812,49 +37000,33 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"wwr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"wwH" = ( -/obj/item/tool/wirecutters, +"wwa" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "floorscorched1" }, -/area/fiorina/station/lowsec) -"wwR" = ( -/obj/structure/largecrate/random/case, -/obj/item/storage/toolbox/emergency{ - pixel_y = 4 +/area/fiorina/tumor/civres) +"wwo" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; + name = "\improper Fiorina Engineering Canteen Vendor" }, /turf/open/floor/prison{ - dir = 9; - icon_state = "whitepurple" + icon_state = "bluefull" }, -/area/fiorina/station/research_cells) -"wwZ" = ( -/obj/structure/bed/sofa/south/grey/right, +/area/fiorina/station/power_ring) +"wxl" = ( +/obj/structure/machinery/recharge_station, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "darkbrown2" }, -/area/fiorina/station/civres_blue) -"wxj" = ( -/obj/item/newspaper, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"wxo" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/landmark/objective_landmark/close, +/area/fiorina/maintenance) +"wxW" = ( +/obj/structure/prop/almayer/computers/mapping_computer, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "darkredfull2" }, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells) "wxX" = ( /obj/structure/machinery/computer/cameras{ dir = 8; @@ -36863,6 +37035,12 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) +"wxY" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/tumor/servers) "wxZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -36874,18 +37052,44 @@ /obj/structure/machinery/computer/cameras, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) +"wyd" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/botany) "wyl" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"wyP" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"wyK" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 }, -/turf/open/floor/prison, -/area/fiorina/station/park) +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/oob) +"wyQ" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, +/area/fiorina/station/lowsec) "wyT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -36896,108 +37100,99 @@ name = "astroturf" }, /area/fiorina/station/research_cells) -"wzE" = ( -/turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/lowsec) -"wzS" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_y = 6 +"wzd" = ( +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" }, /turf/open/floor/prison, /area/fiorina/station/security) -"wAa" = ( -/obj/structure/machinery/vending/snack/packaged, +"wzg" = ( +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"wAj" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 +/area/fiorina/station/flight_deck) +"wzE" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/lowsec) +"wzH" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, -/obj/structure/machinery/shower{ - dir = 4 +/area/fiorina/station/chapel) +"wzK" = ( +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/item/prop/almayer/flight_recorder, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"wzT" = ( +/obj/structure/platform{ + dir = 8 }, -/area/fiorina/station/lowsec) -"wAl" = ( -/obj/structure/machinery/space_heater, -/turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" +/obj/structure/platform, +/obj/structure/platform_decoration{ + dir = 10 }, -/area/fiorina/tumor/civres) +/obj/structure/reagent_dispensers/fueltank{ + layer = 2.6 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "wAn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"wAr" = ( +"wAt" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/phone{ - pixel_y = -4 - }, -/obj/item/phone{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/tool/pen, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" + }, +/area/fiorina/lz/near_lzI) +"wAQ" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/area/fiorina/station/security) -"wAv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "whitegreen" }, -/area/fiorina/station/power_ring) -"wAD" = ( -/obj/item/shard{ - icon_state = "large" +/area/fiorina/tumor/ice_lab) +"wBx" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "A ticket to Souto Man's raffle!"; + name = "\improper Souto Raffle Ticket"; + pixel_x = 6; + pixel_y = 7 }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"wAM" = ( -/obj/structure/tunnel/maint_tunnel, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"wAR" = ( -/obj/structure/filingcabinet, -/obj/structure/filingcabinet{ - pixel_x = 16 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"wAT" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt{ - pixel_y = 8 +/area/fiorina/station/park) +"wBB" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/obj/item/trash/cigbutt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"wBr" = ( -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 + icon_state = "yellow" }, +/area/fiorina/station/disco) +"wBE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/aspen, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "darkyellow2" }, -/area/fiorina/station/lowsec) +/area/fiorina/lz/near_lzI) "wBK" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, @@ -37006,65 +37201,76 @@ /obj/structure/largecrate/supply/supplies, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"wCA" = ( -/obj/item/reagent_container/glass/bucket/janibucket, +"wCI" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkbrowncorners2" }, -/area/fiorina/station/civres_blue) -"wCV" = ( -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/structure/surface/rack, +/area/fiorina/station/park) +"wCJ" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) -"wDF" = ( -/obj/structure/bed/chair{ - dir = 1 + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/medbay) +"wDe" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "greenblue" }, -/area/fiorina/station/power_ring) -"wDV" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +/area/fiorina/station/botany) +"wDw" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" }, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/flight_deck) -"wEa" = ( -/obj/item/stack/rods, +/area/fiorina/station/medbay) +"wDz" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/prison, +/area/fiorina/station/security) +"wDJ" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"wEn" = ( -/obj/structure/barricade/handrail/type_b{ +/area/fiorina/tumor/fiberbush) +"wDK" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/shower, +/obj/structure/window{ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "sterile_white" }, -/area/fiorina/station/flight_deck) -"wEQ" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +/area/fiorina/station/medbay) +"wED" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + dir = 4; + icon_state = "blue" }, -/area/fiorina/station/disco) -"wER" = ( +/area/fiorina/station/civres_blue) +"wEE" = ( +/obj/item/tool/crowbar/red, /turf/open/floor/prison{ - icon_state = "panelscorched" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/oob) +/area/fiorina/station/medbay) "wEX" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -37075,90 +37281,73 @@ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"wEY" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/chapel) -"wFk" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 +"wFd" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 1; + icon_state = "darkpurple2" }, -/area/fiorina/lz/near_lzI) -"wFo" = ( +/area/fiorina/tumor/servers) +"wFp" = ( +/obj/item/stack/cable_coil/pink, /turf/open/floor/prison{ - icon_state = "floorscorched1" + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/station/medbay) +"wFB" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, -/area/fiorina/tumor/civres) -"wFD" = ( -/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) -"wFE" = ( -/obj/structure/bed/chair{ - dir = 1 +/area/fiorina/station/lowsec) +"wFM" = ( +/obj/structure/machinery/power/apc{ + dir = 8 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 6; - pixel_y = -7 +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, -/obj/structure/prop/souto_land/streamer{ - pixel_y = 24 +/area/fiorina/station/telecomm/lz1_cargo) +"wFS" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched1" }, -/turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/chapel) "wFU" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"wGa" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 3 - }, -/obj/structure/largecrate/random/mini/med{ - pixel_x = -6; - pixel_y = -3 - }, -/turf/open/floor/prison, -/area/fiorina/station/central_ring) -"wGe" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 +"wGb" = ( +/obj/item/ammo_casing{ + icon_state = "casing_1" }, /turf/open/floor/prison{ - icon_state = "yellowfull" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/central_ring) "wGf" = ( /obj/item/stack/rods, /turf/open/floor/wood, /area/fiorina/station/park) -"wGm" = ( +"wGA" = ( /obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - icon_state = "darkyellow2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"wGD" = ( -/obj/structure/bed/chair{ - dir = 8 + dir = 8; + pixel_x = -10; + pixel_y = 13 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/power_ring) "wGM" = ( /obj/item/device/taperecorder{ pixel_x = 1; @@ -37167,6 +37356,18 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/chapel) +"wGX" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_h"; + layer = 2.5; + pixel_y = -11 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/telecomm/lz1_cargo) "wHl" = ( /obj/structure/platform_decoration{ dir = 8 @@ -37177,40 +37378,67 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) +"wHr" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" + }, +/area/fiorina/station/security) "wHw" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"wHx" = ( -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" +"wHC" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/area/fiorina/lz/near_lzI) -"wHE" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/storage/pill_bottle/inaprovaline/skillless, -/obj/effect/landmark/objective_landmark/close, +/obj/item/clothing/gloves/botanic_leather, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "floor_plate" + }, +/area/fiorina/station/botany) +"wId" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) +"wIk" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4 }, +/turf/open/floor/prison, +/area/fiorina/station/security) +"wIp" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) -"wHX" = ( -/obj/item/tool/lighter/random, +"wIx" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ - dir = 10; - icon_state = "kitchen" - }, -/area/fiorina/tumor/civres) -"wII" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 + dir = 4; + icon_state = "red" }, +/area/fiorina/station/security) +"wIy" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, -/area/fiorina/station/lowsec) +/area/fiorina/tumor/servers) +"wIG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform_decoration/kutjevo, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "wIJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -37225,34 +37453,18 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"wJa" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"wIL" = ( +/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/chapel) "wJd" = ( /obj/structure/barricade/handrail, /turf/open/organic/grass{ name = "astroturf" }, /area/fiorina/station/research_cells) -"wJf" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) -"wJt" = ( -/obj/structure/bed/chair/comfy, -/turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) "wJw" = ( /obj/structure/closet/crate/trashcart, /obj/item/weapon/gun/rifle/m16, @@ -37262,153 +37474,113 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"wJJ" = ( -/obj/structure/closet/bodybag, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) -"wJX" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "wKb" = ( /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, /area/fiorina/station/park) -"wKn" = ( -/obj/structure/barricade/metal/wired{ - health = 120; - icon_state = "metal_2" +"wKl" = ( +/obj/structure/bed/sofa/south/grey/right, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, +/area/fiorina/station/civres_blue) +"wKm" = ( +/obj/item/stack/sheet/cardboard, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/disco) +"wKx" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "wKE" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"wKF" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +"wKR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/surgery, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/maintenance) -"wLf" = ( -/obj/structure/machinery/deployable/barrier, /turf/open/floor/prison{ icon_state = "redfull" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "wLA" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security) -"wLI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_box/magazine/misc/flares, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/servers) -"wLJ" = ( -/obj/structure/prop/souto_land/pole{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"wLN" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/skills{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"wLP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard, -/turf/open/floor/prison{ - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"wLX" = ( -/obj/item/stack/cable_coil, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +"wLS" = ( +/obj/item/tool/wrench, /turf/open/floor/prison{ - dir = 1; + dir = 8; icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) -"wMi" = ( -/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_one_access = null +"wLT" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) -"wMz" = ( -/obj/structure/machinery/faxmachine, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/fiorina/station/security/wardens) -"wMG" = ( -/obj/item/stack/rods, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 }, -/area/fiorina/station/medbay) -"wMI" = ( -/obj/item/storage/box/gloves, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"wMP" = ( -/obj/item/stool, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "bluefull" +/area/fiorina/tumor/civres) +"wMe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/blood/empty{ + pixel_x = -7; + pixel_y = 4 }, -/area/fiorina/station/civres_blue) -"wMQ" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/item/reagent_container/blood/BMinus{ + pixel_x = 7; + pixel_y = 4 }, -/area/fiorina/station/power_ring) -"wMR" = ( -/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/lz/near_lzII) -"wMS" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/area/fiorina/station/telecomm/lz1_cargo) +"wMh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer3/laptop/secure_data, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) +"wMi" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) +"wMv" = ( +/obj/item/shard{ + icon_state = "medium" }, -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - dir = 6; - icon_state = "whitepurple" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/chapel) +"wMz" = ( +/obj/structure/machinery/faxmachine, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/carpet, +/area/fiorina/station/security/wardens) +"wMA" = ( +/obj/item/disk/botany, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) "wNi" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/prison, @@ -37422,142 +37594,122 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) -"wNw" = ( +"wNB" = ( +/obj/structure/closet/firecloset/full, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - dir = 9; - icon_state = "darkpurple2" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/tumor/servers) -"wOc" = ( -/obj/structure/platform, -/obj/structure/platform{ +/area/fiorina/station/medbay) +"wND" = ( +/obj/structure/bed/chair/comfy{ dir = 8 }, -/obj/structure/platform_decoration{ - dir = 10 - }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "blue" }, -/area/fiorina/station/power_ring) -"wOD" = ( +/area/fiorina/station/civres_blue) +"wNG" = ( /turf/open/floor/prison{ - dir = 8; - icon_state = "floor_marked" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/servers) -"wOM" = ( -/obj/item/tool/kitchen/knife, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"wOR" = ( +/area/fiorina/station/security) +"wNM" = ( +/obj/item/tool/weldingtool, /turf/open/floor/prison{ - dir = 10; - icon_state = "greenblue" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) -"wOS" = ( +/area/fiorina/station/civres_blue) +"wNX" = ( /turf/open/floor/prison{ - icon_state = "redcorner" + dir = 8; + icon_state = "green" }, -/area/fiorina/station/security) -"wOT" = ( -/obj/effect/decal/cleanable/blood/splatter, +/area/fiorina/station/chapel) +"wOG" = ( +/obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/disco) "wPz" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/telecomm/lz1_cargo) -"wPF" = ( -/obj/item/trash/semki, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/power_ring) -"wPL" = ( -/obj/structure/platform_decoration, +"wQb" = ( /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"wQh" = ( -/obj/structure/prop/almayer/computers/sensor_computer1{ - name = "computer" - }, -/obj/structure/machinery/light/double/blue{ dir = 1; - pixel_y = 21 + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) +"wQg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkredfull2" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"wQn" = ( -/obj/effect/landmark/static_comms/net_one, +/area/fiorina/station/security) +"wQD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/weapon/gun/energy/taser, /turf/open/floor/prison{ - dir = 10; icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"wQs" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/security) "wQN" = ( /obj/structure/machinery/floodlight/landing/floor, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"wQR" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "wQT" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"wRg" = ( -/obj/item/stack/sheet/metal, -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) -"wRh" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitegreen" +"wQW" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/station/medbay) -"wRn" = ( -/obj/structure/machinery/light/double/blue, /turf/open/floor/prison, /area/fiorina/station/park) -"wRo" = ( -/obj/structure/barricade/wooden{ - dir = 1 - }, +"wQY" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/prison{ dir = 10; icon_state = "whitegreenfull" }, -/area/fiorina/station/medbay) -"wRv" = ( -/obj/structure/bed/chair, -/turf/open/floor/prison{ - icon_state = "darkpurple2" +/area/fiorina/tumor/ice_lab) +"wRg" = ( +/obj/item/stack/sheet/metal, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" }, +/turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"wRG" = ( -/obj/structure/platform{ - dir = 8 - }, +"wRz" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ dir = 8; - icon_state = "blue" + icon_state = "cell_stripe" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/central_ring) "wRP" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -37565,130 +37717,119 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"wRW" = ( -/obj/structure/prop/resin_prop{ - dir = 1; - icon_state = "chair"; - pixel_y = 6 - }, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"wRZ" = ( +"wSb" = ( +/obj/structure/machinery/gibber, /turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/power_ring) +"wSc" = ( +/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..."; dir = 1; - icon_state = "blue_plate" + health = 25000; + pixel_y = 19 + }, +/obj/item/stack/sheet/wood, +/obj/structure/machinery/computer/cameras/wooden_tv{ + desc = "Somehow, it still functions."; + layer = 3.1; + name = "discarded camera console"; + pixel_x = -6; + pixel_y = 5 }, -/area/fiorina/station/botany) -"wSe" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + icon_state = "floor_plate" }, /area/fiorina/tumor/servers) "wSm" = ( /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"wTo" = ( -/obj/structure/platform{ - dir = 4 +"wSo" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/obj/item/stool, /turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/civres_blue) -"wTy" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" + dir = 4; + icon_state = "darkbrown2" }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"wTz" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/prison{ - icon_state = "floor_plate" +/area/fiorina/station/park) +"wSt" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, -/area/fiorina/station/security) -"wTO" = ( -/obj/structure/bed{ - icon_state = "abed" +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"wSC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/glass/bottle/spaceacillin{ + pixel_x = -6; + pixel_y = 4 }, -/obj/item/reagent_container/food/drinks/flask/marine, +/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitepurple" + icon_state = "darkredfull2" }, /area/fiorina/station/research_cells) -"wTV" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +"wSD" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"wSN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "darkredfull2" }, /area/fiorina/station/research_cells) -"wUA" = ( +"wSU" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/aux_engi) -"wUN" = ( -/obj/item/reagent_container/food/drinks/cans/sodawater, +/area/fiorina/station/transit_hub) +"wSX" = ( +/obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/station/central_ring) -"wVu" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/area/fiorina/station/transit_hub) +"wTC" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 5; + icon_state = "darkyellow2" }, -/area/fiorina/tumor/aux_engi) -"wVI" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/area/fiorina/station/telecomm/lz1_cargo) +"wTW" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"wUs" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched1" }, -/obj/effect/landmark/objective_landmark/science, +/area/fiorina/station/civres_blue) +"wUz" = ( +/obj/item/frame/toolbox_tiles, /turf/open/floor/prison{ - dir = 10; + dir = 9; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"wVK" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"wVL" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 +"wVc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = 11; + pixel_y = 14 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/tumor/fiberbush) "wWs" = ( /turf/open/floor/greengrid, /area/fiorina/station/security) -"wWF" = ( -/obj/item/frame/rack, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) -"wWT" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/central_ring) "wWW" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -37698,271 +37839,286 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/station/medbay) -"wXf" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" +"wXe" = ( +/obj/structure/machinery/computer/cameras{ + dir = 1 }, -/area/fiorina/station/flight_deck) -"wXP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper, /turf/open/floor/prison{ - icon_state = "darkpurple2" + icon_state = "redfull" }, -/area/fiorina/tumor/servers) -"wYx" = ( -/obj/item/storage/box/flashbangs, -/obj/structure/surface/table/reinforced/prison, +/area/fiorina/station/security) +"wXy" = ( +/obj/structure/largecrate/random, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"wXN" = ( +/obj/structure/machinery/cryo_cell, +/obj/structure/pipes/standard/cap/hidden, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "sterile_white" }, /area/fiorina/station/medbay) -"wYE" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/fiorina/lz/near_lzII) -"wYG" = ( -/obj/structure/barricade/wooden{ - dir = 1 +"wXQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" + icon_state = "floor_plate" }, -/area/fiorina/station/telecomm/lz1_cargo) -"wZn" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null +/area/fiorina/station/lowsec) +"wYq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/chem_dispenser/soda, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/item/clothing/under/marine/ua_riot, -/obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/obj/item/prop/helmetgarb/riot_shield, +/area/fiorina/station/power_ring) +"wYP" = ( +/obj/structure/platform, +/obj/item/clothing/gloves/botanic_leather, /turf/open/floor/prison{ - icon_state = "redfull" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"wZo" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/area/fiorina/station/botany) +"wYT" = ( +/obj/structure/surface/rack, +/obj/item/tank/emergency_oxygen/engi, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" }, +/area/fiorina/station/power_ring) +"wZt" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 8; + icon_state = "floor_marked" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/research_cells) "wZv" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, /area/fiorina/station/park) -"wZE" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) +"wZH" = ( +/obj/structure/filingcabinet, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "wZN" = ( /obj/item/reagent_container/food/drinks/bottle/melonliquor, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"xaK" = ( -/obj/structure/barricade/handrail/type_b, +"xak" = ( +/obj/structure/closet/emcloset, +/obj/item/storage/pill_bottle/kelotane/skillless, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) -"xaS" = ( -/obj/structure/prop/almayer/computers/sensor_computer1, +/area/fiorina/tumor/ice_lab) +"xat" = ( +/obj/item/stool, /turf/open/floor/prison{ - icon_state = "darkpurplefull2" + icon_state = "bluefull" }, -/area/fiorina/tumor/servers) -"xbq" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/civres_blue) +"xaO" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - dir = 8; - icon_state = "blue" + icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) -"xbu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/prize/honk{ - anchored = 1; - layer = 2.9; - pixel_x = -1; - pixel_y = 13 +/area/fiorina/station/medbay) +"xbc" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) +"xbm" = ( +/obj/structure/machinery/line_nexter{ + id = "line2"; + pixel_x = -2 }, /obj/structure/barricade/handrail/type_b, +/turf/open/floor/prison, +/area/fiorina/station/disco) +"xbo" = ( +/obj/structure/barricade/sandbags{ + dir = 8; + icon_state = "sandbag_0"; + pixel_y = 2 + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"xbp" = ( +/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"; + registered_name = "John Forklift" }, -/area/fiorina/station/flight_deck) -"xbB" = ( /turf/open/floor/prison{ - icon_state = "darkyellow2" + icon_state = "bluefull" + }, +/area/fiorina/station/power_ring) +"xbr" = ( +/obj/structure/machinery/power/apc{ + dir = 4 }, -/area/fiorina/station/flight_deck) -"xbQ" = ( /turf/open/floor/prison{ - icon_state = "panelscorched" + dir = 1; + icon_state = "green" }, -/area/fiorina/station/civres_blue) -"xca" = ( +/area/fiorina/station/transit_hub) +"xbE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison{ - icon_state = "platingdmg2" + icon_state = "yellowfull" }, -/area/fiorina/station/security) -"xcf" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/area/fiorina/station/disco) +"xbM" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) +/area/fiorina/station/lowsec) "xck" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) -"xcJ" = ( -/obj/structure/platform, +"xcz" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"xcS" = ( /obj/structure/platform{ - dir = 4 + dir = 8 }, -/obj/structure/platform_decoration{ - dir = 6 +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/station/power_ring) -"xdy" = ( -/turf/open/floor/prison{ - icon_state = "darkredfull2" +"xdb" = ( +/obj/structure/closet/bodybag, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/prison, +/area/fiorina/station/lowsec) +"xdt" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 }, +/turf/open/space/basic, /area/fiorina/oob) "xdE" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) -"xec" = ( +"xdL" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ - icon_state = "kitchen" + icon_state = "floor_plate" }, -/area/fiorina/station/research_cells) -"xed" = ( -/obj/structure/window/reinforced{ - dir = 4 +/area/fiorina/tumor/servers) +"xdT" = ( +/obj/item/trash/cigbutt, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/structure/window/reinforced{ - dir = 8 +/area/fiorina/station/power_ring) +"xdZ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/secure_data, -/turf/open/floor/prison, -/area/fiorina/station/security) -"xeh" = ( -/obj/structure/surface/rack, -/obj/item/tool/extinguisher, -/obj/item/tool/crowbar{ - pixel_x = 5; - pixel_y = -5 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/obj/item/tool/crowbar, +/area/fiorina/station/lowsec) +"xei" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/fiorina/station/central_ring) +"xel" = ( +/obj/effect/landmark/survivor_spawner, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec) "xew" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" }, /area/fiorina/lz/near_lzI) -"xeD" = ( -/obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison{ - dir = 4; - icon_state = "blue_plate" - }, -/area/fiorina/station/botany) "xeO" = ( /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"xfd" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"xfq" = ( -/obj/effect/alien/weeds/node, -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"xfw" = ( -/obj/effect/landmark/objective_landmark/science, +"xeX" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "darkpurple2" + icon_state = "platingdmg1" }, /area/fiorina/tumor/servers) -"xfA" = ( -/obj/structure/bed/chair{ +"xfb" = ( +/obj/item/inflatable, +/obj/item/inflatable, +/obj/item/inflatable, +/obj/item/inflatable, +/obj/item/inflatable, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"xfh" = ( +/obj/structure/barricade/wooden{ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"xfG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"xfR" = ( +"xgb" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison{ - dir = 1; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) -"xfV" = ( -/obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison{ - dir = 1; - icon_state = "blue_plate" + icon_state = "floor_plate" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/civres) "xgn" = ( /obj/structure/machinery/optable, /turf/open/floor/corsat{ icon_state = "squares" }, /area/fiorina/station/medbay) -"xgr" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) "xgx" = ( /obj/structure/machinery/defenses/tesla_coil{ faction_group = list("USCM") @@ -37971,23 +38127,54 @@ name = "astroturf" }, /area/fiorina/station/park) +"xgC" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "xgF" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"xhc" = ( +"xgH" = ( +/obj/item/toy/handcard/uno_reverse_blue, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/transit_hub) -"xii" = ( -/obj/structure/tunnel, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" +/area/fiorina/station/research_cells) +"xgU" = ( +/obj/item/circuitboard/machine/rdserver, +/turf/open/floor/prison{ + icon_state = "floorscorched1" }, -/area/fiorina/tumor/fiberbush) +/area/fiorina/tumor/servers) +"xhL" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaltopleft" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"xhM" = ( +/obj/structure/curtain/red, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, +/area/fiorina/station/civres_blue) +"xia" = ( +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "xiF" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue{ @@ -37996,6 +38183,18 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/security) +"xiL" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, +/area/fiorina/station/botany) +"xiO" = ( +/obj/structure/machinery/vending/cigarette/free, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "xja" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -38006,84 +38205,63 @@ /obj/structure/computerframe, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"xjv" = ( +"xjM" = ( /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/station/power_ring) -"xjw" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 + dir = 8; + icon_state = "redcorner" }, +/area/fiorina/station/security) +"xkm" = ( +/obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + icon_state = "bluefull" }, -/area/fiorina/lz/near_lzI) -"xjK" = ( -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/power_ring) +"xkq" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/tumor/ice_lab) -"xjW" = ( -/obj/item/device/flashlight/flare, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellowcorners2" +/obj/structure/platform_decoration{ + dir = 6 }, -/area/fiorina/station/telecomm/lz1_cargo) -"xkj" = ( -/obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/power_ring) "xkv" = ( /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_tram) -"xkC" = ( -/obj/structure/barricade/metal/wired{ - dir = 4 - }, -/obj/structure/machinery/m56d_hmg/mg_turret/dropship{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "cell_stripe" - }, -/area/fiorina/station/central_ring) -"xkG" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +"xlb" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"xkP" = ( -/obj/item/tool/mop, +/area/fiorina/station/civres_blue) +"xlk" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" + }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/park) +/area/fiorina/station/medbay) "xlp" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/wood, /area/fiorina/station/research_cells) -"xlq" = ( -/obj/structure/largecrate/supply, +"xlx" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/tomatosoup, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "blue" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/power_ring) "xlZ" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/pillbottles, @@ -38094,167 +38272,58 @@ icon_state = "stan27" }, /area/fiorina/oob) -"xmg" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) "xmj" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/green, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"xmH" = ( +"xmC" = ( +/obj/item/device/flashlight/flare/on, /turf/open/floor/prison{ dir = 1; - icon_state = "green" - }, -/area/fiorina/tumor/aux_engi) -"xmM" = ( -/obj/structure/barricade/metal/wired{ - dir = 1 + icon_state = "whitegreen" }, +/area/fiorina/tumor/ice_lab) +"xmV" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ + dir = 10; icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzI) -"xmX" = ( -/obj/structure/cargo_container/grant/right{ - health = 5000; - unacidable = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/telecomm/lz1_tram) "xna" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"xng" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkyellow2" - }, -/area/fiorina/station/flight_deck) "xno" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"xnp" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) -"xnq" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"xns" = ( -/obj/structure/surface/rack, -/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/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"xnA" = ( -/obj/structure/curtain/red, -/turf/open/floor/prison{ - icon_state = "sterile_white" - }, -/area/fiorina/station/civres_blue) -"xnE" = ( -/obj/structure/largecrate/random/case/small, -/obj/item/key/cargo_train, -/turf/open/floor/prison, -/area/fiorina/tumor/aux_engi) -"xnK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"xnM" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) -"xnN" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"xnR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/cups, -/obj/item/reagent_container/food/drinks/coffee{ - name = "\improper paper cup"; - pixel_x = 8; - pixel_y = 16 +"xnt" = ( +/obj/structure/closet{ + density = 0; + pixel_y = 18 }, -/turf/open/floor/prison, -/area/fiorina/station/security) -"xnS" = ( +/obj/item/clothing/gloves/combat, /turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" + dir = 1; + icon_state = "whitepurple" }, -/area/fiorina/station/park) +/area/fiorina/station/research_cells) "xnU" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"xnW" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) -"xog" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno/limb, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreencorner" - }, -/area/fiorina/station/medbay) "xoi" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"xoB" = ( -/obj/item/trash/chunk, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"xoF" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "blue" - }, -/area/fiorina/station/power_ring) -"xoI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/objective, +"xow" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 4; + icon_state = "green" }, -/area/fiorina/station/park) +/area/fiorina/station/chapel) "xoK" = ( /obj/structure/closet, /obj/item/handcuffs, @@ -38262,138 +38331,147 @@ /obj/item/weapon/chainofcommand, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"xoQ" = ( -/obj/structure/machinery/light/double/blue, +"xoR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "bluefull" }, -/area/fiorina/tumor/civres) -"xpB" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/power_ring) +"xpj" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "lavendergrass_4" }, -/area/fiorina/station/medbay) -"xqf" = ( -/obj/structure/closet/bombcloset, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/stack/sheet/mineral/plastic, -/obj/item/stack/sheet/mineral/plastic, -/obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" }, -/area/fiorina/tumor/aux_engi) -"xqh" = ( -/obj/item/ammo_casing{ - icon_state = "cartridge_2" +/area/fiorina/station/central_ring) +"xpw" = ( +/obj/structure/machinery/power/apc{ + dir = 8 }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"xpx" = ( +/obj/item/storage/belt/marine, +/turf/open/floor/prison, +/area/fiorina/station/security) +"xpM" = ( +/obj/structure/platform, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/central_ring) -"xqj" = ( -/obj/structure/bed{ - icon_state = "abed" +/area/fiorina/station/power_ring) +"xpO" = ( +/obj/structure/machinery/power/terminal{ + dir = 1 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitepurple" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/research_cells) -"xqD" = ( -/obj/item/explosive/grenade/high_explosive/frag, -/turf/open/floor/prison, -/area/fiorina/station/security) -"xqG" = ( -/obj/item/stack/rods, +/area/fiorina/tumor/aux_engi) +"xqP" = ( +/obj/structure/surface/rack, +/obj/item/tool/plantspray/weeds, /turf/open/floor/prison{ dir = 4; - icon_state = "greencorner" + icon_state = "blue_plate" }, -/area/fiorina/station/chapel) -"xri" = ( +/area/fiorina/station/botany) +"xqY" = ( +/obj/effect/spawner/random/tool, /turf/open/floor/prison{ - dir = 4; - icon_state = "yellow" + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/tumor/ice_lab) +"xrd" = ( +/obj/structure/machinery/computer3/server/rack, +/obj/structure/barricade/handrail/type_b{ + dir = 4 }, -/area/fiorina/station/lowsec) -"xrn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/gun/pistol/lowchance, /turf/open/floor/prison, -/area/fiorina/station/power_ring) -"xrs" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/candelabra{ - layer = 3.2; - pixel_x = 1; - pixel_y = 13 +/area/fiorina/tumor/servers) +"xro" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/skills{ + dir = 4 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenfull" + icon_state = "bluefull" }, -/area/fiorina/station/transit_hub) -"xrG" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" +/area/fiorina/station/power_ring) +"xrz" = ( +/obj/item/clothing/head/cmcap, +/turf/open/floor/prison{ + icon_state = "green" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/transit_hub) "xrH" = ( /obj/structure/machinery/landinglight/ds2{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"xrJ" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/aux_engi) -"xrT" = ( -/obj/structure/inflatable, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"xrZ" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/area/fiorina/tumor/ship) -"xrU" = ( -/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"xsa" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +/area/fiorina/station/civres_blue) +"xsh" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 }, +/obj/item/bedsheet/green, /turf/open/floor/prison{ - dir = 8; - icon_state = "redcorner" - }, -/area/fiorina/station/power_ring) -"xsg" = ( -/obj/item/trash/pistachios, -/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_x = 10; - pixel_y = -3 + icon_state = "whitegreen" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) "xst" = ( /obj/structure/platform, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) +"xsC" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"xsS" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"xsX" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) +"xtd" = ( +/obj/structure/largecrate/random/case/small, +/obj/item/key/cargo_train, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "xte" = ( /obj/structure/platform_decoration, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/telecomm/lz1_tram) +"xtm" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/fiorina/tumor/aux_engi) "xtP" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -38403,73 +38481,35 @@ icon_state = "hr_kutjevo"; name = "solar lattice" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) -"xub" = ( -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/park) -"xup" = ( -/obj/structure/largecrate/supply/generator, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"xuw" = ( -/obj/item/stool, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" - }, -/area/fiorina/station/research_cells) -"xuH" = ( -/obj/item/ammo_casing{ - icon_state = "casing_7_1" - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/fiorina/oob) +"xuQ" = ( +/obj/effect/decal/medical_decals{ + icon_state = "docstripingdir" }, -/area/fiorina/station/medbay) -"xvs" = ( -/obj/item/stack/rods, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" }, -/area/fiorina/station/research_cells) -"xvt" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison{ - dir = 8; - icon_state = "whitegreen" - }, /area/fiorina/station/medbay) +"xvv" = ( +/turf/open/floor/prison, +/area/fiorina/station/botany) "xvB" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/access{ name = "greenhouse airlock" }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"xvD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/ricepudding, +"xvC" = ( +/obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) -"xvH" = ( -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/security) "xvI" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -38480,24 +38520,14 @@ /obj/item/trash/eat, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"xvR" = ( -/obj/item/stack/sheet/metal, +"xwo" = ( +/obj/structure/surface/rack, +/obj/item/storage/box/sprays, /turf/open/floor/prison{ dir = 9; icon_state = "greenfull" }, -/area/fiorina/tumor/civres) -"xwi" = ( -/obj/item/explosive/grenade/phosphorus, -/obj/item/explosive/grenade/phosphorus, -/obj/item/explosive/grenade/phosphorus, -/obj/structure/surface/rack, -/obj/item/explosive/grenade/phosphorus, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) +/area/fiorina/station/botany) "xwt" = ( /obj/structure/bed/chair/comfy, /turf/open/organic/grass{ @@ -38505,49 +38535,12 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"xwy" = ( -/obj/structure/closet/firecloset, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"xwA" = ( -/obj/item/ammo_casing{ - icon_state = "casing_6_1" - }, -/obj/item/weapon/gun/smg/mp5, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) "xwC" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/fiberbush) -"xwD" = ( -/obj/item/tool/weldingtool, -/turf/open/floor/prison, -/area/fiorina/station/civres_blue) -"xxd" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" - }, -/area/fiorina/maintenance) -"xxh" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkbrown2" - }, -/area/fiorina/tumor/aux_engi) "xxD" = ( /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"xxE" = ( -/obj/item/stack/rods/plasteel, -/turf/open/floor/prison{ - icon_state = "damaged3" - }, -/area/fiorina/station/security) "xxP" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "lavendergrass_2" @@ -38557,65 +38550,37 @@ name = "astroturf" }, /area/fiorina/station/civres_blue) +"xxU" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) "xxX" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib4" }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"xyf" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"xyy" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) -"xyK" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ +"xyq" = ( +/obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) -"xyR" = ( -/obj/structure/bedsheetbin, -/turf/open/floor/prison{ - dir = 8; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"xzb" = ( -/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + dir = 4; + icon_state = "blue_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/botany) +"xyw" = ( +/obj/structure/machinery/computer/arcade, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "xzj" = ( /turf/open/floor/carpet, /area/fiorina/tumor/civres) -"xzr" = ( -/obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison, -/area/fiorina/maintenance) "xzs" = ( /obj/structure/machinery/space_heater, /turf/open/organic/grass{ @@ -38623,40 +38588,33 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"xzI" = ( -/obj/item/tool/warning_cone, -/obj/structure/barricade/metal{ - dir = 8; - health = 150; - icon_state = "metal_2" - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"xzW" = ( -/obj/structure/closet/wardrobe/orange, -/obj/item/explosive/mine/pmc, -/obj/effect/spawner/random/gun/smg, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison{ - icon_state = "yellowfull" - }, -/area/fiorina/station/lowsec) -"xAi" = ( -/obj/structure/machinery/vending/sovietsoda, +"xzN" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "greenfull" + icon_state = "blue" }, -/area/fiorina/station/botany) +/area/fiorina/station/chapel) "xAl" = ( /obj/structure/cargo_container/grant/right{ desc = "A huge industrial shipping container. You're not sure how it got here." }, /turf/open/space, /area/fiorina/oob) +"xAo" = ( +/obj/item/trash/cigbutt/bcigbutt, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) +"xAq" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/research_cells) "xAs" = ( /obj/item/device/reagent_scanner, /turf/open/organic/grass{ @@ -38664,26 +38622,23 @@ name = "astroturf" }, /area/fiorina/tumor/fiberbush) -"xAw" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "sterile_white" - }, -/area/fiorina/station/lowsec) -"xAR" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 +"xAY" = ( +/obj/effect/landmark{ + icon_state = "hive_spawn"; + name = "xeno_hive_spawn" }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreencorner" }, +/area/fiorina/tumor/ice_lab) +"xBc" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitepurple" }, -/area/fiorina/station/park) +/area/fiorina/station/research_cells) "xBl" = ( /obj/structure/surface/table/woodentable, /obj/item/circuitboard/apc, @@ -38698,103 +38653,73 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"xBv" = ( -/obj/structure/bed/roller, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison, -/area/fiorina/station/lowsec) -"xBI" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, -/area/fiorina/lz/near_lzII) -"xBK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29"; - pixel_x = 1; - pixel_y = 10 +"xBu" = ( +/obj/structure/platform_decoration{ + dir = 8 }, +/obj/effect/spawner/random/tool, /turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"xBR" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "redfull" +/area/fiorina/station/power_ring) +"xBN" = ( +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = 1; + pixel_y = -1 }, -/area/fiorina/station/security/wardens) -"xBT" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkpurplefull2" }, -/area/fiorina/station/security/wardens) +/area/fiorina/station/research_cells) "xCa" = ( /obj/item/toy/crayon/rainbow, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"xCm" = ( -/obj/structure/barricade/sandbags{ - icon_state = "sandbag_0"; - pixel_y = -14 - }, +"xCg" = ( +/obj/item/stack/sheet/metal, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"xCo" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 + icon_state = "sterile_white" }, -/obj/structure/disposalpipe/segment{ - color = "#c4c4c4"; - dir = 4; - layer = 6; - name = "overhead pipe"; - pixel_y = 20 +/area/fiorina/station/research_cells) +"xCh" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/tumor/civres) -"xCs" = ( -/obj/effect/decal/medical_decals{ - icon_state = "cryocell1decal" + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/research_cells) +"xCp" = ( +/obj/structure/inflatable/popped, /turf/open/floor/prison{ icon_state = "whitegreen" }, /area/fiorina/station/medbay) -"xCy" = ( -/obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/fiorina/station/research_cells) -"xCW" = ( -/obj/structure/grille, +"xCr" = ( +/obj/structure/curtain/shower, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "kitchen" }, -/area/fiorina/station/research_cells) -"xDe" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison{ - icon_state = "green" +/area/fiorina/tumor/civres) +"xCv" = ( +/obj/structure/platform{ + dir = 4 }, -/area/fiorina/station/chapel) -"xDg" = ( -/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, /area/fiorina/station/medbay) +"xCV" = ( +/obj/item/reagent_container/food/drinks/bottle/orangejuice, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"xDk" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" + }, +/area/fiorina/station/civres_blue) "xDq" = ( /turf/closed/shuttle/ert{ icon_state = "stan20" @@ -38804,120 +38729,135 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) -"xDz" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 +"xEi" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 6 }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"xDQ" = ( /turf/open/floor/prison{ - icon_state = "cell_stripe" + icon_state = "floor_plate" }, -/area/fiorina/station/security) -"xEa" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/item/clothing/accessory/storage/holster, -/obj/structure/window/reinforced{ - dir = 4 +/area/fiorina/station/power_ring) +"xEy" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, /turf/open/floor/prison{ - icon_state = "redfull" - }, -/area/fiorina/station/security) -"xEE" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - indestructible = 1 - }, -/obj/item/clothing/head/that{ - anchored = 1; - indestructible = 1; - pixel_y = 7 + icon_state = "floor_plate" }, -/turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"xFe" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 +"xEH" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, -/turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"xEW" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/power_ring) +"xEX" = ( +/obj/effect/spawner/random/gun/rifle, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "xFf" = ( /obj/structure/largecrate/random, /turf/open/floor/corsat{ icon_state = "plate" }, /area/fiorina/tumor/aux_engi) -"xFx" = ( +"xFg" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/central_ring) +"xFJ" = ( +/obj/item/tool/soap, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/fiorina/station/lowsec) +"xFL" = ( +/obj/effect/decal{ + icon = 'icons/obj/items/policetape.dmi'; + icon_state = "engineering_v" + }, /turf/open/floor/prison{ dir = 10; - icon_state = "green" + icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"xFB" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/botany) +/area/fiorina/station/telecomm/lz1_cargo) "xFP" = ( /turf/closed/shuttle/ert{ icon_state = "stan_rightengine" }, /area/fiorina/lz/near_lzI) -"xGt" = ( -/obj/structure/window/framed/prison/reinforced, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) -"xGY" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 4; - pixel_y = 4 +"xGc" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, /turf/open/floor/prison{ - dir = 10; - icon_state = "bright_clean_marked" + icon_state = "bluefull" + }, +/area/fiorina/station/civres_blue) +"xGd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/cigarette/weed{ + icon_state = "ucigoff" }, -/area/fiorina/station/medbay) -"xHV" = ( -/turf/closed/wall/mineral/bone_resin, -/area/fiorina/tumor/civres) -"xHY" = ( -/obj/effect/landmark/xeno_spawn, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/aux_engi) -"xIb" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.5 +/area/fiorina/station/lowsec) +"xGi" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, +/area/fiorina/tumor/civres) +"xGl" = ( +/obj/structure/barricade/wooden, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/ice_lab) -"xIg" = ( -/obj/structure/largecrate/supply/medicine/medivend, +/area/fiorina/station/power_ring) +"xGr" = ( +/obj/item/trash/sosjerky, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) +"xGt" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"xGD" = ( +/obj/structure/machinery/deployable/barrier, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/security) +"xHi" = ( +/obj/item/trash/candle, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/telecomm/lz1_cargo) +"xHV" = ( +/turf/closed/wall/mineral/bone_resin, +/area/fiorina/tumor/civres) "xIh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/light/double/blue{ @@ -38927,73 +38867,121 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"xIo" = ( +"xIq" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/platform_decoration{ + dir = 1 + }, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" + icon_state = "floor_plate" }, -/area/fiorina/station/park) +/area/fiorina/station/disco) "xIx" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) -"xJg" = ( -/obj/structure/platform{ - dir = 4; - layer = 2 - }, -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, +"xJn" = ( +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkredfull2" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/disco) "xJw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/civres_blue) -"xKf" = ( +"xJQ" = ( /obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - dir = 4; - icon_state = "blue" + dir = 9; + icon_state = "yellow" }, -/area/fiorina/station/civres_blue) +/area/fiorina/station/lowsec) "xKj" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"xKA" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"xKE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/taperecorder{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/fiorina/station/lowsec) +"xKP" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/fiorina/station/research_cells) "xKX" = ( /turf/open/floor/plating/prison, /area/fiorina/station/disco) -"xLa" = ( +"xLd" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 30 + }, /turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" + icon_state = "redfull" }, -/area/fiorina/oob) +/area/fiorina/station/security) +"xLf" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibmid1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) "xLi" = ( /turf/closed/wall/prison, -/area/fiorina/tumor/ice_lab) -"xLI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/radio{ - pixel_y = 8 +/area/fiorina/tumor/ice_lab) +"xLj" = ( +/obj/item/reagent_container/food/drinks/bottle/patron, +/turf/open/floor/prison, +/area/fiorina/station/civres_blue) +"xLn" = ( +/obj/structure/window/reinforced{ + dir = 1 }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"xLx" = ( +/obj/item/bedsheet, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/power_ring) -"xLP" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, +/area/fiorina/station/lowsec) +"xLD" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, /turf/open/floor/prison{ - icon_state = "whitegreen" + icon_state = "bluefull" }, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/power_ring) "xLQ" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, @@ -39003,41 +38991,17 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"xMg" = ( -/turf/open/floor/prison{ - dir = 9; - icon_state = "whitegreen" - }, -/area/fiorina/tumor/ice_lab) -"xMs" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/faxmachine, -/turf/open/floor/prison{ - icon_state = "bluefull" - }, -/area/fiorina/station/power_ring) -"xMN" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" - }, -/area/fiorina/station/botany) -"xMR" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "whitepurple" - }, -/area/fiorina/station/research_cells) -"xMT" = ( -/obj/structure/bed/chair{ - dir = 4 - }, +"xMp" = ( +/obj/item/trash/c_tube, /turf/open/floor/prison{ - icon_state = "bluecorner" + dir = 10; + icon_state = "whitegreenfull" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/medbay) +"xMO" = ( +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "xMW" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -39052,14 +39016,13 @@ }, /turf/open/space, /area/fiorina/oob) -"xNf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/card/id/guest, -/obj/effect/landmark/objective_landmark/close, +"xMX" = ( +/obj/structure/inflatable/door, /turf/open/floor/prison{ - icon_state = "redfull" + dir = 8; + icon_state = "whitegreen" }, -/area/fiorina/station/security) +/area/fiorina/station/medbay) "xNg" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" @@ -39072,22 +39035,63 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, /area/fiorina/station/security) -"xNQ" = ( +"xNn" = ( /obj/structure/stairs/perspective{ - dir = 8; icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ - dir = 4 + dir = 8 }, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) +"xNw" = ( +/obj/item/fuelCell, /turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) +"xNG" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"xNJ" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 1 + }, +/obj/item/frame/rack, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) -"xOa" = ( -/obj/structure/bookcase/manuals/engineering, +"xNU" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/fiorina/station/flight_deck) +"xOm" = ( +/obj/structure/bed/chair{ + dir = 8 + }, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) +/area/fiorina/station/power_ring) +"xOs" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/fiorina/station/medbay) "xOE" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -39096,217 +39100,149 @@ icon_state = "plate" }, /area/fiorina/tumor/ship) -"xOI" = ( -/obj/structure/machinery/vending/coffee, +"xOU" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/flight_deck) -"xOQ" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + dir = 8; + icon_state = "darkyellow2" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) -"xOV" = ( -/obj/structure/machinery/gibber, +/area/fiorina/station/telecomm/lz1_cargo) +"xPk" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "blue_plate" + icon_state = "greencorner" }, -/area/fiorina/station/botany) +/area/fiorina/tumor/civres) "xPG" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"xPO" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) -"xPX" = ( -/obj/structure/machinery/disposal, +"xQx" = ( /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/transit_hub) -"xQb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/glass/beaker{ - pixel_x = -5; - pixel_y = 15 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 5; - pixel_y = 2 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/tumor/ice_lab) -"xQs" = ( -/obj/item/reagent_container/food/drinks/coffee{ - name = "\improper paper cup" +/area/fiorina/station/security/wardens) +"xQC" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 }, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"xRl" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/central_ring) -"xQC" = ( -/obj/structure/window/framed/prison/reinforced/hull, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"xQE" = ( -/obj/structure/closet/bodybag, -/obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"xRg" = ( -/obj/item/trash/popcorn, +/area/fiorina/station/telecomm/lz1_cargo) +"xRo" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"xRw" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ - dir = 8; + dir = 1; icon_state = "blue" }, /area/fiorina/station/power_ring) -"xRh" = ( +"xRI" = ( /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreen" + dir = 4; + icon_state = "yellow" }, -/area/fiorina/tumor/ice_lab) -"xSd" = ( -/turf/open/floor/prison{ - dir = 5; - icon_state = "blue" +/area/fiorina/station/lowsec) +"xRY" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/area/fiorina/station/civres_blue) -"xSg" = ( -/obj/structure/flora/pottedplant/random, +/obj/item/card/id/visa, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "whitepurple" }, -/area/fiorina/tumor/civres) -"xSB" = ( -/obj/effect/spawner/random/toolbox, -/obj/structure/surface/rack, -/obj/item/device/flashlight, -/turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" +/area/fiorina/station/research_cells) +"xSz" = ( +/obj/structure/barricade/metal/wired{ + dir = 8 }, -/area/fiorina/station/transit_hub) -"xTa" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"xSM" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/prison{ - dir = 4; - icon_state = "greenblue" + dir = 1; + icon_state = "whitegreen" }, -/area/fiorina/station/botany) -"xTe" = ( -/obj/structure/machinery/recharge_station, +/area/fiorina/station/central_ring) +"xTf" = ( +/obj/item/tool/kitchen/utensil/pspoon, /turf/open/floor/prison{ - dir = 9; + dir = 4; icon_state = "blue" }, /area/fiorina/station/power_ring) -"xTi" = ( -/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 +"xTD" = ( +/obj/structure/inflatable/popped/door, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkbrown2" - }, -/area/fiorina/station/park) -"xTy" = ( -/obj/structure/barricade/deployable{ - dir = 4 + icon_state = "whitegreen" }, +/area/fiorina/station/medbay) +"xTW" = ( +/obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/security) +/area/fiorina/lz/near_lzII) "xUi" = ( /obj/structure/surface/rack, /obj/item/device/camera, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"xUn" = ( +/obj/structure/machinery/door/poddoor/almayer{ + density = 0; + dir = 4 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "xUo" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"xUq" = ( -/obj/item/stack/barbed_wire, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" - }, -/area/fiorina/station/medbay) -"xUt" = ( -/obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/civres_blue) -"xUz" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "bluecorner" - }, -/area/fiorina/station/power_ring) -"xVh" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) -"xVm" = ( -/obj/effect/landmark/objective_landmark/close, +"xUr" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/station/security) -"xVv" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/area/fiorina/station/park) +"xVw" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - dir = 6; + dir = 1; icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"xVD" = ( -/obj/structure/prop/resin_prop{ - icon_state = "rack" - }, +"xVJ" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical/green, /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "darkbrownfull2" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/maintenance) "xVK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -39318,118 +39254,138 @@ name = "astroturf" }, /area/fiorina/station/park) -"xVP" = ( -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellowcorners2" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"xVR" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/sink{ - pixel_y = 32 - }, -/obj/item/tool/kitchen/knife/butcher, +"xVW" = ( /turf/open/floor/prison{ - icon_state = "kitchen" + dir = 9; + icon_state = "darkbrown2" }, -/area/fiorina/station/power_ring) +/area/fiorina/station/park) "xWc" = ( /obj/item/clothing/shoes/dress, /turf/open/space, /area/fiorina/oob) -"xWp" = ( -/obj/effect/landmark/xeno_spawn, +"xWE" = ( +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -5; + pixel_y = -11 + }, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "bluefull" }, -/area/fiorina/tumor/ice_lab) -"xWH" = ( -/obj/structure/machinery/computer/emails{ - dir = 1; - pixel_y = 4 +/area/fiorina/station/civres_blue) +"xWG" = ( +/obj/item/weapon/twohanded/spear, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" }, +/area/fiorina/station/research_cells) +"xWV" = ( /obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/phone{ + pixel_y = -4 + }, +/obj/item/phone{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/tool/pen, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "floor_plate" + }, +/area/fiorina/station/security) +"xXh" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "redfull" }, /area/fiorina/station/medbay) -"xWN" = ( -/obj/structure/bed/sofa/south/grey/left, +"xXl" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/central_ring) +"xXt" = ( +/obj/structure/machinery/vending/snack, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"xXY" = ( +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison{ icon_state = "floor_plate" }, +/area/fiorina/station/flight_deck) +"xYe" = ( +/obj/structure/tunnel/maint_tunnel, +/turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"xXw" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/organic/grass{ - desc = "It'll get in your shoes no matter what you do."; - name = "astroturf" - }, -/area/fiorina/station/central_ring) "xYg" = ( /obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"xYA" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "blue_plate" +"xYo" = ( +/obj/structure/machinery/power/apc{ + dir = 8 }, -/area/fiorina/station/botany) -"xYB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker{ - pixel_x = -5; - pixel_y = -6 +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, -/obj/item/reagent_container/food/condiment/peppermill{ - pixel_x = -5; - pixel_y = -11 +/area/fiorina/tumor/aux_engi) +"xYJ" = ( +/obj/structure/bed{ + icon_state = "abed" }, -/obj/item/reagent_container/food/snacks/doughslice, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/station/flight_deck) -"xYY" = ( -/obj/item/stool, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 + icon_state = "whitepurple" }, +/area/fiorina/station/research_cells) +"xYN" = ( +/obj/item/device/t_scanner, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" }, /area/fiorina/station/civres_blue) -"xZb" = ( -/obj/item/stack/rods, -/turf/open/floor/prison, -/area/fiorina/station/park) -"xZk" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "cartridge_2" +"xYR" = ( +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 22 }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkyellowcorners2" + icon_state = "blue" }, -/area/fiorina/station/telecomm/lz1_cargo) -"xZo" = ( -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "A ticket to Souto Man's raffle!"; - name = "\improper Souto Raffle Ticket"; - pixel_x = 7; - pixel_y = 6 +/area/fiorina/station/civres_blue) +"xZx" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/stamp, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, +/area/fiorina/tumor/civres) +"xZA" = ( /turf/open/floor/prison{ - icon_state = "blue" + dir = 4; + icon_state = "darkyellow2" }, -/area/fiorina/station/chapel) +/area/fiorina/station/telecomm/lz1_tram) "xZD" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -39439,35 +39395,77 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"xZI" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/security/wardens) +"xZM" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" + }, +/area/fiorina/tumor/civres) +"xZN" = ( +/obj/item/clothing/under/shorts/green, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/fiorina/station/central_ring) "xZR" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"yaz" = ( -/obj/structure/platform, -/obj/structure/closet/firecloset/full, -/obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"yaC" = ( -/obj/structure/machinery/vending/cigarette/free, +"xZU" = ( +/obj/structure/closet/crate/miningcar{ + name = "\improper materials storage bin" + }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/tumor/aux_engi) -"yaJ" = ( -/obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) -"yaU" = ( -/obj/effect/landmark/monkey_spawn, +/area/fiorina/station/botany) +"xZV" = ( +/obj/item/trash/semki, /turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"yar" = ( +/obj/structure/machinery/vending/cola, +/obj/structure/prop/souto_land/streamer{ dir = 1; + pixel_y = 24 + }, +/turf/open/floor/prison{ + dir = 8; icon_state = "darkbrown2" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/station/park) +"yat" = ( +/obj/item/inflatable/door, +/obj/item/inflatable/door, +/obj/item/inflatable/door, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) +"yaJ" = ( +/obj/structure/machinery/vending/sovietsoda, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "yaY" = ( /obj/item/stack/sheet/metal, /turf/open/space, @@ -39492,58 +39490,37 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"ybs" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/station/central_ring) -"ybR" = ( -/obj/item/stack/sheet/metal{ - amount = 5 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"ybx" = ( +/obj/structure/platform, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/area/fiorina/station/telecomm/lz1_cargo) +/turf/open/floor/prison, +/area/fiorina/station/botany) "ybU" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" }, /turf/open/floor/plating/prison, /area/fiorina/station/park) -"ybY" = ( -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"ycd" = ( -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/maintenance) -"ycg" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/vials/random, +"ycf" = ( +/obj/structure/closet/secure_closet/security_empty, /turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" + icon_state = "redfull" }, -/area/fiorina/station/medbay) -"ycj" = ( -/obj/structure/platform{ - dir = 1 +/area/fiorina/station/security) +"ycw" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"ycn" = ( /turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrowncorners2" + dir = 9; + icon_state = "greenfull" }, -/area/fiorina/tumor/aux_engi) +/area/fiorina/tumor/civres) "ycC" = ( /turf/open/floor/plating/prison, /area/fiorina/station/chapel) @@ -39551,72 +39528,91 @@ /obj/item/storage/pouch/radio, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"ycN" = ( -/obj/item/tool/wrench, +"ycT" = ( +/obj/structure/machinery/space_heater, /turf/open/floor/prison{ - icon_state = "bluefull" + icon_state = "floor_plate" + }, +/area/fiorina/tumor/fiberbush) +"ydb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, -/area/fiorina/station/power_ring) -"ycX" = ( /turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_cargo) -"ydk" = ( -/obj/effect/decal/cleanable/blood/drip, +/area/fiorina/station/civres_blue) +"ydd" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison{ - icon_state = "floorscorched1" + icon_state = "darkbrown2" }, -/area/fiorina/station/chapel) -"ydX" = ( +/area/fiorina/station/park) +"ydK" = ( /turf/open/floor/prison{ - dir = 9; - icon_state = "darkyellow2" + dir = 4; + icon_state = "blue" + }, +/area/fiorina/station/power_ring) +"ydQ" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/area/fiorina/station/telecomm/lz1_tram) -"ydY" = ( -/obj/structure/surface/rack, /turf/open/floor/prison{ - dir = 6; - icon_state = "darkbrown2" + icon_state = "whitegreen" + }, +/area/fiorina/tumor/ice_lab) +"yet" = ( +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" }, /area/fiorina/maintenance) -"yft" = ( -/obj/item/clothing/under/color/orange, +"yeA" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, -/area/fiorina/station/security) -"yfB" = ( -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" +/area/fiorina/station/medbay) +"yeX" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"yfp" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stair_cut/alt, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/obj/item/stack/cable_coil/blue, /turf/open/floor/prison{ dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, -/area/fiorina/station/medbay) -"yfC" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 8 +/area/fiorina/station/disco) +"yfA" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, /turf/open/floor/prison{ - icon_state = "floor_plate" + dir = 1; + icon_state = "darkyellow2" }, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/telecomm/lz1_cargo) "yfE" = ( /obj/structure/disposalpipe/junction{ dir = 4 }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"yfH" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, +"yfK" = ( /turf/open/floor/prison{ - icon_state = "sterile_white" + dir = 1; + icon_state = "cell_stripe" }, -/area/fiorina/station/civres_blue) +/area/fiorina/maintenance) "yge" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -39630,10 +39626,31 @@ name = "astroturf" }, /area/fiorina/station/park) -"ygv" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +"ygk" = ( +/obj/item/ammo_magazine/rifle/m16{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, +/area/fiorina/station/lowsec) +"ygr" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/fiorina/station/security) +"ygs" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) "ygw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -39648,61 +39665,44 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"ygH" = ( -/obj/item/ammo_casing{ - icon_state = "casing_1" - }, +"yhs" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/dexalin/skillless, /turf/open/floor/prison{ - dir = 10; - icon_state = "sterile_white" + icon_state = "floor_plate" }, /area/fiorina/station/medbay) -"ygS" = ( -/obj/structure/largecrate/random/secure, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" - }, -/area/fiorina/station/disco) "yhu" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"yhE" = ( -/obj/structure/machinery/vending/hydroseeds, +"yhJ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/item/prop/helmetgarb/spacejam_tickets{ + desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; + name = "\improper arcade tickets"; + pixel_x = 1; + pixel_y = -1 + }, /turf/open/floor/prison{ - dir = 9; - icon_state = "greenfull" + dir = 6; + icon_state = "whitepurple" }, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells) "yhR" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) -"yhT" = ( -/obj/structure/largecrate/supply/ammo, -/obj/item/storage/fancy/crayons, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_plate" - }, -/area/fiorina/station/telecomm/lz1_cargo) -"yil" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/iv_drip{ - pixel_y = 19 - }, -/obj/item/bedsheet/green, -/turf/open/floor/prison{ - dir = 4; - icon_state = "whitegreen" - }, -/area/fiorina/station/medbay) +"yif" = ( +/obj/structure/machinery/disposal, +/turf/open/floor/prison, +/area/fiorina/tumor/aux_engi) "yio" = ( /turf/closed/shuttle/ert, /area/fiorina/tumor/aux_engi) @@ -39712,45 +39712,37 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"yiD" = ( -/obj/structure/machinery/vending/cigarette/colony, +"yiL" = ( +/obj/item/trash/cigbutt/bcigbutt, /turf/open/floor/prison{ icon_state = "darkredfull2" }, -/area/fiorina/lz/near_lzI) -"yiG" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/area/fiorina/station/security) +"yiR" = ( /turf/open/floor/prison{ - icon_state = "floor_plate" + icon_state = "panelscorched" }, -/area/fiorina/station/disco) -"yjs" = ( -/obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison{ - dir = 10; - icon_state = "whitegreenfull" +/area/fiorina/station/civres_blue) +"yiT" = ( +/obj/structure/barricade/sandbags{ + icon_state = "sandbag_0"; + pixel_y = -14 }, -/area/fiorina/station/medbay) -"yjO" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/prison{ + dir = 10; icon_state = "floor_plate" }, -/area/fiorina/tumor/civres) -"yke" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/prison{ - icon_state = "darkpurplefull2" - }, -/area/fiorina/station/research_cells) -"ykI" = ( -/obj/structure/largecrate/random/barrel/green, +/area/fiorina/lz/near_lzI) +"yjW" = ( +/obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ icon_state = "floor_plate" }, -/area/fiorina/station/medbay) +/area/fiorina/station/security) +"ykw" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "ykO" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Corner" @@ -39758,34 +39750,42 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"ykT" = ( -/turf/open/floor/prison{ - dir = 8; - icon_state = "darkpurple2" - }, -/area/fiorina/tumor/servers) "ykX" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) -"ylf" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison{ - icon_state = "floor_plate" +"yli" = ( +/obj/structure/sign/prop3{ + desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, -/area/fiorina/tumor/fiberbush) -"yls" = ( -/obj/structure/monorail{ - name = "launch track" +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/central_ring) +"ylr" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/fiorina/station/research_cells) "ylu" = ( /obj/item/tool/wrench, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"ylW" = ( +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/fiorina/station/medbay) (1,1,1) = {" bQM @@ -41587,12 +41587,12 @@ xHV xHV xHV xHV -ejk -hDx -hDx -hDx -hDx -hDx +lIt +swj +swj +swj +swj +swj sUl qPb qPb @@ -41793,18 +41793,18 @@ xHV xHV dXG dIo -hDx +swj dXG -diP -qmd -xFx -diP -kDO -diP -qty -diP -qty -oOK +gPo +vgw +eWr +gPo +oeT +gPo +eYz +gPo +eYz +iad sUl kVg kbT @@ -42005,18 +42005,18 @@ xHV dXG dXG dIo -hDx +swj dXG -bjx +cFT dXG -oVC -lhQ -kDO -lhQ -qty -lhQ -gcr -lhQ +vXy +uPX +oeT +uPX +eYz +uPX +qny +uPX aEi pRH qPb @@ -42217,18 +42217,18 @@ dIo dIo dXG dIo -wJa +cKb dXG -lhQ +uPX dXG -vAZ -hDx -ejk -hDx -hDx -hDx -hDx -rUL +eRl +swj +lIt +swj +swj +swj +swj +qMs sUl kbT rNc @@ -42429,16 +42429,16 @@ dXG dIo dXG dIo -hDx -hDx +swj +swj qXM -qty -hDx +eYz +swj naW sLx xHV clu -hDx +swj xHV xHV dHd @@ -42448,9 +42448,9 @@ kow tfP tfP tfP -dwk -lso -lso +rXt +wnD +wnD gmT jyM jjM @@ -42460,7 +42460,7 @@ kbT kbT kbT qPb -jTe +uyN tfP xwC xwC @@ -42636,22 +42636,22 @@ xHV xHV xHV xHV -rsz -rsz +nsD +nsD dIo dIo dIo -mtm -hDx +jsp +swj dXG -qty -hDx +eYz +swj naW xHV -omF -lKd -lKd -lKd +xCr +jQy +jQy +jQy xHV naW bQM @@ -42660,9 +42660,9 @@ bQM bQM tfP tfP -pri -lso -lso +ycT +wnD +wnD enH gmT enH @@ -42853,17 +42853,17 @@ dXG clu dXG dXG -hDx -hDx +swj +swj dXG -qty +eYz xHV naW xHV naW -uZD -lKd -wHX +sfn +jQy +bMz naW xHV xHV @@ -42873,8 +42873,8 @@ kPz kPz tfP tfP -tHh -olm +eyi +uPi qPb qPb qPb @@ -42896,11 +42896,11 @@ xwC jhG nTq gUj -xrT +tbd uXD -fSY +mYG uXD -xrT +tbd jhG kIo msn @@ -43066,18 +43066,18 @@ clu dXG dXG uVZ -hDx +swj dXG -qty +eYz xHV xHV -siR -omF -lKd +mlU +xCr +jQy lLe -lKd -lKd -pCN +jQy +jQy +dyY xHV bQM bQM @@ -43107,18 +43107,18 @@ xwC xwC xwC xwC -eOo -xrT +gBx +tbd kNN -fSY +mYG uXD -xrT -eOo +tbd +gBx cTr kbT kbT kbT -eOo +gBx xwC xwC xwC @@ -43269,7 +43269,7 @@ xHV xHV xHV xHV -hDx +swj dXG dXG dXG @@ -43278,16 +43278,16 @@ dIo dIo dIo dXG -hDx +swj lLe -qty +eYz xHV xHV naW naW -lKd +jQy lLe -lKd +jQy naW xHV xHV @@ -43318,12 +43318,12 @@ xwC qPb dnK qPb -lso -lso +wnD +wnD hLM -gdn +uQk tfP -gdn +uQk hLM pBq kbT @@ -43482,25 +43482,25 @@ xHV xHV xHV xHV -qty +eYz clu clu dIo xHV xHV -diP -qty -diP -qty +gPo +eYz +gPo +eYz dXG -hDx +swj dXG -pVw -pVw -lKd -lKd -lKd -pRn +bFL +bFL +jQy +jQy +jQy +ihn xHV xHV xHV @@ -43526,19 +43526,19 @@ qPb kbT kbT qPb -tQn -lso -lso -lso +ieJ +wnD +wnD +wnD qPb qPb kbT kbT kbT -lso -lso +wnD +wnD kbT -lso +wnD kbT kbT kbT @@ -43692,25 +43692,25 @@ xHV xHV xHV dIo -hDx -hDx +swj +swj dXG clu dXG dIo xHV -qty -lhQ -qty -lhQ -qty -qty -hDx +eYz +uPX +eYz +uPX +eYz +eYz +swj dXG -lKd -lKd -lKd -lKd +jQy +jQy +jQy +jQy xHV xHV xHV @@ -43735,13 +43735,13 @@ xwC gwH gwH qPb -lso +wnD kbT kbT -tQn -lso -lso -lso +ieJ +wnD +wnD +wnD qPb qPb qPb @@ -43904,20 +43904,20 @@ xHV xHV xHV dIo -qty -qty -qty +eYz +eYz +eYz dIo dXG -rsz -hDx +nsD +swj whu whu whu -hDx -qty -qty -xSg +swj +eYz +eYz +qss naW naW naW @@ -44116,26 +44116,26 @@ xHV xHV xHV dIo -wJa -hDx -hDx +cKb +swj +swj pwL oKq -hDx -diP -qty -diP -qty -diP -qty -qty -hDx +swj +gPo +eYz +gPo +eYz +gPo +eYz +eYz +swj naW xHV xHV -lKd -coh -nvz +jQy +ifc +oyo xHV xHV bQM @@ -44165,19 +44165,19 @@ kbT ogM kbT kbT -lso +wnD qPb qPb -lso +wnD kbT kbT -lso -lso +wnD +wnD kbT wbp qPb qPb -eOo +gBx kbT kbT kbT @@ -44324,30 +44324,30 @@ xHV xHV dXG xHV -qty +eYz xHV xHV dIo -qty -qty -qty +eYz +eYz +eYz dXG dXG -hDx -lhQ -qty -lhQ -qty -lhQ +swj +uPX +eYz +uPX +eYz +uPX dXG -qty -hDx +eYz +swj xHV xHV xHV -pRn -lKd -lKd +ihn +jQy +jQy naW naW xHV @@ -44371,20 +44371,20 @@ bQM xwC xwC xwC -gzz +wDJ qPb kbT ogM kbT kbT -lso +wnD qPb qPb -lso -eOo +wnD +gBx xwC xwC -lso +wnD xwC qPb qPb @@ -44409,9 +44409,9 @@ lHx lHx jlk jlk -sAv -sJT -sAv +tDC +hvL +tDC jlk baC baC @@ -44535,33 +44535,33 @@ xHV xHV xHV lLe -hDx -qty +swj +eYz xHV xHV dIo -hDx -hDx -hDx +swj +swj +swj dXG dXG dXG -hDx +swj xHV dIo xHV -hDx +swj dXG -qty +eYz xHV naW naW naW -ecF +uXY jSD -lKd -fDo -pCN +jQy +rjy +dyY xHV xHV kPz @@ -44586,8 +44586,8 @@ xwC xwC uXn qPb -tQn -lso +ieJ +wnD kbT kbT qPb @@ -44599,7 +44599,7 @@ xwC xwC xwC xwt -jOt +wVc qPb wfV qPb @@ -44616,14 +44616,14 @@ jlk jlk vZV vZV -syF -kZQ -nyy +mkI +lCl +uTR jlk jlk -qDG -sJT -qDG +hAI +hvL +hAI jlk jlk rZP @@ -44745,16 +44745,16 @@ tYw tYw tYw dIo -qty -qty -qty +eYz +eYz +eYz dXG -qty -qty -hDx -qty -qty -qty +eYz +eYz +swj +eYz +eYz +eYz dXG dXG xHV @@ -44762,16 +44762,16 @@ xHV xHV xHV xHV -hDx -qty -qty +swj +eYz +eYz xHV naW -mAG -omF -lKd +lWn +xCr +jQy jSD -gkd +sdE naW xHV xHV @@ -44782,12 +44782,12 @@ bQM tfP tfP tfP -eOo +gBx qPb qPb qPb qPb -eOo +gBx gwH gwH xwC @@ -44800,8 +44800,8 @@ gwH gwH xwC qPb -lso -lso +wnD +wnD kbT qPb xwC @@ -44811,33 +44811,33 @@ tfP tfP tfP xwt -mtr +lrI qPb -eOo +gBx kbT kbT -lso -lso -lso -lso -jTe +wnD +wnD +wnD +wnD +uyN xwC -fVA -gUf -gHb +cJY +qxP +uDX jlk vZV jmp -aKW +svP cyb -qDG +hAI jlk -uZr -aKW -sJT -aKW -qDG -sAv +lLS +svP +hvL +svP +hAI +tDC lHx bQM bQM @@ -44957,16 +44957,16 @@ tYw xHV xHV dIo -wJa +cKb lLe dXG -qty +eYz lLe dXG dXG -hDx -hDx -hDx +swj +swj +swj xHV xHV xHV @@ -44974,17 +44974,17 @@ xHV xHV xHV xHV -hDx +swj dXG -qty +eYz xHV naW naW naW -uZD -lKd -lKd -wAl +sfn +jQy +jQy +lFV xHV kPz kPz @@ -45025,31 +45025,31 @@ tfP xwt xwC qPb -lso -lso +wnD +wnD qPb qPb -lso +wnD kbT kbT kbT -tQn -sVP -gCX -bZF +ieJ +uzG +nMm +sia rGq -hjP -euT +taj +lzq rGq fAt -hjP +taj knh -sJT -sJT -sJT -wgH -sJT -sJT +hvL +hvL +hvL +uzi +hvL +hvL lHx bQM bQM @@ -45169,10 +45169,10 @@ tYw xHV xHV dIo -mLB -hDx +rAU +swj dXG -qty +eYz dXG dXG dXG @@ -45188,14 +45188,14 @@ xHV doD doD doD -qty +eYz xHV naW -mAG -omF -lKd -lKd -lKd +lWn +xCr +jQy +jQy +jQy xHV naW bQM @@ -45236,32 +45236,32 @@ gwH tfP dwQ dwQ -lso +wnD dwQ dwQ -lso +wnD dwQ dwQ kbT dwQ dwQ ogM -sVP +uzG lyf -aKW +svP rOI -hjP -hjP -hjP -hjP -hjP +taj +taj +taj +taj +taj knh -aKW -aKW -sJT -aKW -qDG -pxu +svP +svP +hvL +svP +hAI +myK lHx bQM bQM @@ -45382,32 +45382,32 @@ xHV xHV dIo dIo -mLB -hDx -qty -hDx -hDx +rAU +swj +eYz +swj +swj dXG -xvR -qty -qty +oev +eYz +eYz dIo -rsz +nsD qgB qoG dIo dXG dXG dXG -qty +eYz ame -hDx +swj naW naW xHV -hDx +swj dXG -hDx +swj xHV dHd kow @@ -45418,15 +45418,15 @@ gwH tfP gwH gwH -eOo +gBx qPb rNc qPb qPb -eOo +gBx qPb qPb -eOo +gBx gwH tfP kow @@ -45446,34 +45446,34 @@ ycK qPb qPb qPb -lso -lso +wnD +wnD qPb -lso -lso -lso +wnD +wnD +wnD uXn -lso -lso -lso -lso +wnD +wnD +wnD +wnD ogM -sVP -gCX +uzG +nMm uNM -hjP +taj rGq -mbc -aFn +lSb +vbV jlk -hjP +taj knh rGq -aKW -sJT -aKW -hjP -oVn +svP +hvL +svP +taj +nvK rZP bQM baC @@ -45599,37 +45599,37 @@ dIo dIo xHV xHV -hDx +swj dXG -hDx -hDx +swj +swj dIo dIo xHV avY dIo dXG -rsz +nsD dXG -diP -xFx -hDx -sRg -hDx -hDx -hDx -hDx -hDx -hDx +gPo +eWr +swj +ftb +swj +swj +swj +swj +swj +swj sUl qPb dnK dnK qPb gwH -eOo +gBx gwH -eOo +gBx xzs qPb qPb @@ -45658,10 +45658,10 @@ qPb fpB kbT kbT -lso -kIF -lso -lso +wnD +lZo +wnD +wnD xwC xwC xwC @@ -45670,8 +45670,8 @@ ogM ogM ogM xwC -sVP -gCX +uzG +nMm uNM yhu yhu @@ -45681,10 +45681,10 @@ uNM jlk jlk rZP -xVD -sJT -aKW -hjP +ble +hvL +svP +taj dpH jlk baC @@ -45812,10 +45812,10 @@ xHV xHV xHV dIo -qty -qty -qty -rsz +eYz +eYz +eYz +nsD xHV xHV xHV @@ -45823,16 +45823,16 @@ xHV dXG dXG dXG -bjx -tQq -xFx -diP -qty -diP -qty -diP -qty -diP +cFT +xPk +eWr +gPo +eYz +gPo +eYz +gPo +eYz +gPo sUl qPb qPb @@ -45844,7 +45844,7 @@ qPb qPb qPb qPb -xii +tsH kbT qPb qPb @@ -45878,26 +45878,26 @@ xwC xwC xwC xwC -lso -lso -lso +wnD +wnD +wnD ogM -sVP -piL -peY -peY -peY -peY -peY -peY +uzG +dMt +wsz +wsz +wsz +wsz +wsz +wsz jlk jlk rZP -xVD -sJT -aKW -hjP -hlq +ble +hvL +svP +taj +hNU jlk baC baC @@ -46024,9 +46024,9 @@ xHV xHV xHV dIo -hDx -hDx -hDx +swj +swj +swj dXG xHV xHV @@ -46035,16 +46035,16 @@ xHV xHV xHV xHV -lhQ -fpp -oVC -lhQ -qty -lhQ -qty -lhQ -qty -lhQ +uPX +ntc +vXy +uPX +eYz +uPX +eYz +uPX +eYz +uPX sUl qPb qPb @@ -46094,21 +46094,21 @@ kbT kbT kbT ogM -jVH -bEn +oHm +mLY qbd -bEn -bEn -bEn -bEn -bEn -ycn -gCX +mLY +mLY +mLY +mLY +mLY +bZD +nMm rZP -xVD -sJT -aKW -hjP +ble +hvL +svP +taj dxE jlk baC @@ -46219,9 +46219,9 @@ xHV xHV xHV dXG -pty -hDx -pty +xGi +swj +xGi xHV xHV xHV @@ -46238,7 +46238,7 @@ xHV dIo dXG qXM -hDx +swj xHV gCE xHV @@ -46247,16 +46247,16 @@ xHV xHV xHV xHV -bby +sIC dXG qXM -hDx -qty -qty -qty -hDx -hDx -hDx +swj +eYz +eYz +eYz +swj +swj +swj sUl qPb cwB @@ -46299,27 +46299,27 @@ xwC xwC xwC xwC -jTe +uyN qPb qPb kbT kbT qPb jCA -aKW +svP fpn fpn -aKW +svP fpn fpn -aKW +svP lyf -sVP -stX +uzG +ddY rZP jlk -sJT -aKW +hvL +svP bfF rGq rZP @@ -46430,10 +46430,10 @@ xHV xHV xHV xHV -rsz -fBP -hDx -fBP +nsD +rqC +swj +rqC xHV xHV xHV @@ -46450,25 +46450,25 @@ xHV dIo dXG dXG -hDx +swj xHV xHV xHV xHV xHV dXG -hDx -hDx -bby +swj +swj +sIC dXG dXG -hDx -qty +swj +eYz xHV xHV xHV xHV -hDx +swj dHd kow kow @@ -46476,8 +46476,8 @@ kow tfP tfP tfP -ylf -ylf +sig +sig qPb qPb qPb @@ -46486,7 +46486,7 @@ qPb qPb xzs gwH -eOo +gBx tfP tfP kow @@ -46512,7 +46512,7 @@ xwC qPb qPb qPb -lso +wnD qPb kbT kbT @@ -46525,13 +46525,13 @@ jlk jlk jlk jlk -aKW -sVP -gCX +svP +uzG +nMm rZP jlk jlk -aKW +svP bfF rGq rZP @@ -46638,14 +46638,14 @@ xHV xHV xHV xHV -qty -qty -qty -qty -hDx -pty -hDx -fBP +eYz +eYz +eYz +eYz +swj +xGi +swj +rqC xHV xHV xHV @@ -46659,10 +46659,10 @@ dIo dIo dIo dIo -hDx +swj dXG -qty -hDx +eYz +swj xHV xHV xHV @@ -46674,9 +46674,9 @@ dXG dXG dXG dXG -hDx -qty -lsf +swj +eYz +stC xHV xHV xHV @@ -46689,13 +46689,13 @@ bQM tfP tfP kPY -cnU +jkw rNc qPb qPb qPb qPb -eOo +gBx gwH gwH gwH @@ -46722,11 +46722,11 @@ gwH xwC qPb qPb -lso +wnD kbT kbT kbT -lso +wnD kbT gwH gwH @@ -46737,13 +46737,13 @@ rZP rZP jlk jlk -bMd -hIo -iDE +mJc +jFz +aik rZP jlk jlk -aKW +svP bfF rGq lHx @@ -46849,46 +46849,46 @@ jXz xHV xHV xHV -qty -hDx -hDx -hDx -qty +eYz +swj +swj +swj +eYz dXG -fBP +rqC dXG -fBP -rsz -hDx -hDx +rqC +nsD +swj +swj nIc cmP dIo xHV xHV xHV -hDx -hDx -hDx -hDx -hDx +swj +swj +swj +swj +swj dXG dXG -hDx +swj xHV xHV xHV xHV dXG dXG -hDx -bby -bby -hDx +swj +sIC +sIC +swj dXG -hDx -qty -qty +swj +eYz +eYz xHV xHV xHV @@ -46901,7 +46901,7 @@ bQM bQM tfP kPY -ylf +sig xzs qPb qPb @@ -46933,12 +46933,12 @@ qPb gwH gwH qPb -lso +wnD kbT kbT kbT kbT -lmV +qJr qPb gwH gwH @@ -46949,9 +46949,9 @@ xKj jlk jlk jlk -aKW -sVP -gCX +svP +uzG +nMm rZP jlk jlk @@ -47052,56 +47052,56 @@ agi aWV agi jXz -ezr -gks +tbG +ach jXz -vjH -ezr +peA +tbG jXz -kPe +cPs xHV xHV -nIn -hDx -hDx -hDx -qty +pXt +swj +swj +swj +eYz dXG -fBP +rqC dXG dXG dXG dXG vwt -xCo +bxE yis dIo -hDx -hDx -hDx -qty -qty +swj +swj +swj +eYz +eYz dXG -qty -qty -qty -qty +eYz +eYz +eYz +eYz dXG xHV xHV xHV -rsz +nsD dXG dXG dXG xHV -rsz +nsD xHV -rsz -hDx -qty -qty -qty +nsD +swj +eYz +eYz +eYz xHV xHV xHV @@ -47114,12 +47114,12 @@ xHV tfP tfP kPY -bxW -gFe -gFe -gFe -gFe -bxW +mnr +hSG +hSG +hSG +hSG +mnr uNM uNM rZP @@ -47143,8 +47143,8 @@ kPY kbT kbT kbT -lso -lso +wnD +wnD kbT kbT kbT @@ -47159,11 +47159,11 @@ xKj jlk xKj rGq -jhi +kXs rGq -aKW -sVP -stX +svP +uzG +ddY rZP jlk jlk @@ -47264,33 +47264,33 @@ agi agi agi jXz -eOH -gks +oiF +ach jXz -hng -jnr +dyh +gve jXz -kPe +cPs xHV xHV -qty -hDx -hDx -hDx -qty +eYz +swj +swj +swj +eYz dXG lLe dXG dXG dXG dXG -hDx +swj lbt dXG -rsz +nsD dXG dXG -qty +eYz dXG qXM dXG @@ -47299,10 +47299,10 @@ dXG dXG dXG lLe -qty -hDx +eYz +swj xHV -hDx +swj dXG lLe dXG @@ -47310,11 +47310,11 @@ clu dXG clu dXG -hDx -xvR -qty -qty -hCT +swj +oev +eYz +eYz +rki xHV xHV pqC @@ -47327,36 +47327,36 @@ dIo uNM uNM uNM -sJT -sJT -sJT -sJT +hvL +hvL +hvL +hvL uNM uNM uNM uNM -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -rth -hjP -mrn -qzy -qzy -qzy -qzy -mrn +taj +taj +taj +taj +taj +taj +taj +taj +pLj +taj +iQJ +tZk +tZk +tZk +tZk +iQJ uNM -lmV +qJr kbT -lmV +qJr kbT -lso +wnD kbT kbT qPb @@ -47373,12 +47373,12 @@ xKj rGq rGq bDU -aKW -yaU -gCX +svP +mYy +nMm rZP jlk -jhi +kXs rGq osX rGq @@ -47477,24 +47477,24 @@ agi agi jXz jXz -gKu +jPY jXz -gKu +jPY jXz jXz -fGb +jHz xHV xHV -qty -qty -qty -qty +eYz +eYz +eYz +eYz dXG -hDx -fBP -hDx -fBP -rsz +swj +rqC +swj +rqC +nsD dXG dXG lbt @@ -47504,30 +47504,30 @@ dXG dXG dXG dXG -mLB -hDx -qty -hDx +rAU +swj +eYz +swj dXG eHD dXG dXG dXG -qty -bby +eYz +sIC qXM dXG dXG xHV dXG xHV -rsz -hDx -qty -qty -qty -hDx -hCT +nsD +swj +eYz +eYz +eYz +swj +rki xHV naW naW @@ -47539,15 +47539,15 @@ xHV jlk uNM uNM -sVP +uzG rGq rOI -piL -peY -peY -ppO -peY -gUf +dMt +wsz +wsz +iRn +wsz +qxP rGq rGq rGq @@ -47557,12 +47557,12 @@ rZP xKj xKj xKj -aKW -aKW -aKW -aKW -aKW -aKW +svP +svP +svP +svP +svP +svP jlk tfP kbT @@ -47585,9 +47585,9 @@ xKj rGq rGq rGq -aKW -sVP -gCX +svP +uzG +nMm jlk jlk rGq @@ -47681,31 +47681,31 @@ agi aWV agi agi -lwK +lvD agi agi agi agi mjx -eda -eQR -efz -eQR -efz -eQR -eda -eQR -efz +dDT +pjg +gir +pjg +gir +pjg +dDT +pjg +gir dXG -hDx -hDx -hDx +swj +swj +swj dXG xHV -hDx -fBP -hDx -fBP +swj +rqC +swj +rqC dXG wKE dXG @@ -47714,33 +47714,33 @@ dXG dXG dXG dXG -hDx -mLB +swj +rAU dIo -fBP -fBP +rqC +rqC dIo dIo dIo obI -wlz +dxP dXG -qty +eYz dXG dXG -bby -hDx -rsz +sIC +swj +nsD dXG dXG dXG -hDx -qty -qty -qty -hDx -hDx -hDx +swj +eYz +eYz +eYz +swj +swj +swj xHV xHV xHV @@ -47751,30 +47751,30 @@ xHV jlk uNM uNM -sVP +uzG fpn fpn -hjP +taj fpn -hjP +taj fpn fpn -gCX -gHb +nMm +uDX rGq rGq -aKW -aKW -aKW -jEf +svP +svP +svP +jWg jlk -jEf -aKW -aKW -aKW -aKW -gHb -aKW +jWg +svP +svP +svP +svP +uDX +svP jlk jlk jlk @@ -47797,9 +47797,9 @@ xKj rGq rGq gJu -joy -fBg -gCX +heA +tmI +nMm rGq knh rGq @@ -47893,21 +47893,21 @@ agi agi agi agi -cBU -wNw -ykT -uhd +rbv +aeb +otg +dLL hoZ mjx -efz -fLq -efz -fLq -efz -fLq -efz -fLq -efz +gir +mDn +gir +mDn +gir +mDn +gir +mDn +gir dXG dXG dXG @@ -47915,9 +47915,9 @@ dXG xHV xHV xHV -fBP -hDx -fBP +rqC +swj +rqC dXG dXG dXG @@ -47927,34 +47927,34 @@ lLe dXG dXG dXG -qty -fBP -fBP -aae +eYz +rqC +rqC +iYJ dIo -aat -fBP +kKt +rqC dCu -qty +eYz dXG dXG dXG dXG -bby +sIC dIo dIo -rsz +nsD dIo dIo -hDx -qty -qty -qty -diP -qty -diP -nsg -xFx +swj +eYz +eYz +eYz +gPo +eYz +gPo +byJ +eWr xHV dIo naW @@ -47963,32 +47963,32 @@ xHV jlk uNM uNM -jVH -bEn -gPO -bEn -bEn -bEn -bEn -ycn -gCX -aKW -aKW -aKW -aKW -aKW -aKW -jEf -jEf -jDj -awF -xHY -awF -sJT -aKW -aKW -aKW -aKW +oHm +mLY +arG +mLY +mLY +mLY +mLY +bZD +nMm +svP +svP +svP +svP +svP +svP +jWg +jWg +dZj +tcB +xtm +tcB +hvL +svP +svP +svP +svP jlk rGq rGq @@ -48009,15 +48009,15 @@ rGq rGq rGq jFl -aKW -xgr -gCX +svP +fAr +nMm rGq knh -hjP +taj pWO tuk -olB +wky jlk baC baC @@ -48105,74 +48105,74 @@ agi agi agi hoZ -dpE -uTX -dPC -nBV -lwK -fGb -ege +igc +jnU +nUS +oiV +lvD +jHz +gNJ mjx mjx -ege +gNJ mjx mjx -ege +gNJ mjx mjx -mLB -hDx -hDx -hDx +rAU +swj +swj +swj xHV xHV xHV -jDX -hDx -fBP -rsz -hDx -hDx -xCo +hgh +swj +rqC +nsD +swj +swj +bxE dXG dXG dXG dXG -qty +eYz lLe -fBP -vIF -pyW +rqC +nKo +jri dIo -tML -iQu +fCF +wfo dIo -hDx -qty +swj +eYz dXG -hDx -hDx +swj +swj xHV dIo -iHn -fqZ -hoY +vzT +rPd +vlN dIo -qWB -qty -qty -qty -lhQ -qty -lhQ -tzj -lvs -hDx +iNk +eYz +eYz +eYz +uPX +eYz +uPX +sze +lgH +swj dIo naW xHV xHV -geU +iaE amF amF amF @@ -48181,26 +48181,26 @@ amF amF amF amF -geU -sVP -gCX -gHb -aKW -gHb -aKW -aKW -gHb -jEf +iaE +uzG +nMm +uDX +svP +uDX +svP +svP +uDX +jWg jlk -jDj -qnq -peY -qQf -sJT -gHb -aKW -gHb -aKW +dZj +wjC +wsz +tzW +hvL +uDX +svP +uDX +svP rGq rGq rGq @@ -48216,15 +48216,15 @@ rZP jlk jlk rGq -kgP +nYE rGq rGq rGq gJu -joy -fBg -gCX -aKW +heA +tmI +nMm +svP knh rGq hlT @@ -48317,40 +48317,40 @@ agi agi agi hoZ -cBU -vco -wVK -uFX -lwK +rbv +jCe +hrw +ddN +lvD mjx -efz -eQR -efz -eQR -efz -eQR -efz -eQR -efz +gir +pjg +gir +pjg +gir +pjg +gir +pjg +gir doD doD doD xHV xHV -fBP -fBP -fBP -hDx -fBP -hDx +rqC +rqC +rqC +swj +rqC +swj xHV xHV nIc dXG -rsz +nsD dXG dXG -qty +eYz nib dIo dIo @@ -48359,32 +48359,32 @@ dIo dIo dIo dIo -cua -qty +bbU +eYz dXG -hDx +swj xHV xHV dIo -xfA -fBP -uIu +ojW +rqC +eGO dIo dIo dIo dIo dIo dIo -hDx -hDx -lhQ -oVC -nsg -nsg -nsg -xFx -xHV -geU +swj +swj +uPX +vXy +byJ +byJ +byJ +eWr +xHV +iaE amF fjX jXZ @@ -48393,28 +48393,28 @@ jXZ jXZ lZf amF -geU -sVP -gCX -sJT -sJT -sJT -sJT -sJT -sJT -jDj -jDj -jDj -fBg -ePx -lYc -sJT -sJT -sJT -aKW -aKW +iaE +uzG +nMm +hvL +hvL +hvL +hvL +hvL +hvL +dZj +dZj +dZj +tmI +pnx +mSZ +hvL +hvL +hvL +svP +svP rGq -hjP +taj rGq rGq knh @@ -48422,21 +48422,21 @@ bfF rGq rGq rGq -aKW +svP jlk rZP daK rGq rGq -aKW +svP rGq rGq rGq wcP -aKW -sVP -gCX -aKW +svP +uzG +nMm +svP jlk jlk rZP @@ -48529,30 +48529,30 @@ agi agi agi hoZ -lwK -lwK -lwK -dCl -lwK +lvD +lvD +lvD +dSM +lvD mjx -egY -fLq -efz -fLq -efz -fLq -kur -fLq -efz +qph +mDn +gir +mDn +gir +mDn +iZm +mDn +gir hoZ -fGb -hDx +jHz +swj xHV xHV -hDx -hDx -hDx -hDx +swj +swj +swj +swj xHV xHV xHV @@ -48562,25 +48562,25 @@ cmP dIo dXG dXG -qty -qty +eYz +eYz dCu -fBP -eaL +rqC +wgs dIo -gol -fBP +tle +rqC dCu -qty +eYz dXG dXG dXG dXG dXG dXG -fBP -aZU -hDx +rqC +hbn +swj dIo xHV xHV @@ -48588,14 +48588,14 @@ xHV xHV dIo dIo -hSF -qty -qty -hDx +qoc +eYz +eYz +swj whu -tLT -lvs -xoQ +srt +lgH +pIw amF amF hiO @@ -48606,25 +48606,25 @@ kZS hiO amF amF -vNx -piL -peY -peY -peY -peY -peY -peY -peY -peY -peY -oiR -hjP -gCX -peY -gUf -sJT -aKW -aKW +uZu +dMt +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +tnw +taj +nMm +wsz +qxP +hvL +svP +svP rGq rGq rGq @@ -48634,21 +48634,21 @@ bfF rGq rGq rGq -aKW +svP rZP rZP rGq rGq rGq -aKW -aKW +svP +svP fpn fpn -mcG -aKW -sVP -gCX -aKW +ace +svP +uzG +nMm +svP jlk jlk rZP @@ -48739,32 +48739,32 @@ agi agi agi agi -gEF +nub pCX -lwK -wNw -ykT -uhd -lwK +lvD +aeb +otg +dLL +lvD jXz jXz -gEF +nub gLv jXz -gKu +jPY jXz jXz -liX +aDc hoZ -njx -fGb -bby +lLQ +jHz +sIC xHV -fBP -hDx -fBP -fBP -fBP +rqC +swj +rqC +rqC +rqC xHV xHV xHV @@ -48772,27 +48772,27 @@ xHV nIc yis dIo -fuF +ody dXG dXG dXG dIo -fBP -gaZ +rqC +uWA dIo -mAB -hLt +bbp +iQj dIo -mii -hDx -qty +kVW +swj +eYz dXG -hDx +swj xHV dIo -uPg -ctJ -hDx +qBS +sHL +swj dIo dXG dXG @@ -48800,14 +48800,14 @@ xHV xHV xHV dIo -hSF -diP -xFx -hDx -hDx -nEs -oVC -hDx +qoc +gPo +eWr +swj +swj +ifm +vXy +swj pyK sXi pyK @@ -48818,25 +48818,25 @@ rGq pyK sXi pyK -sVP -hjP +uzG +taj fpn fpn -hjP +taj fpn fpn -hjP +taj fpn fpn -hjP -qUp -hjP -gCX -ruE -gCX -sJT -aKW -aKW +taj +ajZ +taj +nMm +nOy +nMm +hvL +svP +svP rGq rGq jlk @@ -48846,21 +48846,21 @@ vsT rGq rGq rGq -aKW -mhW -yaC +svP +hlk +xiO rGq bDU rGq -peY -peY -peY -peY -qzW -nqs -crH -gCX -aKW +wsz +wsz +wsz +wsz +cBG +sVW +hgD +nMm +svP okT jlk rZP @@ -48953,28 +48953,28 @@ aWV hoZ hoZ hoZ -dBY -uTX -dPC -nBV -lwK -fGb +kCS +jnU +nUS +oiV +lvD +jHz erl hoZ hoZ jXz -gks +ach agi jXz agi -njx -njx -fGb -hDx +lLQ +lLQ +jHz +swj xHV -fBP -hDx -fBP +rqC +swj +rqC dIo dIo dIo @@ -48984,10 +48984,10 @@ xHV nIc dIo dIo -hSF +qoc dXG dXG -wlz +dxP dIo dIo dIo @@ -48995,16 +48995,16 @@ dIo dIo dIo dIo -xEE +cbE dXG -qty +eYz dXG -hDx +swj xHV dIo -mLB -hgz -yjO +rAU +tCv +teI dIo xHV mfe @@ -49012,14 +49012,14 @@ xHV xHV xHV dIo -hSF -qty -qty -fpp -fpp -oVC -qty -qty +qoc +eYz +eYz +ntc +ntc +vXy +eYz +eYz sXi fpn sXi @@ -49030,25 +49030,25 @@ rGq sXi fpn sXi -sVP -hxC -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -sVP -hjP -gCX -bEn -lwG -sJT -aKW -aKW +uzG +ugk +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +uzG +taj +nMm +mLY +aJv +hvL +svP +svP rGq rGq knh @@ -49059,20 +49059,20 @@ oDe rGq rGq rGq -aKW -sJT +svP +hvL rGq rGq rGq -bEn -bEn -bEn -bEn -ftY -nIq -uNX -lwG -aKW +mLY +mLY +mLY +mLY +oIE +uaM +hzL +aJv +svP rGq jlk rZP @@ -49163,14 +49163,14 @@ bQM bQM aWV cVQ -gEF +nub hoZ -lwK -vco -wVK -uFX -lwK -fGb +lvD +jCe +hrw +ddN +lvD +jHz hoZ hoZ agi @@ -49179,14 +49179,14 @@ agi agi agi agi -njx -njx -fGb -fGb -fGb -fBP -hDx -fBP +lLQ +lLQ +jHz +jHz +jHz +rqC +swj +rqC dIo tYw tYw @@ -49196,9 +49196,9 @@ xHV qgi xHV xHV -gGG +fBr dXG -qty +eYz dXG xHV xHV @@ -49209,10 +49209,10 @@ dXG dXG dXG egL -qty +eYz qXM dXG -hDx +swj dIo dIo dXG @@ -49224,14 +49224,14 @@ xHV xHV dIo dIo -hSF -diP -xFx -igA -nsg -xFx -qty -qty +qoc +gPo +eWr +vdJ +byJ +eWr +eYz +eYz sXi fpn sXi @@ -49242,26 +49242,26 @@ rGq sXi fpn sXi -sVP -gCX -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -fBg -ePx -lYc -sJT -sJT -sJT -aKW +uzG +nMm +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +tmI +pnx +mSZ +hvL +hvL +hvL +svP rGq -hjP +taj boe jlk rGq @@ -49271,20 +49271,20 @@ rGq rGq rGq rGq -aKW -sJT +svP +hvL rGq rGq rGq -aKW +svP rZP -aKW -aKW -ezb -xgr -lYc -aKW -aKW +svP +svP +jtM +fAr +mSZ +svP +svP rGq jlk rZP @@ -49377,11 +49377,11 @@ aWV pCX hoZ hoZ -dCl -lwK -dQA -lwK -lwK +dSM +lvD +hbt +lvD +lvD hoZ hoZ hoZ @@ -49392,13 +49392,13 @@ gQK agi aWV aWV -fGb +jHz hoZ hoZ hoZ -fBP -hDx -fBP +rqC +swj +rqC dIo tYw tYw @@ -49408,42 +49408,42 @@ xHV qgi xHV xHV -gGG +fBr dXG -qty +eYz dXG -hDx +swj xHV -hDx -qty -qty -qty -qty +swj +eYz +eYz +eYz +eYz dXG dXG dXG dXG -qty -hDx +eYz +swj dXG -hDx -qty -mLB +swj +eYz +rAU dIo dIo dIo dIo dIo dIo -hDx -rMg -qty -qty -hDx +swj +dUf +eYz +eYz +swj whu -tQq -xFx -hDx +xPk +eWr +swj sXi sXi sXi @@ -49454,24 +49454,24 @@ rGq sXi sXi sXi -sVP -gCX -gHb -aKW -gHb -aKW -aKW -gHb -aKW -gHb -sJT -xgr -gjX -uZM -sJT -gHb -aKW -gHb +uzG +nMm +uDX +svP +uDX +svP +svP +uDX +svP +uDX +hvL +fAr +rsU +lIA +hvL +uDX +svP +uDX rGq rGq jlk @@ -49482,20 +49482,20 @@ knh knh jlk jlk -aKW -aKW -sJT +svP +svP +hvL rGq rGq rGq -jmy +htD rZP jDR rGq -aKW -sVP -gCX -aKW +svP +uzG +nMm +svP rGq rGq rGq @@ -49587,13 +49587,13 @@ bQM bQM aWV hoZ -gEF +nub hoZ -lwK -wNw -ykT -uhd -lwK +lvD +aeb +otg +dLL +lvD jXz oED hoZ @@ -49603,14 +49603,14 @@ agi gQK agi agi -njx -fGb +lLQ +jHz hoZ pCX hoZ -fBP -dsv -fBP +rqC +bdE +rqC dIo dIo dIo @@ -49623,39 +49623,39 @@ xHV xHV dXG dXG -qty +eYz dXG -qty +eYz dXG dXG lLe dXG dXG -muB -qty -qty -qty -qty +vLX +eYz +eYz +eYz +eYz dXG dXG dXG -qty -hDx -vFQ -hDx +eYz +swj +qdC +swj whu -hDx +swj whu -hDx -rMg -hDx -diP -tIK -hDx -hDx -hDx -lvs -xoQ +swj +dUf +swj +gPo +vUF +swj +swj +swj +lgH +pIw amF amF hiO @@ -49666,23 +49666,23 @@ nPA hiO amF amF -vNx -gCX -aKW -xrJ -aKW -aKW -aKW -aKW -aKW -aKW -sJT -fBg -ePx -lYc -sJT -aKW -aKW +uZu +nMm +svP +fAS +svP +svP +svP +svP +svP +svP +hvL +tmI +pnx +mSZ +hvL +svP +svP rGq rGq jlk @@ -49692,22 +49692,22 @@ jlk bfF rGq rGq -jEG +mMk rZP rZP -qNm -myg -aKW -aKW -gvT -eev +msF +sMX +svP +svP +dZo +dae rZP rGq rGq -aKW -sVP -gCX -aKW +svP +uzG +nMm +svP rGq oyd rGq @@ -49801,31 +49801,31 @@ aWV cVQ hoZ pCX -lwK -uTX -dPC -nBV -lwK +lvD +jnU +nUS +oiV +lvD jXz hoZ -fGb -gEF +jHz +nub gVx hro jor jXz hoZ -njx -fGb +lLQ +jHz oED hoZ hoZ -fBP -hDx -fBP -fBP -fBP -fBP +rqC +swj +rqC +rqC +rqC +rqC pqC bQM bQM @@ -49833,8 +49833,8 @@ bQM pqC xHV xHV -hDx -hDx +swj +swj dXG dXG dXG @@ -49846,29 +49846,29 @@ dXG dXG dXG xHV -qty -qty -diP -qty -diP -qty -diP -qty -diP -qty -diP -qty -diP -qty -diP -hcb -lvs -diP -foZ -xFx -rNF -hDx -taX +eYz +eYz +gPo +eYz +gPo +eYz +gPo +eYz +gPo +eYz +gPo +eYz +gPo +eYz +gPo +bhW +lgH +gPo +cPC +eWr +oJY +swj +wLT amF aXn jXZ @@ -49877,22 +49877,22 @@ jXZ jXZ qCW amF -geU -jVH -lwG -aKW -aKW -oem -aKW -aKW -aKW -aKW -gHb -sJT -sVP -hjP -gCX -sJT +iaE +oHm +aJv +svP +svP +dVR +svP +svP +svP +svP +uDX +hvL +uzG +taj +nMm +hvL uNM yhu uNM @@ -49900,11 +49900,11 @@ jlk jlk jlk jlk -uwI +uEY kpp rGq rGq -nUF +snW rZP rZP rZP @@ -49917,8 +49917,8 @@ rZP rGq rGq rGq -sVP -gCX +uzG +nMm rGq lzJ lzJ @@ -50011,33 +50011,33 @@ agi agi aWV hoZ -gEF +nub hoZ -lwK -vco -wVK -uFX -lwK -gEF -fGb -fGb +lvD +jCe +hrw +ddN +lvD +nub +jHz +jHz jXz hhL hro jqs -gEF +nub hoZ -njx -fGb -fGb -fGb -fGb -fBP -hDx -hDx -hDx -hDx -fBP +lLQ +jHz +jHz +jHz +jHz +rqC +swj +swj +swj +swj +rqC pqC bQM bQM @@ -50045,42 +50045,42 @@ bQM pqC xHV xHV -hDx +swj dXG -hDx -xkG -hDx -hDx -jcg -fBP -fBP -hDx -hDx -xHV -xHV -xHV -qty -lhQ -qty -lhQ -qty -lhQ -qty -lhQ -qty -lhQ -qty -lhQ -qty -lhQ -tzj -lvs -lhQ -aUM -lsl -xFx +swj +xEy +swj +swj +xgb +rqC +rqC +swj +swj +xHV +xHV +xHV +eYz +uPX +eYz +uPX +eYz +uPX +eYz +uPX +eYz +uPX +eYz +uPX +eYz +uPX +sze +lgH +uPX +gLV +enx +eWr apw -taX +wLT amF amF amF @@ -50089,34 +50089,34 @@ amF amF amF amF -geU +iaE jlk jlk jlk -aKW -aKW -aKW -aKW -nRI -aKW +svP +svP +svP +svP +bcz +svP jlk -sJT -sVP -hjP -gCX -sJT +hvL +uzG +taj +nMm +hvL yhu -jlJ +tMS jlk jlk jlk jlk jlk -uwI +uEY vsT rGq rGq -amj +uha rZP jlk jlk @@ -50134,7 +50134,7 @@ jlk ctc lzJ lzJ -uGM +oPU lzJ lzJ hUi @@ -50225,14 +50225,14 @@ aWV jXz jXz hoZ -lwK -lwK -lwK -lwK -lwK +lvD +lvD +lvD +lvD +lvD jXz jXz -fGb +jHz agi gQK agi @@ -50245,11 +50245,11 @@ aWV aWV aWV aWV -fBP -fBP -ngk -hDx -fBP +rqC +rqC +wgq +swj +rqC pqC bQM bQM @@ -50263,34 +50263,34 @@ dIo dIo dIo dIo -mLB -qty -qty -mLB -bby +rAU +eYz +eYz +rAU +sIC xHV xHV xHV xHV xHV -fGY +tiY dXG -qty -hDx -vFQ -hDx +eYz +swj +qdC +swj whu -hDx +swj whu -hDx -rMg -hDx -lhQ -oVC -dKN -hDx -jUy -hDq +swj +dUf +swj +uPX +vXy +udj +swj +cRx +vts apw apw amF @@ -50305,18 +50305,18 @@ amF rZP rZP rZP -gHb -qGX -qGX +uDX +oTy +oTy rZP rZP jlk jlk -sJT -sVP -hjP -gCX -sJT +hvL +uzG +taj +nMm +hvL uNM jlk jlk @@ -50328,7 +50328,7 @@ rZP jDR rGq rGq -pry +ugm jlk jlk jlk @@ -50340,13 +50340,13 @@ rGq rGq rGq rGq -jhi +kXs jlk jlk jlk lzJ lzJ -uGM +oPU lzJ lzJ lzJ @@ -50436,14 +50436,14 @@ rmu aWV vOP aWV -fGb -fGb -fGb -ipy -iSG -ipy -fGb -fGb +jHz +jHz +jHz +oxv +wxY +oxv +jHz +jHz hoZ hoZ mJq @@ -50458,10 +50458,10 @@ pab pnS aWV agi -hDx -fBP -hDx -fBP +swj +rqC +swj +rqC tYw xHV xHV @@ -50475,34 +50475,34 @@ dIo dIo dIo dIo -hDx -fBP -fBP -hDx +swj +rqC +rqC +swj xHV xHV xHV xHV xHV xHV -hDx -tZS -qUx -mLB +swj +odC +iGw +rAU dIo dIo dIo kUj kUj kUj -hDx -rMg -qty -qty -hDx +swj +dUf +eYz +eYz +swj whu -hDx -qWO +swj +orV mZo apw amF @@ -50516,19 +50516,19 @@ amF amF amF rZP -qzS -hjP -hjP -hjP -bHY +afW +taj +taj +taj +lhJ jlk rZP jlk -rhK -sVP -hjP -gCX -vqZ +kZl +uzG +taj +nMm +dkz jlk jlk jlk @@ -50552,7 +50552,7 @@ rGq oyd rGq rGq -jhi +kXs jlk jlk jlk @@ -50563,7 +50563,7 @@ fyO lzJ lzJ lzJ -cdD +tkj irB irB baC @@ -50641,15 +50641,15 @@ agi agi aWV jXz -njx -rpe -njx -tYx +lLQ +hWv +lLQ +jHC jXz pPG jXz hoZ -fGb +jHz hoZ gFg hoZ @@ -50659,38 +50659,38 @@ hoZ hoZ hoZ hoZ -gEF -jEl -efz -gEF -efz -jEl -gEF -efz -efz -gEF +nub +qxy +gir +nub +gir +qxy +nub +gir +gir +nub pCX -hDx -fBP -vAZ -fBP -hDx -diX +swj +rqC +eRl +rqC +swj +gyA xHV xHV xHV -rsz -hDx -hDx +nsD +swj +swj dIo -hDx -uST -hDx +swj +tMU +swj tYw xHV -qty -qty -hDx +eYz +eYz +swj xHV xHV xHV @@ -50699,24 +50699,24 @@ xHV xHV dIo dIo -jit -wFo +dOk +wwa dIo -xOa -xOa -hDx -hDx +krb +krb +swj +swj kUj kUj xHV -lhQ -oVC -gWT -fpp -bln -oVC +uPX +vXy +kzs +ntc +tKN +vXy apw -taX +wLT amF amF amF @@ -50725,26 +50725,26 @@ amF amF amF amF -geU +iaE jlk mHR -oBd -xnE -hjP -hjP -bBX +olk +xtd +taj +taj +pdP jlk rZP jlk -rhK -sVP -hjP -gCX -sVM +kZl +uzG +taj +nMm +aHJ jlk jlk -iqt -iqt +xNw +xNw jlk jlk umy @@ -50771,11 +50771,11 @@ jlk lzJ lzJ lzJ -xAR +eVK lzJ lzJ lzJ -cdD +tkj lzJ irB irB @@ -50852,14 +50852,14 @@ agi agi aWV jXz -njx -njx -njx -njx -njx -lwK -vTB -lwK +lLQ +lLQ +lLQ +lLQ +lLQ +lvD +efI +lvD hoZ hoZ hoZ @@ -50882,26 +50882,26 @@ hoZ pCX hoZ hoZ -gEF -fBP -hDx -fBP -hDx -jje -hDx -rsz -rsz -hDx +nub +rqC +swj +rqC +swj +sPJ +swj +nsD +nsD +swj qXM -hDx -sFI +swj +iwZ lLe -qty -qty +eYz +eYz fJj -hDx -fBP -fBP +swj +rqC +rqC qXM xHV xHV @@ -50910,25 +50910,25 @@ tYw tYw tYw dIo -pcD -fBP -fBP -fBP -qty -fBP -fBP -fBP -qty +tss +rqC +rqC +rqC +eYz +rqC +rqC +rqC +eYz kUj kUj -qty -muB -nsg -nsg -iKf +eYz +vLX +byJ +byJ +xZM apw -hDx -taX +swj +wLT amF fjX jXZ @@ -50937,27 +50937,27 @@ jXZ jXZ lZf amF -geU +iaE xFf rZP rZP -qGX -qGX -qGX +oTy +oTy +oTy rZP rZP rZP jlk jlk -sVP -hjP -gCX -sJT -jhi -rLb -hjP -hjP -hjP +uzG +taj +nMm +hvL +kXs +gQL +taj +taj +taj knh rGq rGq @@ -50988,7 +50988,7 @@ irB uYx lzJ lzJ -ajK +oer plu lzJ irB @@ -51063,15 +51063,15 @@ bQM agi agi rmu -cBY -njx -njx -njx -njx -njx -lwK -vTT -lwK +qGy +lLQ +lLQ +lLQ +lLQ +lLQ +lvD +bez +lvD hoZ hoZ gGx @@ -51095,26 +51095,26 @@ hoZ hoZ hoZ hoZ -hGZ -hDx -fBP +loj +swj +rqC jRk -nnx -hDx -hDx -vAZ +fcg +swj +swj +eRl dXG lLe dXG qXM dXG -qty -qty +eYz +eYz dXG -hDx -qty -qty -hDx +swj +eYz +eYz +swj xHV xHV tYw @@ -51122,24 +51122,24 @@ tYw tYw tYw dIo -qnK +rNV xzj kdK xzj -fBP +rqC xzj xzj xzj -fBP +rqC xHV kUj -lhQ -oVC -hDx -hDx -hDx -lvs -xoQ +uPX +vXy +swj +swj +swj +lgH +pIw amF amF hiO @@ -51153,24 +51153,24 @@ amF bDx jlk jlk -hjP -hjP -hjP -bBX +taj +taj +taj +pdP rZP kbb rZP jlk jlk -whp -gCX -sJT -aKW -aKW -aKW -aKW -aKW -bMd +stf +nMm +hvL +svP +svP +svP +svP +svP +mJc rGq rGq rGq @@ -51200,7 +51200,7 @@ irB irB lzJ lzJ -ajK +oer lzJ lzJ lzJ @@ -51275,15 +51275,15 @@ bQM agi agi rmu -njx -njx -njx -njx -njx -njx -lwK -vZc -lwK +lLQ +lLQ +lLQ +lLQ +lLQ +lLQ +lvD +uMZ +lvD hoZ hoZ fqF @@ -51307,51 +51307,51 @@ hoZ hoZ hoZ pCX -fBP -hDx -fBP -fBP -fBP -fBP -sIQ +rqC +swj +rqC +rqC +rqC +rqC +gxR dXG -hDx +swj dXG -rsz +nsD dIo -moJ -qty -moJ +eWA +eYz +eWA dIo -hDx -fBP -fBP -hDx -uIG +swj +rqC +rqC +swj +guU xHV tYw tYw tYw tYw dIo -wfy +xZx xzj xzj xzj -fBP +rqC xzj xzj xzj xHV xHV kUj -qty -qty -hDx +eYz +eYz +swj whu -nEs -oVC -hDx +ifm +vXy +swj pyK sXi pyK @@ -51362,27 +51362,27 @@ rGq pyK sXi pyK -ncn -gUf -sJT -sJT -sJT -pOm +kCH +qxP +hvL +hvL +hvL +veP fmY -aao -sJT +xYo +hvL jlk jlk jlk -hjP -gCX -sJT -sJT -sJT -iAL -sJT -aKW -bMd +taj +nMm +hvL +hvL +hvL +uxd +hvL +svP +mJc rGq bDU rGq @@ -51393,30 +51393,30 @@ rZP rZP jlk jlk -uvi -uGM -uGM -jUI +rur +oPU +oPU +voi fjr jgu jgu jgu irB -ajK +oer lzJ lzJ -uGM +oPU mCA irB irB irB irB -cdD +tkj lzJ lzJ lzJ fyO -uGM +oPU irB irB irB @@ -51487,17 +51487,17 @@ agi agi agi rmu -cEf -njx -njx -njx -njx -hwE +mVO +lLQ +lLQ +lLQ +lLQ +odl jXz pPG jXz -fGb -fGb +jHz +jHz hoZ vjT gFg @@ -51520,25 +51520,25 @@ hoZ hoZ hoZ lLe -hDx -hDx -hDx -hDx -hDx -fBP +swj +swj +swj +swj +swj +rqC xHV -rsz +nsD xHV xHV dIo -moJ -qty -moJ +eWA +eYz +eWA dIo -wJa -qty -qty -xoQ +cKb +eYz +eYz +pIw tYw tYw tYw @@ -51546,24 +51546,24 @@ tYw tYw tYw dIo -rdX +cTx xzj xzj xzj -fBP +rqC xzj xzj dXG xHV xHV dIo -lhQ -oVC -fpp -fpp -oVC -qty -qty +uPX +vXy +ntc +ntc +vXy +eYz +eYz sXi fpn sXi @@ -51574,26 +51574,26 @@ rGq sXi fpn sXi -sVP -piL -peY -cJa -peY +uzG +dMt +wsz +uMm +wsz ddM iQK ddM -peY -peY -bST -peY -hjP -piL -peY -peY -peY -gUf -sJT -aKW +wsz +wsz +ruu +wsz +taj +dMt +wsz +wsz +wsz +qxP +hvL +svP jlk jlk jlk @@ -51605,17 +51605,17 @@ dxE rZP jlk jlk -tdo -uGM -uGM -jUI -iZA +vxI +oPU +oPU +voi +bBB jgu jgu jgu -nsn -ajK -uGM +pvz +oer +oPU lzJ lzJ irB @@ -51623,9 +51623,9 @@ irB irB irB irB -cdD -ajK -iSh +tkj +oer +pIA lzJ lzJ lzJ @@ -51634,7 +51634,7 @@ irB irB irB irB -iAO +gOd wbI itN baC @@ -51699,9 +51699,9 @@ agi agi aWV jXz -lwK -lwK -lwK +lvD +lvD +lvD jXz aWV aWV @@ -51719,63 +51719,63 @@ hoZ hoZ hoZ hoZ -gEF -jEl -efz -gEF -jEl -efz -gEF -jEl -efz -gEF +nub +qxy +gir +nub +qxy +gir +nub +qxy +gir +nub agi hoZ dXG -fon -hDx -hDx -hDx -hDx -fBP +jEz +swj +swj +swj +swj +rqC dIo tYw xHV xHV dIo -moJ -oGm -moJ +eWA +ycw +eWA dIo -iPZ -fBP -fBP -hDx +bnM +rqC +rqC +swj tYw -gto -qNS +vel +lAQ tYw tYw tYw dIo -pcD -fBP -fBP -fBP -qty +tss +rqC +rqC +rqC +eYz xHV -fBP +rqC xHV xHV xHV -hDx -qty -qty -nsg -nsg -xFx -qty -qty +swj +eYz +eYz +byJ +byJ +eWr +eYz +eYz sXi fpn sXi @@ -51786,30 +51786,30 @@ rGq sXi fpn sXi -sVP -hxC -bEn -kCg -bEn -ajh -ihC -hxC -bEn -bEn -aQM -bEn -bEn -bEn -bEn -ycn -aKW -gCX -sJT -aKW -dro +uzG +ugk +mLY +inO +mLY +mEY +nWh +ugk +mLY +mLY +oGg +mLY +mLY +mLY +mLY +bZD +svP +nMm +hvL +svP +iXV jlk jlk -jhi +kXs rGq rGq rGq @@ -51817,16 +51817,16 @@ rGq rZP jlk jlk -lrC -uGM -uGM -xub -xub -xub +xUr +oPU +oPU +wgO +wgO +wgO vhB -xub -cdD -ajK +wgO +tkj +oer lzJ lzJ irB @@ -51835,18 +51835,18 @@ irB irB irB irB -cdD -ajK +tkj +oer irB irB lzJ lzJ -uGM +oPU irB irB irB -nfI -vHK +hub +uiD wbI itN baC @@ -51911,9 +51911,9 @@ agi agi sSY ruJ -ocS -psO -qew +lZs +evd +rWQ ruJ sSY aWV @@ -51945,11 +51945,11 @@ agi agi xHV xHV -fBP -fBP -fBP -fBP -fBP +rqC +rqC +rqC +rqC +rqC dIo xHV xHV @@ -51959,14 +51959,14 @@ dIo dIo dIo dIo -cDj -rIX -rIX -gma -gma -gma -gma -cDj +rqG +kLz +kLz +bNE +bNE +bNE +bNE +rqG xJw xJw rja @@ -51979,15 +51979,15 @@ egv egv egv egv -gma +bNE apf -lhQ -oVC -hDx -vkM -tQq -xFx -hDx +uPX +vXy +swj +uXP +xPk +eWr +swj sXi sXi sXi @@ -51998,27 +51998,27 @@ rGq sXi sXi sXi -jVH -lwG +oHm +aJv jlk jlk -mWi -sVP -hjP -gCX -sJT +gmN +uzG +taj +nMm +hvL jlk jlk jlk -pOm -sJT -sJT -sVP -hjP -gCX -sJT -aKW -tMP +veP +hvL +hvL +uzG +taj +nMm +hvL +svP +yif jlk jlk aHg @@ -52029,17 +52029,17 @@ cye jlk jlk jlk -lrC -uGM -uGM -xub -xub -xub +xUr +oPU +oPU +wgO +wgO +wgO vhB -xub -cdD -ajK -uGM +wgO +tkj +oer +oPU lzJ irB irB @@ -52047,18 +52047,18 @@ irB irB irB irB -cdD -ajK -uGM -uGM -uGM -uGM -uGM -uGM -uGM -uGM -cdD -iAO +tkj +oer +oPU +oPU +oPU +oPU +oPU +oPU +oPU +oPU +tkj +gOd qkg itN baC @@ -52123,25 +52123,25 @@ agi agi aWV jXz -lwK -lwK -lwK +lvD +lvD +lvD jXz jXz jXz jXz -uwP -uwP -dmu +kME +kME +imN jXz -lwK -njx +lvD +lLQ hoZ hoZ hoZ hoZ -fGb -fGb +jHz +jHz hoZ aWV aWV @@ -52157,48 +52157,48 @@ agi agi xJw xJw -eWu +gAh apf apf bvY apf -eWu +gAh egv -cDj -gma -gma -gma -gma -bfZ -bfZ -bfZ -bfZ -gma -gma -nAr -gbD -rVZ -nAr -cDj +rqG +bNE +bNE +bNE +bNE +pQs +pQs +pQs +pQs +bNE +bNE +raL +rty +iXJ +raL +rqG xJw rja -vub +uvZ apf apf -vub +uvZ egv egv egv egv egv -gma +bNE xna -qty -qty -hDx -hDx -hDx -lvs +eYz +eYz +swj +swj +swj +lgH rZP amF amF @@ -52215,25 +52215,25 @@ jlk jlk jlk jlk -sVP -hjP -gCX -eyM +uzG +taj +nMm +cHK jlk jlk jlk jlk -jXB -sJT -sVP -hjP -gCX -sJT +aKN +hvL +uzG +taj +nMm +hvL jlk jlk jlk jlk -jhi +kXs rGq rGq rGq @@ -52241,36 +52241,36 @@ rGq jlk jlk jlk -tdo -uGM -uGM -jUI -waP +vxI +oPU +oPU +voi +vcN jgu jgu jgu -rxh -ajK -uGM -rON -uGM -qDy +bxm +oer +oPU +vQC +oPU +jls irB irB irB irB -cdD -teH -oAV -oAV -tsQ -uGM -uGM -uGM -lRI -uGM -cdD -ajK +tkj +uWO +gSX +gSX +oTT +oPU +oPU +oPU +gAn +oPU +tkj +oer jFO itN itN @@ -52334,85 +52334,85 @@ agi agi agi aWV -cxl -cOq -njx -njx -lwK -njx -njx -njx -lwK -dfz -njx -njx -lwK -njx +rqY +hFC +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +fuw +lLQ +lLQ +lvD +lLQ hoZ hoZ hoZ hoZ hoZ -fGb -fGb +jHz +jHz agi agi agi agi hoZ -fGb -eEo +jHz +qFs agi agi agi aWV aWV xJw -eWu -dUs -iOt -iOt -uAv +gAh +oEi +kyF +kyF +xDk apf -gma -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -qPT -ddE -qwJ -eTn -mbN +bNE +bNE +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +rKA +qCk +cvd +rRz +cjG xJw rja -gma -xbQ +bNE +yiR xna -gma +bNE egv egv egv egv apf apf -vsc -tZS -oVC -fpp -fpp -fpp -oVC +wUs +odC +vXy +ntc +ntc +ntc +vXy rZP -geU +iaE amF aXn jXZ @@ -52421,68 +52421,68 @@ jXZ jXZ qCW amF -geU +iaE lev jlk jlk -mpO -evc -sVP -hjP -gCX +oOp +xpO +uzG +taj +nMm jlk jlk jlk jlk jlk jlk -sJT -sVP -hjP -oYX -sJT +hvL +uzG +taj +khd +hvL jlk jlk jlk rZP -ofo -aKW +mWO +svP rGq rGq rGq jlk jlk rZP -sRk -uGM -uGM -jUI +lwA +oPU +oPU +voi xck jgu oCe jgu -cdD -ajK -uGM -pWH -uGM -tdZ -oPC +tkj +oer +oPU +uKE +oPU +rsg +kDa irB jgu jgu -rZh -dMc +cPL +uCX jgu jgu -dxd -xub -qyB -oAV -oAV -tsQ -cdD -ajK +hcY +wgO +gqM +gSX +gSX +oTT +tkj +oer vLH itN aju @@ -52546,34 +52546,34 @@ agi agi agi aWV -cBB -njx -njx -njx -lwK -njx -njx -njx -lwK -njx -njx -njx -lwK -ykT -uhd -agi -gEF +rRg +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +otg +dLL +agi +nub hoZ hoZ -fGb -fGb +jHz +jHz agi agi agi agi agi -fGb -eEo +jHz +qFs agi jXz jXz @@ -52581,48 +52581,48 @@ aWV aWV xJw xJw -tik +nhM mMH aBs -gFG -bfZ +cOj +pQs apf -bfZ -bfZ -bfZ -bfZ -gEe -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -nAr -mXY -qJJ -nAr -gma +pQs +pQs +pQs +pQs +xLj +pQs +pQs +pQs +pQs +pQs +pQs +pQs +raL +wND +imp +raL +bNE rja rja -gma +bNE apf apf -vsc -vub +wUs +uvZ egv -vub +uvZ apf -xbQ +yiR apf -gma -qty -qty +bNE +eYz +eYz tYw -hDx -hDx -hDx +swj +swj +swj uNM uNM uNM @@ -52636,74 +52636,74 @@ amF uNM uNM uNM -hjP -mpO -evc -kKZ -hjP -gCX +taj +oOp +xpO +hBf +taj +nMm jlk jlk jlk jlk jlk jlk -wVu -hIo +wuN +jFz jlk -iDE -wVu +aik +wuN jlk jlk jlk rZP -aBk -aKW +uci +svP rGq rGq rGq -ivM -nhi +bjR +mvY glG -jUI -uGM -uGM -jUI +voi +oPU +oPU +voi oPZ jgu oCe jgu -cdD -ajK -uGM -tdZ -oPC -war +tkj +oer +oPU +rsg +kDa +sTU jgu kXD jgu qOW -lDe -ofF +mWs +dCK chT jgu -rZh -qPC -dMc +cPL +sTm +uCX jgu jgu -dxd -cdD -ajK -hhy -vwc -vwc -vwc -fuA +hcY +tkj +oer +xVW +oyT +oyT +oyT +uaL qNv -iVt +sUt jgu -hMg +veJ irB baC baC @@ -52758,21 +52758,21 @@ agi agi agi aWV -jJh -njx -njx -njx -lwK -njx -njx -njx -lwK -njx -njx -njx -lwK -njx -nBV +oLK +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +lLQ +oiV jXz hoZ hoZ @@ -52785,7 +52785,7 @@ agi agi hoZ hoZ -eEo +qFs egv xJw xJw @@ -52793,110 +52793,110 @@ xJw xJw xJw rja -tik +nhM dGx kLI -gFG -bfZ -bfZ -mJe -bfZ -bfZ -bfZ -bfZ -bfZ -eWu -bfZ -bfZ -bfZ -eWu -bfZ -bfZ -bfZ -bfZ -bfZ -gma +cOj +pQs +pQs +qGP +pQs +pQs +pQs +pQs +pQs +gAh +pQs +pQs +pQs +gAh +pQs +pQs +pQs +pQs +pQs +bNE apf apf -xbQ -gma +yiR +bNE apf apf apf apf apf apf -gma -gma +bNE +bNE apf -diP +gPo qXM -mLB +rAU tYw tYw dXG uNM -avf +qjR uNM -pYh -elY -hjP +eUo +wXy +taj uNM -hjP -elY -pYh +taj +wXy +eUo uNM uNM uNM -hjP -xqf -sJT -sVP -hjP -uWg -sJT +taj +vaC +hvL +uzG +taj +hpn +hvL jlk jlk jlk jlk -aKW -sJT -sVP -sVi -gCX -sJT -aKW +svP +hvL +uzG +wIp +nMm +hvL +svP jlk jlk rZP -wHE -aKW +mJg +svP rGq rGq rGq -aKW -shC +svP +nTV glG -jUI -uGM -uGM -jUI -nGI +voi +oPU +oPU +voi +ktq jgu jgu jgu -rxh -ajK -uGM -btz +bxm +oer +oPU +uLf jgu kXD jgu wbI wbI wbI -cdD -ajK +tkj +oer wbI eVf wnu @@ -52904,16 +52904,16 @@ wnu dqE tNV kXD -dxd -cdD -ajK +hcY +tkj +oer lzJ -mEc -bDN -bDN -bDN +mtG +tiZ +tiZ +tiZ qNv -xZb +cbA jgu irB irB @@ -52970,21 +52970,21 @@ agi agi agi aWV -cxl -njx -njx -njx -lwK -njx -njx -njx -lwK -njx -njx -njx -lwK -wVK -uFX +rqY +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +lLQ +lLQ +lLQ +lvD +hrw +ddN jXz agi agi @@ -52996,8 +52996,8 @@ hoZ agi agi hoZ -fGb -fGb +jHz +jHz egv xJw xJw @@ -53005,119 +53005,119 @@ xJw xJw xJw rja -xSd -vky -vky -dOs +lge +sWe +sWe +lRr apf -bfZ -bfZ -bfZ -bfZ -bfZ -gma -iht -gma -gma -gma -iht -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -vsc +pQs +pQs +pQs +pQs +pQs +bNE +aPO +bNE +bNE +bNE +aPO +bNE +pQs +pQs +pQs +pQs +pQs +pQs +wUs hSH apf -vsc -hyz +wUs +unA apf apf apf -gma -gma +bNE +bNE apf egv egv -xmH -rQF -fyA -hjP -hjP -hjP -hjP -aKW -aKW -aKW -aKW -aKW -aKW -aKW -aKW -aKW -sJT -foV -hjP -hjP -sJT -iAL -sVP -jah -gCX -sJT +nwT +pLS +fTd +taj +taj +taj +taj +svP +svP +svP +svP +svP +svP +svP +svP +svP +hvL +bUt +taj +taj +hvL +uxd +uzG +cDb +nMm +hvL jlk jlk jlk -aKW -aKW -sJT -sVP -sVi -gCX -sJT -aKW +svP +svP +hvL +uzG +wIp +nMm +hvL +svP jlk jlk jlk -jhi +kXs rGq rGq rGq rGq -aKW -sCB +svP +siE glG -lrC -uGM -uGM -xub -xub -xub +xUr +oPU +oPU +wgO +wgO +wgO vhB -xub -cdD -ajK -tdZ -war +wgO +tkj +oer +rsg +sTU kXD oRR dLq -hhy -vwc -vwc -oTU -mkB -vwc -vwc -aNn +xVW +oyT +oyT +oWw +exI +oyT +oyT +ijt wbI wbI lzJ kXD -dxd -cdD +hcY +tkj lzJ irB lzJ @@ -53183,24 +53183,24 @@ agi agi aWV aWV -rCO -iJE -qit +cYV +fUz +edu aWV jXz jXz jXz aWV -rCO -iJE -dEI +cYV +fUz +mIf jXz -ykT -uhd +otg +dLL jXz agi agi -fGb +jHz hoZ hoZ idi @@ -53208,25 +53208,25 @@ hoZ agi agi hoZ -fGb -fGb +jHz +jHz rja rja rja rja rja rja -cDj -bfZ -bfZ +rqG +pQs +pQs apf -bfZ -bfZ -gma -gma -gma -gma -gma +pQs +pQs +bNE +bNE +bNE +bNE +bNE rja rja rja @@ -53234,15 +53234,15 @@ rja rja rja rja -cDj -gma -bfZ -bfZ -bfZ -bfZ -bfZ -hOW -hyz +rqG +bNE +pQs +pQs +pQs +pQs +pQs +qwK +unA rja rja xJw @@ -53253,43 +53253,43 @@ apf egv egv egv -tbC -wUA -fmU -hjP -hjP -hjP -aKW -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT -sJT +cYI +tpF +gFW +taj +taj +taj +svP +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL +hvL uNM -hIo -sVi -iDE +jFz +wIp +aik uNM -whL -nSa -tqM -aKW -aKW -sJT -sVP -sVi -gCX -sJT -aKW +whl +vmT +fxL +svP +svP +hvL +uzG +wIp +nMm +hvL +svP jlk jlk jlk @@ -53301,36 +53301,36 @@ rGq jlk jlk rZP -pmM -cFn -uGM -xub -xub -xub +aIB +bFC +oPU +wgO +wgO +wgO vhB -xub -cdD -ajK -btz +wgO +tkj +oer +uLf jgu jgu wbI wbI -cdD -oGT -bDN -twd -bDN -bDN -gqH -ajK +tkj +gZM +tiZ +oJd +tiZ +tiZ +wCI +oer wbI wbI wbI kXD -dxd -iFj -bDN +hcY +mPX +tiZ irB irB wbI @@ -53395,30 +53395,30 @@ aWV aWV jXz jXz -cQG -njx -qkk +eim +lLQ +orB jXz -olT -olT -olT +pgx +pgx +pgx jXz -cQG -njx -qkk +eim +lLQ +orB gKi -njx -nBV +lLQ +oiV jXz agi agi agi -fGb +jHz hoZ -ied -kdG -kdG -lEI +jNw +rqA +rqA +skG hoZ cto hoZ @@ -53428,12 +53428,12 @@ rja rja rja rja -xWN -bfZ -bfZ -bfZ -bfZ -gma +fLX +pQs +pQs +pQs +pQs +bNE rja rja vVi @@ -53448,15 +53448,15 @@ xUi rja rja rja -iht -gma -bfZ -bfZ -bfZ -bfZ +aPO +bNE +pQs +pQs +pQs +pQs apf -gma -cDj +bNE +rqG rja xJw xJw @@ -53468,11 +53468,11 @@ egv jlk jlk jlk -aKW -hjP -hjP -aKW -sJT +svP +taj +taj +svP +hvL uNM sgw vFi @@ -53486,26 +53486,26 @@ sgw vFi yhu uNM -sJT -sVP -hjP -uWg -sJT -sJT -sJT -sJT -sJT -sJT -sJT +hvL +uzG +taj +hpn +hvL +hvL +hvL +hvL +hvL +hvL +hvL jlk jlk -gCX -sJT -aKW +nMm +hvL +svP jlk jlk jlk -jhi +kXs rGq rGq rGq @@ -53516,31 +53516,31 @@ jlk irB irB irB -sRk -nGI +lwA +ktq jgu jgu jgu -rxh -teH -war +bxm +uWO +sTU kXD wbI jcv djf -cdD -ajK -sel -qjc -qjc -pAO -hoN -bWE +tkj +oer +hPi +jUG +jUG +oKf +lxT +alP wbI jcv wbI kXD -vOp +oCn wHl wbI irB @@ -53605,53 +53605,53 @@ agi agi aWV aWV -cvf -cvf -lwK -njx -nBV -cvf -fGb -pkp -fGb -cvf -lwK -njx -nBV +pbv +pbv +lvD +lLQ +oiV +pbv +jHz +rWt +jHz +pbv +lvD +lLQ +oiV gKi -wVK -uFX +hrw +ddN jXz agi agi agi agi hoZ -iMm +iuN krn kJS -lMM +mcH hoZ -fGb -fGb +jHz +jHz egv xJw xJw xJw xJw rja -wwZ -bfZ -bfZ -iJJ -bfZ -mbN +wKl +pQs +pQs +xCV +pQs +cjG rja -gRV -bMr -bMr -bMr -bMr +wfc +jYK +jYK +jYK +jYK mDz toE mDz @@ -53662,16 +53662,16 @@ eTC rja rja rja -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -gma -gma -mbN +bNE +pQs +pQs +pQs +pQs +pQs +pQs +bNE +bNE +cjG rja xJw xJw @@ -53680,41 +53680,41 @@ egv jlk bQM lHx -ezz -cyL -ubk -hAY -sJT -ncn -peY -peY -peY -peY -peY -peY -peY -peY -peY -peY -peY -hwn -xxh -eUk -hjP -piL -cJa -peY -peY -peY -peY +dRs +jrN +ltA +riP +hvL +kCH +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +nwv +nVR +sUV +taj +dMt +uMm +wsz +wsz +wsz +wsz jlk jlk jlk jlk -gCX -sJT -aKW -aKW +nMm +hvL +svP +svP jlk jlk rGq @@ -53728,35 +53728,35 @@ jlk irB itN irB -lrC +xUr xck jgu itN jgu -cdD -jqg +tkj +bcT jgu jgu jBQ bvK dLq -cdD -ajK +tkj +oer pGK jfd hRX mjB -cdD -ajK +tkj +oer jBQ oRR dLq jgu jgu -dxd +hcY wbI -cdD -ajK +tkj +oer lzJ wbI irB @@ -53817,19 +53817,19 @@ agi aWV aWV jXz -cvf -cvf -lwK +pbv +pbv +lvD hoZ -lwK -cvf -cQX -fGb -lwK -cvf -lwK -lwK -lwK +lvD +pbv +vwD +jHz +lvD +pbv +lvD +lvD +lvD gKi gKi gKi @@ -53839,13 +53839,13 @@ agi agi agi hoZ -iMm +iuN ksV kNW -lMM +mcH hoZ -fGb -fGb +jHz +jHz rja xJw xJw @@ -53853,17 +53853,17 @@ xJw xJw rja rja -gma -gma -bfZ -bfZ -gma +bNE +bNE +pQs +pQs +bNE rja rja -tqN -jre -woI -bMr +kAc +mIQ +hDb +jYK xxD xxD xxD @@ -53875,15 +53875,15 @@ xxD hHq rja rja -gma -bfZ -bfZ -bfZ -dUs -iOt -iOt -uAv -gma +bNE +pQs +pQs +pQs +oEi +kyF +kyF +xDk +bNE rja rja rja @@ -53892,45 +53892,45 @@ egv bQM bQM lHx -jay -hjP +qjh +taj dlA -aKW -sJT -sVP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -bMd -hjP -hjP -hjP -hjP -hjP -whp -hjP -hjP +svP +hvL +uzG +taj +taj +taj +taj +taj +taj +taj +taj +taj +taj +taj +mJc +taj +taj +taj +taj +taj +stf +taj +taj jlk jlk jlk jlk jlk jlk -sJT -aKW -aKW +hvL +svP +svP rGq knh -sJT -aKW +hvL +svP rGq rGq jlk @@ -53945,30 +53945,30 @@ irB jgu itN jgu -cdD -iDo +tkj +sRE jgu anu wbI rBz wbI -cdD -ajK +tkj +oer pGK hRX pzh sQL -vbY -ajK +nez +oer wbI rBz wbI qkg jgu -snq +sBf wbI -cdD -ajK +tkj +oer wbI vtl irB @@ -54029,48 +54029,48 @@ agi jXz jXz jXz -ykT -njx -njx -ykT -ykT -ykT +otg +lLQ +lLQ +otg +otg +otg gzb -ykT -ykT -ykT +otg +otg +otg wRg -ykT -ykT -ykT +otg +otg +otg gzb wRg gzb -ykT -ykT -ykT -ykT +otg +otg +otg +otg hoZ -iWy -kty -kOb -iaO -fGb -fGb -gma -blb -bfZ +vHo +lIj +uQJ +uOC +jHz +jHz +bNE +ydb +pQs xJw egv egv egv rja rja -gma -bfZ -bfZ -bfZ -gma +bNE +pQs +pQs +pQs +bNE rja vVi vVi @@ -54088,16 +54088,16 @@ xxD xxD rja rja -gma -bfZ -bfZ -tik +bNE +pQs +pQs +nhM mMH aBs -gFG -gma -gma -mbN +cOj +bNE +bNE +cjG rja xJw egv @@ -54106,30 +54106,30 @@ bQM rZP lHx rZP -hjP -aKW -ryx -sVP -hjP -hxC -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -aQM -poo -bEn -bEn -bEn -bEn -ycn -hxC -rYJ +taj +svP +ftU +uzG +taj +ugk +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +oGg +lFD +mLY +mLY +mLY +mLY +bZD +ugk +adE rZP rZP rZP @@ -54137,12 +54137,12 @@ rZP jlk jlk jlk -aKW +svP rGq rGq knh -sJT -aKW +hvL +svP rGq rGq jlk @@ -54157,30 +54157,30 @@ irB jgu jgu jgu -cdD -weK -gSG -vwc -vwc -vwc -vwc -oTU -ajK +tkj +osv +iyk +oyT +oyT +oyT +oyT +oWw +oer pGK mxs vhI fgM -cdD -ixb -vwc -vwc -vwc -cpS -omw -kGh -vwc -oTU -ajK +tkj +lzP +oyT +oyT +oyT +eNn +uqj +bFi +oyT +oWw +oer fyO oyC wbI @@ -54231,34 +54231,34 @@ cAW agi agi aPD -bpC -bIX -fGb -fGb -fGb +tpE +rUf +jHz +jHz +jHz hoZ hoZ hoZ mjx -njx -njx -fGb -fGb -fGb -qqX -fGb -njx -njx -njx -fGb -fGb -fGb -fGb -fGb -fGb -fGb -fGb -fGb +lLQ +lLQ +jHz +jHz +jHz +haJ +jHz +lLQ +lLQ +lLQ +jHz +jHz +jHz +jHz +jHz +jHz +jHz +jHz +jHz hoZ hoZ pCX @@ -54266,33 +54266,33 @@ hoZ hoZ hoZ hoZ -ngq -ied -iOt -iOt -uAv -bfZ +qSm +jNw +kyF +kyF +xDk +pQs rja egv -bfZ -bfZ +pQs +pQs egv ccH -gma -eWu -bfZ -bfZ -bfZ -bfZ -gma -gma -gma -gma -gma +bNE +gAh +pQs +pQs +pQs +pQs +bNE +bNE +bNE +bNE +bNE rja kze rja -wAa +lzE rja rja tDQ @@ -54301,15 +54301,15 @@ xxD xxD rja rja -cDj -bfZ -tik +rqG +pQs +nhM dGx kLI -gFG -bfZ -bfZ -gma +cOj +pQs +pQs +bNE rja xJw egv @@ -54318,20 +54318,20 @@ bQM bQM bQM lHx -aKW -aKW -sJT -kKZ -hjP -gCX -sJT -sJT -sJT -sJT -sJT -ngG -vbl -pER +svP +svP +hvL +hBf +taj +nMm +hvL +hvL +hvL +hvL +hvL +gsU +iON +vrO jlk jlk jlk @@ -54339,8 +54339,8 @@ jlk jlk jlk jlk -sVP -gCX +uzG +nMm jlk jlk jlk @@ -54349,12 +54349,12 @@ jlk jlk jlk jlk -aKW +svP rGq rGq knh -sJT -aKW +hvL +svP rGq rGq rGq @@ -54368,31 +54368,31 @@ irB irB itN itN -uGM -cdD -qNW -xTi -bDN -bDN -bDN -bDN -gqH -tQJ +oPU +tkj +fdR +spA +tiZ +tiZ +tiZ +tiZ +wCI +lAn dqa sbf vhI sQL -mRz -mEc -bDN -bDN -bDN -hqF -hmd -itC -bDN -bDN -xIo +oWG +mtG +tiZ +tiZ +tiZ +uVO +tXD +wSo +tiZ +tiZ +qhk wbI wbI wbI @@ -54443,8 +54443,8 @@ cAW agi agi aPD -bpC -bJz +tpE +gXF bPK clN clN @@ -54452,76 +54452,76 @@ clN clN clN crM -csH -cxd -wVK -wVK -wVK -wVK -wVK -lwK -njx -lwK -wVK -wVK -wVK -wVK -wVK -lwK -wVK -wVK -wVK -fGb +uYS +mlu +hrw +hrw +hrw +hrw +hrw +lvD +lLQ +lvD +hrw +hrw +hrw +hrw +hrw +lvD +hrw +hrw +hrw +jHz hoZ hoZ -wVK -wVK -wVK -wVK -fGb -tik +hrw +hrw +hrw +hrw +jHz +nhM mQG oEs -gFG -gma -gma +cOj +bNE +bNE apf -gma -gma +bNE +bNE lag -gma -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ +bNE +bNE +pQs +pQs +pQs +pQs +pQs +pQs +pQs apf gHy -bfZ -hyz -gma -gma -bfZ -cMJ +pQs +unA +bNE +bNE +pQs +ioE rja jta jta rja -xnA +xhM rja rja rja -gma -xSd -vky -vky -dOs -gma -gma -gma +bNE +lge +sWe +sWe +lRr +bNE +bNE +bNE rja xJw egv @@ -54532,17 +54532,17 @@ bQM rZP lHx rZP -sJT -sVP -hjP -gCX -sJT -qGX -qGX -qGX -qGX -qGX -qGX +hvL +uzG +taj +nMm +hvL +oTy +oTy +oTy +oTy +oTy +oTy jlk jlk jlk @@ -54551,15 +54551,15 @@ jlk jlk jlk jlk -hIo -iDE +jFz +aik jlk jlk jlk jlk jlk jlk -aKW +svP rGq rGq rGq @@ -54580,22 +54580,22 @@ irB irB itN itN -uGM -cdD -iDo +oPU +tkj +sRE jgu anu wbI jcv wbI -cdD -ajK +tkj +oer pGK uxN gTc sQL -tov -ajK +nWk +oer wbI jcv wbI @@ -54655,8 +54655,8 @@ cAW agi agi aPD -bpG -bJz +uOx +gXF bQh hoZ hoZ @@ -54664,73 +54664,73 @@ hoZ hoZ jXz jXz -dBC -naj +jcG +hsl jXz -olT -olT -olT +pgx +pgx +pgx jXz -tdb -fGb -naj +wFd +jHz +hsl aWV -olT -olT -olT +pgx +pgx +pgx aWV -tdb +wFd hoZ hoZ hoZ hoZ -fGb +jHz hoZ hoZ -fGb -fGb -fGb -gma -tik +jHz +jHz +jHz +bNE +nhM npx oTz -gFG -gma -gma -gma +cOj +bNE +bNE +bNE apf -gma +bNE lag apf apf -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -gma -eWu +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +bNE +gAh rja rja rja rja -nYw -nYw -lmX +hKN +hKN +weV rja -qjg -bfZ +paF +pQs apf -imH -gma +aHH +bNE rja vVi vVi @@ -54744,45 +54744,45 @@ bQM bQM bQM lHx -sJT -sVP -hjP -gCX -sJT -sJT -pGg -pGg -pGg -sJT -sJT -pGg -pGg +hvL +uzG +taj +nMm +hvL +hvL +bHR +bHR +bHR +hvL +hvL +bHR +bHR jlk jlk jlk jlk -aKW -bVh -sVP -gCX -aKW -aKW +svP +ing +uzG +nMm +svP +svP jlk jlk -aKW -aKW -aKW -aKW -aKW +svP +svP +svP +svP +svP dYI yio yio hyT -wbn +sfI ubN -wbn -wbn -ujJ +sfI +sfI +bPT qCa jlk irB @@ -54791,23 +54791,23 @@ irB irB itN itN -tgv -uGM -cdD -jqg +sIz +oPU +tkj +bcT jgu jgu jBQ nAf dLq -cdD -ajK +tkj +oer pGK hRX sbf sQL -cdD -ajK +tkj +oer jBQ oRR dLq @@ -54868,78 +54868,78 @@ aWV aWV aWV aPD -bKM +caA bQh hoZ hoZ -cqU +lun jXz jXz -ieW -fGb -nBV -nyl -wNw -rKS -uhd -chS -uTX -fGb -nBV -nyl -wNw -ykT -uhd -chS -uTX +xrd +jHz +oiV +nmh +aeb +wLS +dLL +cRK +jnU +jHz +oiV +nmh +aeb +otg +dLL +cRK +jnU hoZ -ghU -eEo -eEo +vZs +qFs +qFs hoZ -fGb -eEo -eEo +jHz +qFs +qFs jXz jXz -bfZ -xSd -vky -vky -dOs -bfZ +pQs +lge +sWe +sWe +lRr +pQs rja egv -bfZ -bfZ +pQs +pQs egv egv -gma -rKZ -bfZ -bfZ -eWu -gma -gma -gma -gma -bfZ -bfZ -vsc -bfZ +bNE +dbi +pQs +pQs +gAh +bNE +bNE +bNE +bNE +pQs +pQs +wUs +pQs gHy -bfZ -gma -gma -gma +pQs +bNE +bNE +bNE rja rja -qPG -yfH -ujC +scH +hyo +laX rja -qIZ -oKa +irQ +lyY apf iTm apf @@ -54956,36 +54956,36 @@ bQM bQM bQM lHx -weN -sVP -hjP -piL -peY -peY -peY -peY -peY -xxh -peY -peY -peY -peY -peY -peY -peY -peY -peY -eUk -gCX -aKW -aKW -aKW -aKW -aKW -fQx -aKW +qzM +uzG +taj +dMt +wsz +wsz +wsz +wsz +wsz +nVR +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +wsz +sUV +nMm +svP +svP +svP +svP +svP +hSA +svP rGq -aKW +svP nLV wIJ iyS @@ -54994,7 +54994,7 @@ rGq rGq uyM rGq -bka +dga lde jlk uGT @@ -55003,23 +55003,23 @@ uGT itN itN itN -xoI -uGM -cdD -qyi -gng +kMC +oPU +tkj +eEX +aBD kXD wbI rBz wbI -uds -ajK -iEi -qPC -qPC -dMc -cdD -ajK +qUC +oer +sSM +sTm +sTm +uCX +tkj +oer wbI rBz wbI @@ -55080,32 +55080,32 @@ aPD aPD aPD aPD -fGb +jHz bQh hoZ hoZ hoZ jXz -ulW -fWS -fGb -nBV -lwK -uTX -njx -nBV -lwK -uTX -fGb -uNR -lwK -uTX -njx -nBV -lwK -uTX -fGB -eEo +maY +fUC +jHz +oiV +lvD +jnU +lLQ +oiV +lvD +jnU +jHz +nkM +lvD +jnU +lLQ +oiV +lvD +jnU +eSH +qFs agi agi agi @@ -55114,47 +55114,47 @@ aWV agi agi aWV -bfZ -bfZ -gma -gma -bfZ -bfZ +pQs +pQs +bNE +bNE +pQs +pQs xJw egv egv egv rja -cDj -bfZ -bfZ -bfZ -cDj +rqG +pQs +pQs +pQs +rqG rja vVi vVi vVi rja -gma -gma -bfZ -fIj -bfZ -bfZ -bfZ -bfZ -bfZ -gma +bNE +bNE +pQs +kds +pQs +pQs +pQs +pQs +pQs +bNE rja rja rja rja rja -gma -imH +bNE +aHH iTm iTm -ibb +lRW vVi toE mDz @@ -55168,70 +55168,70 @@ bQM bQM bQM lHx -sJT -sVP -hjP -whp -hjP -hjP -hjP -hjP -hjP -hjP -nCa -hjP -hjP -hjP -hjP -whp -hjP -hjP -ruE -hjP -gCX -aKW -aKW +hvL +uzG +taj +stf +taj +taj +taj +taj +taj +taj +jjH +taj +taj +taj +taj +stf +taj +taj +nOy +taj +nMm +svP +svP rGq -aKW -hjP -hjP -hjP -aKW -aKW +svP +taj +taj +taj +svP +svP bAc hgS hgS lvy eTb -wbn -wbn -wbn -rOo -wRW +sfI +sfI +sfI +dNx +siK jlk -pmM -gmv -xub -nGz -xub -lJm -xub -uGM -cdD -ajK -btz +aIB +bSS +wgO +dDn +wgO +slc +wgO +oPU +tkj +oer +uLf kXD wbI wbI wbI -cdD -mkB -vwc -vwc -dFE -vwc -oTU -ajK +tkj +exI +oyT +oyT +nOi +oyT +oWw +oer wbI wbI tNV @@ -55287,35 +55287,35 @@ bTo pcu pcu agi -aCi -aVT -bac -bdS -bry +hCp +wSc +gvZ +ivD +lkM hoZ bQh hoZ -fGb +jHz jXz aWV jXz -mlM -fGb -nBV -nyl -vco -wVK -cfz -chS -uTX -fGb -nBV -nyl -vco -wVK -uFX -chS -uTX +eEJ +jHz +oiV +nmh +jCe +hrw +cnH +cRK +jnU +jHz +oiV +nmh +jCe +hrw +ddN +cRK +jnU agi aWV aWV @@ -55328,8 +55328,8 @@ egv egv egv egv -gma -gma +bNE +bNE apf xJw xJw @@ -55337,34 +55337,34 @@ xJw xJw xJw rja -xWN -bfZ -bfZ -gma +fLX +pQs +pQs +bNE rja rja -iCP +bya xxD vkh rja vVi rja -gma -bfZ -gma -gma +bNE +pQs +bNE +bNE apf -bfZ -bfZ -oeZ -gma -gma -jfN -gma -gma -bfZ +pQs +pQs +qfg +bNE +bNE +dfh +bNE +bNE +pQs apf -bfZ +pQs kzz rja rja @@ -55380,70 +55380,70 @@ xJw bQM bQM rZP -lOo -sVP -hjP -hxC -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -bEn -kxM -bEn -bEn -bEn -lwG +lvf +uzG +taj +ugk +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +mLY +tHw +mLY +mLY +mLY +aJv rGq uNM uNM -aKW -hjP -aKW +svP +taj +svP fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -tEj +kIg fpn -aKW +svP fpn -aKW +svP fpn vwM vhB -xub +wgO vhB -xub +wgO vhB -xub +wgO vhB -uGM -dGc -ajK -vfQ +oPU +gyt +oer +ckZ kXD aBJ wKb wbI -iFj -bDN -bDN -gqH -mEc -bDN -bDN -xIo +mPX +tiZ +tiZ +wCI +mtG +tiZ +tiZ +qhk wbI wZv lzJ @@ -55507,27 +55507,27 @@ aPD hoZ bQh hoZ -fGb +jHz jXz aWV jXz jXz -dBC -naj +jcG +hsl jXz -ond -ond -ond +kPf +kPf +kPf jXz -tdb -fGb -naj +wFd +jHz +hsl aWV -ond -ond -ond +kPf +kPf +kPf aWV -tdb +wFd agi aWV aWV @@ -55541,21 +55541,21 @@ egv egv egv apf -gma -gma +bNE +bNE rja xJw xJw xJw xJw rja -wwZ -bfZ -bfZ -gma +wKl +pQs +pQs +bNE rja -wmp -bMr +sGC +jYK xxD xxD sII @@ -55565,19 +55565,19 @@ vVi kze vVi rja -cDj -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -gma +rqG +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +pQs +bNE vVi xxD xxD @@ -55586,17 +55586,17 @@ vyu xxD xxD xxD -bMr -jre +jYK +mIQ wFU bQM bQM rZP -dbX -sVP -hjP -gCX -hJc +sGx +uzG +taj +nMm +gxQ rZP lHx lHx @@ -55608,42 +55608,42 @@ lHx jlk jlk jlk -sJT -uxa -saI -sJT -kPi -sJT +hvL +gbV +uTs +hvL +ufN +hvL jlk uNM ubN -hjP +taj ubN fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -tHr +mGX fpn -aKW +svP fpn vwM vhB -xub +wgO vhB -xub +wgO vhB -xub +wgO vhB -uGM -cdD -ajK -vfQ +oPU +tkj +oer +ckZ kXD kIe tas @@ -55651,8 +55651,8 @@ tas tTA wbI wbI -cdD -kmE +tkj +ydd wbI wbI wbI @@ -55716,30 +55716,30 @@ aWV aWV aWV aPD -bNN +iGx bQh hoZ -fGb +jHz jXz aWV jXz -ieW -fGb -nBV -nyl -wNw -ykT -uhd -chS -uTX -fGb -nBV -nyl -wNw -ykT -uhd -chS -uTX +xrd +jHz +oiV +nmh +aeb +otg +dLL +cRK +jnU +jHz +oiV +nmh +aeb +otg +dLL +cRK +jnU agi aWV aWV @@ -55752,22 +55752,22 @@ egv apf apf lag -gma -gma +bNE +bNE apf -gma +bNE egv egv rja rja ccH -cDj -bfZ -bfZ -mbN +rqG +pQs +pQs +cjG rja -jOr -bMr +hzi +jYK xxD xxD xxD @@ -55775,21 +55775,21 @@ leF xxD xxD xxD -ntg +dsW rja rja -gma -bfZ -bfZ -dUs -iOt -iOt -uAv -bfZ -bfZ -bfZ -bfZ -bfZ +bNE +pQs +pQs +oEi +kyF +kyF +xDk +pQs +pQs +pQs +pQs +pQs tob xxD xxD @@ -55798,17 +55798,17 @@ xxD xxD xxD xxD -bMr -tqN +jYK +kAc wFU bQM bQM lHx -qCs -sVP -hjP -gCX -sJT +jkj +uzG +taj +nMm +hvL lHx bQM bQM @@ -55828,43 +55828,43 @@ rGq jlk jlk uNM -kTK -aKW -pBg +iFC +svP +cBm fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn -aKW +svP fpn vwM vhB -xub +wgO vhB -xub +wgO vhB -xub +wgO vhB -uGM -cdD -ajK -vfQ +oPU +tkj +oer +ckZ jgu jgu -sel -qjc -pAO +hPi +jUG +oKf jgu wuC -bod -wLJ +roi +tMb xIh itN wbI @@ -55927,31 +55927,31 @@ agi agi agi aPD -bAb -fGb +gkE +jHz bQh hoZ -cmm +teu jXz aWV -llG -fWS -fGb -nBV -lwK -uTX -njx -nBV -lwK -uTX -fGb -nBV -lwK -uTX -njx -nBV -fSl -uTX +cje +fUC +jHz +oiV +lvD +jnU +lLQ +oiV +lvD +jnU +jHz +oiV +lvD +jnU +lLQ +oiV +qJR +jnU agi aWV aWV @@ -55966,20 +55966,20 @@ apf lag egv apf -gma -gma +bNE +bNE egv egv -cMJ -qSv -cDj -bfZ -bfZ -bfZ -gma +ioE +fCw +rqG +pQs +pQs +pQs +bNE rja -sCj -bMr +lMq +jYK xxD xxD xxD @@ -55990,18 +55990,18 @@ xxD xxD jta vVi -gma -bfZ -bfZ -tik +bNE +pQs +pQs +nhM mMH aBs -gFG -eWu -bfZ -eWu -bfZ -gma +cOj +gAh +pQs +gAh +pQs +bNE rja rja rja @@ -56010,17 +56010,17 @@ rja tDQ xxD xxD -bMr -woI +jYK +hDb wFU bQM bQM lHx -sJT -sVP -hjP -gCX -sJT +hvL +uzG +taj +nMm +hvL lHx bQM bQM @@ -56034,49 +56034,49 @@ jlk jlk sgw sgw -jFN +bvr rGq sgw sgw jlk uNM ubN -aKW +svP ubN -tEj -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP -hjP +kIg +taj +taj +taj +taj +taj +taj +taj +taj +taj +taj +taj +taj rZP -xub -xub -xub -xub -xub -xub -xub -gte -cdD -ajK -kEp -uRK -uRK -sHb -xub -btz +wgO +wgO +wgO +wgO +wgO +wgO +wgO +dmT +tkj +oer +ove +dJe +dJe +vuX +wgO +uLf jgu jgu -sel -aiK +hPi +gtf jgu itN jBQ @@ -56139,31 +56139,31 @@ agi agi agi aPD -bDC -fGb +eYs +jHz bQk hoZ hoZ jXz aWV jXz -mlM -fGb -nBV -nyl -vco -xfw -quy -chS -uTX -qqX -nBV -nyl -vco -rHd -uFX -chS -uTX +eEJ +jHz +oiV +nmh +jCe +dXi +hPL +cRK +jnU +haJ +oiV +nmh +jCe +mpN +ddN +cRK +jnU agi aWV aWV @@ -56177,18 +56177,18 @@ apf egv egv egv -gma -gma -gma -bfZ -eWu -gma -bfZ -bfZ -bfZ -bfZ -bfZ -gma +bNE +bNE +bNE +pQs +gAh +bNE +pQs +pQs +pQs +pQs +pQs +bNE rja rja vVi @@ -56203,36 +56203,36 @@ xxD jta rja rja -gma -bfZ -tik +bNE +pQs +nhM dGx kLI -gFG -dUs -iOt -iOt -uAv -bfZ -gma +cOj +oEi +kyF +kyF +xDk +pQs +bNE rja -rvu -lmX -xnA +hSk +weV +xhM xxD xxD xxD -bMr -vXr +jYK +whr xJw bQM bQM lHx -sJT -sVP -hjP -gCX -sJT +hvL +uzG +taj +nMm +hvL lHx bQM bQM @@ -56252,44 +56252,44 @@ fmg jlk jlk uNM -aJf -aKW -oWV -hjP -thi -thi -thi -thi -hjP +fhB +svP +oIz +taj +qAQ +qAQ +qAQ +qAQ +taj ohY eTb -gAa +icT eTb -bBX +pdP amF rZP rZP -xnS -xnS -xnS -xnS -xkP -lIx -xub -uGM -iFj -xIo -uGM -uGM -uGM -lRI -uGM -kEp -hOR -hOR -aMZ -knv -hOR +lgx +lgx +lgx +lgx +mLL +cOC +wgO +oPU +mPX +qhk +oPU +oPU +oPU +gAn +oPU +ove +dbr +dbr +vMN +fGi +dbr itN wbI qJL @@ -56351,31 +56351,31 @@ agi agi agi aPD -bHI +auj hoZ bQh hoZ -fGb +jHz hoZ jXz jXz jXz -dBC -naj +jcG +hsl jXz -kcw -pxa -kcw +kue +xgU +kue jXz -tdb -fGb -naj +wFd +jHz +hsl aWV -kcw -kcw -kcw +kue +kue +kue aWV -wLX +iIZ agi agi dxS @@ -56389,23 +56389,23 @@ egv egv eXp eXp -gma -gma -gma -gma -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -cDj +bNE +bNE +bNE +bNE +bNE +pQs +pQs +pQs +pQs +pQs +pQs +pQs +rqG rja -gma -bfZ -gma +bNE +pQs +bNE rja vVi rja @@ -56415,18 +56415,18 @@ xxD xxD soN rja -gma -bfZ -xSd -vky -vky -dOs -tik +bNE +pQs +lge +sWe +sWe +lRr +nhM mMH aBs -gFG -bfZ -gma +cOj +pQs +bNE rja rja rja @@ -56440,11 +56440,11 @@ xJw xJw xJw xJw -jiW -jiW -jiW -jiW -jiW +guz +guz +guz +guz +guz cEw cEw cEw @@ -56454,13 +56454,13 @@ cEw cEw cEw cEw -jiW -jiW -bIg +guz +guz +brY okv -jiW -bIg -jiW +guz +brY +guz aTo aTo rZP @@ -56481,26 +56481,26 @@ rZP rZP rZP rZP -biH -biH -biH -biH +juX +juX +juX +juX itN itN itN itN -bLz -xnS +dGA +lgx vhB vhB -xnS +lgx vhB vhB -xnS +lgx vhB vhB -xnS -xnS +lgx +lgx vhB itN itN @@ -56567,28 +56567,28 @@ hoZ hoZ bUw hoZ -fGb +jHz hoZ jXz jXz -ieW -njx -lwK -ykT -ykT -ykT -ykT -ykT -lwK -njx -lwK -ykT -ykT -ykT -ykT -ykT -lwK -uTX +xrd +lLQ +lvD +otg +otg +otg +otg +otg +lvD +lLQ +lvD +otg +otg +otg +otg +otg +lvD +jnU agi agi agi @@ -56599,49 +56599,49 @@ qlf egv egv eXp -erB -roC -sLT -gma -eWu -gma -gma -bfZ -bfZ -bfZ -bfZ -eGV -bfZ -bfZ -bfZ -gma -bfZ -bfZ -bfZ -gma -gma +jnm +kiR +wNM +bNE +gAh +bNE +bNE +pQs +pQs +pQs +pQs +sAp +pQs +pQs +pQs +bNE +pQs +pQs +pQs +bNE +bNE vVi bQy rja -xnA +xhM rja rja rja -qIZ -mKt -dUs -iOt -iOt -uAv -tik +irQ +wbP +oEi +kyF +kyF +xDk +nhM dGx kLI -gFG -bfZ -bfZ -gma -gma -gma +cOj +pQs +pQs +bNE +bNE +bNE nip apf apf @@ -56652,81 +56652,81 @@ ojv apf apf nip -jiW -ktD -joz -joz -jiW +guz +jhp +wSU +wSU +guz bnA -wMI -fXv -fXv -xSB +mTl +vBX +vBX +frM bnA -joz -joz -lhj -jiW -aqJ -dfV -dfV -dfV +wSU +wSU +nJq +guz +iiw +awL +awL +awL xDq naf naf cqz ggd -ssD -bVO -ssD -dfV -cyd -cyd -cyd -cyd -dfV -kzO -dfV -dfV -dfV -dfV -dfV -kzO -dfV -cyd -cyd -cyd -cyd -dfV -ssD -iSi -ssD -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -ssD -iSi -ssD -iSi -hbC -hbC -iSi -hbC -hbC -hbC -hbC -cbb +tsc +hQk +tsc +awL +uNp +uNp +uNp +uNp +awL +tcW +awL +awL +awL +awL +awL +tcW +awL +uNp +uNp +uNp +uNp +awL +tsc +bEk +tsc +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +tsc +bEk +tsc +bEk +ogf +ogf +bEk +ogf +ogf +ogf +ogf +mRM bQM bQM bQM @@ -56779,29 +56779,29 @@ hoZ bNP hoZ hoZ -fGb +jHz hoZ jXz -xaS -fWS -fGb -njx -fGb -fGb -fGb -fGb -fGb -njx -tZN -uTS -fGb -fIv -fGb -fGb -fGb -njx -uTX -fGb +ddU +fUC +jHz +lLQ +jHz +jHz +jHz +jHz +jHz +lLQ +qpX +viL +jHz +tQk +jHz +jHz +jHz +lLQ +jnU +jHz agi agi bGY @@ -56811,49 +56811,49 @@ aVU bel hTs eXp -gma -bfZ +bNE +pQs apf -lDm -bfZ -bfZ -eaZ -bfZ -bfZ -gma -gma -gma -gma -bfZ -bfZ -bfZ -oeZ -bfZ -bfZ -bfZ -gma +wdU +pQs +pQs +gnQ +pQs +pQs +bNE +bNE +bNE +bNE +pQs +pQs +pQs +qfg +pQs +pQs +pQs +bNE rja rja rja -nYw -nYw -ajX +hKN +hKN +fZT rja -gma -bfZ -tik +bNE +pQs +nhM mMH aBs -gFG -xSd -vky -vky -dOs -hOW -bfZ +cOj +lge +sWe +sWe +lRr +qwK +pQs tpY -bfZ -gma +pQs +bNE nip apf apf @@ -56864,22 +56864,22 @@ apf apf apf nip -jiW -joz -fXv -joz -jiW +guz +wSU +vBX +wSU +guz uLJ -fzs -fXv -hgC -fXv +sUc +vBX +kxU +vBX wAn -joz -joz -lhj -jiW -rol +wSU +wSU +nJq +guz +gcx okv okv okv @@ -56938,7 +56938,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -56988,32 +56988,32 @@ agi agi agi hoZ -fGb +jHz hoZ hoZ hoZ hoZ jXz jXz -mlM -njx -lwK +eEJ +lLQ +lvD agi agi agi agi agi -lwK -njx -lwK -wVK -wVK -wVK -wVK -wVK -lwK -fpi -fGb +lvD +lLQ +lvD +hrw +hrw +hrw +hrw +hrw +lvD +nzw +jHz agi agi whf @@ -57023,134 +57023,134 @@ rBs nxl whf apf -gma -gGu +bNE +oDh vzh -lDm -uLd -xwD -bfZ -gGu -gma +wdU +pma +oJm +pQs +oDh +bNE rja rja rja rja -gma -eWu -bfZ -bfZ -bfZ -fIj -bfZ -eWu -cDj +bNE +gAh +pQs +pQs +pQs +kds +pQs +gAh +rqG rja rja -qPG -ujC +scH +laX rja rja -gma -bfZ -tik +bNE +pQs +nhM dGx kLI -gFG -eWu -bfZ -eWu -bfZ -bfZ -bfZ -bfZ -vsc -gma +cOj +gAh +pQs +gAh +pQs +pQs +pQs +pQs +wUs +bNE rja rja -eWu -eWu +gAh +gAh rja rja -eWu -eWu +gAh +gAh rja rja -jiW -joz -joz -joz -jiW +guz +wSU +wSU +wSU +guz uXw -fXv -akw -fXv -fXv +vBX +qqQ +vBX +vBX bnA -joz -joz -lhj -jiW -rol +wSU +wSU +nJq +guz +gcx okv -aqJ -dfV +iiw +awL iBP vcf vcf lku mzT -ssD -ciX -ssD -dfV -cyd -cyd -cyd -cyd -dfV -mZV -dfV -dfV -dfV -dfV -dfV -mZV -dfV -cyd -cyd -cyd -cyd -dfV -ssD -iSi -ssD -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -kOM -ssD -iSi -ssD -iSi -hbC -hbC -iSi -hbC -hbC -hbC -hbC -ogo +tsc +wtm +tsc +awL +uNp +uNp +uNp +uNp +awL +exW +awL +awL +awL +awL +awL +exW +awL +uNp +uNp +uNp +uNp +awL +tsc +bEk +tsc +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +hmS +tsc +bEk +tsc +bEk +ogf +ogf +bEk +ogf +ogf +ogf +ogf +fWI bQM bQM bQM @@ -57208,26 +57208,26 @@ hoZ jXz jXz jXz -njx -njx +lLQ +lLQ jXz agi agi -ond +kPf jXz -uTX -fGb +jnU +jHz agi aWV -olT -lwK -mVg +pgx +lvD +mgO aWV hoZ -uTX -fGb -nBV -lwK +jnU +jHz +oiV +lvD oKV rBs aVU @@ -57235,48 +57235,48 @@ bOK rBs khu apf -bfZ +pQs apf -uLd -uLd -bfZ -uLd -bfZ -oeZ -mbN +pma +pma +pQs +pma +pQs +qfg +cjG rja -jdo -pTA +pKf +vtc rja -cDj -gma -bfZ -bfZ -bfZ -bfZ -bfZ -bfZ -dAA -hyX +rqG +bNE +pQs +pQs +pQs +pQs +pQs +pQs +mTs +nYB rja rja rja rja -cDj -bfZ -bfZ -xSd -vky -vky -dOs -bfZ +rqG +pQs +pQs +lge +sWe +sWe +lRr +pQs apf -vsc +wUs apf -bfZ +pQs apf -bfZ -gma +pQs +bNE rja rja rja @@ -57289,28 +57289,28 @@ rja rja rja bnA -mfK -jiW -jiW -iYI +tXt +guz +guz +cYe bnA -mfK -pJa -fXv -jiW +tXt +rnl +vBX +guz bnA -qNw -joz -lhj -jiW -rol +vDf +wSU +nJq +guz +gcx pLQ -rol -jiW -jiW -jiW -jiW -ayA +gcx +guz +guz +guz +guz +gTW cEw cEw cEw @@ -57329,26 +57329,26 @@ tRH tRH tRH tRH -biH -biH -biH -biH +juX +juX +juX +juX itN itN itN itN -sqB -gyU +iVo +nkF vhB vhB -gyU +nkF vhB vhB -gyU +nkF vhB vhB -gyU -gyU +nkF +nkF vhB itN itN @@ -57410,36 +57410,36 @@ agi agi agi agi -fGb -fGb -fGb -ghU -fGb +jHz +jHz +jHz +vZs +jHz hoZ hoZ hoZ -fGb +jHz moW -njx -njx -nyl -agi -ykT -uhd -chS -uTX -fGb -agi -nyl -wNw -ykT -ifq -chS +lLQ +lLQ +nmh +agi +otg +dLL +cRK +jnU +jHz +agi +nmh +aeb +otg +njN +cRK rPZ -uTX -fGb -nBV -lwK +jnU +jHz +oiV +lvD aVU aVU aVU @@ -57448,46 +57448,46 @@ aVU gec apf nre -bfZ -bfZ -uLd -bfZ -bfZ -bfZ -bfZ -gma +pQs +pQs +pma +pQs +pQs +pQs +pQs +bNE rja -lAv -nYw +lYj +hKN rja rja rja -gma -hgr -gma -gma -bfZ -bfZ -bfZ -bfZ -nAr -gbD -iGL -nAr -bfZ -bfZ -bfZ -bfZ -bfZ -gma -gma -wZo -gma -gma +bNE +tmL +bNE +bNE +pQs +pQs +pQs +pQs +raL +rty +kwZ +raL +pQs +pQs +pQs +pQs +pQs +bNE +bNE +nOg +bNE +bNE apf -bfZ -bfZ -hOW +pQs +pQs +qwK apf rja rja @@ -57501,72 +57501,72 @@ rja rja rja bnA -vUa -ifs -nuE -vUa +iKF +ykw +alC +iKF bnA jbU xZD bnA bgc bnA -joz -vrc -lhj -jiW -rol +wSU +kok +nJq +guz +gcx okv -rol -jiW -joz +gcx +guz +wSU uSA uSA -aHx +pRp bnA -dnx -jiW -ioP +wps +guz +jHp wrR -iyu -oqn -oqn -cRS +mpE +vOm +vOm +psx ipd -npp -lfJ -coT -kul -kul -hja -hyR -hGC -iyq -gyU -gyU -gyU -xub -xub -xub -xub -hhy -aNn -uGM -uGM -gUO -uGM -uGM -uGM -uGM -uGM -hhy -aNn -uGM -uGM -uGM -wyP -uGM -uGM +soj +iTJ +kbo +tSm +tSm +iTs +bqC +art +fvr +nkF +nkF +nkF +wgO +wgO +wgO +wgO +xVW +ijt +oPU +oPU +mpb +oPU +oPU +oPU +oPU +oPU +xVW +ijt +oPU +oPU +oPU +wQW +oPU +oPU itN itN itN @@ -57625,33 +57625,33 @@ agi hoZ vjT gFg -ipy -fGb +oxv +jHz hoZ hoZ hoZ -fGb +jHz hoZ -njx -njx -lwK -uTX -njx -qIO -lwK -uTX -ugC -nBV -lwK -uTX +lLQ +lLQ +lvD +jnU +lLQ +fKn +lvD +jnU +lDU +oiV +lvD +jnU hoZ -nBV -fNp +oiV +kHI hoZ -uTX -fGb -nBV -lwK +jnU +jHz +oiV +lvD aVU aVU imz @@ -57659,18 +57659,18 @@ aVU aVU khu tfX -gFc -gFc -bfZ -bfZ -eWu -gGu -bfZ -bfZ -gma +vuS +vuS +pQs +pQs +gAh +oDh +pQs +pQs +bNE rja rja -xnA +xhM rja jta rja @@ -57678,101 +57678,101 @@ vVi vVi vVi rja -gma -dAA -bfZ -bfZ -qPT -ddE -qwJ -eTn -bfZ -bfZ -bfZ -gma -gma +bNE +mTs +pQs +pQs +rKA +qCk +cvd +rRz +pQs +pQs +pQs +bNE +bNE bis bis bis bis bis -muO +dBy mNh ycC -vYL -gXt -muO +idb +eQQ +dBy bis bis bis bis bis bis -pxR -fcX -bEO -kEE +jsf +heo +rJF +akp xvB -jiW -kpm -fXv -eAy -jiW -kpm -fXv -eAy -jiW +guz +aAA +vBX +fXI +guz +aAA +vBX +fXI +guz xvB -kpm -eZm -tMn -jiW -rol +aAA +xNn +eBr +guz +gcx pLQ -rol -jiW -joz -ndt -pLh -nyo +gcx +guz +wSU +yeX +pen +byT bnA -vjz -jiW -vjz +mSo +guz +mSo wrR -jGA -jGA -jGA -xFB +xvv +xvv +xvv +rLA ipd -npp -cLR -wRZ -wRZ -wRZ -pDg -wRZ -vxV -xub +soj +rKy +xiL +xiL +xiL +iQz +xiL +rft +wgO vhB vhB -xub +wgO vhB vhB -xub +wgO vhB -cdD -ajK +tkj +oer jgu jgu -uGM -uGM +oPU +oPU fZD wbI wbI agG -xzI -tVB +vFc +htO nKX wbI wbI @@ -57781,7 +57781,7 @@ wbI wbI wbI wbI -uGM +oPU jgu jgu itN @@ -57838,32 +57838,32 @@ hoZ gFg hoZ gFg -gEF +nub gzb gzb gzb -gEF +nub hoZ -njx -njx -nyl -vco -wVK -uFX -rMt -uTX -fGb -uXu -lwK -vco -pxa -uFX -chS +lLQ +lLQ +nmh +jCe +hrw +ddN +qAk +jnU +jHz +vWL +lvD +jCe +xgU +ddN +cRK hoZ -uTX -fGb -nBV -lwK +jnU +jHz +oiV +lvD rBs rBs aVU @@ -57871,36 +57871,36 @@ aVU vDR sUY apf -bfZ +pQs umZ -orG -bfZ -gFc -bfZ -bfZ -eGV -bfZ -gma +jIz +pQs +vuS +pQs +pQs +sAp +pQs +bNE vVi xxD -vXS +pVc xxD -vXr -upF -ejp -kdw +whr +dwJ +gnL +vvT rja -qwh -bfZ -gma -gma -nAr -mXY -qJJ -nAr -gma -gma -gma +dhL +pQs +bNE +bNE +raL +wND +imp +raL +bNE +bNE +bNE bis bis bis @@ -57910,81 +57910,81 @@ bis bis wGM ycC -gXt +eQQ ycC mNh dDU -olC +rkv bis bis bis -uCW -vmH -bEO -bEO -bEO -kEE +tEA +bQL +rJF +rJF +rJF +akp okv -jiW -kpm -fXv -eAy -jiW -kpm -fXv -eAy -jiW +guz +aAA +vBX +fXI +guz +aAA +vBX +fXI +guz okv -kpm -fUF +aAA +ojk uSA -jiW -rol +guz +gcx okv -rol -jiW -joz +gcx +guz +wSU uSA uSA -xVh -kLT -qxB -fXv -jiW +giw +noz +nSh +vBX +guz eMG -jGA -jGA -jGA -xFB +xvv +xvv +xvv +rLA ipd -xMN -cLR -wRZ -dMv -qfU -mXe -oJO -bcg -dFw -xub -xub -xub -xub -xub -xub -iNw -cdD -ajK +spb +rKy +xiL +mAt +nMp +jFh +vxm +heT +aZW +wgO +wgO +wgO +wgO +wgO +wgO +bRs +tkj +oer kXD -lsr +fnY vhB -kBV +bED wbI qUo fAv vtl -cdD -lCZ +tkj +oLF ivz jot fAv @@ -57993,8 +57993,8 @@ bNT jot fAv vtl -uGM -wRn +oPU +lgS jgu itN itN @@ -58050,30 +58050,30 @@ hoZ vjT gFg vjT -fGb +jHz lrA lrA lrA -fGb +jHz hoZ -njx -njx +lLQ +lLQ jXz -ond -ond -ond +kPf +kPf +kPf jXz -uTX -fGb -nBV -fGB -kXw -fNp -fNp +jnU +jHz +oiV +eSH +eEx +kHI +kHI aWV -fGb -uTX -fGb +jHz +jnU +jHz mbC dxS whf @@ -58082,37 +58082,37 @@ sdY rBs qLI gec -lDm -rEm +wdU +uHl nWC -sUq -eWu -lDm -eWu -gma -gFc -bfZ -bfZ +dtR +gAh +wdU +gAh +bNE +vuS +pQs +pQs tob xxD xxD xxD -bMr -bMr -iRe -aJK +jYK +jYK +fbF +bFg rja -qIZ -gma -dUs -iOt -iOt -iOt -iOt -iOt -iOt -iOt -uAv +irQ +bNE +oEi +kyF +kyF +kyF +kyF +kyF +kyF +kyF +xDk bis bis tpt @@ -58125,78 +58125,78 @@ ycC lqq ycC lqq -cmW +pJP ycC ycC -oys -ruv -ruv -ruv -tjQ -tJe -bEO -kEE +anW +wNX +wNX +wNX +ort +htX +rJF +akp okv -jiW -kpm -muZ -eAy -jiW -kpm -vxr -eAy -jiW +guz +aAA +ppQ +fXI +guz +aAA +iHu +fXI +guz okv -kpm -fUF +aAA +ojk uSA -jiW -rol +guz +gcx pLQ -rol -jiW -joz -fXv -fXv -fXv +gcx +guz +wSU +vBX +vBX +vBX uSA -ena -fXv -jiW +kfY +vBX +guz bPG -jGA -jGA -jGA -xFB +xvv +xvv +xvv +rLA ipd -xMN -cLR -tII -vxV +spb +rKy +gIs +rft wrR ipd ipd nvD -dxd +hcY vhB vhB -xub +wgO vhB vhB -xub +wgO vhB -cdD -ajK +tkj +oer kXD -tjo +cRg vhB -uGM +oPU aRT kjT qun oyC -cdD -ajK +tkj +oer aRT kjT qun @@ -58205,8 +58205,8 @@ qaO azs auQ oyC -uGM -uGM +oPU +oPU jgu jgu jgu @@ -58262,31 +58262,31 @@ hoZ gGx hoZ hoZ -fGb +jHz lrA agi lrA -fGb +jHz hoZ -njx -njx -nyl -wNw -ykT -uhd -chS -uTX -fGb -veM -lwK -wNw -esF -uhd -chS -fGb -uTX -fGb -eWu +lLQ +lLQ +nmh +aeb +otg +dLL +cRK +jnU +jHz +bRQ +lvD +aeb +aOm +dLL +cRK +jHz +jnU +jHz +gAh eXp vTv heO @@ -58295,16 +58295,16 @@ aVU bel bIZ eXp -lDm -gma -wEa -lDm -gma -njq -gma -bfZ -bfZ -gma +wdU +bNE +vgi +wdU +bNE +mMi +bNE +pQs +pQs +bNE rja rja mfR @@ -58314,17 +58314,17 @@ xxD xxD xxD vVi -dUs -iOt -hJw -gma -gma -gma -gma -gma -gma -gma -gFG +oEi +kyF +hoo +bNE +bNE +bNE +bNE +bNE +bNE +bNE +cOj bis bis sfs @@ -58336,79 +58336,79 @@ pYc lqq lqq geL -bEO +rJF ycC -uRO -ydk -ruv -bEO -bEO +bPQ +rHh +wNX +rJF +rJF ycC -bEO -kEE -bEO -kEE +rJF +akp +rJF +akp okv -jiW -kpm -ndt -pLh +guz +aAA +yeX +pen ofw -jNA -bzL -eAy -jiW +ppS +hGn +fXI +guz okv -kpm -fUF -joz -jiW -rol +aAA +ojk +wSU +guz +gcx aVd -rol -jiW -joz -fXv -fXv -fXv +gcx +guz +wSU +vBX +vBX +vBX uSA -ena -fXv -jiW +kfY +vBX +guz bPG -jGA -jGA -jGA -xFB +xvv +xvv +xvv +rLA ipd -cyO -cLR -wRZ -jya -kul -hja -hyR -hGC -sHb -xub -xub -iNw -xub -xub -xub -xub -cdD -ajK +kdq +rKy +xiL +mdS +tSm +iTs +bqC +art +vuX +wgO +wgO +bRs +wgO +wgO +wgO +wgO +tkj +oer jgu -vrw -uGM -uGM +qcX +oPU +oPU bNT kjT qun oRR -bAU -ajK +lEL +oer aRT kjT qun @@ -58417,10 +58417,10 @@ wbI cCt wbI wbI -uGM -uGM -jUI -bsF +oPU +oPU +voi +cEY jgu itN itN @@ -58474,31 +58474,31 @@ hoZ fqF hoZ hoZ -fGb +jHz lrA agi lrA -fGb +jHz hoZ -njx -njx -lwK -uTX -njx -nBV -lwK -uTX -fGb -nBV +lLQ +lLQ +lvD +jnU +lLQ +oiV +lvD +jnU +jHz +oiV hoZ hoZ -njx -nBV -fSl -fGb -uTX -fGb -eWu +lLQ +oiV +qJR +jHz +jnU +jHz +gAh nga eXp eXp @@ -58507,17 +58507,17 @@ apf apf apf eXp -gma -gma -gma +bNE +bNE +bNE rja -aVJ +oOw ccH -gma -eWu -bfZ -bfZ -cDj +bNE +gAh +pQs +pQs +rqG rja rja toE @@ -58526,17 +58526,17 @@ hqc xxD xxD tob -obT -gma -gma -gma -gma -gma -gma -gma -gma -gma -qam +wQb +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +umg bis bis tPz @@ -58550,77 +58550,77 @@ lqq ycC lqq sBA -jLF -rrP -vMQ -vMQ -vMQ -vNF -bEO -kEE -vLV +kzB +pBe +xow +xow +xow +wpy +rJF +akp +qif bis bnA -tGi -joz -joz -joz -hUf -joz -joz -joz -feY +wQR +wSU +wSU +wSU +hjR +wSU +wSU +wSU +tSY bnA -qNw -fUF -joz -jiW -rol +vDf +ojk +wSU +guz +gcx okv -rol -jiW -joz +gcx +guz +wSU uSA uSA -pCS -tYr -rAk -fXv -jiW +qLv +gyy +dpn +vBX +guz bPG -jGA -jGA -jGA -xFB +xvv +xvv +xvv +rLA ipd -yhE -rkr -qfU -djd -wRZ -pDg -wRZ -vxV -xub +vMs +sFd +nMp +rdo +xiL +iQz +xiL +rft +wgO hCc vhB -xub +wgO vhB vhB -lJm +slc vhB -dGc -ajK +gyt +oer kXD -nej +bmw vhB -uGM +oPU bNT kjT aPd vtl -cdD -nbU +tkj +bdb lls kjT qun @@ -58629,10 +58629,10 @@ bNT jot fAv vtl -uGM -uGM -uGM -jUI +oPU +oPU +oPU +voi jgu jgu jgu @@ -58686,30 +58686,30 @@ hoZ vjT gFg vjT -fGb +jHz lrA lrA lrA -fGb +jHz hoZ -tXQ -njx -nyl -vco -wVK -uFX -rRb -uTX -fGb -nBV +xeX +lLQ +nmh +jCe +hrw +ddN +dRk +jnU +jHz +oiV hoZ -tXQ -smX -uFX -chS +xeX +ihv +ddN +cRK agi -uTX -fGb +jnU +jHz egv nga nga @@ -58721,16 +58721,16 @@ nga nga apf apf -cMJ +ioE rja rja -xUt -gma -gma -bfZ -bfZ -wxj -gma +jzN +bNE +bNE +pQs +pQs +mCH +bNE vVi fyy toE @@ -58738,17 +58738,17 @@ toE pxk bJb rja -obT -jxY -vky -vky -vky -rKX -vky -vky -aMq -gma -gFG +wQb +qpk +sWe +sWe +sWe +mGf +sWe +sWe +sms +bNE +cOj bis bis nHm @@ -58763,76 +58763,76 @@ wMi wMi bis bis -bEO -bEO -bEO +rJF +rJF +rJF uXB -uRO -bEO -uyr -vLV +bPQ +rJF +vOO +qif bis bnA -tGi -joz -joz -joz -fXv -joz -joz -joz -feY +wQR +wSU +wSU +wSU +vBX +wSU +wSU +wSU +tSY bnA -qNw -fUF -xcf -jiW -rol +vDf +ojk +cQe +guz +gcx okv -rol -jiW -joz -ndt -pLh -nyo +gcx +guz +wSU +yeX +pen +byT bnA -ioP -mBm -ioP +jHp +myH +jHp wrR -vUn -tcJ -tcJ -lUg +tkP +pYL +pYL +jHD wrR wrR wrR wrR -cLR -dMv -mXe -oJO -bcg -dFw -xub -wvS -xub -xub -xub -xub -xub -cdD -ajK +rKy +mAt +jFh +vxm +heT +aZW +wgO +lAN +wgO +wgO +wgO +wgO +wgO +tkj +oer kXD -vyz +sBY itd -uGM +oPU bNT azs bJp oyC -hln -dfu +utL +uZt pIt azs auQ @@ -58841,12 +58841,12 @@ bNT azs auQ oyC -uGM -uGM -uGM -uGM -jUI -bsF +oPU +oPU +oPU +oPU +voi +cEY jgu itN itN @@ -58898,30 +58898,30 @@ hoZ gFg iKg gFg -gEF +nub gzb gzb gzb -gEF +nub hoZ -njx -njx +lLQ +lLQ jXz -kcw -kcw -kcw +kue +kue +kue jXz -gFK -fGb -nBV -fGB -fNp -rLC -kcw +tbm +jHz +oiV +eSH +kHI +mUK +kue aWV agi -vco -wVK +jCe +hrw qdJ apf kOB @@ -58937,12 +58937,12 @@ eXp eXp eXp rja -gma -eWu -bfZ -bfZ -bfZ -gma +bNE +gAh +pQs +pQs +pQs +bNE vVi sha pNj @@ -58950,17 +58950,17 @@ tDB rja rja rja -obT -gFG -gma -gma -gma -gma -gma -gma -obT -gma -gFG +wQb +cOj +bNE +bNE +bNE +bNE +bNE +bNE +wQb +bNE +cOj bis ycC fAZ @@ -58975,76 +58975,76 @@ clP clP bis bis -bEO -sVN +rJF +mnJ ycC -bEO -uRO -bEO -kEE -bEO -kEE +rJF +bPQ +rJF +akp +rJF +akp xvB -jiW -kpm -ndt -pLh -qkf -jNA -bzL -eAy -jiW +guz +aAA +yeX +pen +vYY +ppS +hGn +fXI +guz xvB -kpm -fUF -joz -jiW -rol +aAA +ojk +wSU +guz +gcx okv -rol -jiW -bLd +gcx +guz +eQY vJn vJn -bLg +asE bnA -hmr -jiW -vjz +kzL +guz +mSo wrR -gnm -guG -guG -guG -guG -cyO +uia +teq +teq +teq +teq +kdq ipd -flq -cLR -vxV -gyi -gyi -vyX +lzB +rKy +rft +iOX +iOX +eyO itN itN itN itN jgu -xub -xub -xub -cdD -ajK +wgO +wgO +wgO +tkj +oer jgu jgu -uGM -uGM +oPU +oPU agv rPI qJf gfL -lty -iIX +eRq +tai doq wbI tmx @@ -59053,12 +59053,12 @@ wbI wbI weX wbI -uGM -uGM -uGM -lRI -uGM -bcs +oPU +oPU +oPU +gAn +oPU +pAr jgu jgu jgu @@ -59110,34 +59110,34 @@ hoZ vjT gFg vjT -fGb +jHz hoZ hoZ hoZ hoZ hoZ -njx -tXQ +lLQ +xeX hoZ -ykT -ykT -ykT -ykT -lwK -fGb -lwK -ykT -ykT -ykT -ykT +otg +otg +otg +otg +lvD +jHz +lvD +otg +otg +otg +otg aWV jXz -fGb -fGb +jHz +jHz qdJ apf ybg -hIR +muD gyB kOB kOB @@ -59147,34 +59147,34 @@ kOB eXp eXp eXp -eWu +gAh rja -gma -gma -bfZ -bfZ -bfZ -gma +bNE +bNE +pQs +pQs +pQs +bNE rja vVi rja rja rja -dUs -iOt -hJw -gFG -gma -nAr -gbD -rVZ -nAr -gma -obT -gma -vsc +oEi +kyF +hoo +cOj +bNE +raL +rty +iXJ +raL +bNE +wQb +bNE +wUs ycC -bEO +rJF ycC lqq lqq @@ -59189,33 +59189,33 @@ tPz bis bis dje -bEO -bEO -uRO -hCS -kEE -bEO -kEE +rJF +rJF +bPQ +qJP +akp +rJF +akp okv -jiW -kpm -fXv -eAy -jiW -kpm -muZ -eAy -jiW +guz +aAA +vBX +fXI +guz +aAA +ppQ +fXI +guz okv -kpm -fUF +aAA +ojk uSA -jiW -rol +guz +gcx okv -rol -jiW -emU +gcx +guz +jYn wrR ipd ipd @@ -59224,55 +59224,55 @@ wrR wrR wrR wrR -guG -guG -guG -guG -guG -xAi +teq +teq +teq +teq +teq +orC ipd -iBi -cLR -vxV -gyi -gyi -aIK +xZU +rKy +rft +iOX +iOX +xqP tRH bQM bQM itN -ujO -uGM -uGM -xub -cdD -mkB -dkC -vwc -vwc -vwc -aDl -hhg -dFE -tQi -oTU -mAg -iKG -uGM -vNr -uGM -fdK -uGM -miB -uGM -gUO -uGM -uGM -uGM -uGM -uGM -jUI -dkP +cIQ +oPU +oPU +wgO +tkj +exI +hHr +oyT +oyT +oyT +yar +wBx +nOi +txY +oWw +mdG +wjO +oPU +eFR +oPU +ccY +oPU +sBj +oPU +mpb +oPU +oPU +oPU +oPU +oPU +voi +cUA jgu itN bQM @@ -59313,39 +59313,39 @@ bQM bQM agi agi -fGb -fGb -fGb +jHz +jHz +jHz aPD hoZ hoZ hoZ -fGb +jHz itv -fGb +jHz hoZ hoZ hoZ hoZ hoZ -njx -tXQ -fGb -fGb -fGb -fGb -fGb -uTX -fGb +lLQ +xeX +jHz +jHz +jHz +jHz +jHz +jnU +jHz hoZ -fGb -fGb -fGb -fGb -fGb -fGb -fGb -fGb +jHz +jHz +jHz +jHz +jHz +jHz +jHz +jHz egv nga kOB @@ -59359,33 +59359,33 @@ qdJ rja rja rja -eWu -dUs -pbZ -iOt -iOt -xbq -iOt -iOt -iOt -iOt -iOt -kUI -iOt -hJw -gma -gma -gFG -gma -qPT -ddE -qwJ -eTn -gma -obT -gma -gFG -gXt +gAh +oEi +qug +kyF +kyF +gZG +kyF +kyF +kyF +kyF +kyF +thI +kyF +hoo +bNE +bNE +cOj +bNE +rKA +qCk +cvd +rRz +bNE +wQb +bNE +cOj +eQQ mNh lqq mxR @@ -59403,88 +59403,88 @@ dje ycC hNY ycC -uRO -bEO -kEE -bEO -wfi +bPQ +rJF +akp +rJF +bDX okv -jiW -kpm -fXv -lFC -jiW -kpm -fXv -eAy -jiW +guz +aAA +vBX +xrz +guz +aAA +vBX +fXI +guz okv -kpm -fUF +aAA +ojk uSA -jiW -rol +guz +gcx okv -rol -jiW -nyo -vPk -ohI -lfJ -tQs -kul -kul -kul -kul -kul -kul -kul -kul -wOR -yhE +gcx +guz +byT +pVD +mKx +iTJ +rwQ +tSm +tSm +tSm +tSm +tSm +tSm +tSm +tSm +plh +vMs ipd -kGu -cLR -vxV -gyi -gyi -evH +xwo +rKy +rft +iOX +iOX +hil tRH bQM bQM itN -dMO -uGM -uGM -xub -iFj -bDN -bDN -eQv -bDN -bDN -cie -bDN -bDN -qWw -hue -gKt -eoR -uGM -wFE -uGM -uGM -uJX -qUe -uGM -uGM -uGM -uGM -uGM -uGM -uGM -dAk -lrC +qeR +oPU +oPU +wgO +mPX +tiZ +tiZ +kJd +tiZ +tiZ +gkC +tiZ +tiZ +hHC +hgP +ecD +exa +oPU +dkl +oPU +oPU +qVW +vtk +oPU +oPU +oPU +oPU +oPU +oPU +oPU +tmX +xUr jgu itN bQM @@ -59525,80 +59525,80 @@ bQM bQM agi agi -fGb +jHz aWV agi agi hoZ hoZ -fGb +jHz hoZ hoZ hoZ -fGb +jHz hoZ agi agi aWV agi jXz -wVK -wVK -wVK -wVK -lwK +hrw +hrw +hrw +hrw +lvD hoZ -fGb -nBV -lwK -wVK -wVK -wVK -wVK -lwK -fGb -fGb +jHz +oiV +lvD +hrw +hrw +hrw +hrw +lvD +jHz +jHz egv nga apf kOB kOB qdJ -qtq +ekF apf -gRy -nAr -dUs -iOt -iOt -iOt -hJw -gma +fZe +raL +oEi +kyF +kyF +kyF +hoo +bNE apf -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gFG -gma -nAr -mXY -qJJ -nAr -gma -obT -gFG +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +cOj +bNE +raL +wND +imp +raL +bNE +wQb +cOj dWB -bEO -gXt +rJF +eQQ ycC lqq geL @@ -59615,72 +59615,72 @@ gPS dyB mNh dDU -uRO +bPQ ycC -kEE -bEO -kEE +akp +rJF +akp okv -jiW -kpm -ndt -pLh -qkf -jNA -bzL -eAy -jiW +guz +aAA +yeX +pen +vYY +ppS +hGn +fXI +guz okv -kpm -vdI -ivL -jiW -rol +aAA +aje +vTI +guz +gcx okv -rol -kGq -emU -vPk -ohI -ebm -qfU -qfU -qfU -fbL -qfU -qfU -qfU -qfU -djd -vxV -wcX +gcx +ffA +jYn +pVD +mKx +iBM +nMp +nMp +nMp +iHW +nMp +nMp +nMp +nMp +rdo +rft +aId ipd -wxo -cLR -vxV -gyi -gyi -gyi +cSh +rKy +rft +iOX +iOX +iOX tRH tRH bQM itN jgu -wGD -xub -xub +bGA +wgO +wgO wbI wbI wbI fZD -uGM -uGM +oPU +oPU hbo jJS occ qBB -ilb -vyA +vxu +onb rwu wbI uep @@ -59688,13 +59688,13 @@ wbI icS lFc rAK -uGM -uGM -jXv -uGM +oPU +oPU +aBZ +oPU vhB vhB -uGM +oPU jgu jgu jgu @@ -59737,8 +59737,8 @@ bQM bQM agi aWV -adk -alJ +tYg +clv dxS agi hoZ @@ -59746,8 +59746,8 @@ hoZ hoZ hoZ hoZ -nBV -fGb +oiV +jHz kAO agi agi @@ -59758,19 +59758,19 @@ aWV jXz jXz jXz -gEF +nub hoZ -fGb +jHz hoZ -gEF +nub jXz jXz jXz cvL -lwK +lvD hoZ -fGb -hvh +jHz +jsU apf kOB kOB @@ -59778,37 +59778,37 @@ kOB qdJ apf iTm -sVa -iOt -hJw -gma -gma -gma -gma +jWE +kyF +hoo +bNE +bNE +bNE +bNE apf -jxY -vky -vky -vky -vky -vky -vky -vky -vky -vky -vky -vky -vky -dOs +qpk +sWe +sWe +sWe +sWe +sWe +sWe +sWe +sWe +sWe +sWe +sWe +sWe +lRr rja rja rja rja rja rja -obT -gma -gFG +wQb +bNE +cOj bis ycC nzI @@ -59827,72 +59827,72 @@ clP dje ddG ddG -mWV -bEO -xDe +uEM +rJF +eqS bis bis bnA -qNw -joz -joz -joz -fXv -joz -joz -joz -feY +vDf +wSU +wSU +wSU +vBX +wSU +wSU +wSU +tSY bnA -qNw -vrc -lhj -jiW -rol +vDf +kok +nJq +guz +gcx okv -rol -wlp -emU +gcx +vrS +jYn wrR wrR -tWo -wRZ -gyi -nnX -dyd -dyd -vqb -kCG -wRZ -cLR -wcm -kWD +tql +xiL +iOX +pGy +eYN +eYN +ybx +jqM +xiL +rKy +fzp +aTO ipd -tyO -cLR -vxV -oex -gyi -dXH -dXH +tWh +rKy +rft +tYQ +iOX +uWe +uWe gEx bQM uGT -xub -uGM -uGM -xub +wgO +oPU +oPU +wgO bNT yge kvh wbI -uGM -uGM +oPU +oPU bNT jot nec vtl -cdD -ajK +tkj +oer bNT jot pIs @@ -59900,11 +59900,11 @@ kDN pIs fAv wbI -gUO -uGM +mpb +oPU jgu jgu -cHD +nUe cDl itN itN @@ -59949,17 +59949,17 @@ bQM agi agi aWV -aji -aqS +bPy +jyY dxS dxS hoZ bmV hoZ -uTX +jnU hoZ -nBV -fGb +oiV +jHz hoZ agi agi @@ -59967,46 +59967,46 @@ agi agi jXz jXz -uBS -uBS -lwK -lwK -tgc -lwK -lwK -wLI -kUr -jnO -dxg -bzC -lwK +oXk +oXk +lvD +lvD +pKu +lvD +lvD +bXe +iDO +oYW +qjb +qov +lvD hoZ pCX -gma +bNE iPx apf gNY egv qdJ -gRy +fZe iTm iTm -hvh -gma -gma -jxY -vky -vky -xKf -dOs +jsU +bNE +bNE +qpk +sWe +sWe +wED +lRr eXp -bFt -dCo -nAr -nAr -nAr -gma -bFt +xat +cBJ +raL +raL +raL +bNE +xat eXp dTx eXp @@ -60015,12 +60015,12 @@ eXp rja ubc gVs -hQH -hQH +lex +lex rja -obT +wQb kMq -gFG +cOj bis bis hPY @@ -60037,74 +60037,74 @@ kNs lqq agT eFD -uRO -bEO +bPQ +rJF hNY -bEO -kEE -bEO -bEO +rJF +akp +rJF +rJF bnA -iKj -joz -joz -joz -fXv -fJx -joz -joz -fXv +fLY +wSU +wSU +wSU +vBX +bnh +wSU +wSU +vBX bnA -fXv -joz -lhj -jiW -rol +vBX +wSU +nJq +guz +gcx okv -rol -kGq -emU +gcx +ffA +jYn wrR -jeD -pan -jjS -qqa -hyG -nYk -nQN -oCI -tUe -xYA -cLR -vxV -rEe +nhX +anT +vcq +kle +wHC +kat +jVM +omN +nrd +vAX +rKy +rft +jgL ipd -cyO -cLR -vxV -gyi -kWj -iWg -iWg +kdq +rKy +rft +iOX +aTY +rcc +rcc gEx bQM uGT -lmy -gbU -lQf +sFo +hnK +oqG jgu bNT azs auQ wbI -uGM -uGM +oPU +oPU wbI pKJ qun oyC -knu -fFC +hsf +sUe wbI ukr fOg @@ -60112,13 +60112,13 @@ fOg fOg rGK wbI -uGM -uGM +oPU +oPU eLu -vVu -cEl -cEl -ycd +dFK +kTs +kTs +yet eLu twb twb @@ -60161,17 +60161,17 @@ bQM agi aWV aak -akE -arS -aCV +pnh +pKO +gpY dxS hoZ hoZ -fGb +jHz hoZ hoZ hoZ -fGb +jHz hoZ agi agi @@ -60179,46 +60179,46 @@ agi agi aWV jXz -eTh -njx -lwK -wVK -lwK -njx -lwK -wOD -wOD -lwK -wOD -lPq -fGb +lBS +lLQ +lvD +hrw +lvD +lLQ +lvD +otK +otK +lvD +otK +vsL +jHz hoZ hoZ -gma +bNE nga esS apf egv qdJ -nAr -obT +raL +wQb apf -jxY -vky -xKf -dOs +qpk +sWe +wED +lRr rja rja rja rja eXp -xYY -gma -nAr -nAr -nAr -gma -wMP +mdD +bNE +raL +raL +raL +bNE +aqw eXp pTR apf @@ -60230,9 +60230,9 @@ apf apf apf rja -obT +wQb kMq -qam +umg bis bis bis @@ -60249,55 +60249,55 @@ clP dbq bis bis -hxU -bEO -uRO -bEO -kEE +wMv +rJF +bPQ +rJF +akp dje -bEO +rJF bnA -jiW -kpm -ndt -pLh +guz +aAA +yeX +pen ofw -jNA -bzL -eAy -jiW -fXv -fXv -vrc -lGm -jiW -rol +ppS +hGn +fXI +guz +vBX +vBX +kok +bem +guz +gcx okv -rol -jiW -nyo +gcx +guz +byT wrR -weS -mQe -xYA -nBK +nzf +dpZ +vAX +hWz bSM bSM bSM bSM -qVF -foL -cLR -vxV -iBi +vCm +pAl +rKy +rft +xZU ipd -xAi -cLR -vxV -gyi -iWg -eWO -iWg +orC +rKy +rft +iOX +rcc +bma +rcc gEx bQM uGT @@ -60309,14 +60309,14 @@ wbI mtj wbI wbI -xnS -xnS +lgx +lgx bNT kjT dqG nFB -sNT -ajK +rNK +oer vLH nCX dQW @@ -60324,13 +60324,13 @@ nCX nCX rwj wbI -uGM -uGM +oPU +oPU eLu -nJQ -cEl -cEl -clG +bSq +kTs +kTs +vnG eLu twb twb @@ -60374,15 +60374,15 @@ agi agi aWV agi -awh -aIZ +tqx +qvN dxS -fGb +jHz hoZ -fGb +jHz hoZ hoZ -nBV +oiV hoZ hoZ agi @@ -60391,32 +60391,32 @@ agi agi aWV jXz -lwK -lwK -wNw -njx -uhd -lwK -viH -wOD -wOD -lwK -wOD -wOD -fGb -fGb -fGb +lvD +lvD +aeb +lLQ +dLL +lvD +fuO +otK +otK +lvD +otK +otK +jHz +jHz +jHz apf uQE -gma +bNE apf rja rja -dUs -hJw -gma -gFG -mFm +oEi +hoo +bNE +cOj +myi rja rja eXp @@ -60424,13 +60424,13 @@ eXp eXp eXp eXp -bFt -gma -nAr -nAr -nAr -dCo -bFt +xat +bNE +raL +raL +raL +cBJ +xat eXp eXp eXp @@ -60442,9 +60442,9 @@ apf apf wvY rja -obT -gma -gFG +wQb +bNE +cOj bis ewE ewE @@ -60463,53 +60463,53 @@ bis bis bis bis -uRO -bEO -kEE -bEO -bEO +bPQ +rJF +akp +rJF +rJF bht hTM okv -pie -eAy -jiW -kpm -muZ -eAy -jiW -fXv -fXv -joz -lGm -tlM -rol +qhZ +fXI +guz +aAA +ppQ +fXI +guz +vBX +vBX +wSU +bem +rdi +gcx tER -rol -jiW -nyo +gcx +guz +byT wrR -gzA -eZL -cjs -mLS -eLO -eLO -eLO -eLO -eew -xYA -cLR -aLj -juE +eQz +ixK +rKG +wyd +oby +oby +oby +oby +ftd +vAX +rKy +oEX +sVZ ipd -yhE -cLR -vxV -gyi -gyi -nLf -nLf +vMs +rKy +rft +iOX +iOX +xyq +xyq gEx bQM bQM @@ -60521,14 +60521,14 @@ itN jgu jgu jgu -rjn -rjn +tkg +tkg jgu noe qun vtl -cdD -ajK +tkj +oer bNT jot kDN @@ -60536,14 +60536,14 @@ kDN kDN fAv vtl -uGM -uGM +oPU +oPU eLu -wKF -cEl -cEl -clG -rfG +xVJ +kTs +kTs +vnG +tUG twb twb kPz @@ -60589,74 +60589,74 @@ azZ lAh aMg dxS -fGb -fGb -fGb -uTX +jHz +jHz +jHz +jnU hoZ -nBV +oiV hoZ hoZ aWV aWV agi -fGb +jHz aWV jXz -lwK -wLP -qLp -fGb -frt -ugH -lwK -wSe -wSe -lwK -wSe -mSN +lvD +qaA +jlb +jHz +ifw +vWj +lvD +aZi +aZi +lvD +aZi +uEy egv -eWu -gma +gAh +bNE apf apf apf uQE apf lag -obT -pmy -gma -gFG -iry +wQb +xYN +bNE +cOj +ssM rja eXp -nAr -gbD -nKq -jIm +raL +rty +cui +mzn eXp -nIf -fiF -nAr -nAr -nAr -tNs -wTo +til +ljx +raL +raL +raL +bpe +snr eXp -nAr -gbD -rVZ -nAr -uHX +raL +rty +iXJ +raL +xlb apf apf apf apf -uHX -obT -gma -gFG +xlb +wQb +bNE +cOj wpD lpr ycC @@ -60670,57 +60670,57 @@ rFu clP fzO clP -nUy -aWD -aGs -bEO -nUy -uRO -bEO -kEE -sJw +eHk +bZn +txb +rJF +eHk +bPQ +rJF +akp +wFS hNY omI -jiW -kpm -fXv -eAy -jiW -kpm -fXv -eAy -jiW -fXv -fXv -joz -lhj -aVh +guz +aAA +vBX +fXI +guz +aAA +vBX +fXI +guz +vBX +vBX +wSU +nJq +rhh kJf okv -rol -jiW -emU +gcx +guz +jYn wrR wrR -haU -aVS -gyi -heu -heu -gyi -gyi -hYT -wRZ -cLR -vxV +iFg +bFJ +iOX +iDK +iDK +iOX +iOX +wMA +xiL +rKy +rft wrR wrR wrR -sAK -vxV -nLf -gyi -wuP +mhS +rft +xyq +iOX +hPq nvD tRH tRH @@ -60732,15 +60732,15 @@ bQM twb lXs hsZ -rxz +pBb jJb cME eLu noe qun oyC -cdD -ajK +tkj +oer bNT azs fOg @@ -60748,15 +60748,15 @@ fOg syU auQ oyC -uGM +oPU vhB ayX -jmV +qbn gfo qPr -ycd -clG -kDW +yet +vnG +kRO twb kPz bQM @@ -60803,72 +60803,72 @@ azZ agi qRg aWV -gEF +nub hoZ hoZ hoZ -gEF +nub agi agi agi hoZ -dfD -fGb +ifL +jHz jXz -lwK -wXP -qOy -xvD -nGX -ukz -lwK -wNw -uhd -njx -wNw -uhd +lvD +eME +wMh +kQG +lEk +wcB +lvD +aeb +dLL +lLQ +aeb +dLL egv -gma -gma +bNE +bNE apf apf apf apf apf lag -obT -gma -gma -gFG -wCA +wQb +bNE +bNE +cOj +seh rja eXp -qPT -ewY -gzF -sjl -mzF -dka -rTL -azN -azN -azN -vpJ -dka -gma -qPT -ddE -qwJ -eTn +rKA +bff +bxg +jlB +xrZ +xGc +uws +uzy +uzy +uzy +iAq +xGc +bNE +rKA +qCk +cvd +rRz rja apf esS apf -wAM +xYe rja -obT -gma -gFG +wQb +bNE +cOj bis xIx ycC @@ -60883,58 +60883,58 @@ wMi wMi bis bis -jLF -nUy -dRm +kzB +eHk +eFq bis -uRO -bEO -kEE -bEO +bPQ +rJF +akp +rJF dje -gZT +lcn okv -aam -fXv -eAy -jiW -kpm -muZ -eAy -iTG -twL -fXv -joz -lhj -aVh +xbr +vBX +fXI +guz +aAA +ppQ +fXI +wSX +iuz +vBX +wSU +nJq +rhh uEj okv -rol -jiW -emU -vPk -ohI -lfJ -kul -oQF -kul -kul -kul -kul -tQs -kul -eVb -jya -kul -kul -kul -elq -jya -kul -kul -kul -kul -idO +gcx +guz +jYn +pVD +mKx +iTJ +tSm +opP +tSm +tSm +tSm +tSm +rwQ +tSm +sjX +mdS +tSm +tSm +tSm +sbW +mdS +tSm +tSm +tSm +tSm +gLK gEx bQM bQM @@ -60944,15 +60944,15 @@ bQM tPN luy doY -rxz +pBb cME jJb eLu tOS qun -joE -cdD -qHK +oyJ +tkj +nju wbI nCX nCX @@ -60960,15 +60960,15 @@ xgx nCX pBT wbI -uGM +oPU vhB ayX -cEl +kTs gfo gfo -ycd -clG -mRk +yet +vnG +vnA twb kPz bQM @@ -61015,30 +61015,30 @@ bQM agi aWV agi -lwK -uTX +lvD +jnU hoZ -nBV -lwK +oiV +lvD agi -gEF -fGb +nub +jHz hoZ hoZ -fGb +jHz hoZ -dfa -nBV -njx -fGb -njx -uTX -lwK -uTX -nBV -njx -uTX -nBV +tfw +oiV +lLQ +jHz +lLQ +jnU +lvD +jnU +oiV +lLQ +jnU +oiV egv apf apf @@ -61048,39 +61048,39 @@ pKY qlf hcv hds -vBY -wek -gma -gFG +wnh +fth +bNE +cOj eXp eXp eXp -nAr -mXY -uAv -qzB -gma -gma -gma -nAr -nAr -nAr -gma -gma -gma -nAr -mXY -qJJ -nAr +raL +wND +xDk +xWE +bNE +bNE +bNE +raL +raL +raL +bNE +bNE +bNE +raL +wND +imp +raL rja rja rja rja rja rja -obT +wQb kMq -gFG +cOj bis ewE ycC @@ -61099,9 +61099,9 @@ bis bis bis bis -uRO -bEO -kEE +bPQ +rJF +akp bis bis bnA @@ -61110,43 +61110,43 @@ cEw bnA bnA bnA -pqq -joz -joz -joz -ptV -fXv -joz -lGm -aVh +vql +wSU +wSU +wSU +oVk +vBX +wSU +bem +rhh jji vjG -rol -jiW -nyo -vPk -ohI -dsQ -qfU -qfU -qfU -qfU -qfU -qfU -qfU -dDS -djd -dMv -qfU -qfU -djd -wRZ -wRZ -dMv -qfU -qfU -djd -vxV +gcx +guz +byT +pVD +mKx +dBt +nMp +nMp +nMp +nMp +nMp +nMp +nMp +mDq +rdo +mAt +nMp +nMp +rdo +xiL +xiL +mAt +nMp +nMp +rdo +rft gEx bQM bQM @@ -61156,15 +61156,15 @@ bQM twb qDn hUO -rxz +pBb cME cME eLu jgu iSu vtl -cdD -ajK +tkj +oer bNT esZ kDN @@ -61172,15 +61172,15 @@ kDN kDN exO wbI -uGM -uGM +oPU +oPU eLu -vVu -cEl -cEl -ycd -xzr -mRk +dFK +kTs +kTs +yet +gSC +vnA twb kPz bQM @@ -61227,138 +61227,138 @@ bQM agi agi agi -lwK -uTX +lvD +jnU pCX -nBV -lwK +oiV +lvD agi -gEF -dfD +nub +ifL hoZ hoZ hoZ -gEF -eQD -nBV -qQO -rVS -njx -uTX -lwK -xfR -nBV -njx -uTX -vzk -gma +nub +qYZ +oiV +neT +xdL +lLQ +jnU +lvD +pPo +oiV +lLQ +jnU +vFA +bNE apf iLJ apf -gma -gma -gma -gma +bNE +bNE +bNE +bNE rja -obT -gma -gma -mOF -iOt -iOt -iOt -iOt -sPC -iZt -cOn -cnn -iOt -hSf -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -iOt -hJw +wQb +bNE +bNE +pQz +kyF +kyF +kyF +kyF +xYR +ceB +frc +nEh +kyF +bpo +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +kyF +hoo kMq -qam +umg bis ewE ycC kCI bis -lOE -mTX -gQx +xzN +bDM +bTc lqq mxR lqq lqq lqq -ahn -mTX -axi +ilM +bDM +pgQ bis bFr -aaj -bEO -kEE -iFD +hIX +rJF +akp +bHt bFr cEw cEw cEw cEw bnA -oKl -joz -joz +aQR +wSU +wSU uSA -joz -ptV -fXv -vrc -lGm -jiW -rol +wSU +oVk +vBX +kok +bem +guz +gcx okv -rol -jiW -nyo +gcx +guz +byT wrR -plr -ilI +vdH +eyv wrR wrR -kbA -gyi -gYA +oJl +iOX +vXk wrR ipd wrR -oJU -vhC -wRZ -gyi -nnX -dyd -dyd -vqb -gyi -wRZ -cLR -vxV +qjX +wDe +xiL +iOX +pGy +eYN +eYN +ybx +iOX +xiL +rKy +rft tRH tRH tRH @@ -61368,15 +61368,15 @@ twb twb nzU lvg -rxz +pBb cME uzw eLu jgu jgu fic -cdD -ajK +tkj +oer bNT azs deB @@ -61384,15 +61384,15 @@ sjR deB auQ wbI -uGM -uGM +oPU +oPU eLu -nBp -cEl -cEl -kPJ -clG -kDW +sIs +kTs +kTs +hgA +vnG +kRO twb kPz bQM @@ -61439,93 +61439,93 @@ bQM aWV fXL fXL -gXH -hAp +sjT +pmv iDq iDq -gXH +sjT fXL agi -fGb +jHz hoZ hoZ hoZ -gEF -eQD -lwK -vco -usq -uFX -lwK -lwK -uTX -wRv -njx -uTX -nBV +nub +qYZ +lvD +jCe +sxk +ddN +lvD +lvD +jnU +xvC +lLQ +jnU +oiV uQE apf apf -gma -eWu +bNE +gAh egv egv rja rja -obT -gma -gma -wEa -gma -gma -gma -gma -gma -qDi -xkj -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma -gma +wQb +bNE +bNE +vgi +bNE +bNE +bNE +bNE +bNE +vSC +eJK +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE +bNE kMq kMq -gma -gma -gma +bNE +bNE +bNE kMq kMq -gma -gFG +bNE +cOj bis kCI ycC bis bis -cGm -kLY -klL +gKG +gjY +lKP lqq lqq lqq epV lqq -hZp -lmr -pIo +oYG +bXh +lpd bis bis -fRG -bEO -xDe +kCj +rJF +eqS bis bFr cEw @@ -61533,48 +61533,48 @@ cEw cEw cEw bnA -xrU +tEX uSA uSA -joz -joz -aVE -fXv -joz -lhj -jiW -rol +wSU +wSU +eys +vBX +wSU +nJq +guz +gcx kEj -rol -jiW -emU -vPk -oWc -ohI +gcx +guz +jYn +pVD +iQH +mKx ipd -rWi -ohI -wRZ -ohI -wRZ -saQ +ncs +mKx +xiL +mKx +xiL +gvr ipd -cLR -vxV -xYA -qqa -uOR -nYk -nQN -oCI -tUe -xYA -cLR -vxV +rKy +rft +vAX +kle +mLm +kat +jVM +omN +nrd +vAX +rKy +rft wrR -gyi -gyi -kCG +iOX +iOX +jqM wrR eLu eLu @@ -61587,8 +61587,8 @@ eLu noe qun msu -qnE -oaI +lte +hdA fbo wbI fZD @@ -61596,14 +61596,14 @@ wbI wbI wbI wbI -uGM -uGM +oPU +oPU eLu -qmS -cEl -cEl -clG -cyu +kon +kTs +kTs +vnG +uIg twb twb kPz @@ -61651,79 +61651,79 @@ bQM agi agi agi -lwK -uTX +lvD +jnU hoZ -nBV -lwK +oiV +lvD agi -fGb -fGb +jHz +jHz hoZ hoZ hoZ jXz -onw -njx -lwK -ykT -lwK -njx -pyv -vco -uFX -agi -vco -uFX +rHV +lLQ +lvD +otg +lvD +lLQ +cNe +jCe +ddN +agi +jCe +ddN apf esS -gma +bNE egv egv egv egv eXp rja -dUs -uAv -vky -rHx -vky -xKf -vky -dUs -iOt -iOt -uAv -vky -xKf -vky -vky -vky -vky -vky -xKf -vky -dUs -iOt -iOt -uAv -vky -vky -xKf -vky -vky -vky -vky -vky -dOs +oEi +xDk +sWe +kzx +sWe +wED +sWe +oEi +kyF +kyF +xDk +sWe +wED +sWe +sWe +sWe +sWe +sWe +wED +sWe +oEi +kyF +kyF +xDk +sWe +sWe +wED +sWe +sWe +sWe +sWe +sWe +lRr bis tgB tgB bis nOz -tvX -rJK +mCp +gTi xst lqq lqq @@ -61731,67 +61731,67 @@ lqq lqq lqq vrT -tvX -rJK +mCp +gTi nOz bis -uRO -uxp -kEE -iFD +bPQ +qGh +akp +bHt bFr cEw cEw cEw cEw bnA -jxN -joz -joz +dCt +wSU +wSU uSA -joz -joz -fXv -vrc -lhj -jiW -rol +wSU +wSU +vBX +kok +nJq +guz +gcx okv -rol -jiW -emU -vPk -ohI -ohI +gcx +guz +jYn +pVD +mKx +mKx ipd -oxN -ohI -wRZ -ohI -wRZ -ozH +drt +mKx +xiL +mKx +xiL +ltz ipd -cLR -vha -xYA -nBK +rKy +iEA +vAX +hWz bSM bSM bSM bSM -qVF -xYA -cLR -vxV +vCm +vAX +rKy +rft wrR -kbA -gyi -cxn +oJl +iOX +tJC wrR -jKm -aGV -ofb -nRf +qzo +neE +iTK +uMc eLu cME cME @@ -61799,23 +61799,23 @@ eLu fOg xVK fZD -cdD -ajK -uGM -uGM -uGM -uGM -uGM -uGM -uGM -gUO +tkj +oer +oPU +oPU +oPU +oPU +oPU +oPU +oPU +mpb vhB ayX -cEl +kTs gfo gfo -cEl -fBp +kTs +kSB twb twb kPz @@ -61863,11 +61863,11 @@ azZ agi agi hoZ -lwK -uTX +lvD +jnU hoZ -nBV -lwK +oiV +lvD hoZ hoZ hsc @@ -61875,13 +61875,13 @@ hoZ bmV aWV jXz -oxg -pyv -lwK -lwK -tjU -lwK -lwK +afX +cNe +lvD +lvD +kvg +lvD +lvD agi agi agi @@ -61889,24 +61889,24 @@ agi agi apf apf -gma +bNE egv egv tel ioM ioM ioM -oAm -vQN +sKu +iXs ioM ioM ioM ioM ioM -oAm -vMh -vMh -vQN +sKu +chx +chx +iXs ioM ioM ioM @@ -61916,17 +61916,17 @@ ioM ioM ioM ioM -oAm -vMh -vMh -vQN +sKu +chx +chx +iXs ioM ioM hVI hVI hVI -hDy -hDy +jMh +jMh hVI hVI hVI @@ -61934,22 +61934,22 @@ nXj nXj sJu lqq -tvX -rJK +mCp +gTi kHf -rlC +tcL nOz pVR nOz -jBS +jeL fKm -tvX -rJK +mCp +gTi lqq wpD -uRO -bEO -kEE +bPQ +rJF +akp bis bFr cEw @@ -61958,52 +61958,52 @@ cEw cEw cEw bnA -nBu -joz -joz -joz -joz -fXv -eZm -tMn -jiW -rol +rPf +wSU +wSU +wSU +wSU +vBX +xNn +eBr +guz +gcx okv -rol -jiW -emU -vPk -ohI -ohI +gcx +guz +jYn +pVD +mKx +mKx ipd -iMM -ohI -xfV -ohI -wRZ -nIo +kFd +mKx +sMY +mKx +xiL +vwN ipd -cLR -vxV -xYA -mLS -eLO -eLO -eLO -eLO -eew -xYA -cLR -jya +rKy +rft +vAX +wyd +oby +oby +oby +oby +ftd +vAX +rKy +mdS aMM -kul -kul -kul +tSm +tSm +tSm aMM -sRV -fnB -fnB -xDQ +gag +ubP +ubP +ejs liA cME cME @@ -62011,23 +62011,23 @@ liA nCX nCX wbI -cdD -ajK -uGM -gUO -uGM -uGM -uGM -uGM -uGM -uGM +tkj +oer +oPU +mpb +oPU +oPU +oPU +oPU +oPU +oPU vhB ayX -cEl +kTs gfo gfo -cEl -mJz +kTs +pYz twb twb kPz @@ -62075,11 +62075,11 @@ azZ agi agi agi -lwK -uTX +lvD +jnU pCX -nBV -lwK +oiV +lvD hoZ hoZ hsc @@ -62088,9 +62088,9 @@ hoZ aWV aWV aWV -eDs -eDs -eDs +wIy +wIy +wIy jXz aWV agi @@ -62101,25 +62101,25 @@ agi agi apf apf -eWu +gAh egv egv tel ioM ioM ioM -mJy -cwO +dOO +oTi ioM hVI hVI -goA -wYx -ryN -jEb -jEb -tur -kiE +slh +vfL +dAg +jbq +jbq +brC +gQz hVI hVI hVI @@ -62127,15 +62127,15 @@ hVI hVI hVI hVI -fPZ -ryN -jEb -jEb -tur -tSn +bLM +dAg +jbq +jbq +brC +uMT sJu -nFI -iPM +vBF +qrn hVI bmE bmE @@ -62146,8 +62146,8 @@ mEO mEO hVI nOz -tvX -rJK +mCp +gTi eTc sfi mWX @@ -62155,67 +62155,67 @@ mWX mWX ifk eTc -tvX -rJK +mCp +gTi nOz bis -uRO -bEO -olC -vNt +bPQ +rJF +rkv +fVs cvn bQM bQM bQM kPz wyT -joz -tBt -jiW -kpm -joz -joz -fXv -fUF -fXv -jiW -rol +wSU +dXK +guz +aAA +wSU +wSU +vBX +ojk +vBX +guz +gcx okv -rol -jiW -emU +gcx +guz +jYn wrR -plr -ilI +vdH +eyv wrR wrR -kbA -gyi -gYA +oJl +iOX +vXk wrR ipd wrR -oJU -vxV -wRZ -gyi -hdv -gyi -xeD -gyi -gyi -wRZ -cLR -dMv +qjX +rft +xiL +iOX +qGf +iOX +vQi +iOX +iOX +xiL +rKy +mAt aMM -qfU -qfU -qfU +nMp +nMp +nMp aMM -sRV -fnB -fnB -fnB +gag +ubP +ubP +ubP phe uJg cME @@ -62223,9 +62223,9 @@ eLu kDN exO wbI -cdD -ajK -uGM +tkj +oer +oPU eLu eLu eLu @@ -62235,10 +62235,10 @@ eLu eLu eLu eLu -jJG -cEl -cEl -wCV +cmE +kTs +kTs +lJI eLu twb twb @@ -62288,26 +62288,26 @@ agi agi agi aWV -eDs -eDs -eDs +wIy +wIy +wIy jXz -gEF -gEF +nub +nub agi agi -fGb -fGb +jHz +jHz jXz -rPh -rPh -rPh -rPh -rPh +pgb +pgb +pgb +pgb +pgb jXz xLi -smq -uPz +sQz +iFz azZ xLi rja @@ -62320,35 +62320,35 @@ ioM ioM ioM ioM -oAm -vQN +sKu +iXs ioM hVI -hBX -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ -hBX +fCr +bLM +bLM +bLM +bLM +bLM +bLM +bLM +fCr hVI hVI hVI hVI hVI -hBX -fPZ -ouS -xUq -fPZ -fPZ -tSn +fCr +bLM +eRZ +trN +bLM +bLM +uMT sJu cyV cyV -iPM +qrn cyV cyV sJu @@ -62358,76 +62358,76 @@ mJk svh hVI bis -tvX -tcO -mTX -mTX -mTX -mTX -mTX -mTX -mTX -hOz -rJK +mCp +iYa +bDM +bDM +bDM +bDM +bDM +bDM +bDM +szs +gTi bis bis -uRO -bEO -bEO -kEE +bPQ +rJF +rJF +akp cvn kPz kPz kPz cEw wyT -joz -eAy -jiW -kpm -joz -joz -fXv -fUF -fXv -jiW -rol +wSU +fXI +guz +aAA +wSU +wSU +vBX +ojk +vBX +guz +gcx okv -rol -jiW -dmH -xDz -wRZ -lfJ -kul -kul -kul -kul -kul -kul -kul -kul -elq -jya -kul -kul -kul -kul -kul -kul -kul -kul -elq -vxV +gcx +guz +bxA +cKU +xiL +iTJ +tSm +tSm +tSm +tSm +tSm +tSm +tSm +tSm +sbW +mdS +tSm +tSm +tSm +tSm +tSm +tSm +tSm +tSm +sbW +rft wrR -gyi -gyi -gyi +iOX +iOX +iOX wrR -fnB -fnB -fnB -ofb +ubP +ubP +ubP +iTK eLu cME cME @@ -62435,17 +62435,17 @@ eLu deB auQ wbI -cdD -ajK -wRn +tkj +oer +lgS eLu eLu eLu -mea -mea +bhf +bhf eLu -mea -mea +bhf +bhf eLu eLu ppI @@ -62499,68 +62499,68 @@ azZ azZ azZ azZ -rPh -rPh -rPh -rPh -rPh -xjK -kRt +pgb +pgb +pgb +pgb +pgb +mvp +cJL azZ xLi ddL ddL xLi -xjK -xjK -xjK -pQh -xjK -jES -xjK -xjK -xjK -azZ -azZ -fPZ -fPZ -fPZ +mvp +mvp +mvp +rYw +mvp +luZ +mvp +mvp +mvp +azZ +azZ +bLM +bLM +bLM mEO -fPZ -vmr +bLM +xsC hVI -jTG -kwK -kye -ryN -tur -fPZ -nHH -mhb -aja -leR -fPZ -fPZ -mFh -mhb -dFG -dla -dla -iRc -nsb -wVL -aja -fPZ -fPZ -bGs -hjr -bdL -dFG +bPV +aJo +ayB +dAg +brC +bLM +aKb +jQs +xEH +iNt +bLM +bLM +ddB +jQs +veR +fYa +fYa +gbv +gBN +jpQ +xEH +bLM +bLM +oQk +hOG +xMX +veR ioM hVI cyV cyV -iPM +qrn cyV mbg ioM @@ -62570,76 +62570,76 @@ mrX mrX pkM bis -wjk -bJF -bJF -bJF -lmr -bEO -nrY -bJF -bJF -bJF -dgF +wzH +tyj +tyj +tyj +bXh +rJF +nTv +tyj +tyj +tyj +dtS bis -sXy -usa -vNF -uqa -kEE +byB +etj +wpy +cCO +akp cvn bQM bQM bQM wyT -joz -ndt -pLh +wSU +yeX +pen ofw -jNA -bzL -mrO -fXv -vdI -ivL -jiW -rol +ppS +hGn +lit +vBX +aje +vTI +guz +gcx okv -rol -jiW -fXv -bYB -wRZ -cLR -wRZ -wRZ -wRZ -uRX -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -wRZ -mOn +gcx +guz +vBX +evT +xiL +rKy +xiL +xiL +xiL +vCl +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +xiL +fXD wrR wrR jRh wrR wrR -lbk -crO -fnB -aGV +rfQ +qMI +ubP +neE eLu eLu eLu @@ -62647,9 +62647,9 @@ eLu sGI szK wbI -iFj -xIo -uGM +mPX +qhk +oPU eLu mTM gyJ @@ -62663,8 +62663,8 @@ gyJ cME cME eLu -jvB -vsg +tHJ +lQJ twb twb twb @@ -62708,73 +62708,73 @@ lAh lAh azZ azZ -sqg -sqg -xRh -hhl -hTt -iHU -iYq -xjK -xMg -sqg -sqg -szQ -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -azZ -azZ -azZ -lle -mhb -mhb +hae +hae +ceJ +mJH +hAX +tsA +oZk +mvp +lkr +hae +hae +ncF +hae +hae +hae +hae +hae +hae +hae +hae +hae +hae +hae +hae +azZ +azZ +azZ +kpe +jQs +jQs mEO -mhb +jQs mEO mEO -fPZ -cwO -mFh -mhb -aja -mJy -qxL -cwO -mFh -mhb -aja -mJy -fPZ -vkC -mFh -mhb -aja -mJy -fPZ -cwO -mFh -vtn -aja -jUB -fPZ -vbF +bLM +oTi +ddB +jQs +xEH +dOO +asI +oTi +ddB +jQs +xEH +dOO +bLM +dVD +ddB +jQs +xEH +dOO +bLM +oTi +ddB +nmK +xEH +xfh +bLM +ftS ioM hVI -iPM -iPM +qrn +qrn hVI -iPM -iPM +qrn +qrn ioM ioM bmE @@ -62786,9 +62786,9 @@ jUs clP oxS eTc -nHG -bEO -rJK +gdQ +rJF +gTi eTc clP oxS @@ -62796,72 +62796,72 @@ iwf bFr cvn cvn -uRO -bEO -kEE +bPQ +rJF +akp cvn bFr cvn cvn cEw -joz -joz -eAy -jiW -kpm -joz -joz -fXv -vrc -lhj -jiW -rol +wSU +wSU +fXI +guz +aAA +wSU +wSU +vBX +kok +nJq +guz +gcx okv -rol -jiW -bLd -gMV -wRZ -rkr -qfU -qfU -qfU -qfU -qfU -qfU -qfU -qfU -djd -dMv -qfU -qfU -qfU -qfU -qfU -qfU -qfU -qfU -djd -vxV +gcx +guz +eQY +sVd +xiL +sFd +nMp +nMp +nMp +nMp +nMp +nMp +nMp +nMp +rdo +mAt +nMp +nMp +nMp +nMp +nMp +nMp +nMp +nMp +rdo +rft wrR -gyi -gyi -gyi +iOX +iOX +iOX wrR -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP fXB -jUI -jUI +voi +voi vhB -uGM -uGM -uGM -uGM -uGM -lzX +oPU +oPU +oPU +oPU +oPU +lRq liA cME cME @@ -62875,10 +62875,10 @@ xno cME cME ayX -hxg -goz -tUr -fAh +qsF +dYV +upf +nWB twb kPz kPz @@ -62919,76 +62919,76 @@ bQM azZ azZ azZ -kbO -kbO -dFk -ezJ -xjK -rPh -ruy -iZn -xjK -tOr -hmk -kbO -mqo -kbO -kbO -kbO -kbO -kbO -fhZ -kbO -tLY -dFk -hmk -kbO -vFF -kbO +eqU +eqU +uAg +kpq +mvp +pgb +dqX +jFD +mvp +cer +pvF +eqU +eHn +eqU +eqU +eqU +eqU +eqU +hmE +eqU +hvp +uAg +pvF +eqU +qSA +eqU azZ azZ azZ -jEb -jEb -jEb -jEb +jbq +jbq +jbq +jbq mEO -ryN -jEb -tur -mJy -fPZ -cwO -ryN -jEb -tur -mJy -fPZ -cwO -ryN -jEb -qBG -mJy -wRo -vbF -ryN -jEb -tur -idT -fPZ -cwO -ryN -jEb -deE -tSn +dAg +jbq +brC +dOO +bLM +oTi +dAg +jbq +brC +dOO +bLM +oTi +dAg +jbq +rcE +dOO +ekz +ftS +dAg +jbq +brC +kQr +bLM +oTi +dAg +jbq +evk +uMT sJu cyV cyV -iPM +qrn cyV cyV -iPM -iPM +qrn +qrn cyV tQB bQM @@ -62998,9 +62998,9 @@ jjW tna umW jjW -tvX -bEO -rJK +mCp +rJF +gTi jjW tna umW @@ -63011,69 +63011,69 @@ cvn iKs iKs iKs -gQh -qwl -ilX -rkQ -xrs -bUy -joz -eAy -jiW -kpm -joz -joz -fXv +kpR +uLM +cxc +ldd +nIb +gSK +wSU +fXI +guz +aAA +wSU +wSU +vBX bnA -lGm -jiW -rue -dfV -efS -jiW -emU +bem +guz +pCH +awL +wSt +guz +jYn wrR -ohI -vxV -wRZ -gyi -nnX -dyd -dyd -vqb -gyi -wRZ -tRt -vxV -eqq -nrI -nnX -dyd -dyd -vqb -kCG -wRZ -cLR -jya +mKx +rft +xiL +iOX +pGy +eYN +eYN +ybx +iOX +xiL +gmx +rft +kgY +mxm +pGy +eYN +eYN +ybx +jqM +xiL +rKy +mdS aMM -kul -kul -kul +tSm +tSm +tSm aMM -sRV -fnB -fnB -fnB +gag +ubP +ubP +ubP fXB -jUI -jUI +voi +voi vhB -uGM -uGM -uGM -uGM -wQs -uGM +oPU +oPU +oPU +oPU +oMu +oPU eLu cME cPq @@ -63087,10 +63087,10 @@ cPq cME cME ayX -hxg +qsF mHC gfo -bNz +ivK twb twb kPz @@ -63133,74 +63133,74 @@ azZ azZ azZ azZ -ghv -ezJ -xjK -hUh -iJC -iZZ -xjK -muT -ezJ +nQE +kpq +mvp +gTN +wln +rot +mvp +xmC +kpq azZ azZ -xjK -xjK -xjK -xjK -xjK -xjK -xjK -xjK -tOr -ezJ -nvZ -xjK -xjK -tuo +mvp +mvp +mvp +mvp +mvp +mvp +mvp +mvp +cer +kpq +jVt +mvp +mvp +erj azZ azZ azZ azZ -jlg -vmr +eLw +xsC hVI -vmr -fPZ -fPZ -ryN -jEb -tur -fPZ -fPZ -fPZ -ryN -jEb -tur -fPZ -fPZ -bGs -kic -jEb -eYi -fPZ -ajN -fPZ -mUk -rfq -tur -fPZ -fPZ -fPZ -dxA +xsC +bLM +bLM +dAg +jbq +brC +bLM +bLM +bLM +dAg +jbq +brC +bLM +bLM +oQk +iKO +jbq +uJQ +bLM +raP +bLM +fqh +aSm +brC +bLM +bLM +bLM +omO sJu cyV cyV -iPM +qrn kvx cyV -iPM -iPM +qrn +qrn cyV tQB bQM @@ -63210,9 +63210,9 @@ jjW tna umW ovM -tvX -bEO -rJK +mCp +rJF +gTi alX tna umW @@ -63220,90 +63220,90 @@ jjW cvn bQM cvn -gpB -bEO -uxp -ruv -ruv -ruv -ruv -eeL -joz -ndt -pLh +vCu +rJF +qGh +wNX +wNX +wNX +wNX +lri +wSU +yeX +pen ofw -jNA -bzL -mrO -feY +ppS +hGn +lit +tSY bnA -lhj -jiW -jiW -jiW -jiW -jiW -emU +nJq +guz +guz +guz +guz +guz +jYn wrR -ohI -vxV -otG -qqa -uOR -nYk -nQN -oCI -tUe -xYA -cLR -vxV -meM -qqa -uOR -nYk -nQN -oCI -tUe -xYA -cLR -dMv +mKx +rft +aYf +kle +mLm +kat +jVM +omN +nrd +vAX +rKy +rft +oeV +kle +mLm +kat +jVM +omN +nrd +vAX +rKy +mAt aMM -qfU -qfU -qfU +nMp +nMp +nMp aMM -sRV -fnB -tZo -fnB +gag +ubP +iwu +ubP fXB -jUI -jUI +voi +voi vhB -xnS -uGM -uGM -uGM -uGM -wRn +lgx +oPU +oPU +oPU +oPU +lgS eLu eLu eLu -mea -mea +bhf +bhf eLu -mea -mea +bhf +bhf eLu eLu cME cME eLu -fWD -uJM +wxl +hZN gfo -goz -opC +dYV +dxv twb kPz bQM @@ -63346,30 +63346,30 @@ azZ azZ azZ azZ -ezJ -rPh -hWB -rPh -rPh -rPh -ghv -ezJ +kpq +pgb +vFS +pgb +pgb +pgb +nQE +kpq azZ xLi xLi xLi -dNF -dNF -jmM +rHX +rHX +esR xLi -idV -xjK -tOr -ezJ -npV -xjK -xjK -tuo +hrA +mvp +cer +kpq +jdn +mvp +mvp +erj azZ azZ azZ @@ -63379,11 +63379,11 @@ aFZ ioM ioM ioM -iCo -iCo -iCo -iCo -iCo +xUn +xUn +xUn +xUn +xUn aFZ aFZ tQB @@ -63393,27 +63393,27 @@ tQB tQB aFZ aFZ -fPZ -fPZ -fPZ +bLM +bLM +bLM hVI hVI hVI hVI hVI -daP -yfB -daP +luf +hDV +luf ioM hVI -iPM -iPM -iPM -iPM -ykI +qrn +qrn +qrn +qrn +hIO hVI -uLX -kZI +fDi +cqX tQB bQM bQM @@ -63422,9 +63422,9 @@ jjW tna umW jjW -tvX -bEO -rJK +mCp +rJF +gTi jjW tna umW @@ -63435,59 +63435,59 @@ cvn iKs iKs iKs -bEO +rJF iKs iKs iKs -joz -joz -joz -eAy -jiW -kpm -joz -joz -fXv +wSU +wSU +wSU +fXI +guz +aAA +wSU +wSU +vBX bnA -mRT -hxk -pip -fXv -pCS -hxk -nLh +mOm +cZP +vov +vBX +qLv +cZP +jRC wrR -plr -vxV -xYA -nBK +vdH +rft +vAX +hWz bSM bSM bSM bSM -kSL -xYA -cLR -vxV -mCG -nBK +wYP +vAX +rKy +rft +lIH +hWz bSM bSM bSM bSM -qVF -xYA -cLR -vxV +vCm +vAX +rKy +rft wrR -kbA -gyi -cxn +oJl +iOX +tJC wrR -fnB -fnB -fnB -vGe +ubP +ubP +ubP +aTx eLu eLu eLu @@ -63512,10 +63512,10 @@ tPN twb twb twb -laG -cEl -cEl -krT +vQJ +kTs +kTs +hej twb kPz kPz @@ -63558,29 +63558,29 @@ azZ azZ azZ azZ -ezJ +kpq azZ azZ azZ azZ azZ -tOr +cer azZ azZ xLi -eXd -dNF -xMg -sqg -xRh -pBn -xjK -xjK -tOr -ezJ -sNd -xjK -ehf +oZf +rHX +lkr +hae +ceJ +sbL +mvp +mvp +cer +kpq +fKP +mvp +vRH azZ azZ azZ @@ -63591,11 +63591,11 @@ aFZ ioM ioM ioM -iPM -idE -idE -idE -qUQ +qrn +byY +byY +byY +eRF aFZ bQM bQM @@ -63610,22 +63610,22 @@ jjs hVI hVI jvm -kqz +tja aif -hvi -kqz -kqz -kqz +xuQ +tja +tja +tja ioM -gSD -dDm -iPM -iPM -iPM -tng +iUc +nEB +qrn +qrn +qrn +bwj hVI -uLX -kZI +fDi +cqX tQB bQM bQM @@ -63634,9 +63634,9 @@ jjW tna umW alX -tvX -bEO -rJK +mCp +rJF +gTi jjW tna umW @@ -63644,62 +63644,62 @@ jjW cvn bQM cvn -uRO -bEO -bEO -vMQ -rrP -vMQ -vMQ -nrR -joz -joz -eAy -jiW -kpm -joz -joz -aiV +bPQ +rJF +rJF +xow +pBe +xow +xow +caC +wSU +wSU +fXI +guz +aAA +wSU +wSU +lNP bnA bnA -vGV -eXU -noY -tVG -xhc +eOI +aqj +fpN +bQj +oxU wrR wrR -ohI -vxV -xYA -mLS -eLO -eLO -eLO -eLO -eew -xYA -cLR -vxV -xOV -mLS -eLO -eLO -eLO -lCE -eew -xYA -cLR -vxV +mKx +rft +vAX +wyd +oby +oby +oby +oby +ftd +vAX +rKy +rft +iiz +wyd +oby +oby +oby +hKP +ftd +vAX +rKy +rft wrR -gyi -gyi -gyi +iOX +iOX +iOX wrR axA -fnB -fnB -fnB +ubP +ubP +ubP eLu iuZ cME @@ -63707,9 +63707,9 @@ nUJ cME cME eLu -jUI -jUI -lrC +voi +voi +xUr itN swg fQV @@ -63724,10 +63724,10 @@ fQV fQV erT twb -bxr +chE kMU gfo -bNz +ivK twb twb kPz @@ -63780,36 +63780,36 @@ phz azZ azZ xLi -mNj -xMg -sqg -xRh -pAe -qTr -xjK -xjK -tOr -ezJ -xjK -xjK -xjK -azZ -azZ -azZ -bQM -pfi -hbC -hbC -ssD -iSi -ssD -oYH -oYH -oYH -oYH -oYH +tYU +lkr +hae +ceJ +bGH +kWS +mvp +mvp +cer +kpq +mvp +mvp +mvp +azZ +azZ +azZ +bQM +dPZ +ogf +ogf +tsc +bEk +tsc +tii +tii +tii +tii +tii bTI -iSi +bEk hEb hzG hzG @@ -63817,26 +63817,26 @@ hay vmj bQM aFZ -fTA -kqz -kqz +cdY +tja +tja hVI iJF -tVt +nuN hVI -mbi -kqz -kqz -bII +nQl +tja +tja +cgx ioM -iPM +qrn cyV ndZ -iPM +qrn cyV cyV -iPM -iPM +qrn +qrn cyV tQB bQM @@ -63846,9 +63846,9 @@ jjW tna umW jjW -tvX -bEO -rJK +mCp +rJF +gTi jjW tna umW @@ -63859,59 +63859,59 @@ cvn iKs iKs iKs -gQh -keV -pYI -oAa -xrs -qbD +kpR +iDQ +sUr +iyY +nIb +lQo cEw wyT wyT wyT -joz -joz -fXv -fXv -jiW -fXv -fXv -fXv -fXv -bcH -guG -wRZ -ohI -vxV -wRZ -gyi -gyi -gyi -kCG -kCG -gyi -wRZ -cLR -vxV -wRZ -gyi -gyi -gyi -gyi -gyi -gyi -wRZ -cLR -vxV +wSU +wSU +vBX +vBX +guz +vBX +vBX +vBX +vBX +bXA +teq +xiL +mKx +rft +xiL +iOX +iOX +iOX +jqM +jqM +iOX +xiL +rKy +rft +xiL +iOX +iOX +iOX +iOX +iOX +iOX +xiL +rKy +rft wrR wrR jRh wrR wrR xiF -fnB -fnB -xDQ +ubP +ubP +ejs liA cME nqL @@ -63919,9 +63919,9 @@ cME cME cME eLu -jUI -jUI -sRk +voi +voi +lwA uGT bTo afk @@ -63936,11 +63936,11 @@ afk afk iWq tPN -uxO -cEl -cEl -dtc -mBy +rMo +kTs +kTs +ape +exy twb kPz bQM @@ -63992,34 +63992,34 @@ kBE azZ azZ xLi -mSY -nee -xjK -ezJ -dsT -mNj -xjK -xjK -tOr -ayv -jES +aJk +muX +mvp +kpq +iOY +tYU +mvp +mvp +cer +gpA +luZ lAh lAh azZ azZ bQM bQM -gEU +bmT bQM bQM -mTy -alu -mTy -kFH -bow -bow -bow -bow +vxz +iSR +vxz +mPe +esw +esw +esw +esw bTI bQM bFA @@ -64029,26 +64029,26 @@ hXZ aLp aLp aFZ -nwh -kqz -kqz +gnG +tja +tja hVI xgn -kqz +tja hVI -bgR -kcn -kqz -kqz +tpZ +xhL +tja +tja sJu -iPM +qrn lwd ndZ -iPM +qrn cyV cyV -iPM -iPM +qrn +qrn cyV aFZ aFZ @@ -64058,9 +64058,9 @@ jUs clP clP eTc -tvX -wEY -rJK +mCp +rJc +gTi eTc clP clP @@ -64068,9 +64068,9 @@ iwf bFr cvn cvn -uRO -oTl -kEE +bPQ +wIL +akp cvn bFr cvn @@ -64081,49 +64081,49 @@ cEw bQM bQM wyT -joz -joz -fXv -otP -jiW -fXv -fXv -fXv -fXv -fXv -guG -wRZ -wRZ -lfJ -kul -kul -kul -kul -kul -kul -kul -kul -elq -jya -kul -kul -kul -hGz -kul -kul -kul -kul -elq -vxV +wSU +wSU +vBX +nJu +guz +vBX +vBX +vBX +vBX +vBX +teq +xiL +xiL +iTJ +tSm +tSm +tSm +tSm +tSm +tSm +tSm +tSm +sbW +mdS +tSm +tSm +tSm +gbF +tSm +tSm +tSm +tSm +sbW +rft wrR qQt cME dkb uGY axA -fnB -fnB -vGe +ubP +ubP +aTx eLu eLu eLu @@ -64148,11 +64148,11 @@ afk afk iWq tPN -cWR +fmE dKX gfo -aXM -bTG +rQu +fzC twb kPz bQM @@ -64204,54 +64204,54 @@ azZ azZ azZ xLi -xjK -lax -nDJ -dsT -dNF -pBn -xjK -xjK -tOr -ezJ -xjK +mvp +ubX +wAQ +iOY +rHX +sbL +mvp +mvp +cer +kpq +mvp jKR lAh azZ azZ bQM bQM -gEU +bmT bQM bQM -wsy -aOh -wsy -hDy -hDy -hDy -qmz -hDy +knY +fvH +knY +jMh +jMh +jMh +cMb +jMh bTI bQM bFA -hpJ +rYY ePq mzS lEp wWW -lBg -hvi -tST -kqz +xXh +xuQ +gjz +tja tEH -kqz -kqz +tja +tja hVI -bjO -bjO -kqz -kqz +qEl +qEl +tja +tja ioM hVI hVI @@ -64266,23 +64266,23 @@ hVI hVI ioM bis -lOE -mTX -mTX -wot -mxn -bEO -tcO -mTX -jDk -mTX -axi +xzN +bDM +bDM +qLa +dZK +rJF +iYa +bDM +opN +bDM +pgQ bis -sXy -ghP -xqG -oTl -kEE +byB +lpH +hUD +wIL +akp cvn kPz kPz @@ -64293,59 +64293,59 @@ kPz kPz kPz wyT -xPX -joz -joz -joz -vVJ -joz -joz -joz -joz -joz -guG -tOo -wRZ -rkr -qfU -xTa -qfU -qfU -qfU -qfU -xTa -djd -wRZ -wRZ -dMv -lWD -qfU -qfU -qfU -qfU -qfU -qfU -qfU -pnv +iSw +wSU +wSU +wSU +weB +wSU +wSU +wSU +wSU +wSU +teq +cdV +xiL +sFd +nMp +oFU +nMp +nMp +nMp +nMp +oFU +rdo +xiL +xiL +mAt +igu +nMp +nMp +nMp +nMp +nMp +nMp +nMp +eSn wrR bcf cME cME uGY -fnB -fnB -fnB -fnB -fnB -clG -clG -clG -qTa -fnB -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP +ubP +vnG +vnG +vnG +fRq +ubP +ubP +ubP +ubP +ubP dCM bTo afk @@ -64360,11 +64360,11 @@ afk afk iWq tPN -jtv -cEl -cEl -lZC -sNu +mKo +kTs +kTs +bYY +dwf twb kPz bQM @@ -64417,35 +64417,35 @@ azZ azZ xLi xLi -eXd -mNj -olG -aoH +oZf +tYU +knW +fop xLi -jmM -xjK -tOr -ezJ -xjK +esR +mvp +cer +kpq +mvp efT lAh azZ azZ bQM bQM -qvn -hbC -hbC -ssD -iSi -ssD -oYH -oYH -oYH -oYH -oYH +qmv +ogf +ogf +tsc +bEk +tsc +tii +tii +tii +tii +tii bTI -iSi +bEk eHC uVX uVX @@ -64453,48 +64453,48 @@ nHZ tHL sTu aFZ -hvi -kqz -kqz +xuQ +tja +tja hVI ieu ieu hVI hVI -bjO -kqz -kqz -iPM -rPQ -dVe -cmg -bzH +qEl +tja +tja +qrn +hGg +tge +pFc +stU ioM -bow +esw ioM hVI -idE -xwy -cRN +byY +nfZ +qmj ioM bis -tvX -nrY -bJF -bJF -oIR -bEO -nrY -bJF -bJF -lmr -rJK +mCp +nTv +tyj +tyj +nvn +rJF +nTv +tyj +tyj +bXh +gTi bis bis -uRO -bEO -bEO -kEE +bPQ +rJF +rJF +akp cvn bQM bQM @@ -64526,10 +64526,10 @@ tRH tRH nqN ceC -nIh -nIh -nIh -fHh +dCn +dCn +dCn +wIk ceC nqN tRH @@ -64544,20 +64544,20 @@ eLu cME cME ggk -jAx -fnB -crO -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB +iTj +ubP +qMI +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP nqN aKA jlH @@ -64572,10 +64572,10 @@ jlH jlH bUB twb -miu +ifP gfo gfo -bNz +ivK twb twb kPz @@ -64634,10 +64634,10 @@ lAh lAh lAh lAh -xjK -xjK -tOr -ezJ +mvp +mvp +cer +kpq xLi xLi azZ @@ -64651,11 +64651,11 @@ aFZ aFZ aFZ aSS -iPM -idE -xDg -idE -iPM +qrn +byY +duW +byY +qrn aFZ bQM bQM @@ -64665,48 +64665,48 @@ bQM bQM bQM aFZ -gkZ -kcn -kqz +mdz +xhL +tja tEH gOJ rQK uVD aif -wlR -mFh -bPk -mhb -mhb -mhb -iti -mhb -mct -aja +eVN +ddB +rie +jQs +jQs +jQs +qhC +jQs +umz +xEH ioM -bfg +dTX mEO mEO mEO ioM nOz -tvX -rJK +mCp +gTi eTc clP -wjk -pat -dgF +wzH +fIL +dtS clP eTc -tvX -rJK +mCp +gTi nOz bis -uRO -bEO -trB -kEE +bPQ +rJF +kKd +akp cvn bQM bQM @@ -64721,14 +64721,14 @@ bQM bQM bQM dCM -qdB -tHs -tHs -tHs -tHs -tHs -tHs -tHs +fDb +ihB +ihB +ihB +ihB +ihB +ihB +ihB dCM bQM kPz @@ -64737,12 +64737,12 @@ bQM kPz bQM dCM -mdn -ftv -tPQ -fnB -xca -sRV +dUu +sNU +dHU +ubP +vIG +gag dCM bQM kPz @@ -64754,22 +64754,22 @@ pJK eLu kNY cME -aJg +itK uGY -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP uGY aWk aWk @@ -64784,10 +64784,10 @@ pRG aWk twb twb -laG -cEl -cEl -ajH +vQJ +kTs +kTs +wnM twb kPz kPz @@ -64845,11 +64845,11 @@ xLi xLi xLi xLi -qVq -sgb -xjK -tOr -ezJ +pSs +mBJ +mvp +cer +kpq lAh lAh lAh @@ -64863,11 +64863,11 @@ aFZ aFZ mIu ioM -iCo -iCo -iCo -iCo -iCo +xUn +xUn +xUn +xUn +xUn aFZ fQV fQV @@ -64877,33 +64877,33 @@ tQB tQB aFZ aFZ -gHF -tHX -tHX +wDw +ylW +ylW tEH gtH uVD ppX hVI -auH -ryN -pNV -sjw -jEb -jEb -pdw -jEb -pNV -cwO +ceq +dAg +iea +mzK +jbq +jbq +qDZ +jbq +iea +oTi ioM -hKW +ihp mEO mEO mEO sJu lqq -tvX -rJK +mCp +gTi jjW nOz dnz @@ -64911,14 +64911,14 @@ kNB bPl nOz jjW -tvX -rJK +mCp +gTi lqq wpD -uRO -uxp -bEO -kEE +bPQ +qGh +rJF +akp bFr bFr kPz @@ -64933,14 +64933,14 @@ kPz kPz kPz dCM -tTu -tHs -fhC -ftv -sRV -aqI -lRH -tHs +bBt +ihB +mWS +sNU +gag +pbX +igV +ihB dCM bQM kPz @@ -64949,12 +64949,12 @@ kPz kPz bQM dCM -sRV -ftv -fnB -iLy -aqI -sRV +gag +sNU +ubP +nyC +pbX +gag dCM bQM kPz @@ -64968,20 +64968,20 @@ cME cME uzw uGY -sRV -cvq +gag +cHl nqN nqN nqN -ksk -sRV -cvq +aME +gag +cHl nqN nqN nqN -ksk -sRV -cvq +aME +gag +cHl uGY vZX vZX @@ -64994,12 +64994,12 @@ oly vZX vZX jwc -lCw -uat -qwU +pEt +cxb +uRI gfo -fhc -ydY +hyc +qwG twb kPz bQM @@ -65049,24 +65049,24 @@ lAh xLi xLi xLi -npV -nvZ +jdn +jVt xLi xLi -nsx -hKJ +sNg +xak xLi xLi xLi xLi -xjK -tOr -ezJ +mvp +cer +kpq xLi -hBI -iMS +cyk +mAS xLi -jpS +sWb azZ tel tel @@ -65075,23 +65075,23 @@ hVI xLS mEO ioM -iPM -fPZ -kqz -fPZ -iPM +qrn +bLM +tja +bLM +qrn tQB pcu pcu pcu tQB -qLz -oPW -roN -iPM -kqz -kqz -kqz +prC +rbp +hyq +qrn +tja +tja +tja hVI tEH tEH @@ -65099,38 +65099,38 @@ hVI hVI tEH hVI -mJy -cwO -wJJ -mhb -mhb -aja -ogr -tkk +dOO +oTi +ikt +jQs +jQs +xEH +wFp +pzE ioM -kwa +pNG mEO mEO -idE +byY ioM nOz -tvX -rJK +mCp +gTi eTc clP -lOE -mTX -axi +xzN +bDM +pgQ clP eTc -tvX -rJK +mCp +gTi nOz bFr -uRO +bPQ iKs iKs -kEE +akp bFr bFr bQM @@ -65145,14 +65145,14 @@ bQM bQM bQM dCM -tTu -tHs -sRV -ftv -sRV -aqI -sRV -tHs +bBt +ihB +gag +sNU +gag +pbX +gag +ihB dCM bQM kPz @@ -65161,12 +65161,12 @@ bQM kPz bQM dCM -sRV -ftv -kzN -tPQ -aqI -hVz +gag +sNU +bSs +dHU +pbX +cDE dCM bQM kPz @@ -65180,20 +65180,20 @@ cME cME cME gIB -sTa -sTa +lld +lld dCM bQM dCM -sTa -sTa -sTa +lld +lld +lld dCM bQM dCM -sTa -sTa -sTa +lld +lld +lld ovr vZX vZX @@ -65206,11 +65206,11 @@ vZX vZX vZX jwc -hxg -cEl +qsF +kTs gfo gfo -bNz +ivK twb twb kPz @@ -65260,111 +65260,111 @@ azZ azZ xLi xLi -sNd -xjK -xjK -xjK -mZG -xjK -xjK -idV -bAS +fKP +mvp +mvp +mvp +oih +mvp +mvp +hrA +wou xLi xLi -aOd -tOr -ezJ -xIb -jMe -tGO +cGa +cer +kpq +fMc +qkt +nEW ddL ejw ejw ejw rBr -evg +cXp hVI xLS mEO sJu -hDy -fPZ -kqz -fPZ -hDy +jMh +bLM +tja +bLM +jMh tQB jlH jlH jlH tQB -iPM -iPM -cHJ -iPM -kqz -imw -kqz -mFh -mhb -mhb -mhb -sRb -mhb -xvt -avX -cwO -mJy -uIl -fbW -xCs -rib -kqz +qrn +qrn +jxm +qrn +tja +bOR +tja +ddB +jQs +jQs +jQs +iWe +jQs +lBR +afq +oTi +dOO +wXN +bJG +eOp +qqW +tja sJu mEO mEO mEO -lyd +vXl ioM bis -cGm -tcO -mTX -mTX -mxn -bEO -tcO -mTX -mTX -mxn -pIo +gKG +iYa +bDM +bDM +dZK +rJF +iYa +bDM +bDM +dZK +lpd bFr bFr -fRG -bEO -bEO -kEE +kCj +rJF +rJF +akp bFr bFr bFr bFr bFr bFr -gdt -gdt -gdt +gBY +gBY +gBY bFr -gdt -gdt -gdt +gBY +gBY +gBY dCM -qdB -tHs -sRV -ftv -sRV -aqI -sRV -tHs +fDb +ihB +gag +sNU +gag +pbX +gag +ihB nqN nqN nqN @@ -65374,10 +65374,10 @@ nqN nqN nqN ceC -nIh -nIh -nIh -kov +dCn +dCn +dCn +llJ ceC nqN nqN @@ -65392,20 +65392,20 @@ cME cME cME gIB -tHs -tHs +ihB +ihB dCM bQM dCM -tHs -tHs -tHs +ihB +ihB +ihB dCM bQM dCM -tHs -tHs -iTw +ihB +ihB +oXb nqN aWk aWk @@ -65418,11 +65418,11 @@ qkN vZX vZX aWk -cEB -jrk -rkb -czj -xxd +nrn +pxL +ddv +vLe +rVp twb kPz kPz @@ -65471,66 +65471,66 @@ azZ azZ azZ xLi -jXO -xjK -xMg -sqg -sqg -sqg -sqg -sqg -sqg -sqg +wQY +mvp +lkr +hae +hae +hae +hae +hae +hae +hae xZR -sqg -sqg -ukI -ezJ -xJg -dNF -cwU +hae +hae +iRI +kpq +oxp +rHX +tvi ddL -xjK -dNF -xjK -jpS +mvp +rHX +mvp +sWb phz hVI qeX mEO hVI -dVK -xpB -kqz -fPZ -idE +rsH +rZI +tja +bLM +byY aFZ tQB tQB tQB aFZ -iPM -fOo -bgb -lXk -kqz -kqz -kqz -mJy -kqz -kqz -kqz -kqz -kqz -kqz -kqz -cwO -mJy -rXz -goh -cwO -tAI -fwR +qrn +kYz +bAE +vci +tja +tja +tja +dOO +tja +tja +tja +tja +tja +tja +tja +oTi +dOO +tsr +pSr +oTi +hiP +tcD aFZ hVI hVI @@ -65538,23 +65538,23 @@ bmE hVI aFZ bFr -wjk -bJF -bJF -bJF -lmr -bEO -nrY -bJF -bJF -bJF -dgF +wzH +tyj +tyj +tyj +bXh +rJF +nTv +tyj +tyj +tyj +dtS bFr bis -lEa -cWG -cWG -eVL +fTn +hXX +hXX +byc bFr bFr bFr @@ -65570,30 +65570,30 @@ iKs iKs uGY uGY -tHs -sRV -ftv -sRV -aqI -sRV -tHs +ihB +gag +sNU +gag +pbX +gag +ihB hVG -fnB -fnB -fnB -fnB -fnB -dme -fnB -dAQ -qms -jLK -the -qms -aDr -fnB -fnB -fnB +ubP +ubP +ubP +ubP +ubP +nEI +ubP +fYo +fou +alY +cqT +fou +aNk +ubP +ubP +ubP uGY gKl cME @@ -65604,20 +65604,20 @@ nNJ kNY rmh ceC -fnB -fnB +ubP +ubP nqN bQM nqN -fnB -fnB -fnB +ubP +ubP +ubP nqN bQM nqN -dnE -fnB -fnB +tEY +ubP +ubP dCM bQM bQM @@ -65683,129 +65683,129 @@ azZ azZ azZ xLi -jYB -xjK -tOr -hmk -kbO -fhZ -kbO -kbO -kbO -kbO +geT +mvp +cer +pvF +eqU +hmE +eqU +eqU +eqU +eqU xZR -kbO -kbO -dFk -ezJ +eqU +eqU +uAg +kpq xLi -kLX -oHn +cZe +bKF ddL -xjK -dNF -xjK +mvp +rHX +mvp wfY -jpS +sWb hVI hVI mEO hVI -iPM -jUz -kqz -fPZ -iPM +qrn +oJN +tja +bLM +qrn hVI -mOC -eCh -oxT +wow +boF +xaO hVI hVI hVI -cLc -mMo -iPM -kqz -iPM -ryN -opy -eSZ -jEb -jEb -pdw -jEb -pNV +lOm +rjP +qrn +tja +qrn +dAg +tlJ +qnb +jbq +jbq +qDZ +jbq +iea mEO -mJy -gMw +dOO +sls lfo -cwO -mJy -cwO +oTi +dOO +oTi hVI -nmx -kkk -mJy -cwO -uQF +nmL +ixn +dOO +oTi +ubA bFr bFr uIS uIS bis -tvX -bEO -rJK +mCp +rJF +gTi bis uIS uIS bis bFr -qZx -tvX -muO -muO -rJK -bEO -mTX -mTX -bEO -muO -muO -rJK -lOE -mTX -mTX -mTX -mTX -axi -tvX +fQA +mCp +dBy +dBy +gTi +rJF +bDM +bDM +rJF +dBy +dBy +gTi +xzN +bDM +bDM +bDM +bDM +pgQ +mCp ggk -tHs -sRV -ftv -sRV -aqI -lYw -tHs +ihB +gag +sNU +gag +pbX +hnM +ihB hVG -fnB -fnB -eUD -fnB -fnB -fnB -wLf +ubP +ubP +rAY +ubP +ubP +ubP +ngn sYP -tHs -nIy -fgB -xxE -tHs -tHs -fnB -fnB +ihB +ktC +kHZ +lRk +ihB +ihB +ubP +ubP uGY cFq xno @@ -65816,20 +65816,20 @@ twb twb twb nqN -fnB -fnB +ubP +ubP nqN bQM nqN -fnB -fnB -fnB +ubP +ubP +ubP nqN bQM nqN -fnB -fnB -fnB +ubP +ubP +ubP dCM bQM bQM @@ -65896,20 +65896,20 @@ azZ azZ xLi xLi -xjK -tOr -ezJ -xjK -xjK -xjK -xjK -xjK -bAS +mvp +cer +kpq +mvp +mvp +mvp +mvp +mvp +wou xLi xLi -aOd -tOr -ezJ +cGa +cer +kpq xLi ddL ddL @@ -65923,101 +65923,101 @@ hVI hVI mEO hVI -gzd -rHj -kqz -fPZ -orx +tAj +dOt +tja +bLM +ckt hVI -gom -fPZ -fPZ -fPZ -fPZ +tMV +bLM +bLM +bLM +bLM hVI hVI hVI -iPM -mky -iPM +qrn +jiA +qrn hVI -vXB -mMf -bNA -hRV -mYu +aqo +sdR +jci +nsm +cGU mEO -mJy -vkC -mJy -aBX -fxz -cwO -mJy -cwO +dOO +dVD +dOO +hhD +kpv +oTi +dOO +oTi hVI -jDL -fPZ -fPZ -fPZ -uXW -xfG +xOs +bLM +bLM +bLM +kYd +bpx hVI -dZt -qZx +pdN +fQA bis wMi wMi wMi bis -gET -snp +tJQ +mnR bis bFr -qZx -tvX +fQA +mCp iKs iKs -xZo -bEO +kvT +rJF iKs iKs -bEO -mEL -muO -muO -muO +rJF +clb +dBy +dBy +dBy iKs iKs iKs dFh -muO -muO +dBy +dBy ggk -tHs -sRV -ftv -sRV -aqI -sRV -tHs +ihB +gag +sNU +gag +pbX +gag +ihB hVG -jJT -fnB -fnB -fnB -vfJ -fnB -wLf +bLE +ubP +ubP +ubP +nDq +ubP +ngn wWs wWs -sRV -dFO +gag +aej wWs wWs -tHs -vDc -xDQ +ihB +qrI +ejs ggk cME cME @@ -66028,20 +66028,20 @@ tPN bQM bQM dCM -tHs -tHs +ihB +ihB dCM bQM dCM -tHs -tHs -tHs +ihB +ihB +ihB dCM bQM dCM -tHs -tHs -tHs +ihB +ihB +ihB dCM bQM bQM @@ -66108,10 +66108,10 @@ azZ azZ xLi xLi -xjK -cjS -ezJ -xjK +mvp +phC +kpq +mvp xLi xLi ddL @@ -66119,15 +66119,15 @@ ddL ddL xLi xLi -xjK -tOr -ezJ -xQb -kyl -xjK -xjK -xjK -xjK +mvp +cer +kpq +vtr +epD +mvp +mvp +mvp +mvp phz phz phz @@ -66135,101 +66135,101 @@ mEO mEO mEO hVI -idE -fPZ -kqz -fPZ -idE +byY +bLM +tja +bLM +byY hVI -qqM -kqz -kqz -kqz -kqz -kqz +jhl +tja +tja +tja +tja +tja aif -kqz -kqz -kqz -cso +tja +tja +tja +yhs hVI -gSN -icK +kYi +aFQ xxX iAA aRt nUb -wOT -cwO -mJy -uIl -qoZ -kHu -mJy -kqz +lzd +oTi +dOO +wXN +oFO +sHM +dOO +tja aif -fPZ -opV -mJy -cwO -tur -pSm +bLM +oga +dOO +oTi +brC +pjE hVI -bEO -bEO -bEO -tvX -muO -rJK -bEO -bEO -kCv -bEO -bEO -bEO -tvX -muO -muO -rJK -bEO -gHP -bJF -bEO -muO -muO -rJK -wjk -bJF -bJF -bJF -bJF -dgF -tvX +rJF +rJF +rJF +mCp +dBy +gTi +rJF +rJF +bQv +rJF +rJF +rJF +mCp +dBy +dBy +gTi +rJF +vCQ +tyj +rJF +dBy +dBy +gTi +wzH +tyj +tyj +tyj +tyj +dtS +mCp ggk -tHs -sRV -ftv -sRV -aqI -fhC -iTw +ihB +gag +sNU +gag +pbX +mWS +oXb ceC xGt xGt ceC -fnB -wFD -fnB -tHs +ubP +iwy +ubP +ihB wWs wWs -sRV -sRV +gag +gag wWs wWs -tHs -egm -xDQ +ihB +ncY +ejs ggk cME cME @@ -66240,20 +66240,20 @@ tPN bQM bQM dCM -oEY -uEm +ldZ +sbF dCM bQM dCM -uEm -uEm -uEm +sbF +sbF +sbF dCM bQM dCM -uEm -uEm -uEm +sbF +sbF +sbF dCM bQM bQM @@ -66319,44 +66319,44 @@ azZ azZ azZ xLi -idV -xjK -tOr -ezJ -bAS +hrA +mvp +cer +kpq +wou xLi -pso -nDW -oAQ -nTD -qVD -shq -jES -tOr -ezJ -xjK -xjK -xjK -jES -xjK -xjK -xjK -xjK +hqG +lQL +qsE +qMi +uky +nmy +luZ +cer +kpq +mvp +mvp +mvp +luZ +mvp +mvp +mvp +mvp phz ecu mEO hVI hVI -hDy -fPZ -kqz -fPZ -hDy +jMh +bLM +tja +bLM +jMh vWe hVI -kqz -fPZ -aac +tja +bLM +sBO hVI hVI hVI @@ -66374,11 +66374,11 @@ azv nUb mEO uza -dnB -jEb -tur -mJy -tkk +ipA +jbq +brC +dOO +pzE hVI hVI hVI @@ -66387,61 +66387,61 @@ tEH tEH hVI hVI -muO -muO -bEO -tvX +dBy +dBy +rJF +mCp iKs -rJK -bEO -lOE -mTX -mTX -mTX -mTX -mxn +gTi +rJF +xzN +bDM +bDM +bDM +bDM +dZK iKs -nrY -dgF -qZx +nTv +dtS +fQA bFr bFr bFr -ocd -tKs -muO -mEL +oLV +nxq +dBy +clb bFr cvn cvn bFr -muO -muO +dBy +dBy uGY -kaC -tHs -tHs -tHs -tHs -tHs -tHs +any +ihB +ihB +ihB +ihB +ihB +ihB buz -gvX -aav +ycf +hek dCM -fnB -fnB -fnB -tHs +ubP +ubP +ubP +ihB wWs wWs -tPQ -fnB +dHU +ubP wWs wWs -tHs -fnB -fnB +ihB +ubP +ubP uGY obz lAV @@ -66452,20 +66452,20 @@ nqN nqN nqN nqN -sRV +gag fCD nqN nqN nqN -ksk -sRV -cvq +aME +gag +cHl nqN nqN nqN -ksk -sRV -cvq +aME +gag +cHl nqN nqN nqN @@ -66530,157 +66530,157 @@ azZ azZ azZ azZ -jpS -xjK -xjK -tOr -ezJ -xjK +sWb +mvp +mvp +cer +kpq +mvp ddL lXO nId ykO pCc -tDY -siz -xjK -tOr -mtk -sqg -sqg -sqg -sqg -sqg -sqg -xRh -xjK +pxW +ioV +mvp +cer +wun +hae +hae +hae +hae +hae +hae +ceJ +mvp phz mEO mEO hVI -vmr -fPZ -vXi -kqz -fPZ -fPZ -fPZ -rbE -kqz -fPZ -aRx -luv -hBX -fPZ -iRc -fPZ -dla -oja -dWx -fPZ -hjr -mhb +xsC +bLM +ioS +tja +bLM +bLM +bLM +jTD +tja +bLM +tGU +rGe +fCr +bLM +gbv +bLM +fYa +voK +koY +bLM +hOG +jQs mEO -mhb -wMG -kdb -ovC -jvG -mhb -mhb -mhb -avX -cwO -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ +jQs +oDV +sBM +bQn +nJT +jQs +jQs +jQs +afq +oTi +bLM +bLM +bLM +bLM +bLM +bLM +bLM sJu -rIo -muO -bEO -tvX +fie +dBy +rJF +mCp iKs -rJK -bEO -tvX +gTi +rJF +mCp iKs iKs -muO -muO +dBy +dBy iKs -nrY -dgF -qZx +nTv +dtS +fQA bFr bFr bQM bFr bis -jiJ -muO -hiG +gXd +dBy +owd cvn bQM bQM cvn -muO -kAt +dBy +aSM uGY uGY uGY uGY uGY nqN -aIf -fOt +ksL +eip gpG -tHs -qIy +ihB +ohx ceC -mAv -fnB -fnB -tHs +cxy +ubP +ubP +ihB wWs wWs -fMk -fnB +xNG +ubP wWs wWs -tHs -fnB -vGe +ihB +ubP +aTx nqN uGY uxv uxv uGY uGY -iSf -cHx -fnB -tdG -fnB -fnB -fnB -jCl -rIW -fnB -crO -fnB -fnB -fnB -fnB -fnB -fnB -crO -fnB -dAQ -fnB +vlS +psm +ubP +nXu +ubP +ubP +ubP +mVY +mqB +ubP +qMI +ubP +ubP +ubP +ubP +ubP +ubP +qMI +ubP +fYo +ubP nqN vZX vZX @@ -66743,104 +66743,104 @@ azZ azZ azZ xLi -jpS -jmM -tOr -ezJ -xjK +sWb +esR +cer +kpq +mvp ddL ntH nMZ oHX pFP -qZa -sjn -xjK -tOr -hmk -kbO -kbO -kbO -kbO -kbO -dFk -ezJ -xjK +iUr +tNf +mvp +cer +pvF +eqU +eqU +eqU +eqU +eqU +uAg +kpq +mvp phz mEO hVI hVI -nqV -kqz -kqz -kqz -kqz -kqz -kqz -kqz -kqz -fPZ -kiE -jOJ -fPZ -kqz -kqz -kqz -pIX -bNf -fPZ -fPZ +suY +tja +tja +tja +tja +tja +tja +tja +tja +bLM +gQz +ntM +bLM +tja +tja +tja +gFp +ikL +bLM +bLM mEO -sjw -jEb +mzK +jbq mEO -jEb -jEb -jEb -oii -jEb -jEb -jEb -pNV -cwO -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ -fPZ +jbq +jbq +jbq +bXc +jbq +jbq +jbq +iea +oTi +bLM +bLM +bLM +bLM +bLM +bLM +bLM sJu -rIo -ekH -bEO -tvX +fie +sWl +rJF +mCp iKs -rJK -bEO -wjk -bJF -bJF -bJF -bJF -bJF -dgF -qZx +gTi +rJF +wzH +tyj +tyj +tyj +tyj +tyj +dtS +fQA bFr bFr bQM bQM bFr rLJ -qXP -muO -tKs +oeY +dBy +nxq bFr cvn cvn bFr -muO -muO +dBy +dBy eLu eLu fdf @@ -66850,49 +66850,49 @@ twb oZy nfA gpG -rUT -tHs +lkP +ihB hVG -jWB -vfJ -bfx -tHs +fZz +nDq +uRZ +ihB wWs wWs -sRV -sRV +gag +gag wWs wWs -tHs -vfJ -wOS -sTa -sTa -sTa -sTa -gJG -oWW -fnB -fnB -fnB -fnB -fnB -fnB -fnB -ftv -aqI +ihB +nDq +rxg +lld +lld +lld +lld +wmx +bCe +ubP +ubP +ubP +ubP +ubP +ubP +ubP +sNU +pbX sYP -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP sYP -fnB -xDQ +ubP +ejs ggk vZX vZX @@ -66955,66 +66955,66 @@ azZ xLi xLi xLi -jpS -xjK -tOr -ezJ -ftq +sWb +mvp +cer +kpq +aUA ddL oIq nOw oXR pHh -qZh -sma -xjK -tOr -ezJ -xjK -xjK -xjK -xjK -xjK -tOr -ezJ -xjK +oEu +cKB +mvp +cer +kpq +mvp +mvp +mvp +mvp +mvp +cer +kpq +mvp hVI hVI hVI -sjx -fPZ -kqz -wLN +gbT +bLM +tja +ctC vWe -sbQ -kqz -fPZ -trH -kqz -fPZ -vsz +gbh +tja +bLM +kZV +tja +bLM +gAC hVI -tOZ -kqz -kqz -kqz -pIX -bNf -dKy +lpw +tja +tja +tja +gFp +ikL +xMp jyP -mJy -lyX +dOO +sDn hVI -vtG -vtG -vtG -qeU +mtP +mtP +mtP +cqP hVI tEH tEH hVI -oxZ -rSM +njY +xCp hVI tEH tEH @@ -67023,20 +67023,20 @@ hVI hVI hVI hVI -bEO -ncP -bEO -wjk -bJF -dgF -bEO -nHb -bEO -bEO -bEO -hmj -muO -muO +rJF +lGL +rJF +wzH +tyj +dtS +rJF +sCe +rJF +rJF +rJF +fmb +dBy +dBy bis bFr bQM @@ -67044,15 +67044,15 @@ bQM bQM bFr bis -jiJ -bMA -lOE -mTX -azI -mTX -mTX -axi -tvX +gXd +qIT +xzN +bDM +hwr +bDM +bDM +pgQ +mCp rHu bnL cME @@ -67062,49 +67062,49 @@ liA nyS scZ ceC -itt -aPF +bQW +fiG ceC -fnB -wFD -fnB -tHs +ubP +iwy +ubP +ihB wWs wWs -sRV -sRV +gag +gag wWs wWs -tHs -wFD -ezT -uEm -uEm -uEm -aQZ -uEm -ajr -fnB -fnB -fnB -fnB -fnB -qhB -rmA -ftv -aqI -fnB -fnB -sRV -sTa -sTa -sTa -sTa -sRV -fnB -fnB -fnB -xDQ +ihB +iwy +xjM +sbF +sbF +sbF +wIx +sbF +qhN +ubP +ubP +ubP +ubP +ubP +daY +hEZ +sNU +pbX +ubP +ubP +gag +lld +lld +lld +lld +gag +ubP +ubP +ubP +ejs ggk vZX vZX @@ -67169,71 +67169,71 @@ xLi phz phz phz -tOr -ezJ -bAS +cer +kpq +wou xLi -nvC -nPO -paQ -pIi -gKL -kWJ -xjK -tOr -vpB -xWp -xfq -sqg -xRh -hYV -tOr -ezJ -bAS +lIl +cEG +mvV +fno +byF +swJ +mvp +cer +ojc +ujo +kii +hae +ceJ +tdr +cer +kpq +wou hVI hVI hVI -gfN -rDm -kqz -cxF -sVD -qfI -kqz -gGp -jOJ -kqz -fPZ -brr -kcO -cqy -fPZ -kqz -fPZ -dla -fzb -mXI -fPZ -mJy -oBP +eUZ +wEE +tja +dTg +vRF +ewI +tja +sYy +ntM +tja +bLM +mRA +lIk +vJo +bLM +tja +bLM +fYa +cbF +eOy +bLM +dOO +uRF aif -fPZ -fPZ -fPZ -kuS +bLM +bLM +bLM +loP hVI -kSP -fPZ +rMq +bLM hVI -mJy -kqz +dOO +tja aif ovJ -fPZ +bLM sJu -hSL -euG -sct +nCt +yeA +olg aFZ cvn bFr @@ -67255,16 +67255,16 @@ twb twb twb twb -eTx -oti -muO -muO +tIn +dwP +dBy +dBy iKs iKs iKs iKs -muO -muO +dBy +dBy rHu xPG cME @@ -67277,46 +67277,46 @@ ceC xGt xGt ceC -fnB -fnB -fnB -tHs -tHs -tHs -tHs -tHs -tHs -tHs -tHs -fnB -nza +ubP +ubP +ubP +ihB +ihB +ihB +ihB +ihB +ihB +ihB +ihB +ubP +xGD nqN dCM dCM dCM nqN -flC -fnB -eVZ -fnB -hoy -fnB +lkQ +ubP +ktv +ubP +hPN +ubP pTj -fnB -ftv -aqI -rmA -fnB -azJ -pPf -grL -grL -apy -azJ -fnB -fnB -fnB -fnB +ubP +sNU +pbX +hEZ +ubP +jtK +gmF +txh +txh +afO +jtK +ubP +ubP +ubP +ubP plK plK wHw @@ -67375,88 +67375,88 @@ azZ azZ azZ xLi -ruy -ruy +dqX +dqX phz phz -csp +fEn kEZ -tOr -ezJ -xjK +cer +kpq +mvp xLi ddL ddL ddL xLi xLi -dMK -xjK -tOr -vqg -xjK -neD +nrU +mvp +cer +cvH +mvp +qrt xLi -fWc -xjK -tOr -ezJ -xjK +ydQ +mvp +cer +kpq +mvp hVI hVI hVI dvq -fPZ -kqz -hBX -rLT -sQK -mFz -kiE -pKd -kqz -fPZ -bET -luv -xnK -wsY -kqz -fPZ -dla -sbY -gRm -fwZ -dwM -cDr +bLM +tja +fCr +hDl +ugq +xLf +gQz +mOf +tja +bLM +scp +rGe +jSU +ajP +tja +bLM +fYa +kCN +oXI +hko +eUN +pae hVI -mRU -shG -fPZ -djA +wKR +nxY +bLM +iSW hVI -ivR +psL ovJ -dvY -kqz -cwO +hWi +tja +oTi hVI -fgb -onz +jBn +rHf hVI -lbu +fIq mEO -gbS +oou aFZ -brI -gAk +wIG +ugv qOk -cZc +tIp lml -hGP -olQ +hVS +lDC qOk -kvm -oTG +nYT +vPM bQM tPN ecL @@ -67467,72 +67467,72 @@ tpf tIU cME eLu -nbo -muO -rJK -wjk -bJF -bJF -bJF -bJF -dgF -tvX +cbd +dBy +gTi +wzH +tyj +tyj +tyj +tyj +dtS +mCp rHu rJu uzw kqC -cCq -dHp -dHp -uFh +rzp +vds +vds +elO abJ -usz -usz +ioc +ioc abJ -fnB -fnB -fnB -eoZ -cHx -fnB -fnB -fnB -fnB -fnB -fnB -fnB -dme +ubP +ubP +ubP +kJU +psm +ubP +ubP +ubP +ubP +ubP +ubP +ubP +nEI dCM bQM kPz bQM dCM -fnB -fnB -fnB -vGe +ubP +ubP +ubP +aTx uGY uGY uGY uGY gIB uGY -flC -fnB -sRV -uEm -uEm -uEm -uEm -sRV -fnB -fnB +lkQ +ubP +gag +sbF +sbF +sbF +sbF +gag +ubP +ubP wxZ qeC bLA -xBT -oyg -xBT +xQx +aEB +xQx plK vZX vZX @@ -67587,59 +67587,59 @@ azZ azZ xLi xLi -jpS +sWb phz ctD phz phz -xjK -tOr -ezJ -xjK -xjK -xjK -xjK -xjK +mvp +cer +kpq +mvp +mvp +mvp +mvp +mvp xLi rfd -xjK -xjK -tOr -vpB -xWp -jPz -kbO -dsT -xjK -tOr -ezJ -xjK -gkt -aDi -nvF -gkt -fPZ -kqz -mYo +mvp +mvp +cer +ojc +ujo +aMu +eqU +iOY +mvp +cer +kpq +mvp +uno +ciA +lsn +uno +bLM +tja +qGO hVI -jDL -xuH -knt -jOJ -ffm -fPZ -jlg -rLT -qfI -fPZ -kqz -cxF -xWH -wmG -iVC -fPZ -mJy -cwO +xOs +nCV +aeF +ntM +uIB +bLM +eLw +hDl +ewI +bLM +tja +dTg +qCE +eYr +lbZ +bLM +dOO +oTi nQq hVI hVI @@ -67648,34 +67648,34 @@ hVI hVI hVI hVI -gUH -mJy -tkk +mrI +dOO +pzE vWe hVI hVI hVI lyJ -ndh +nBt kwT tQB -azy +tqP afk afk afk -chA -uWs +xdt +tzN afk afk afk -wvu +rxL fQV tPN ecL cME cME oOi -pSJ +pJc qws cME eLu @@ -67683,9 +67683,9 @@ eLu eLu eLu twb -mNn -mNn -mNn +eBO +eBO +eBO twb eLu eLu @@ -67693,58 +67693,58 @@ eLu kfW cME kqC -pHu -uGD -sHH -vei +dHD +lkb +upY +fHo vRA -usz -usz +ioc +ioc vRA -fnB -kNP -fnB -fnB -diS -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB +ubP +nXX +ubP +ubP +ejL +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP dCM bQM kPz bQM dCM -qms -fnB -qms -cph +fou +ubP +fou +ePM gIB -ndC -hbq -ejn -oTH +lrV +onh +sQy +adq hjE -fnB -fnB -fnB -sRV -sRV -sRV -sRV -fnB -fnB -fnB +ubP +ubP +ubP +gag +gag +gag +gag +ubP +ubP +ubP kjP -qeh -nRb -sOn -sOn -xBR +otC +dkn +uKX +uKX +rZe plK vZX waU @@ -67799,74 +67799,74 @@ azZ lAh xLi xLi -ruy +dqX phz phz phz xLi azZ -tOr -mtk -sqg -sqg -sqg -sqg -sqg -sqg +cer +wun +hae +hae +hae +hae +hae +hae xZR -sqg -sqg -uqo -ezJ -xjK -xjK -xjK -xjK -xjK -tOr -ezJ -xjK +hae +hae +lcJ +kpq +mvp +mvp +mvp +mvp +mvp +cer +kpq +mvp cyV -fPZ -fPZ +bLM +bLM cyV -fPZ -kqz -fPZ -sbp -fPZ -uWS -uFM -jlg -kqz -fPZ -jaR -ueA -nxH -kqz -kqz -cxF -goA -wmG -iVC -fPZ -mJy -cwO +bLM +tja +bLM +wbr +bLM +kid +ezU +eLw +tja +bLM +boI +vTR +oAf +tja +tja +dTg +slh +eYr +lbZ +bLM +dOO +oTi hVI -rCL -fPZ -fPZ -fPZ +dEj +bLM +bLM +bLM hVI -adH -qSg +khY +oAj hVI -mJy -cwO -tbZ -adH +dOO +oTi +ueI +khY hVI -fUZ +rlP mEO lLE xoi @@ -67883,7 +67883,7 @@ afk tCZ pcu tPN -slM +jSE cME cME tIU @@ -67894,69 +67894,69 @@ liA cME qIq eLu -lcH -cCq -dHp -uFh -lcH +uvF +rzp +vds +elO +uvF wQT eLu cME cME cME oFI -pHu -lMB -sHH -veB +dHD +qRa +upY +voO kqC -kis -uiR +pGS +kgN kqC -rRO -hvG -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -fnB -vGe +sOj +uye +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +ubP +aTx nqN dCM dCM dCM nqN -flC -qms -fnB -nDT +lkQ +fou +ubP +kWv gIB -aVD -dzo -sRV -tHs +mdH +rVV +gag +ihB hsC -fnB -fnB -fnB -sRV -sRV -sRV -sRV -fnB -fnB -fnB +ubP +ubP +ubP +gag +gag +gag +gag +ubP +ubP +ubP lAY -nRb -nRb -sOn -sOn -sOn +dkn +dkn +uKX +uKX +uKX plK vZX vZX @@ -68011,88 +68011,88 @@ azZ lAh xLi xLi -ruy +dqX phz phz -ruy +dqX azZ azZ -tOr -lro -kbO -kbO -kbO -kbO -kbO -kbO +cer +bLO +eqU +eqU +eqU +eqU +eqU +eqU xZR -kbO -kbO -uvy -ezJ -xjK -xjK -xjK -xjK -xjK -tOr -ezJ -xjK +eqU +eqU +xAY +kpq +mvp +mvp +mvp +mvp +mvp +cer +kpq +mvp cyV -fPZ -fPZ +bLM +bLM cyV -fPZ -kqz -cxF -sbQ -sbg -fSI -mIk -fPZ -ygH -kqz -kqz -kqz -kqz -fPZ -fPZ -cxF -goA -wmG -iVC -leq -mJy -cwO +bLM +tja +dTg +gbh +leZ +mAs +teK +bLM +aHK +tja +tja +tja +tja +bLM +bLM +dTg +slh +eYr +lbZ +oeN +dOO +oTi hVI -djA -vDj -fPZ -fPZ +iSW +ptH +bLM +bLM hVI -ivR +psL ovJ -dvY -kqz -cwO -fPZ -fPZ +hWi +tja +oTi +bLM +bLM sJu -rjE -dQp -idE +bxQ +mNB +byY fUX tQB -iKT +mpB afk afk afk -cjA -cpW +eze +bHU afk afk afk -rac +hxG jlH twb twb @@ -68107,68 +68107,68 @@ cME cME cME liA -cFy -mcc -vei +oXg +xbM +fHo xno dTf -lcH +uvF cME ljd cME oFI -pHu -sHH -sHH -hPs +dHD +upY +upY +ger abJ -usz -usz +ioc +ioc abJ -sFf -fnB -fnB -fnB -poD -ubH -ubH -ubH -ubH -ubH -rYC -fnB -wOS -sTa -sTa -sTa -sTa -sTa -oWW -eej -fnB -xnR +aUg +ubP +ubP +ubP +szD +cns +cns +cns +cns +cns +wzd +ubP +rxg +lld +lld +lld +lld +lld +bCe +nWv +ubP +iIE gIB -fnB -juS -fnB -fYB +ubP +gKg +ubP +iPz vUv -fnB -fnB -sRV -sTa -sTa -sTa -sTa -sRV -fnB -fnB +ubP +ubP +gag +lld +lld +lld +lld +gag +ubP +ubP cri hfc -mie -scU -sFn -vdZ +tGY +qBj +cZy +aGF plK wHw plK @@ -68222,89 +68222,89 @@ lAh lAh lAh xLi -jpS +sWb phz phz phz azZ xLi azZ -tOr -ezJ -jES -xjK -xjK -xjK -xjK +cer +kpq +luZ +mvp +mvp +mvp +mvp xLi rfd -xjK -xjK -tOr -vpB -xWp -xfq -sqg -xRh -xjK -tOr -ezJ -xjK +mvp +mvp +cer +ojc +ujo +kii +hae +ceJ +mvp +cer +kpq +mvp cyV -fPZ -fPZ +bLM +bLM cyV -fPZ -kqz -fPZ -wAT -trH -kqz -fPZ -fPZ -tnr -fPZ -fPZ -kqz -kqz -qDH -qDH -syf -syf -aNP -ebc -ven -gnV -uGq +bLM +tja +bLM +oTa +kZV +tja +bLM +bLM +img +bLM +bLM +tja +tja +ueX +ueX +qjM +qjM +tis +eca +xlk +nfu +kpH hVI tEH tEH -ajp -aoa +hzv +nDr hVI tEH tEH hVI -ldT -lAf -fPZ -xns +rqq +hMA +bLM +fgY vWe hVI hVI -anG +erD wyl aFZ -aQB -wJX +xKA +xQC llQ -djU -tqa -keo -mxG +viX +bsk +lSS +lcq llQ -lOB -tqa +jaB +bsk bQM bQM kPz @@ -68319,9 +68319,9 @@ cME cME cME kaO -maE -mcc -dds +qPa +xbM +weM daS cME cME @@ -68329,60 +68329,60 @@ cME cME eLu kqC -pHu -sHH -fxP -iUy +dHD +upY +eNa +efW vRA -usz -usz +ioc +ioc vRA -fnB -fnB -fnB -fnB -hss -tHs -tHs -tHs -tHs -tHs -dIi -fnB -ezT -uEm -uEm -uEm -uEm -uEm -ajr -fnB -fnB -aaW +ubP +ubP +ubP +ubP +qqd +ihB +ihB +ihB +ihB +ihB +unu +ubP +xjM +sbF +sbF +sbF +sbF +sbF +qhN +ubP +ubP +mNc gIB -sRV -vGe +gag +aTx uGY gIB uGY -nEy -fnB -azJ -pPf -grL -grL -apy -azJ -fnB -fnB -fnB +lHE +ubP +jtK +gmF +txh +txh +afO +jtK +ubP +ubP +ubP plK -uZn -nRb -sOn -oli +kyd +dkn +uKX +fuJ plK -uYR +hwS gRT vHU eki @@ -68434,90 +68434,90 @@ azZ azZ lAh xLi -ruy +dqX phz irD phz azZ azZ azZ -tOr -ezJ -xjK +cer +kpq +mvp xLi ddL ddL ddL xLi xLi -dMK -jES -tOr -vqg -uef -neD +nrU +luZ +cer +cvH +rFF +qrt xLi -fWc -xjK -tOr -ezJ -xjK -tef -tpO -nql -gkt -yjs -kqz -cJw -vdG -gzQ -kqz -luv -bcF -fPZ -fPZ -fPZ -kqz -vro -qDH +ydQ +mvp +cer +kpq +mvp +tji +azK +nWx +uno +atw +tja +koH +qTx +gRf +tja +rGe +dCv +bLM +bLM +bLM +tja +ltd +ueX aSS -qmC -uCa -uCa -jgl -mhb -avX -oBP -cnW -mhb -mhb -mhb -kqz -mhb -mhb -mhb -mhb -avX -cwO -fPZ -cqH +gNx +tHF +tHF +gbO +jQs +afq +uRF +qqc +jQs +jQs +jQs +tja +jQs +jQs +jQs +jQs +afq +oTi +bLM +svW hVI hVI hVI -bZC +hSo hVI aFZ -xQC -xQC -eDn -eDn -eDn -eDn -eDn -eDn -xQC -xQC -eDn +sKY +sKY +iYw +iYw +iYw +iYw +iYw +iYw +sKY +sKY +iYw kPz kPz twb @@ -68531,9 +68531,9 @@ cME rJh eLu eLu -pHu -mcc -vei +dHD +xbM +fHo vbG vZD cME @@ -68541,60 +68541,60 @@ cME cME eLu kqC -pHu -sHH -bfb +dHD +upY +skj uGY ceC xGt xGt ceC -fnB -fnB -eoZ -fnB -wTy -tHs -sRV -sRV -sRV -tHs -aQU -vlm -fbs +ubP +ubP +kJU +ubP +ibz +ihB +gag +gag +gag +ihB +dVx +gaQ +spm ceC ceC xNm ceC ceC -evv -fnB -fnB +eyy +ubP +ubP bZY uGY uxv uGY uGY -tHs -tHs -fnB -fnB -sRV -uEm -uEm -uEm -uEm -sRV -fnB -fnB -wzS +ihB +ihB +ubP +ubP +gag +sbF +sbF +sbF +sbF +gag +ubP +ubP +ozC plK -rtM -nRb -sOn -iif -nRb -xBT +kmn +dkn +uKX +nuo +dkn +xQx pSU dKo rJO @@ -68646,167 +68646,167 @@ azZ azZ lAh xLi -ruy +dqX phz phz phz phz -mYx +bMT azZ -tOr -ezJ -bAS +cer +kpq +wou xLi -pso -nTD -pdm -pPQ -qVD -cOy -xjK -tOr -vpB -xWp -jPz -kbO -dsT -xjK -tOr -ezJ -xjK +hqG +qMi +phQ +tiM +uky +bzU +mvp +cer +ojc +ujo +aMu +eqU +iOY +mvp +cer +kpq +mvp hVI rIS hVI dvq -fPZ -kqz -xeh -fPZ -tWe -kqz -qfI -fFU -cqy -fPZ -byr -kqz -kqz -dla -oja -peh -fPZ -bDD -mJy -sjw -jEb -jEb -oxk -jEb -jEb -jEb -hcf -jEb -jEb -kqz -pxI -jEb -tur -fPZ -goA +bLM +tja +tAR +bLM +cvi +tja +ewI +gCH +vJo +bLM +otz +tja +tja +fYa +voK +fQI +bLM +hkM +dOO +mzK +jbq +jbq +xTD +jbq +jbq +jbq +tpz +jbq +jbq +tja +eOM +jbq +brC +bLM +slh hVI -lDC -lDC -ldZ -lDC -mhv -mGe -dGw -vPM -haa -mGe -mGe -vPM -rKO -mGe -mGe -eDn -eDn +bLJ +bLJ +frv +bLJ +ofQ +hCh +suX +nQu +iUB +hCh +hCh +nQu +jcF +hCh +hCh +iYw +iYw cAW bQM bQM bQM twb -ivB +qkn uzw eLu mrk cME jkg -lcH -xlq -mcc -vei +uvF +rVL +xbM +fHo xno cME -lcH +uvF cME cME cME kqC -pHu -sHH -vei +dHD +upY +fHo uGY -tBD -vrM -fGp +jIw +cRl +sQC ceC -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP ceC -jVQ +kVN tpa tpa tpa -jVQ +kVN ceC ceC ceC ceC -eZD -wZn -meF +mXS +mQy +jQS ceC ceC -fkY -rmA +hYx +hEZ pTj -jCl -pDH -dme -fnB -ftv -aqI -fnB -fnB -fnB -sRV -sRV -sRV -sRV -fnB -fnB -fnB -fnB +mVY +uNm +nEI +ubP +sNU +pbX +ubP +ubP +ubP +gag +gag +gag +gag +ubP +ubP +ubP +ubP vFs -sOn -sOn -sOn -aFg -nRb -xBT +uKX +uKX +uKX +lkA +dkn +xQx gPs iMo rJO @@ -68863,88 +68863,88 @@ phz phz phz phz -ruy -xjK -tOr -ezJ -xjK +dqX +mvp +cer +kpq +mvp ddL lXO nId ykO pCc -mQn -siz -xjK -tOr -ezJ -xjK -xjK -xjK -xjK -xjK -tOr -ezJ -bAS +msd +ioV +mvp +cer +kpq +mvp +mvp +mvp +mvp +mvp +cer +kpq +wou hVI hVI hVI -exs -fPZ -kqz -xwi -fPZ -hqZ -kqz -fPZ -sbQ -luv -dBI -rLT -kqz -dqk -pIX -bNf -nBG -fKq -fPZ -mJy -cwO -mJM -fOs +fpq +bLM +tja +sve +bLM +iie +tja +bLM +gbh +rGe +bsR +hDl +tja +mMh +gFp +ikL +fwt +vBH +bLM +dOO +oTi +bNo +aEG hVI hVI hVI hVI -aoa +nDr hVI hVI -aoa +nDr hVI vWe -ruB -ruB -dID +nor +nor +tTI vWe -mFv -gXD -gTw -dGw -vPM -vPM -vPM -vPM -vPM -vPM -vPM -vPM -vPM -vPM -vPM -dGw -eDn -oVk -eDn +eqZ +iVT +fqg +suX +nQu +nQu +nQu +nQu +nQu +nQu +nQu +nQu +nQu +nQu +nQu +suX +iYw +yli +iYw bQM bQM twb @@ -68954,78 +68954,78 @@ eLu cME cME eLu -lcH -pHu -mcc -vei -lcH +uvF +dHD +xbM +fHo +uvF wQT eLu cYP qso -hTr +gsN kqC -pHu -sHH -vei +dHD +upY +fHo hVG -hVm +yiL cZV -oQY +wNG hVG -fnB -fnB -fnB -fnB +ubP +ubP +ubP +ubP ceC -xNf -sRV -sRV -sRV -unc +dZu +gag +gag +gag +lgG ceC -bOh -hUV -rRT -hUV -bFR -sMo -gVA +tCH +ohc +taL +ohc +pjf +mSp +mHY ceC -qnQ +wDz pTj -fnB +ubP pTj -gnj -crO -fnB -ftv -aqI -fnB -fnB -fnB -sRV -sRV -sRV -sRV -fnB -fnB -fnB -fnB +sJB +qMI +ubP +sNU +pbX +ubP +ubP +ubP +gag +gag +gag +gag +ubP +ubP +ubP +ubP vFs -sOn -sOn -sOn -fdS -nRb -xBT +uKX +uKX +uKX +oMf +dkn +xQx bWg tKv wxX rJO plK -keL -keL +xZI +xZI aPH nGy rJO @@ -69076,88 +69076,88 @@ phz phz irD phz -xjK -tOr -ezJ -xjK +mvp +cer +kpq +mvp ddL ntH nUr oHX pFP -rfR -sjn -xjK -tOr -mtk -sqg -sqg -sqg -sqg -sqg -ukI -ezJ -xjK +blA +tNf +mvp +cer +wun +hae +hae +hae +hae +hae +iRI +kpq +mvp hVI hVI hVI -xGY -fPZ -kqz -fPZ -fPZ -fPZ -kqz -fPZ -hBX -gwz -fPZ -vBV -aRB -kqz -dWN -bNf -uxi -fPZ -uvG -mJy -cwO -fPZ -jBK +euz +bLM +tja +bLM +bLM +bLM +tja +bLM +fCr +eCy +bLM +xsX +vdn +tja +rbZ +ikL +kke +bLM +wkg +dOO +oTi +bLM +eSO hVI -sol -fPZ -fPZ -fPZ -fPZ +aXR +bLM +bLM +bLM +bLM hVI -mFh -isJ -pQD -rME -fPZ -fPZ -wGa -dGw -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -vPM -vPM -tvI -tvI -tvI -tvI -vPM -vPM -dGw -eHa -eDn +ddB +wiR +xLn +hYX +bLM +bLM +eHt +suX +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +nQu +nQu +aeI +aeI +aeI +aeI +nQu +nQu +suX +egk +iYw bQM twb uts @@ -69167,9 +69167,9 @@ cME cME cME liA -pHu -mcc -ueF +dHD +xbM +fJV kqC kqC kqC @@ -69177,60 +69177,60 @@ kqC kqC kqC kqC -osO -mfV -odg +oSn +hwN +eJy uGY -toJ -twB -twB +lEF +tsN +tsN ceC -bsq -dzo -dzo -bsq +qbI +rVV +rVV +qbI ceC -vUE -fnB -fnB -fnB -sRV +ihO +ubP +ubP +ubP +gag hVG -yft -eSs -aHY -tXi -huI -lpf -seY +oZi +bcq +vgL +dHb +ezO +xpx +eIB ceC -sns -fnB -jmm -fnB -tPQ +fxi +ubP +pwC +ubP +dHU sYP -xqD -ftv -aqI -fnB -fnB -sRV -sTa -sTa -sTa -sTa -sRV -fnB -fnB -wzS +fGA +sNU +pbX +ubP +ubP +gag +lld +lld +lld +lld +gag +ubP +ubP +ozC plK upX -nRb -sOn -iif -nRb -xBT +dkn +uKX +nuo +dkn +xQx uMw rJO rJO @@ -69283,94 +69283,94 @@ azZ azZ xLi phz -ruy +dqX phz phz phz -jpS -xjK -tOr -ezJ -mrm +sWb +mvp +cer +kpq +ajw ddL oIq nOw oXR pHh -lxk -sma -xjK -tOr -hmk -kbO -kbO -kbO -kbO -kbO -kbO -dsT -xjK +apO +cKB +mvp +cer +pvF +eqU +eqU +eqU +eqU +eqU +eqU +iOY +mvp mEO mEO hVI hVI -hOg -kqz -kqz -kqz -kqz -kqz -kqz -wOT -kqz -bYq -kqz -kqz -kqz -qCw -bNf -ffU -fPZ -fPZ -mJy -cwO -hOg -xIg +gYM +tja +tja +tja +tja +tja +tja +lzd +tja +uJG +tja +tja +tja +caX +ikL +fjo +bLM +bLM +dOO +oTi +gYM +hgc hVI -mMb -dLx -fPZ -fPZ -fPZ -dvY -ryN -gBo -qpw -fPZ -fPZ -fPZ -jEC -dGw -tvI -fHy -tvI -tvI -tvI -tvI -tvI -vPM -vPM -vPM -tvI -tvI -tvI -tvI -tvI -tvI -vPM -deH -eDn -eDn +fMn +kOu +bLM +bLM +bLM +hWi +dAg +nRU +dhZ +bLM +bLM +bLM +stP +suX +aeI +ucN +aeI +aeI +aeI +aeI +aeI +nQu +nQu +nQu +aeI +aeI +aeI +aeI +aeI +aeI +nQu +shH +iYw +iYw twb eLu eLu @@ -69379,19 +69379,19 @@ srI dTf eLu twb -pHu -mcc -vei +dHD +xbM +fHo wzE -bux -bZu +sfu +jyF kqC -bux -bZu +sfu +jyF kqC -usz -usz -usz +ioc +ioc +ioc uGY xGt xGt @@ -69402,47 +69402,47 @@ ceC ceC ceC ceC -jpR -fnB -fnB -fnB -sRV +kOV +ubP +ubP +ubP +gag hVG -vOj -yft -dpI -fGe -suE -aBO -tCu +ljV +oZi +qHX +jbu +cKJ +tir +sCH ceC -wvf -cHx -fnB +kIA +psm +ubP pTj -fnB -dme -fnB -ftv -aqI -fnB -fnB -azJ -pPf -grL -grL -apy -azJ -fnB -fnB -vGe +ubP +nEI +ubP +sNU +pbX +ubP +ubP +jtK +gmF +txh +txh +afO +jtK +ubP +ubP +aTx plK -omi -nRb -sOn -aFg -nRb -xBT +qEk +dkn +uKX +lkA +dkn +xQx uMw rJO rJO @@ -69494,60 +69494,60 @@ azZ azZ xLi xLi -jpS +sWb phz -hWU +jFP phz -jpS +sWb xLi -xjK -tOr -ezJ +mvp +cer +kpq azZ xLi -nvC -nVA -paQ -pIi -gKL -shq -jES -tOr -ezJ -xjK -xjK -xjK -xjK -xjK -xjK -xjK -xjK +lIl +wol +mvV +fno +byF +nmy +luZ +cer +kpq +mvp +mvp +mvp +mvp +mvp +mvp +mvp +mvp mEO mEO mEO hVI -hOg -fPZ -goH -kqz -fPZ -fPZ -fPZ -lvh -fPZ -fPZ -gwz -lCm -fPu -dla -fzb -mYN -fPZ -mFh -xog -oBP -aja -lUp +gYM +bLM +rfe +tja +bLM +bLM +bLM +dCs +bLM +bLM +eCy +cTE +njm +fYa +cbF +nvs +bLM +ddB +rcI +uRF +xEH +cBX hVI mei oZz @@ -69558,74 +69558,74 @@ hVI hVI hVI hVI -fPZ -fPZ -hNi -lDC -ggQ -tvI -tvI -tvI -tvI -eMO -tvI -tvI -vPM -vPM -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -dGw -dhe +bLM +bLM +iUa +bLJ +xXl +aeI +aeI +aeI +aeI +ssc +aeI +aeI +nQu +nQu +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +suX +neY liA -gVR -dMa +yfK +tmo gfo cME wQT eLu kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -isP -fAs +wsX +bjt kqC -avl -ocB +qNF +ctW kqC -cCq -dHp -dHp -dHp -ugU -gNW -gNW -gNW -hKE +rzp +vds +vds +vds +car +gOU +gOU +gOU +vFV xGt -mni -tHs -mni -tHs -sRV -sRV -sRV -tHs +ucu +ihB +ucu +ihB +gag +gag +gag +ihB ceC -ryt -ryt +obh +obh nqN -hSR -tam -ilh +bxc +jbF +bBK ceC uGY uGY @@ -69639,22 +69639,22 @@ uGY uGY uGY uGY -sRV -uEm -uEm -uEm -uEm -sRV -fnB -fnB -fnB +gag +sbF +sbF +sbF +sbF +gag +ubP +ubP +ubP plK -aFg -nRb -sOn -fdS -nRb -xBT +lkA +dkn +uKX +oMf +dkn +xQx uMw rJO rJO @@ -69706,15 +69706,15 @@ azZ azZ xLi xLi -jpS +sWb phz phz phz phz xLi -xjK -tOr -ezJ +mvp +cer +kpq azZ xLi xLi @@ -69723,15 +69723,15 @@ ddL ddL xLi xLi -tmi -tOr -ezJ -xjK -bjy -kky -lvx -jpS -ruy +uRT +cer +kpq +mvp +icg +uTr +myQ +sWb +dqX lAh lAh aFZ @@ -69739,62 +69739,62 @@ aFZ bmE hVI hVI -lxe -ayM -kqz -fPZ -bow +kXm +ipM +tja +bLM +esw aFZ hVI hVI -kqz -kqz +tja +tja hVI hVI hVI yhR -rmI -mhb -avX -kqz -kqz -oBP -uXc -cQn -mhb -mhb -mhb -rAQ -bqy +qiK +jQs +afq +tja +tja +uRF +cZp +aWI +jQs +jQs +jQs +nRT +qNj hVI -kSp -pEe -mFh -aja -fPZ -uxi -qwZ -bWr -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -mGe -vPM -jgN -tvI -acx -tvI -tvI -eMO -tvI -vPM -dGw -lDC +vlK +oWY +ddB +xEH +bLM +kke +xSM +tWf +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +hCh +nQu +aQH +aeI +uJR +aeI +aeI +ssc +aeI +nQu +suX +bLJ twb twb tPN @@ -69803,9 +69803,9 @@ tPN twb eLu kqC -pHu -mcc -vei +dHD +xbM +fHo kqC ryJ end @@ -69813,67 +69813,67 @@ kqC ryJ end kqC -pHu -juW -sHH -nCu -ufo -sHH -sHH -eGz -isK +dHD +wbW +upY +ufE +ugg +upY +upY +gmG +ksE xGt -fHU -wAr -fHU -tHs -sRV -sRV -sRV -tHs -bpK -ukN -kSI +roF +xWV +roF +ihB +gag +gag +gag +ihB +wQD +aye +yjW hVG -yft -fnB -fnB +oZi +ubP +ubP hVG -sRV -sFf -sdg +gag +aUg +ntf uGY -pUS -tHs -tHs +aMS +ihB +ihB xGt -wTz -iTy -xvH +klh +mld +hjM uGY -fnB -fnB -fnB -fnB -fnB -sRV -sRV -sRV -sRV +ubP +ubP +ubP +ubP +ubP +gag +gag +gag +gag plK -fdS -nRb -sOn -sOn -sOn -xBT +oMf +dkn +uKX +uKX +uKX +xQx uMw rJO rJO rJO plK -keL -keL +xZI +xZI eYV lvi rJO @@ -69919,95 +69919,95 @@ azZ azZ xLi xLi -jpS +sWb phz phz phz phz -xjK -tOr -ezJ +mvp +cer +kpq azZ azZ -xjK -xjK -xjK -bAS +mvp +mvp +mvp +wou xLi xLi -aOd -tOr -ezJ -xjK -kVz +cGa +cer +kpq +mvp +tmF xLi -xLP +mgh azZ azZ azZ ohF pcu tQB -wnW -aUx +kZu +mAK hVI -rfo -fPZ -kqz -fPZ -idE +wfu +bLM +tja +bLM +byY tEH -fPZ -fPZ -fPZ -trH -trH -fPZ +bLM +bLM +bLM +kZV +kZV +bLM hVI hVI -wRh -kqz -kqz -nhF -kqz -kqz -icj -tST -kqz -kqz -kqz -aGS -eli +woh +tja +tja +wCJ +tja +tja +frR +gjz +tja +tja +tja +tnY +ciy hVI -myO -cwO -mJy -cwO -fPZ -uxi -kUR -eMJ -tvI -vYE -tvI -tvI -tvI -tvI -qbr -vPM -mGe -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -mGe -xQC +wNB +oTi +dOO +oTi +bLM +kke +lwq +hGy +aeI +pdX +aeI +aeI +aeI +aeI +lqJ +nQu +hCh +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +hCh +sKY bQM bQM bQM @@ -70015,70 +70015,70 @@ bQM bQM wzE kqC -pHu -ikA -vei -usz -cCq -dHp -dHp -dHp -uFh -jRR -pHu -sHH -sHH -cVl -sHH -bSP -sHH -sHw -uAG +dHD +bPn +fHo +ioc +rzp +vds +vds +vds +elO +nAs +dHD +upY +upY +hMj +upY +dQe +upY +ygk +rnE xGt -cBT -hBP -rBa -ddO -sRV -fWL -nyD -gkm -oZR -xVm -tJM +cLC +pjR +jOY +wXe +gag +udt +wHr +stw +wQg +qet +mKp nqN -ltb -cbK -hAL +qJv +bqF +tNF ceC -xEa -fnB -lqB +qNu +ubP +wty uGY -aCT -fnB -sRV +giA +ubP +gag hVG -tHs -qbu -tHs +ihB +rZO +ihB hVG -sRV -sRV -sRV -sRV -sRV -sRV -sRV -sRV -cvq +gag +gag +gag +gag +gag +gag +gag +gag +cHl plK -lNB -nRb -nRb -nRb -sOn -xBT +mVd +dkn +dkn +dkn +uKX +xQx gHz aJX uMw @@ -70136,90 +70136,90 @@ phz phz phz phz -xjK -tOr -mtk -sqg -sqg -sqg -sqg -sqg -sqg +mvp +cer +wun +hae +hae +hae +hae +hae +hae xZR -sqg -sqg -uwg -ezJ -xjK -qzn -ham -btq +hae +hae +ovk +kpq +mvp +mlb +byG +uQT azZ azZ azZ bTo pcu aFZ -uCz -kqz +hUL +tja hVI -bow -fPZ -kqz -mUr -bow +esw +bLM +tja +rnM +esw tEH -fPZ -rAa -rss -dBI -ycg -fPZ +bLM +uqd +eUy +bsR +hGu +bLM aif rKa -cVk -oYm -lFj -cFC -kqz -kqz -icj -kqz -kqz -sZr -kqz -aNw +rTV +pWX +bDJ +rtP +tja +tja +frR +tja +tja +nMi +tja +upr hVI hVI -mAz -tur -quk -rMS -tcl -seu -hTc -bWr -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -dGw -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -mGe -xQC +mMa +brC +uhX +tJw +kGD +gyh +buG +tWf +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +suX +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +hCh +sKY bQM bQM bQM @@ -70227,32 +70227,32 @@ bQM bQM wzE kqC -pHu -mcc -vei -usz -avl -xri -xri -xri -iUy -jRR -wjx -sHH -wOM -sHH -sHH -hxi -ufo -isK +dHD +xbM +fHo +ioc +qNF +xRI +xRI +xRI +efW +nAs +fcB +upY +hlB +upY +upY +vYX +ugg +ksE ceC ceC -bFY -tHs -wJt -vZU -sRV -vKj +sIh +ihB +kjX +ueP +gag +hQj nqN nqN nqN @@ -70263,27 +70263,27 @@ ceC nqN nqN ceC -hUH -sRV -nBM +unz +gag +gYH uGY -aVN -fnB -tHs +pDQ +ubP +ihB xGt -gbP -uKh -iin +fZW +cki +huB uGY sEO sEO sEO -alr -ddF -ddF -ddF -ddF -ddF +vpN +sXt +sXt +sXt +sXt +sXt plK plK plK @@ -70293,8 +70293,8 @@ dwT dwT plK plK -rrb -aYZ +nzu +mBZ aPH kPz kPz @@ -70347,101 +70347,101 @@ xLi xLi xLi phz -jpS -xjK -lax -kbO -kbO -kbO -kbO -kbO -kbO -kbO +sWb +mvp +ubX +eqU +eqU +eqU +eqU +eqU +eqU +eqU xZR -kbO -kbO -dFk -ezJ -xjK -xjK -xjK -xjK +eqU +eqU +uAg +kpq +mvp +mvp +mvp +mvp azZ bQM bQM bTo pcu aFZ -duB -kqz +wDK +tja aif -idE -fPZ -kqz -fPZ -idE +byY +bLM +tja +bLM +byY tEH -fPu -jlg -jlg -fPZ -fPZ -fPu +njm +eLw +eLw +bLM +bLM +njm hVI hVI -wRh -xzb -kqz -kqz -kqz -uXa -icj -vro -kqz -sWu -kqz -bxa -lDC -lDC -lDC -lDC -lDC -lDC -lDC -lDC -lDC -ggQ -tvI -kuT -tvI -tvI -tvI -oKQ -tvI -vPM -mGe -vPM -tvI -oKQ -tvI -tvI -tvI -ioG -tvI -tvI -vPM -deH -eDn -eDn -xQC -xQC -xQC -eDn -eDn -vqi -pHu -mcc -veB +woh +hYl +tja +tja +tja +cCs +frR +ltd +tja +set +tja +nyq +bLJ +bLJ +bLJ +bLJ +bLJ +bLJ +bLJ +bLJ +bLJ +xXl +aeI +fyt +aeI +aeI +aeI +rOL +aeI +nQu +hCh +nQu +aeI +rOL +aeI +aeI +aeI +evl +aeI +aeI +nQu +shH +iYw +iYw +sKY +sKY +sKY +iYw +iYw +izh +dHD +xbM +voO kqC ryJ end @@ -70449,39 +70449,39 @@ kqC ryJ end kqC -azT -sHH -sHH -cPQ -sHH -sHH -pbS -isK +lNf +upY +upY +elc +upY +upY +eNr +ksE xGt -mni -tHs -mni -tHs -tHs -fnB -fnB +ucu +ihB +ucu +ihB +ihB +ubP +ubP pTj -sRV -uSo -bOh +gag +hCk +tCH wBK -nzm +kGB ceC -tVZ -tVZ +dBO +dBO uGY uGY uxv uGY uGY -ril -fnB -tHs +nFb +ubP +ihB uGY xGt xGt @@ -70490,20 +70490,20 @@ uGY jwK jnd jwK -aWR -hxy -aWR -aWR -hxy -aWR +nZB +fAf +nZB +nZB +fAf +nZB okg jnd mpf hLz -aWR -hxy -hxy -aWR +nZB +fAf +fAf +nZB aPH aPH aPH @@ -70560,23 +70560,23 @@ xLi xLi xLi xLi -xjK -xjK -xjK -xjK -xjK -xjK -xjK -xjK -bAS +mvp +mvp +mvp +mvp +mvp +mvp +mvp +mvp +wou xLi xLi -aOd -tOr -ezJ -xjK -xjK -xjK +cGa +cer +kpq +mvp +mvp +mvp azZ azZ bQM @@ -70587,11 +70587,11 @@ aFZ hVI hVI hVI -gjj -fPZ -kqz -fPZ -idE +qSy +bLM +tja +bLM +byY aFZ hVI hVI @@ -70601,121 +70601,121 @@ hVI hVI hVI hVI -wRh -kqz -kqz -kqz -kqz -sHQ -pnc -bII -kqz -kqz -kqz -iJj -cAv -vPM -fhz -gTw -gTw -wuT -qyX -vPM -vPM -dGw -tvI -tvI -tvI -tvI -tvI -tvI -kuT -vPM -mGe -xqh -tvI -tvI -ioG -tvI -aJU -tvI -tvI -tvI -vPM -vPM -pkw -ybs -gTw -gTw -gTw -vPM -pkw -tjM -cMg -mcc -vei +woh +tja +tja +tja +tja +jHU +oza +cgx +tja +tja +tja +vyv +nMz +nQu +wRz +fqg +fqg +eLX +edy +nQu +nQu +suX +aeI +aeI +aeI +aeI +aeI +aeI +fyt +nQu +hCh +kob +aeI +aeI +evl +aeI +hTy +aeI +aeI +aeI +nQu +nQu +srp +hOQ +fqg +fqg +fqg +nQu +srp +bqD +cAJ +xbM +fHo kqC -cCq -awo +rzp +tKk kqC -cCq -mIA +rzp +osQ kqC -pHu -sHH -sHH -sHH -nCu -juW -buO -isK +dHD +upY +upY +upY +ufE +wbW +fxS +ksE xGt -fHU -kdk -fHU -tHs -tHs -fnB -fnB +roF +oDg +roF +ihB +ihB +ubP +ubP pTj -juS -gmS -dhs +gKg +dFB +hrB sYP -nzm +kGB uGY -wir -tHs -rcu -tHs -sRV -quU +xLd +ihB +syj +ihB +gag +aOL uGY -jdh -fnB -tHs +ppq +ubP +ihB nqN -jKG -hxy -hxy -hxy -hxy -pbC -hxy -hxy +lJx +fAf +fAf +fAf +fAf +mxc +fAf +fAf jwK -aWR -aWR +nZB +nZB jwK -hxy -mOW -hxy -aAM +fAf +gsd +fAf +lJf hLz -nID +nQH jwK jwK -hLy +lEg wly kPz kPz @@ -70775,19 +70775,19 @@ xLi xLi xLi xLi -mwU -ruy -ruy -ruy -cft -cft +vHX +dqX +dqX +dqX +kQy +kQy xLi xLi phz -tOr -ezJ +cer +kpq rBr -xjK +mvp azZ azZ azZ @@ -70796,138 +70796,138 @@ bQM bTo pcu aFZ -fHQ -kqz +chZ +tja aif -idE -fPZ -kqz -fPZ -qQU +byY +bLM +tja +bLM +qtP aFZ fIT hVI mEO mEO -qDo +ddD hVI lmn -jXQ -tqR -bgR -uiK -bgR -izP +fkH +roE +tpZ +jAF +tpZ +crm nQq nQq -sZr -kqz -kqz -kqz -lcu -vbe -dGw -fsn -mGe -mGe -dGw -rVy -mGe -wnB -wnB -gVX -vPM -vPM -vPM -vPM -vPM -vPM -vPM -dGw -vPM -vPM -vPM -vPM -vPM -vPM -vPM -sYe -tJT -tJT -mGe -isl -dGw -mGe -mGe -mGe -dGw -isl -sHH -pHu -mcc -vei +nMi +tja +tja +tja +bze +iWP +suX +jyQ +hCh +hCh +suX +fNA +hCh +ctY +ctY +iAB +nQu +nQu +nQu +nQu +nQu +nQu +nQu +suX +nQu +nQu +nQu +nQu +nQu +nQu +nQu +xFg +asz +asz +hCh +mGr +suX +hCh +hCh +hCh +suX +mGr +upY +dHD +xbM +fHo kqC -wII -bjk +qLi +dpe kqC -wII -bjk +qLi +dpe kqC -pHu -sHH -vDx -sHH -aLR -sHH -ifI -uAG +dHD +upY +sRv +upY +wam +upY +mom +rnE xGt -cBT -vok -cBT -tHs -tHs -fnB -fnB +cLC +mwK +cLC +ihB +ihB +ubP +ubP pTj -xTy -xTy -sRV -sRV -nzm +aIm +aIm +gag +gag +kGB cCB -tHs -fnB -fnB -cQu -fnB -tHs +ihB +ubP +ubP +eLQ +ubP +ihB cCB -tHs -fnB -tHs +ihB +ubP +ihB uGY hLz -wMR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -hxy -bgG +ndD +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +fAf +tFo xUo -aWR +nZB jwK jwK -aWR +nZB ckm kPz bQM @@ -70986,18 +70986,18 @@ xLi xLi xLi xLi -lzO -xjK -dNF -ruy -dNF -xjK -xjK -xjK +rGc +mvp +rHX +dqX +rHX +mvp +mvp +mvp phz phz -tOr -ezJ +cer +kpq azZ azZ azZ @@ -71008,76 +71008,76 @@ bQM bTo pcu aFZ -qTp -kqz +bRo +tja hVI -idE -fPZ -kqz -fPZ -idE +byY +bLM +tja +bLM +byY sJu mEO sJu mEO mEO -ezo +akW hVI gZf -fPZ -mJy -bII -kqz -kqz -cLr +bLM +dOO +cgx +tja +tja +sTI hVI hVI -fcO -sZr -kqz -kqz -pIX -cYg -dGw -dGw -dGw -jqR -dGw -rVy -mGe -bCk -sLl -jNa -vPM -mGe -mGe -smz -mGe -mGe -dGw -muf -dGw -mGe -wWT -dGw -mGe -mGe -vPM -liT -jXx -jXx -mGe -isl -dGw -dGw -dGw -dGw -dGw -isl -sHH -pHu -mcc -vei +kgT +nMi +tja +tja +gFp +mZH +suX +suX +suX +bEA +suX +fNA +hCh +ohl +qQa +trJ +nQu +hCh +hCh +bkU +hCh +hCh +suX +bqX +suX +hCh +jXV +suX +hCh +hCh +nQu +umm +aDx +aDx +hCh +mGr +suX +suX +suX +suX +suX +mGr +upY +dHD +xbM +fHo kqC kqC kqC @@ -71085,61 +71085,61 @@ kqC kqC kqC mCF -iDa -sHH -sHH +sAF +upY +upY vRA -sHH -sHH -isK +upY +upY +ksE ceC ceC -bFY -tHs -bFY -tHs -tHs -sRV -qks +sIh +ihB +sIh +ihB +ihB +gag +qdE uGY -kik -kik +ltQ +ltQ nqN -kik -iOE +ltQ +ayo uGY -hce -jpl -tHs -tHs -fnB -sRV +eZQ +kyZ +ihB +ihB +ubP +gag hVG -sRV -fnB -tHs +gag +ubP +ihB uGY -mft -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -aWR -hxy -aWR +jEr +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +nZB +fAf +nZB xUo -aWR +nZB jwK jwK -aWR +nZB ckm kPz bQM @@ -71199,17 +71199,17 @@ xLi xLi xLi xLi -mzp -dNF -ruy -dNF -xjK -xjK -xjK +spH +rHX +dqX +rHX +mvp +mvp +mvp phz phz -tOr -ezJ +cer +kpq pPd azZ azZ @@ -71220,138 +71220,138 @@ tuf bTo pcu tQB -qeu -kqz +kSd +tja hVI -lpV -eAQ -kqz -fPZ -ygv +ncj +sdr +tja +bLM +egT aFZ hVI hVI mEO mEO -rNp +bWy hVI gZf -fPZ -mJy -kqz -kqz -iOe -feO +bLM +dOO +tja +tja +fSa +lJS nQq nQq -fJO -kqz -kqz -kqz -aSw -cYa -dGw -gfp -hkW -mGe -dGw -rVy -mGe -oOs -oOs -eKg -vPM -jZx -vPM -vPM -vPM -vPM -jZx -dGw -vPM -dHI -vPM -vPM -vPM -vPM -vPM -xQs -ckj -ckj -mGe -isl -dGw -mGe -mGe -mGe -dGw -isl -sHH -pHu -mcc -vei +qAl +tja +tja +tja +lVQ +qZv +suX +lFQ +aCZ +hCh +suX +fNA +hCh +mRS +mRS +qRK +nQu +dcO +nQu +nQu +nQu +nQu +dcO +suX +nQu +wGb +nQu +nQu +nQu +nQu +nQu +mjm +jfO +jfO +hCh +mGr +suX +hCh +hCh +hCh +suX +mGr +upY +dHD +xbM +fHo kqC -bux -bZu +sfu +jyF kqC -bux -bFN +sfu +iEG kqC -pHu -sHH -sHH +dHD +upY +upY vRA -rkh -xBv -isK +cKH +joJ +ksE xGt -maC -tHs -tHs -tHs -tHs -tHs -bDd +bjo +ihB +ihB +ihB +ihB +ihB +kfL uGY uGY -qTa -qTa +fRq +fRq nqN -qTa -nsH +fRq +ygr xGt -tHs -fnB -aDC -wiQ -vOj -sRV +ihB +ubP +lwp +dlr +ljV +gag hVG -sRV -fnB -tHs +gag +ubP +ihB uGY -gaN -aWR -aWR -aWR -aWR -tBU -aWR -aWR -aWR -aWR -aWR -aWR -aWR -bgG -hxy -aWR +lMh +nZB +nZB +nZB +nZB +tco +nZB +nZB +nZB +nZB +nZB +nZB +nZB +tFo +fAf +nZB xUo -aWR +nZB jwK jwK -aWR +nZB ckm kPz kPz @@ -71407,24 +71407,24 @@ xLi inA xLi xLi -csp -csp -pvT -pvT -xjK -jvp -ruy -dNF -xjK -xjK -xjK +fEn +fEn +kqy +kqy +mvp +sVT +dqX +rHX +mvp +mvp +mvp rBr phz -tOr -ezJ -xjK -ruy -jpS +cer +kpq +mvp +dqX +sWb azZ azZ azZ @@ -71435,135 +71435,135 @@ aFZ hVI hVI hVI -idE -fPZ -kqz -fPZ -idE +byY +bLM +tja +bLM +byY aFZ hVI -nGq +hZf mEO mEO hVI hVI gZf -fPZ -mJy -bII -kqz -fyT -kqz -tnd -ueA -bII -kqz -kqz -kqz -kdo -tzF -vPM -guB -ick -jZb -mDi -sWF -vPM -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -mGe -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -tvI -vPM -vPM -dnA -vWE -jZb -jZb -jZb -vPM -dnA -reD -pHu -mcc -vei +bLM +dOO +cgx +tja +xAo +tja +nkJ +vTR +cgx +tja +tja +tja +tjw +cYS +nQu +pzL +vDL +eWf +qre +diL +nQu +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +hCh +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +aeI +nQu +nQu +oTS +vLO +eWf +eWf +eWf +nQu +oTS +iox +dHD +xbM +fHo kqC -avl -fAs +qNF +bjt kqC -avl -jms +qNF +mDO kqC -pHu -sHH +dHD +upY vRA -eNV -sHH -sHH -isK +vZL +upY +upY +ksE xGt -xed -tHs -tHs -tHs -tHs -tHs -wAR +mEJ +ihB +ihB +ihB +ihB +ihB +tkd cCB -sRV -sRV -sRV -sRV -sRV -nzm +gag +gag +gag +gag +gag +kGB xGt -tHs -fnB -keF -vrf -fnB -tHs +ihB +ubP +eWz +pxr +ubP +ihB uGY -tHs -tHs -pCZ +ihB +ihB +tXT uGY hLz -aWR -aWR -hxy -hxy -jrL -hxy -hxy +nZB +nZB +fAf +fAf +aXx +fAf +fAf jwK -aWR -aWR +nZB +nZB jwK -hxy -mOW -hxy -fMY +fAf +gsd +fAf +czJ hLz -nID -hxy -hxy -hLy +nQH +fAf +fAf +lEg wly ckm ckm @@ -71608,7 +71608,7 @@ bQM azZ azZ ejw -jpS +sWb etL phz phz @@ -71618,102 +71618,102 @@ gDx xLi xLi xLi -ruy -csp -csp -deN -deN -eRS -dNF -ruy -dNF -jmM +dqX +fEn +fEn +oGy +oGy +cLy +rHX +dqX +rHX +esR xLi xLi -ruy +dqX phz -tOr -ezJ +cer +kpq irD trl phz -ruy +dqX azZ azZ lAh -hPF -qFQ -sNK -idE -idE -gkt -idE -fPZ -iOe -fPZ -idE +mnd +oYs +nCh +byY +byY +uno +byY +bLM +fSa +bLM +byY eVm hVI -tNS +tgL mEO xgF hVI -fiD -wkp -fPZ -mJy -kqz -kqz -mqY -kqz -xzb -kqz -kqz -xzb -kqz -kqz -oFW -eDn -eHa -xQC -xQC -xQC -eDn -eDn -iCi -vPM -tvI -rxu -tvI -tvI -tvI -tvI -oKQ -tvI -vPM -mGe -vPM -tvI -oKQ -tvI -vYE -tvI -xXw -hVS -tvI -vPM -deH -eDn -eDn -xQC -xQC -xQC -eDn -eDn -vqi -pHu -mcc -veB +oPn +jEy +bLM +dOO +tja +tja +iMq +tja +hYl +tja +tja +hYl +tja +tja +mCR +iYw +egk +sKY +sKY +sKY +iYw +iYw +sOM +nQu +aeI +eBa +aeI +aeI +aeI +aeI +rOL +aeI +nQu +hCh +nQu +aeI +rOL +aeI +pdX +aeI +xei +xpj +aeI +nQu +shH +iYw +iYw +sKY +sKY +sKY +iYw +iYw +izh +dHD +xbM +voO kqC ryJ end @@ -71721,53 +71721,53 @@ kqC ryJ end kqC -ulJ -sHH +nBb +upY vRA -sHH -sHH -oJW -isK +upY +upY +ejf +ksE xGt -adl -isB -tHs -pQb -lgy -tHs -mEb +izN +mDS +ihB +htq +lNc +ihB +vuK uGY -sRV -sRV -sRV -sRV -sRV -nzm +gag +gag +gag +gag +gag +kGB xGt -kvn -fnB -qKs -tHs -fnB -tHs +gwm +ubP +ggA +ihB +ubP +ihB uGY ceC uGY uGY nqN -jlO +qQd jwK jwK -hxy +fAf sEO sEO sEO -hxy -hxy +fAf +fAf jwK jwK -aWR -aWR +nZB +nZB okg liZ uSQ @@ -71777,9 +71777,9 @@ xja xja hLz hLz -mWg -mWg -mWg +eCK +eCK +eCK wly wly kPz @@ -71831,115 +71831,115 @@ xLi xLi xLi phz -ruy -ruy +dqX +dqX xLi xLi -cBQ -dNF -ruy -dNF -xjK +idP +rHX +dqX +rHX +mvp azZ azZ azZ -eyo -tOr -ezJ +vTq +cer +kpq phz -jpS +sWb phz -ruy -csp -xjK -xjK -csp -idE -idE +dqX +fEn +mvp +mvp +fEn +byY +byY hVI -jJF -fPZ -fPZ -fPZ -kqz -fPZ -idE +rUQ +bLM +bLM +bLM +tja +bLM +byY aFZ hVI -svG +fQY mEO mEO sJu -fPZ -fPZ -fPZ -urS -kqz -kqz -kqz -teT -kqz -kqz -kqz -kqz -kqz -kqz -lwB +bLM +bLM +bLM +abG +tja +tja +tja +tLk +tja +tja +tja +tja +tja +tja +oOk aFZ aFZ -gyW -bQM -bQM -bQM -xQC -mGe -vPM -tvI -tvI -tvI -tvI -tvI -tvI -tvI -rxu -vPM -dGw -vPM -tvI -tvI -rxu -tvI -kuT -tvI -hVS -tvI -vPM -mGe -xQC -cmz +fPB +bQM +bQM +bQM +sKY +hCh +nQu +aeI +aeI +aeI +aeI +aeI +aeI +aeI +eBa +nQu +suX +nQu +aeI +aeI +eBa +aeI +fyt +aeI +xpj +aeI +nQu +hCh +sKY +hTN fyC qOk mKS erT wzE wzE -pHu -mcc -vei -usz -cCq -dHp -dHp -wsN -uFh -jRR -wjx -uyd -sHH -sHH -sHH -sHH -isK +dHD +xbM +fHo +ioc +rzp +vds +vds +msH +elO +nAs +fcB +gQc +upY +upY +upY +upY +ksE ceC ceC nqN @@ -71952,47 +71952,47 @@ nqN uxv ceC ceC -bBS -qXl -weQ +aPr +jyv +kaw uGY -evQ -fnB -fnB -fnB -fnB -tHs -rfa +ilr +ubP +ubP +ubP +ubP +ihB +rKm ceC hLz -gHl +byE hLz -hxy +fAf jwK jwK -hxy +fAf sEO sEO sEO -hxy -hxy +fAf +fAf jwK jwK -hxy -hxy +fAf +fAf hLz hLz hLz hLz -nxM -nxM +aQW +aQW wSm qxN qxN -hxy -hxy -hxy -hxy +fAf +fAf +fAf +fAf ybj wly wly @@ -72041,170 +72041,170 @@ azZ phz xZR phz -xjK +mvp phz -xjK +mvp irD -ldy -lYl -fkP -dNF -ruy -dNF -phg +iMN +oNu +aQY +rHX +dqX +rHX +xqY azZ xLi xLi -xjK -tOr -ezJ +mvp +cer +kpq phz phz phz kEZ -csp -xjK -xjK -csp -idE -idE +fEn +mvp +mvp +fEn +byY +byY hVI -hpN -fPZ -fPZ -fPZ -kqz -fPZ -idE +vCL +bLM +bLM +bLM +tja +bLM +byY aFZ hVI -svG +fQY mEO mEO hVI -fOs -fPZ -fPZ -ryN -owv -jEb -cjl -jEb -yil -jEb -aaf -eTd -jEb -kqz -lJv +aEG +bLM +bLM +dAg +vki +jbq +sGk +jbq +xsh +jbq +fCf +jTo +jbq +tja +tFY aFZ aFZ -gyW -bQM -bQM -bQM -xQC -vuc -vPM -tvI -tvI -tvI -qfE -dnI -tvI -tvI -tvI -vPM -mGe -vPM -tvI -rxu -tvI -tvI -tvI -tvI -tvI -tvI -vPM -mGe -xQC -xyy +fPB +bQM +bQM +bQM +sKY +lqa +nQu +aeI +aeI +aeI +jJZ +cEW +aeI +aeI +aeI +nQu +hCh +nQu +aeI +eBa +aeI +aeI +aeI +aeI +aeI +aeI +nQu +hCh +sKY +dxl afk afk afk ghg wzE wzE -pHu -mcc -vei -usz -laZ -xri -xri -xri -iUy -jRR -wjx -sHH -sHH +dHD +xbM +fHo +ioc +iWp +xRI +xRI +xRI +efW +nAs +fcB +upY +upY vRA -nhR -sql -pZb -kWn -hKE +osN +xdb +pZn +kIb +vFV hZR kPz kPz kPz dCM -tMx -oQY -oQY -vMb +svc +wNG +wNG +hWb xGt -xBI -xBI -xBI +lVA +lVA +lVA gIB -ohs -qgA -tHs -sRV -tHs -mni -gZE +sjM +fIn +ihB +gag +ihB +ucu +fkG ceC -tvU -wMR -hxy -hxy -aWR -aWR -hxy -aWR -jtF -hxy -aWR -aWR -hxy -aWR -aWR -hxy -hxy -lPW -hxy -mqc -aWR +ikF +ndD +fAf +fAf +nZB +nZB +fAf +nZB +kEx +fAf +nZB +nZB +fAf +nZB +nZB +fAf +fAf +nyO +fAf +uuk +nZB wSm pBV qKT qbl wSm -aWR -wMR -hxy +nZB +ndD +fAf wly wly wly @@ -72253,41 +72253,41 @@ xLi xLi xLi xLi -aOd +cGa phz -xjK -app -bUJ -mcT -fkP -dNF -ruy -dNF +mvp +sVS +dwZ +wsM +aQY +rHX +dqX +rHX phz xLi xLi azZ -xjK -tOr +mvp +cer phz -xjK -jpS +mvp +sWb wNi -ruy -csp -xjK -xjK -gKA -mxO -arm -arm -arm -miZ -vcy -jCQ -fPZ -fPZ -edv +dqX +fEn +mvp +mvp +dvB +mpY +xCv +xCv +xCv +gHC +kHc +fbc +bLM +bLM +lDo aFZ aFZ aFZ @@ -72318,28 +72318,28 @@ jmG jmG cKa cKa -cNC -tvI -tvI -tvI -tvI -tvI -tvI -vYE -vPM -mGe -vPM -vPM -vPM -vPM -hrg -hrg -hrg -vPM -vPM -rWB -eDn -eDn +rMT +aeI +aeI +aeI +aeI +aeI +aeI +pdX +nQu +hCh +nQu +nQu +nQu +nQu +hox +hox +hox +nQu +nQu +bVE +iYw +iYw urJ afk hkh @@ -72347,9 +72347,9 @@ afk tCZ pcu wzE -pHu -mcc -veB +dHD +xbM +voO kqC ryJ end @@ -72357,66 +72357,66 @@ kqC ryJ end kqC -ulJ -sHH -sHH -sHH -sHH -xQE -hCX -sHH -isK +nBb +upY +upY +upY +upY +siW +bEm +upY +ksE hZR kPz bQM kPz dCM -mZw -oQY +nIw +wNG cZV -oTe +sjJ xGt -pGv -pGv -pGv +kWL +kWL +kWL gIB -qzX -tZX +mEn +psP uGY -vaj +dBs uGY -nWK -jdh +oOh +ppq ceC -xOQ -hxy -hxy -hxy -aWR -aWR -hxy -tzx -tGl -dSy -aWR -aWR -hxy -aWR -aWR -hxy -tSi -fSe -dSy -wMR -aWR +gjs +fAf +fAf +fAf +nZB +nZB +fAf +xTW +aAJ +dUi +nZB +nZB +fAf +nZB +nZB +fAf +aSA +cvv +dUi +ndD +nZB ppG qbl qbl wSm -rZr -aWR -aWR -hxy +jxc +nZB +nZB +fAf wly wly wly @@ -72465,92 +72465,92 @@ xLi xLi xLi xLi -nvZ +jVt phz -xjK -xjK -lfS -mcT -fkP -obL -ruy -dNF +mvp +mvp +bgD +wsM +aQY +pjW +dqX +rHX phz lAh lAh lAh -xjK -tOr -ezJ -xjK +mvp +cer +kpq +mvp lAh lAh beW -csp -kYM -xjK -upt +fEn +maA +mvp +ckA jmG mvl mvl mvl jmG -tuD -idE -idE -idE -idE +fer +byY +byY +byY +byY tOp -ror -wwR -uJj -kNz +ezd +jjp +hVA +lFB tOp -aaK -oDG -aRb +jWI +amZ +bsO cKa cKa -vJD -ggB -vJD -ggB -vJD +vUP +dVA +vUP +dVA +vUP hqD -aaK -dkj -kNz -hor +jWI +eow +lFB +aLX cKa -ocJ -rsE +bqu +rwm cKa -imL -ggB -uCD -mEv +fZc +dVA +rhf +nss jYs -vMX -tvI -tvI -tvI -hVS -tvI -tvI -tvI -vPM -vZz -vPM -ioG -tvI -rcG -nzp -jdX -tJT -ePm -vPM -rWB -eDn +cMD +aeI +aeI +aeI +xpj +aeI +aeI +aeI +nQu +ele +nQu +evl +aeI +kMm +umI +moK +asz +eMI +nQu +bVE +iYw jKI mdJ afk @@ -72559,76 +72559,76 @@ afk xMW jlH wzE -ldt -mcc -vei +cPh +xbM +fHo kqC -cCq -pDV +rzp +mwP kqC -cCq -qkY +rzp +ldz kqC -avl -xri -xri -xri -xri -xri -xri -xri -uAG +qNF +xRI +xRI +xRI +xRI +xRI +xRI +xRI +rnE hZR kPz kPz kPz dCM -jbx -bck -rbD -oEt +bsc +rIy +paO +sMe xGt -wYE -wYE -wYE +hqO +hqO +hqO uGY njK cHF uGY -hxy +fAf uGY gIB gIB ceC -xnN -hxy -hxy -hxy -aWR -aWR -hxy -aWR -aWR -hxy -aWR -aWR -hxy -aWR -aWR -hxy -aWR -aWR -mnp -aWR -aWR -hxy +uNG +fAf +fAf +fAf +nZB +nZB +fAf +nZB +nZB +fAf +nZB +nZB +fAf +nZB +nZB +fAf +nZB +nZB +avJ +nZB +nZB +fAf wSm wSm -hxy -rZr -aWR -aWR -hxy +fAf +jxc +nZB +nZB +fAf wly tan tan @@ -72667,7 +72667,7 @@ vcC bQM bQM bQM -dOF +wyK azZ azZ eVq @@ -72677,118 +72677,118 @@ xLi xLi xLi xLi -iQP -ruy -xjK -xjK -ljW -lYl -fkP -dNF -mHN -dNF -xjK +ppZ +dqX +mvp +mvp +twR +oNu +aQY +rHX +nDI +rHX +mvp lAh lAh lAh -xjK -tOr -ezJ +mvp +cer +kpq lAh lAh lAh -ruy -csp -xjK -xjK -upt +dqX +fEn +mvp +mvp +ckA lIG -avs -wwr -dTv +spR +kzR +qBI mvl -vBQ -idE -bha -cif -cif +eqJ +byY +iEl +gBR +gBR jmG -fmL -aaK -kNz -kNz +wUz +jWI +lFB +lFB tOp -tOK -blQ -tHu +uqV +tVI +hBc cKa bRc -ggB -imL -ggB -iNO -ggB +dVA +fZc +dVA +akM +dVA hqD -bdI -roY -iZV -hor +uKK +mgz +rLG +aLX hqD -ikq -mYp +kXk +gnY cKa -qZW -ggB -uCD -biJ +ejM +dVA +rhf +sWX jYs -vMX -iuw -tvI -tvI -tvI -tvI -tvI -tvI -sYe -aee -tJT -tvI -tvI -rcG -aIX -vPM -aIX -ePm -dGw -vVR -eDn -eDn -eDn -wby +cMD +jpW +aeI +aeI +aeI +aeI +aeI +aeI +xFg +dYi +asz +aeI +aeI +kMm +bvs +nQu +bvs +eMI +suX +aPv +iYw +iYw +iYw +fCJ llQ jKI bUB bQM wzE -ulJ -mcc -vei +nBb +xbM +fHo kqC -wII -bjk +qLi +dpe kqC -wII -bjk +qLi +dpe kqC -gMJ -usz -gMJ +okG +ioc +okG kqC kqC -sSJ -sSJ -sSJ +dbI +dbI +dbI kqC wzE hZR @@ -72800,48 +72800,48 @@ xGt ceC xGt ceC -aWR -aWR -aWR -pax -hxy -hxy -pax -hxy -pax -hxy -hxy -pax -aWR -hxy -tFu -hxy -eZN -sIT -uVo -hTm -eZN -sIT -fpM -hTm -eZN -sIT -fpM -hTm -eZN -sIT -fpM -hTm -eZN -sIT -uVo -hTm -eZN -hxy -aWR -aWR -aWR -aWR +nZB +nZB +nZB +uSU +fAf +fAf +uSU +fAf +uSU +fAf +fAf +uSU +nZB +fAf +uNI +fAf +lcm +tyC +grA +aOT +lcm +tyC +cRZ +aOT +lcm +tyC +cRZ +aOT +lcm +tyC +cRZ +aOT +lcm +tyC +grA +aOT +lcm +fAf +nZB +nZB +nZB +nZB vzB fiq vzB @@ -72880,7 +72880,7 @@ bQM bQM bQM enY -dOF +wyK azZ azZ azZ @@ -72892,100 +72892,100 @@ xLi xLi phz xLi -ruy +dqX xLi xLi -cBQ -dNF -ruy -dNF -xjK +idP +rHX +dqX +rHX +mvp lAh lAh jZc -xjK -xjK -xjK -xnM -xnM -xnM -ruy -ruy -xjK -xjK -bcV +mvp +mvp +mvp +uOu +uOu +uOu +dqX +dqX +mvp +mvp +gkv cKa -hah +lUZ xlp -ofy +poC mvl -oAm -vMh -xFe -cPI -lvN +sKu +chx +rDu +dCg +hXN jmG -jXD -mhe -iZV -ojf +xVw +bwk +rLG +dlj tOp -ikq -vII -sKn +kXk +amn +pxX cKa bRc -ggB -uUT -ggB -ktI -ggB +dVA +cYi +dVA +wqs +dVA cKa -cYY -roY -iZV -hor +awU +mgz +rLG +aLX cKa kzh tOp cKa -rfJ -ggB -uCD -iwK +sGX +dVA +rhf +avc cKa -gde -dGw -vPM -vPM -tvI -tvI -tvI -tvI -sDV -uRu -ckj -tvI -kuT -rcG -sDV -aIX -uAd -ePm -deH -ued -uvM -cnl -eDn -xQC +xbc +suX +nQu +nQu +aeI +aeI +aeI +aeI +qBf +dYC +jfO +aeI +fyt +kMm +qBf +bvs +tTB +eMI +shH +cmy +wId +vOZ +iYw +sKY wzE wzE wzE wzE wzE -aan -gPm -vei +cQf +jpx +fHo kqC kqC kqC @@ -72993,41 +72993,41 @@ kqC kqC kqC mCF -oMz -kWn -hKE +uJp +kIb +vFV kqC -wAj -fXS -fXS -fXS -gpq +lsR +lZp +lZp +lZp +svN kqC -cCq -dHp -uFh +rzp +vds +elO abJ -usz -usz +ioc +ioc abJ -sKq -sKq -sKq -hxy -jYS -bkS -bkS -bkS -bkS -aWR -bkS -bkS -bkS -bkS -aWR -aWR -aWR -tts +goo +goo +goo +fAf +hRb +upw +upw +upw +upw +nZB +upw +upw +upw +upw +nZB +nZB +nZB +iTt wQN wSm wSm @@ -73092,10 +73092,10 @@ bQM bQM bQM fiq -aDh +dfc ePv ePv -aDh +dfc azZ lAh xLi @@ -73107,139 +73107,139 @@ phz kEZ phz xLi -cfD -dNF -ruy -dNF -xjK +jUa +rHX +dqX +rHX +mvp lAh -vtf -xjK -xMg -aZz -sqg -fde -rjz -fde -xjK -xjK -xjK -fcp -xjK +aeS +mvp +lkr +rTd +hae +tqw +kQH +tqw +mvp +mvp +mvp +hDm +mvp rSr -mIE -mIE -mIE +cOF +cOF +cOF mvl -idE -idE -idE -idE -jAy +byY +byY +byY +byY +nFc jmG -xMR -xMR -iZV -aUa +kjt +kjt +rLG +djF jmG sta sta sta jmG cKa -vJD -ggB -vJD -ggB -vJD +vUP +dVA +vUP +dVA +vUP cKa -bdI -fnj -iZV -vJD -hFn -dkj -oMR -dkj -dkj -kNz -vJD -vJD +uKK +hjB +rLG +vUP +lEd +eow +ulc +eow +eow +lFB +vUP +vUP jmG -eHa -eDn -dGw -dGw -vPM -vPM -vPM -aLC -sDV -uRu -ckj -vPM -vZz -vPM -mIq -mIq -mIq -vPM -dhe -msS -vMX -mGe -uIA -mGe +egk +iYw +suX +suX +nQu +nQu +nQu +fDE +qBf +dYC +jfO +nQu +ele +nQu +pst +pst +pst +nQu +neY +dNk +cMD +hCh +ufL +hCh oFI -gEW -mcc -fLR +mCe +xbM +sJP kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -bux -bZu +sfu +jyF kqC -bux -bZu +sfu +jyF kqC -pHu -mxz -veB +dHD +xLx +voO kqC -dhD -vPa -oXJ -fXS -bYG +ubh +xFJ +eao +lZp +qXj kqC -ulJ -mcc -vei +nBb +xbM +fHo vRA -usz -usz +ioc +ioc vRA -hxy -hxy -aWR -hLy +fAf +fAf +nZB +lEg sEO -pXP -fSe -fSe -dSy -aWR -tSi -fSe -fSe -dSy -aWR -aWR -aWR -ttK +cCy +cvv +cvv +dUi +nZB +aSA +cvv +cvv +dUi +nZB +nZB +nZB +gBe wSm wSm xnU @@ -73262,18 +73262,18 @@ xnU wSm wSm eSF -qnB -fHB -fHB -fHB -ssD -iSi -ssD -hbC -hbC -hbC -hbC -cbb +seF +ojq +ojq +ojq +tsc +bEk +tsc +ogf +ogf +ogf +ogf +mRM bQM bQM bQM @@ -73308,8 +73308,8 @@ fiq fiq fiq fiq -aDh -ruy +dfc +dqX lAh lAh lAh @@ -73319,139 +73319,139 @@ phz phz phz xLi -mHN -ruy -ruy -ruy -ruy +nDI +dqX +dqX +dqX +dqX lAh lAh jZc -tOr -hmk -rov -fde -fde -fde -xjK -xjK -xjK -xjK -xjK +cer +pvF +tfl +tqw +tqw +tqw +mvp +mvp +mvp +mvp +mvp jmG mvl mvl mvl jmG -rfo -idE -idE -idE +wfu +byY +byY +byY hVI jmG -xMR -xMR -iZV -aFJ +kjt +kjt +rLG +gYD fSq -aaK -dkj -kNz +jWI +eow +lFB fSq -vJD -aaK -dkj -dkj -dkj -kNz -aau -xMR -roY -iZV -vJD -jvE -vII -vII -vII -vII -dyM -vJD -vJD +vUP +jWI +eow +eow +eow +lFB +oNC +kjt +mgz +rLG +vUP +lcE +amn +amn +amn +amn +tPB +vUP +vUP jmG bQM -eDn -xQC -eDn -mGe -mGe -isL -wUN -mGe -mGe -mGe -kiq -tsf -lWh -vPM -kiq -vPM -vPM -dhe -msS -vMX -mGe -iTe -mGe +iYw +sKY +iYw +hCh +hCh +lBb +dEh +hCh +hCh +hCh +aXO +pOU +ssR +nQu +aXO +nQu +nQu +neY +dNk +cMD +hCh +efR +hCh oFI -gEW -mcc -mcc -usz -pHu -mcc -vei +mCe +xbM +xbM +ioc +dHD +xbM +fHo kqC -avl -jms +qNF +mDO kqC -avl -aIv +qNF +eub kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -mak -pcl +sIk +dzE kqC -mak -pcl +sIk +dzE kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -usz -usz +ioc +ioc kqC -qcv -qcv -hxy -aWR -iPV -iPV -iPV -iPV -iPV -aWR -iPV -iPV -iPV -iPV -hNc -aWR -aWR -uEN +nAm +nAm +fAf +nZB +fWr +fWr +fWr +fWr +fWr +nZB +fWr +fWr +fWr +fWr +hMH +nZB +nZB +bne wSm wSm wSm @@ -73474,7 +73474,7 @@ wSm wSm wSm xrH -gAS +axn wSm wSm wSm @@ -73485,7 +73485,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -73518,9 +73518,9 @@ kPz bQM bQM kPz -rEH -eok -eok +gEq +eIX +eIX azZ azZ azZ @@ -73529,57 +73529,57 @@ azZ azZ kny phz -xjK -xjK -xjK -xjK -csl -xjK -xjK -xjK -xjK -xjK -vBO -ezJ -cAV -hLX -hLX -nGW -ruy -lTm -qOY -xjK -xjK +mvp +mvp +mvp +mvp +pUO +mvp +mvp +mvp +mvp +mvp +xxU +kpq +jNi +ygs +ygs +kBX +dqX +loE +eIx +mvp +mvp lZA -vJD -vJD -vJD +vUP +vUP +vUP lZA -idE -idE -idE -idE -idE +byY +byY +byY +byY +byY lZA -xMR -xMR -iZV -iZV +kjt +kjt +rLG +rLG fSq -xMR -rmg -iZV +kjt +oZU +rLG fSq -vJD -pya -roY -roY -roY -iZV -pzQ -xMR -oRb -iZV +vUP +hFW +mgz +mgz +mgz +rLG +jHV +kjt +lpZ +rLG cKa kzh tOp @@ -73587,41 +73587,41 @@ cKa kzh tOp cKa -aaK -kNz +jWI +lFB jmG kPz -uwY +eHa pcu -eDn -xQC -xQC -eDn -eON -cYv -cYv -cYv -arY -lDC -irx -aXK -jZb -dRW -jZb -cFN -eDn -eDn -xQC -xQC -xQC +iYw +sKY +sKY +iYw +imI +oEH +oEH +oEH +vkt +bLJ +rcg +xZN +eWf +uRv +eWf +vlO +iYw +iYw +sKY +sKY +sKY wzE -dYr -mcc -mcc -usz -qRD -mcc -veB +gSf +xbM +xbM +ioc +nbP +xbM +voO kqC cRB end @@ -73629,41 +73629,41 @@ kqC ryJ end kqC -hpr -mcc -vei -mKG -fXS -fXS -bGy -hQg -fXS -mKG -pHu -mcc -vei +rgc +xbM +fHo +vfO +lZp +lZp +jmv +uLV +lZp +vfO +dHD +xbM +fHo abJ -usz -usz +ioc +ioc abJ -hxy -hxy -aWR -aWR -aWR -cAA +fAf +fAf +nZB +nZB +nZB +owp uPA uWQ -aWR -evD -aWR +nZB +ghz +nZB uPA uWQ -aWR -aWR -hxy -hxy -vuE +nZB +nZB +fAf +fAf +eZr wSm wSm wSm @@ -73686,7 +73686,7 @@ wSm wSm wSm fZd -gAS +axn wSm wSm wSm @@ -73697,7 +73697,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -73731,8 +73731,8 @@ bQM bQM kPz bQM -wER -lok +weE +qkq azZ azZ azZ @@ -73742,65 +73742,65 @@ azZ azZ phz azZ -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -sqg -ukI -ezJ -xjK -weH -hFe -sCo -csp -fYD -bmX -xjK -xjK +hae +hae +hae +hae +hae +hae +hae +hae +hae +iRI +kpq +mvp +lIC +kxl +swT +fEn +gDI +agh +mvp +mvp wef -vJD -vJD -vJD +vUP +vUP +vUP wef -idE -idE -idE -idE -idE +byY +byY +byY +byY +byY wef -ikq -ikq -dyM -dyM +kXk +kXk +tPB +tPB fSq -ikq -vII -dyM +kXk +amn +tPB fSq -vJD -ikq -vII -vII -vII -dyM -aau -xMR -roY -iZV +vUP +kXk +amn +amn +amn +tPB +oNC +kjt +mgz +rLG cKa -aaK -soQ +jWI +oyy cKa -cFE -soQ +drZ +oyy cKa -xMR -iZV +kjt +rLG uwk swg fyC @@ -73808,74 +73808,74 @@ qOk sHO erT kPz -eDn -rkB -rFr -lBY -uSb -lzb -lDC -lDC -ldZ -ldZ -lDC -ldZ -ldZ -eDn +iYw +hre +wfw +jRF +bvp +iiY +bLJ +bLJ +frv +frv +bLJ +frv +frv +iYw cAW bce bce bce wzE kqC -usz -wGe +ioc +fPl kqC -iSn -mcc -krp -dHp -dHp -hCd -dHp -dHp -uFh -usz -pHu -mcc -vei -mKG -fXS -fXS -oXJ -fXS -fXS -mKG -pHu -mcc -vei +oFp +xbM +sJy +vds +vds +lvV +vds +vds +elO +ioc +dHD +xbM +fHo +vfO +lZp +lZp +eao +lZp +lZp +vfO +dHD +xbM +fHo vRA -usz -usz +ioc +ioc vRA -hxy -hxy -aWR -aWR -aWR -aWR +fAf +fAf +nZB +nZB +nZB +nZB nKl qfc -aWR -hxy -aWR +nZB +fAf +nZB nKl qfc -aWR -aWR -aWR -aWR -tts +nZB +nZB +nZB +nZB +iTt wSm wSm wSm @@ -73898,7 +73898,7 @@ wSm wSm kHG eAM -gAS +axn wSm wSm wSm @@ -73909,7 +73909,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -73943,8 +73943,8 @@ bQM bQM kPz bQM -rEH -pPb +gEq +arW azZ azZ azZ @@ -73954,30 +73954,30 @@ azZ azZ azZ azZ -dNF -dNF -dNF +rHX +rHX +rHX bou -dNF -dNF -dNF -jvp -dNF -dNF -ezJ -xjK -fUu -mcT -sCo -csp -csp -sBl -xjK -xjK +rHX +rHX +rHX +sVT +rHX +rHX +kpq +mvp +mMP +wsM +swT +fEn +fEn +ciM +mvp +mvp cKa -roY -roY -roY +mgz +mgz +mgz cKa tOp tOp @@ -73985,10 +73985,10 @@ cKa tOp cKa cKa -ikq -ikq -dyM -dyM +kXk +kXk +tPB +tPB jmG jmG jmG @@ -74001,18 +74001,18 @@ cKa kzh tOp cKa -fiu -gbi -iZV +cIJ +lfX +rLG cKa -ldm -usA +iFB +dUx cKa -ldm -rEg +iFB +trR cKa -xMR -iZV +kjt +rLG uwk daD afk @@ -74020,74 +74020,74 @@ afk afk ghg gef -xQC -wkD -sMj -gXi -ecC -hgJ -edd -vgP -irx -htc -svo -irx -irx -xQC +sKY +qTe +red +mqJ +qJQ +myj +rtc +idS +rcg +wvL +hys +rcg +rcg +sKY cAW bce cAW cAW wzE -msv -uRY -dHp -dHp -bop -scg -mcc -mcc -tsi -fxP -xri -xri -iUy -usz -pHu -mcc -vei +xJQ +mYl +vds +vds +qEs +rPD +xbM +xbM +kTW +eNa +xRI +xRI +efW +ioc +dHD +xbM +fHo kqC -hnJ -pcl +hAP +dzE kqC -mak -pcl +sIk +dzE kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -usz -usz +ioc +ioc kqC -sKq -sKq -hxy -aWR -bkS -bkS -bkS -bkS -bkS -aWR -bkS -bkS -bkS -bkS -bkS -aWR -aWR -ttK +goo +goo +fAf +nZB +upw +upw +upw +upw +upw +nZB +upw +upw +upw +upw +upw +nZB +nZB +gBe wSm wSm wSm @@ -74110,7 +74110,7 @@ wSm wSm wSm eSF -gAS +axn wSm wSm wSm @@ -74121,7 +74121,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -74154,9 +74154,9 @@ bQM bQM vcC kPz -eok +eIX fiq -xLa +bxd azZ azZ azZ @@ -74167,55 +74167,55 @@ azZ azZ azZ azZ -kbO -kbO -kbO -kbO -kbO -kbO -kbO -kbO -dFk -ezJ -dTp -sVy -bXa -sCo -csp -fYD -bmX -xjK -xjK +eqU +eqU +eqU +eqU +eqU +eqU +eqU +eqU +uAg +kpq +hjp +dsS +dXN +swT +fEn +gDI +agh +mvp +mvp lZA -vJD -vJD -vJD +vUP +vUP +vUP lZA -aaK -dkj -dkj -dkj -dkj -jGL -dkj -dkj -dkj -dkj -ddz -dkj -jGL -dkj -kNz +jWI +eow +eow +eow +eow +owS +eow +eow +eow +eow +vqW +eow +owS +eow +lFB cKa -aaK -soQ +jWI +oyy cKa -mOr -wTO +siB +jSc cKa -vlX -roY -iZV +qya +mgz +rLG hEs cKa cKa @@ -74223,8 +74223,8 @@ cKa cKa cKa cKa -xMR -iZV +kjt +rLG uwk urJ afk @@ -74232,74 +74232,74 @@ hkh afk tCZ pcu -xQC -rym -fBi -irx -rym -rym -edd -vgP -eON -lWr -svo -eON -lWr -xQC +sKY +aso +ber +rcg +aso +aso +rtc +idS +imI +sPt +hys +imI +sPt +sKY bce bce cAW cAW wzE -pHu -dui -cWN -dWM -mcc -mcc -mcc -qBk -mcc -qjY +dHD +voV +sxc +cxA +xbM +xbM +xbM +oFf +xbM +jlq kqC ryJ end kqC -hix -mcc -veB +iCf +xbM +voO kqC -dhD -fXS -bGy -fXS -bYG +ubh +lZp +jmv +lZp +qXj kqC -ulJ -mcc -vei +nBb +xbM +fHo abJ -usz -usz +ioc +ioc abJ -hxy -hxy -aWR -hLy +fAf +fAf +nZB +lEg sEO -pXP -fSe -fSe -dSy -aWR -tSi -fSe -fSe -dSy -aWR -aWR -aWR -uEN +cCy +cvv +cvv +dUi +nZB +aSA +cvv +cvv +dUi +nZB +nZB +nZB +bne wSm wSm wSm @@ -74322,7 +74322,7 @@ wSm wSm wSm xrH -gAS +axn wSm wSm wSm @@ -74333,7 +74333,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -74368,7 +74368,7 @@ bQM kPz vcC bQM -eok +eIX azZ azZ azZ @@ -74379,64 +74379,64 @@ azZ azZ azZ azZ -xjK -xjK +mvp +mvp azZ -xjK +mvp azZ -xjK -xjK -xjK -tOr -ezJ -xjK -ezx -ezx -reO -ruy -ggG -rar -xjK -xjK +mvp +mvp +mvp +cer +kpq +mvp +sxH +sxH +aaR +dqX +pHi +eFX +mvp +mvp wef -vJD -vJD -vJD +vUP +vUP +vUP wef -xMR -roY -roY -lSY -roY -roY -roY -roY -roY -roY -roY -roY -roY -lSY -iZV +kjt +mgz +mgz +xAq +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +xAq +rLG cKa -ldm -usA +iFB +dUx cKa -ldm -usA +iFB +dUx cKa -bGQ -roY -iZV +xnt +mgz +rLG cKa -ocJ -rsE +bqu +rwm cKa -ocJ -rsE +bqu +rwm cKa -xMR -iZV +kjt +rLG uwk mdJ afk @@ -74444,74 +74444,74 @@ afk afk xMW ssJ -xQC -xkC -tom -vGv -uzO -dhe -edd -fje -das -jAt -svo -tJn -jAt -xQC +sKY +cvc +gPk +rmZ +sFY +neY +rtc +fOi +fac +ehO +hys +unF +ehO +sKY cAW bce bce bce wzE -lll -mcc -oPJ -jfk -mcc -vza -mcc -mcc -mcc -cCq +oXD +xbM +dJd +dBl +xbM +cZh +xbM +xbM +xbM +rzp kqC -cCq -sCh +rzp +jln kqC -cLE -mcc -uIb +eQb +xbM +kgp kqC -mXq -fXS -fXS -vPa -gNF +erU +lZp +lZp +xFJ +hrL kqC -pHu -mcc -vei +dHD +xbM +fHo vRA -usz -usz +ioc +ioc vRA -qcv -qcv -qcv -hxy -roo -iPV -iPV -hNc -iPV -aWR -iPV -iPV -iPV -iPV -aWR -hxy -hxy -vPA +nAm +nAm +nAm +fAf +lFo +fWr +fWr +hMH +fWr +nZB +fWr +fWr +fWr +fWr +nZB +fAf +fAf +klB wSm wSm wSm @@ -74534,7 +74534,7 @@ wSm wSm wSm fZd -gAS +axn wSm wSm wSm @@ -74545,7 +74545,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -74599,37 +74599,37 @@ lAh lAh lAh xvI -tOr -vJq -sqg -fde -fde -fde -xjK -xjK -xjK -xjK -xjK +cer +beh +hae +tqw +tqw +tqw +mvp +mvp +mvp +mvp +mvp cKa mvl mvl mvl cKa -ikq -vII -vII -wrQ -roY -nhz -vII -vII -vII -vII -vII -vII -wrQ -roY -fin +kXk +amn +amn +rTZ +mgz +cCe +amn +amn +amn +amn +amn +amn +rTZ +mgz +bOx cKa cKa cKa @@ -74637,18 +74637,18 @@ cKa cKa cKa cKa -pka -vII -dyM +nGV +amn +tPB cKa -dVm -dSw +jnX +rhH cKa -ikq -dSw +kXk +rhH cKa -ikq -dyM +kXk +tPB uwk aKA tWI @@ -74656,74 +74656,74 @@ llQ eOF bUB kPz -eDn -vPM -lBY -oOv -dGw -rFH -lDC +iYw +nQu +jRF +nzi +suX +tde +bLJ izZ -uym -uym +wTW +wTW izZ -uym -uym +wTW +wTW ecM cAW bce cAW cAW wzE -scw -uFh -mcc -mcc -mcc -evf -dWM -mcc -cCq -pHu +gtN +elO +xbM +xbM +xbM +lBI +cxA +xbM +rzp +dHD kqC -wII -uAi +qLi +jhN kqC -pKh -mcc -vei +rYy +xbM +fHo kqC kqC -mKG -mKG -mKG +vfO +vfO +vfO kqC kqC -pHu -mcc -vei +dHD +xbM +fHo vMK goG goG vMK goG vMK -xOQ -hxy -hxy -pax -hxy -hxy -pax -hxy -pax -hxy -hxy -pax -aWR -aWR -aWR -tts +gjs +fAf +fAf +uSU +fAf +fAf +uSU +fAf +uSU +fAf +fAf +uSU +nZB +nZB +nZB +iTt wSm wSm wSm @@ -74746,7 +74746,7 @@ wSm wSm wSm eAM -kAr +cAO wSm wSm wSm @@ -74757,7 +74757,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -74809,49 +74809,49 @@ azZ azZ azZ lAh -vtf -xjK -lax -kbO -kbO -fde -fde -fde -xjK -xjK -xjK -xjK -xjK +aeS +mvp +ubX +eqU +eqU +tqw +tqw +tqw +mvp +mvp +mvp +mvp +mvp mvl -jIZ -wwr -sGu +wSN +kzR +wSC mvl -bhR -vJD -vJD -xMR -roY -fin +knb +vUP +vUP +kjt +mgz +bOx aSz uwk uwk uwk uwk aSz -jXD -roY -iZV +xVw +mgz +rLG cKa -ocJ -iFu +bqu +hJo cKa -ocJ -rsE +bqu +rwm cKa -dso -vJD -vJD +jGz +vUP +vUP cKa kzh tOp @@ -74859,8 +74859,8 @@ cKa kzh tOp cKa -vJD -vJD +vUP +vUP jmG jmG mlC @@ -74868,74 +74868,74 @@ mlC mlC mlC ecM -eDn -eON -cYv -cYv -cYv -arY -lDC +iYw +imI +oEH +oEH +oEH +vkt +bLJ xKX -wkZ -wkZ -wWF -wkZ -wkZ +iaa +iaa +tZO +iaa +iaa ecM mlC wzE wzE wzE wzE -glW -vei -mcc -mcc -jsE -mcc -mcc -mcc -pHu -pQu +rzF +fHo +xbM +xbM +xel +xbM +xbM +xbM +dHD +jbg kqC kqC kqC kqC -cjp -mcc -pZb -xyR -xyR -dHp -dHp -dHp -jsD -xyR -bop -mcc -vei +rKd +xbM +pZn +atY +atY +vds +vds +vds +qJl +atY +qEs +xbM +fHo goG -xMs -whR -lyF -cFQ +dYq +chg +uEh +gZx goG -hxy -hxy -hxy -hxy -hxy -hxy +fAf +fAf +fAf +fAf +fAf +fAf mxQ -xBI +lVA mxQ -hxy -hxy -hxy -hxy -aWR -aWR -ttK +fAf +fAf +fAf +fAf +nZB +nZB +gBe wSm wSm xnU @@ -74958,18 +74958,18 @@ xnU wSm wSm eSF -mmP -fHB -fHB -fHB -ssD -iSi -ssD -hbC -hbC -hbC -hbC -ogo +due +ojq +ojq +ojq +tsc +bEk +tsc +ogf +ogf +ogf +ogf +fWI bQM bQM bQM @@ -75023,131 +75023,131 @@ azZ lAh lAh jZc -xjK -xjK -xjK -eAo -eAo -eAo -ruy -ruy -pQh -xjK -ruy +mvp +mvp +mvp +cYd +cYd +cYd +dqX +dqX +rYw +mvp +dqX mvl -jru +fqI xlp -mIE +cOF cKa cKa cKa cKa -xMR -roY -lpA +kjt +mgz +qrU uwk bQM bQM bQM bQM uwk -ikq -vII -dyM +kXk +amn +tPB cKa -ikq -dSw +kXk +rhH cKa -ikq -dSw +kXk +rhH cKa -jCU -dkj -dkj -dkj -dkj -dkj -fvY -dkj -dkj -dkj -dkj -dkj -vCT -fYV -fDI -fDI -cjF -cjF -cjF -jMA -cjF -cjF -cjF -cjF -cjF -gky -cjF -cjF -cjF -cjF -cjF -cjF -gky -cjF +wqz +eow +eow +eow +eow +eow +tkZ +eow +eow +eow +eow +eow +rIr +nmi +scS +scS +oPR +oPR +oPR +gbR +oPR +oPR +oPR +oPR +oPR +jnQ +oPR +oPR +oPR +oPR +oPR +oPR +jnQ +oPR kqC -usz -usz -usz -usz -usz -mcc -mcc -mcc -mcc -rFT -mcc -avl -xPO +ioc +ioc +ioc +ioc +ioc +xbM +xbM +xbM +xbM +bkQ +xbM +qNF +qSz kqC -qDI -npN +rkp +iKy kqC -cvk -mcc -rrj -mcc -mxz -mcc -rrj -mcc -mcc -mcc -mcc -mcc -vei +utG +xbM +jbm +xbM +xLx +xbM +jbm +xbM +xbM +xbM +xbM +xbM +fHo goG -fHu -qos -jxa -hXc +xoR +ioW +opM +fAU goG -hxy -abe -hxy -hxy -hxy -cqc +fAf +rpL +fAf +fAf +fAf +qsc mxQ iyf mxQ -xOQ -hxy -hxy -hxy -aWR -aWR -uEN +gjs +fAf +fAf +fAf +nZB +nZB +bne wQN wSm wSm @@ -75241,31 +75241,31 @@ eWP lAh lAh lAh -csp -csp -xjK -xjK -csp +fEn +fEn +mvp +mvp +fEn cKa -vmW +oOU fyi -mIE +cOF mvl -vJD -vJD -vJD -xMR -roY -fin +vUP +vUP +vUP +kjt +mgz +bOx aSz uwk uwk uwk uwk aSz -cOl -vJD -vJD +cIt +vUP +vUP cKa kzh tOp @@ -75273,83 +75273,83 @@ cKa kzh tOp cKa -jXD -roY -roY -lSY -roY -roY -roY -roY -roY -roY -roY -gLG -iZV +xVw +mgz +mgz +xAq +mgz +mgz +mgz +mgz +mgz +mgz +mgz +lFg +rLG fSq -cjF -gqe -rAW -cjF -vEF -gqe -gqe +oPR +qBe +exl +oPR +jqE +qBe +qBe miU -rWX +qOu xKX -pXj -gqe -gqe -gqe -bKs -gqe -gqe -gqe -gqe -nXq +eXz +qBe +qBe +qBe +eUP +qBe +qBe +qBe +qBe +eFQ wpO -usz -usz -usz -iUy -mcc -dWM -vza -mcc -qBk -dui -mcc -mcc -avl +ioc +ioc +ioc +efW +xbM +cxA +cZh +xbM +oFf +voV +xbM +xbM +qNF kqC -avl -iUy +qNF +efW kqC -ggp -xri -lXc -xri -xri -xri -xri -xri -ijP -xri -xri -xri -iUy +bki +xRI +iXq +xRI +xRI +xRI +xRI +xRI +mKd +xRI +xRI +xRI +efW goG -oJs -kfA -kfA -fWC +egd +pYB +pYB +bMI goG -hxy -hxy -hxy -hxy -hxy -hxy +fAf +fAf +fAf +fAf +fAf +fAf mxQ tUs mxQ @@ -75358,34 +75358,34 @@ iyf iyf mxQ vMK -hxy -hxy -tZs -hLK -yfC -fHV -tZs -lLv -yfC -fHV -tZs -hLK -yfC -fHV -tZs -hLK -yfC -fHV -tZs -hLK -yfC -fHV -tZs -aWR -aWR -aWR -aWR -aWR +fAf +fAf +nfh +bxe +cFg +gAQ +nfh +bIz +cFg +gAQ +nfh +bxe +cFg +gAQ +nfh +bxe +cFg +gAQ +nfh +bxe +cFg +gAQ +nfh +nZB +nZB +nZB +nZB +nZB vzB fiq vzB @@ -75453,86 +75453,86 @@ azZ lAh lAh lAh -glw -csp -xjK -xjK -csp +nMI +fEn +mvp +mvp +fEn rSr -mIE -mIE -mIE +cOF +cOF +cOF rSr -aaK -dkj -dkj -frY -roY -iZV -vJD -aaK -dkj -dkj -dkj -kNz -kpN -aaK -dkj -dkj -dkj -dkj -dkj -dkj -dkj -dkj -frY -roY +jWI +eow +eow +ufR +mgz +rLG +vUP +jWI +eow +eow +eow +lFB +xBN +jWI +eow +eow +eow +eow +eow +eow +eow +eow +ufR +mgz wef -roY -vrX -vII -vII -vII -vII -vII -vII -vII -dyM +mgz +cbY +amn +amn +amn +amn +amn +amn +amn +tPB fSq -ebP -jJe -gqe -gqe -sad -rsW -kJX -oXE -sED -gqe -kJX -gqe -gqe -gqe -gqe -gqe -gqe -gqe -qqJ -nXq +wdl +nOe +qBe +qBe +hdR +roQ +ccZ +uOP +cZR +qBe +ccZ +qBe +qBe +qBe +qBe +qBe +qBe +qBe +lFv +eFQ wpO -usz -usz -usz -pHu -ciZ -mcc -mcc -dWM -lCs -mcc -vza -cOb -veB +ioc +ioc +ioc +dHD +kbh +xbM +xbM +cxA +jET +xbM +cZh +fYY +voO kqC qRi end @@ -75540,63 +75540,63 @@ wzE wzE wzE kqC -usz -usz -usz -usz -dbL +ioc +ioc +ioc +ioc +pvE kqC jTJ goG goG goG vMK -lKt -kfA -kfA -slG +nxc +pYB +pYB +nWM vMK vMK -xOQ -hxy -hxy -hxy -hxy +gjs +fAf +fAf +fAf +fAf mxQ tUs mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vMK -xOQ -aWR -aWR -aWR -hxy -hxy -hxy -hxy -hxy -hxy -aWR -aWR -aWR -hxy -aWR -aWR -aWR -hxy -aWR -aWR -aWR -hxy -aWR -aWR -aWR -aWR -hxy +gjs +nZB +nZB +nZB +fAf +fAf +fAf +fAf +fAf +fAf +nZB +nZB +nZB +fAf +nZB +nZB +nZB +fAf +nZB +nZB +nZB +fAf +nZB +nZB +nZB +nZB +fAf wly tan tan @@ -75665,150 +75665,150 @@ lAh lAh lAh lAh -mYx -csp -xjK -xjK -csp +bMT +fEn +mvp +mvp +fEn cKa cKa cKa cKa cKa -xMR -roY -nhz -vII -vII -dyM -vJD -ikq -vII -vII -vII -dyM -vJD -xMR -roY -lSY -roY -roY -roY -roY -roY -roY +kjt +mgz +cCe +amn +amn +tPB +vUP +kXk +amn +amn +amn +tPB +vUP +kjt +mgz +xAq +mgz +mgz +mgz +mgz +mgz +mgz wef -roY -roY -roY -fin +mgz +mgz +mgz +bOx jpN uwk uwk uwk lIG -vJD -gDt -vJD +vUP +sHj +vUP cKa -cjF -gqe -gqe -gqe -vTl -ozh -cnu -gqe -gqe -gqe -cnu -gqe -gqe -gqe -gqe -bKs -gqe -gqe -gqe -cjF +oPR +qBe +qBe +qBe +nCH +mEU +oyS +qBe +qBe +qBe +oyS +qBe +qBe +qBe +qBe +eUP +qBe +qBe +qBe +oPR wpO -usz -usz -usz -avl -xri -xri -xri -ibN -mcc -lCs -mcc -mcc -pZb -dHp -dHp -uFh +ioc +ioc +ioc +qNF +xRI +xRI +xRI +nAK +xbM +jET +xbM +xbM +pZn +vds +vds +elO hZR bQM hZR -dDM -cCq -dHp -dHp -dHp -uFh -dDM +jvi +rzp +vds +vds +vds +elO +jvi duF -jao -qcM -dvs -kfA -kfA -kfA -kfA -kfA -bVY +jTN +xro +fGW +pYB +pYB +pYB +pYB +pYB +uvV vMK goG goG goG vMK -xBI +lVA mxQ deR mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vMK -hxy -aWR -aWR -aWR -hxy +fAf +nZB +nZB +nZB +fAf wly wly wly wly -tSi -fSe -dSy -hxy -hxy -aWR -aWR -hxy -hxy -hxy -aWR -hxy -hxy -hxy -hxy -aWR -hxy -hxy +aSA +cvv +dUi +fAf +fAf +nZB +nZB +fAf +fAf +fAf +nZB +fAf +fAf +fAf +fAf +nZB +fAf +fAf wly wly wly @@ -75884,12 +75884,12 @@ wef lSj cKa cKa -eJi -kNz -pLk -roY -roY -fin +pRa +lFB +lpX +mgz +mgz +bOx cKa kzh tOp @@ -75900,20 +75900,20 @@ cKa kzh tOp arn -jXD -roY -nhz -vII -vII -vII -vII -vII -vII -wrQ -roY -roY -roY -iZV +xVw +mgz +cCe +amn +amn +amn +amn +amn +amn +rTZ +mgz +mgz +mgz +rLG uwk bQM kPz @@ -75923,26 +75923,26 @@ hul cKa cKa cKa -qjp -gqe -gqe -gqe -nSz -nSz -lvk -gqe -gqe -gqe -lvk -gqe -gqe -gqe -cjF -cjF -rQm -yiG -rUY -vGO +hrz +qBe +qBe +qBe +fWH +fWH +jlI +qBe +qBe +qBe +jlI +qBe +qBe +qBe +oPR +oPR +hxj +wis +sGa +gNU kqC kqC ecd @@ -75951,75 +75951,75 @@ kqC cRB end kqC -vee -mcc -fxP -xri -xri -xri -xri -xri -iUy +pHx +xbM +eNa +xRI +xRI +xRI +xRI +xRI +efW hZR kPz hZR -vhe -pHu -rrj -mcc -mcc -vei -dDM +auS +dHD +jbm +xbM +xbM +fHo +jvi duF -eTo -rII -lAS -lAS -lAS -dmB -dmB -lAS -lAS -lAS -lAS -lAS -bYv +fEH +xsS +tOM +tOM +tOM +kor +kor +tOM +tOM +tOM +tOM +tOM +wZH mxQ iyf mxQ tUs mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vMK -dlX -iLQ -jbG -mzz -rqL +hhu +bOp +jEQ +slT +mSk wly kPz bQM wly -vJp -xwA -wKn -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy -hxy +lhS +nXE +ibA +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf +fAf wly wly bQM @@ -76090,82 +76090,82 @@ cAW jmG bQM jmG -vJD -aaK -dkj -kNz -roY +vUP +jWI +eow +lFB +mgz cKa -lLP -iZV +dJh +rLG uwk -xMR -roY -iZV +kjt +mgz +rLG cKa -aaK -soQ +jWI +oyy cKa -tPP -soQ +bTr +oyy cKa -cVX -soQ +kyU +oyy cKa -xMR -roY -fin +kjt +mgz +bOx cKa cKa -fdn -fdn +wZt +wZt cKa jmG gHh -roY -roY -roY -iZV +mgz +mgz +mgz +rLG uwk kPz kPz kPz uwk -mIE -mIE -kFa +cOF +cOF +utw lzm -gqe -gqe -gqe -gqe -cTA -rsW -hLO -gqe -gqe -gqe -hLO -gqe -pXj -gqe -cjF +qBe +qBe +qBe +qBe +oSz +roQ +dvg +qBe +qBe +qBe +dvg +qBe +eXz +qBe +oPR kqC kqC -xrG -kDq +dAd +hbp kqC kqC rCq vRA vRA kqC -eaQ -tUA +fLb +ayW kqC -pHu -mcc -dzj +dHD +xbM +rYK kqC cRB end @@ -76175,36 +76175,36 @@ end wzE bQM hZR -dDM -pHu -fxP -eag -ibN -vei -xzW +jvi +dHD +eNa +rwK +nAK +fHo +kpu duF -hXc -lAS -lAS -lAS -lAS -tNt -uBW -lAS -lAS -lAS -lAS -lAS -bYv +fAU +tOM +tOM +tOM +tOM +nny +vHD +tOM +tOM +tOM +tOM +tOM +wZH mxQ -oYM +gbf tUs tUs vDO -atE -nVq -rev -oYM +eBS +fOT +apu +gbf bzO bzO ybj @@ -76215,12 +76215,12 @@ wly kPz bQM wly -xBK -abe -lrm -hxy -mft -gHl +dUn +rpL +fwY +fAf +jEr +byE wly ckm ckm @@ -76302,66 +76302,66 @@ cAW jmG jmG jmG -vJD -xMR -roY -iZV -vJD +vUP +kjt +mgz +rLG +vUP cKa -ldm -usA +iFB +dUx uwk -xMR -roY -iZV +kjt +mgz +rLG cKa -ldm -usA +iFB +dUx cKa -ldm -usA +iFB +dUx cKa -dra -ovc +oMw +yhJ cKa -oLd -roY -iZV +mlg +mgz +rLG cKa -cQA -xec -xec -ohN +uyC +dzB +dzB +aYg cKa -xMR -roY -roY -mSM -iZV +kjt +mgz +mgz +kWx +rLG uwk bQM kPz bQM uwk -mIE +cOF fyi -kGi +dXS qva -dAe -lps -gqe -gqe -iOJ -ozh -kJX -gqe -gqe -gqe -kJX -gqe -gqe -gqe -rUY +xbm +smj +qBe +qBe +aZL +mEU +ccZ +qBe +qBe +qBe +ccZ +qBe +qBe +qBe +sGa kqC kqC vRA @@ -76372,51 +76372,51 @@ kqC tVV arl oFI -eGY -eOf +kCT +opj kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -cCq -fOZ +rzp +bIP kqC -cCq -pDV +rzp +mwP wzE kPz jTJ -clZ -pHu -vei -vbd -pHu -vei -iPq +vUl +dHD +fHo +pLE +dHD +fHo +uuG jTJ -pMA -lAS -lAS -lAS -mKy -rII -rII -lAS -lAS -kxo -lAS -lAS -bYv +gHn +tOM +tOM +tOM +bkg +xsS +xsS +tOM +tOM +uwT +tOM +tOM +wZH mxQ -pes +eBj vfz tUs mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vEK bzO wly @@ -76514,18 +76514,18 @@ cAW cAW bQM uwk -vJD -ikq -vII -dyM -vJD +vUP +kXk +amn +tPB +vUP hEs cKa cKa cKa -dgx -uzX -aFV +wdL +vAU +hCR hEs cKa cKa @@ -76536,50 +76536,50 @@ cKa cKa cKa cKa -jXD -roY -iZV +xVw +mgz +rLG cKa -unW -wpu -xec -oYc +onW +pZp +dzB +shh cKa -xMR -roY +kjt +mgz wef -roY -iZV +mgz +rLG jmG bQM kPz bQM uwk -vbt +jsu fyi -aHs +haQ cKa -pwN -lps -wAD -gqe -gqe -gqe -gqe -gqe -rJT -gqe -kDj -gqe -gqe -gqe -oEI -jKb +ntE +smj +wrT +qBe +qBe +qBe +qBe +qBe +sWw +qBe +sQr +qBe +qBe +qBe +vcu +qQM abJ -cCq -dHp -uFh -wBr +rzp +vds +elO +sKt kqC vRA tiX @@ -76587,49 +76587,49 @@ kqC kqC kqC kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -wII -bjk +qLi +dpe kqC -wII -bjk +qLi +dpe wzE bQM hZR -vbd -pHu -vei -vbd -pHu -vei -vbd +pLE +dHD +fHo +pLE +dHD +fHo +pLE duF -iJG -lAS -lAS -lAS -lAS -lAS -lAS -lAS +mWR +tOM +tOM +tOM +tOM +tOM +tOM +tOM ffZ mxQ mxQ iyf mxQ mxQ -oYM +gbf ndl aZN mxQ -oYM -nVq -rev -oYM -vCv +gbf +fOT +apu +gbf +lTW bzO bzO rzt @@ -76726,82 +76726,82 @@ cAW cAW bQM uwk -aaK -dkj -kNz -vJD -vJD +jWI +eow +lFB +vUP +vUP wef -ocJ -rsE -oWB -ehA -roY -rAt +bqu +rwm +eDA +vsM +mgz +xBc cKa -ocJ -rsE +bqu +rwm cKa -ocJ -rsE +bqu +rwm cKa -ocJ -rsE +bqu +rwm cKa -xMR -roY -iZV +kjt +mgz +rLG cKa -vYP +tjR cKa -unW -xec -fdn -xMR -roY -roY +onW +dzB +wZt +kjt +mgz +mgz wef -iZV +rLG uwk bQM kPz bQM jmG -vBc +bZI fyi -xCy +vqs mvl -pwN -lps -uzd -gqe -uzd -gqe -uzd -rUY -vGO -tMF -hgu -hgu -hgu -hgu -rox -xNQ +ntE +smj +qof +qBe +qof +qBe +qof +sGa +gNU +oOg +bno +bno +bno +bno +vrR +jOb vRA -pHu -djx -vei -wBr +dHD +bAM +fHo +sKt oFI vRA glD kqC -tnj -pDV +pVY +mwP kqC -pHu -mcc -dzj +dHD +xbM +rYK mCF kqC kqC @@ -76811,41 +76811,41 @@ kqC wzE kPz hZR -vbd -pHu -vei -vbd -pHu -tax -vbd +pLE +dHD +fHo +pLE +dHD +naI +pLE duF -lQZ -mWF -lAS -lAS -uyq -lAS -dCF -lAS +dLN +dPm +tOM +tOM +uyw +tOM +hoT +tOM mxQ nmT tUs rbK tUs tUs -rwt +aEC tUs tUs ffZ -oYM -nVq -rev -oYM -oYM +gbf +fOT +apu +gbf +gbf mxQ -iHJ -xsa -ayK +qhD +qhJ +upK bzO rzt rzt @@ -76938,72 +76938,72 @@ bce bce uwk uwk -xMR -roY -iZV -mey -vJD -oWB -ikq -dyM +kjt +mgz +rLG +gBw +vUP +eDA +kXk +tPB wef -xMR -roY -lHc +kjt +mgz +xRY cKa -ikq -dyM +kXk +tPB cKa -ikq -dyM +kXk +tPB cKa -ikq -sAx +kXk +ctI cKa -xMR -iqV -aad +kjt +gzu +kGo cKa -unW -rmb -pdV -xec -fdn -xMR -roY +onW +vBa +cMP +dzB +wZt +kjt +mgz jMf wef -iZV +rLG uwk kPz kPz kPz jmG -wdX +wxW jEK -mIE +cOF jce -pwN -lps -gqe -gqe -gqe -gqe -gqe -iMF +ntE +smj +qBe +qBe +qBe +qBe +qBe +hSl ecM -fYn -eqT -ofr -bhM -tBa -tuH +jVj +gqU +eac +dPe +mcJ +uIL kqC kqC -ulJ -mcc -vei -wBr +nBb +xbM +fHo +sKt kqC kqC kqC @@ -77011,57 +77011,57 @@ kqC ryJ end kqC -ulJ -mcc -vei +nBb +xbM +fHo kqC -bux -bZu +sfu +jyF kqC -aFh -bZu +hHX +jyF wzE bQM hZR -vbd -avl -iUy -vbd -avl -iUy -vbd +pLE +qNF +efW +pLE +qNF +efW +pLE duF -whR -lAS -lAS -lAS -tvu -lAS -lAS -lAS +chg +tOM +tOM +tOM +fiw +tOM +tOM +tOM vDO tUs mxQ tUs mxQ mxQ -jum +mAN mxQ tUs mxQ -oYM -nVq -rev -kfA -kfA -tyQ -sTV -tdA -oYM -cUE -lAS -oYM -myt +gbf +fOT +apu +pYB +pYB +qaT +fWy +uvu +gbf +erw +tOM +gbf +pRz bzO bQM kPz @@ -77149,19 +77149,19 @@ vBP fQV erT uwk -bsd -ikq -vII -dyM -vJD -pqG +wcC +kXk +amn +tPB +vUP +dFI cKa -oWB +eDA wef wef -bDu -hMX -iiE +wlv +xWG +ngF cKa kzh tOp @@ -77172,66 +77172,66 @@ cKa kzh tOp cKa -jXD -roY -iZV +xVw +mgz +rLG cKa -unW -oYc +onW +shh cKa -unW -fdn -xMR -roY +onW +wZt +kjt +mgz bJn aTM -iZV +rLG uwk bQM kPz bQM jmG -wQh -mTS -jas +txf +oZj +sfZ uhm -ebP -bej -uzd -gqe -uzd -gqe -uzd -tnA +wdl +iUS +qof +qBe +qof +qBe +qof +pUo ecM -fXT -nSz -nSz -nSz -nSz -nSz +vNd +fWH +fWH +fWH +fWH +fWH kqC -uPD -uHL -mcc -dzj +mue +bbI +xbM +rYK kqC kqC -pFY -aru -dHp -dHp -dHp -uFh -pHu -mcc -vei +wyQ +eTa +vds +vds +vds +elO +dHD +xbM +fHo kqC -avl -jms +qNF +mDO kqC -avl -jms +qNF +mDO wzE wzE wzE @@ -77244,36 +77244,36 @@ ecd kqC jTJ vMK -dhj -lAS -mKy -lik -lAS -lAS -sDF +mGZ +tOM +bkg +czr +tOM +tOM +hao mxQ jXj mxQ rsp mxQ -oYM -oYM +gbf +gbf mxQ tUs mxQ -oYM -aZQ -rev -oYM -oYM +gbf +xRw +apu +gbf +gbf mxQ -tdA -tMe -tdA -krr -mpr -krr -xsa +uvu +sxE +uvu +sXa +uCO +sXa +qhJ bzO bQM kPz @@ -77361,43 +77361,43 @@ afk afk ghg uwk -mAE -vJD -aaK -dkj -kNz -vJD -ahe -aaK -cmj -rfD -frY -oSR -qqZ -dkj -dkj -kNz -vJD -eJi -rfD -dkj -dkj -kNz -vJD -xMR -mMq -iZV +aoZ +vUP +jWI +eow +lFB +vUP +pDo +jWI +bXz +kGd +ufR +sNi +jna +eow +eow +lFB +vUP +pRa +kGd +eow +eow +lFB +vUP +kjt +jYM +rLG cKa -unW -xec -rmb -oYc +onW +dzB +vBa +shh cKa -xMR -roY +kjt +mgz wef -roY -fin +mgz +bOx jmG uwk uwk @@ -77407,37 +77407,37 @@ mvl mvl uhm cKa -vcr -yiG -gqe -gqe -gqe -gqe -cjF -iMF +dnj +wis +qBe +qBe +qBe +qBe +oPR +hSl ecM bEX bEX izZ -cjF -cjF -cjF +oPR +oPR +oPR kqC -ftH -pHu -mcc -vei +pCQ +dHD +xbM +fHo abJ -usz -cCq -dHp -dHp -dHp -uFh -iUy -pHu -mcc -dzj +ioc +rzp +vds +vds +vds +elO +efW +dHD +xbM +rYK kqC ryJ end @@ -77448,35 +77448,35 @@ kqC wzE pah kwL -mcc -pfE +xbM +iCN qOq -mcc -mcc +xbM +xbM pah bhu goG -lAS -lAS -lAS -gfw -lAS -lAS -aem +tOM +tOM +tOM +tsf +tOM +tOM +dbW mxQ tUs tUs oBj mxQ -oYM +gbf mxQ mxQ msj mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vEK mxQ mxQ @@ -77573,132 +77573,132 @@ hkh afk tCZ uwk -wtx -vJD -xMR -roY -iZV -roY -roY -ikq -qEn -vII -vII -vII -vII -vII -vII -dyM -sAe -ikq -xqj -qEn -vII -dyM -vJD -xMR -roY -iZV +rce +vUP +kjt +mgz +rLG +mgz +mgz +kXk +qGB +amn +amn +amn +amn +amn +amn +tPB +baM +kXk +xYJ +qGB +amn +tPB +vUP +kjt +mgz +rLG cKa -qzl -pdV -xec -isi +okJ +cMP +dzB +lsZ hEs -xMR -roY -roY +kjt +mgz +mgz wef -iZV +rLG jYs -vWI -nSz -sad -qpa -nSz -nSz -vli -fGL -uXM -xrG -lHy -lHy -lHy -lHy -lHy -dBa -gqe -gqe -gqe -klg -gqe -gqe -cjF +uJi +fWH +hdR +hQQ +fWH +fWH +mBG +sue +wBB +dAd +ode +ode +ode +ode +ode +cry +qBe +qBe +qBe +wKm +qBe +qBe +oPR kqC -pzN -pHu -mcc -vei +cRI +dHD +xbM +fHo vRA -usz -avl -xri -xri -xri -iUy -uFh -qWf -mcc -vei -usz -cCq -dHp -dHp -dHp -uFh -usz +ioc +qNF +xRI +xRI +xRI +efW +elO +cHC +xbM +fHo +ioc +rzp +vds +vds +vds +elO +ioc duF koy gsL -pHc -mcc +mOI +xbM qOq -mcc -mcc +xbM +xbM ckx sNN goG -lAS -lAS -lAS -hzq -gnz -lAS -tlp +tOM +tOM +tOM +bPh +mzJ +tOM +mtD mxQ xCa pjT -wul +cHm mxQ -qFg +fvK hvF tUs tUs lhY -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vEK mxQ mxQ -kcz -vkZ -vkZ -vkZ -vkZ -vkZ -vkZ +kGZ +sBW +sBW +sBW +sBW +sBW +sBW bzO bzO bzO @@ -77785,12 +77785,12 @@ afk afk xMW uwk -wtx -vJD -ikq -vII -dyM -mLe +rce +vUP +kXk +amn +tPB +qqC eov efl fDQ @@ -77798,9 +77798,9 @@ eov tzy wef wef -pnA -vJD -bhR +xgH +vUP +knb wef wef tOp @@ -77808,110 +77808,110 @@ cKa kzh tOp cKa -jXD -roY -fin +xVw +mgz +bOx aSz aSz aSz hul aSz aSz -pka -vII -vII -vII -dyM +nGV +amn +amn +amn +tPB jYs -nSz -ozh -iOJ -ozh -iOJ -vYA -oDz -fnW -wEQ -gqe -cjF -cjF -enG -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -cjF +fWH +mEU +aZL +mEU +aZL +cGS +dBz +ivw +kmm +qBe +oPR +oPR +wuW +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +oPR kqC -uPD -gwX -mcc -dzj +mue +gIa +xbM +rYK kqC kqC -usz -avl -xri -xri -xri -iUy -pHu -mcc -vei -usz -avl -xri -xri -xri -iUy -rvf +ioc +qNF +xRI +xRI +xRI +efW +dHD +xbM +fHo +ioc +qNF +xRI +xRI +xRI +efW +sDR hBF -vHR -uJk -mcc -mcc +vcv +iLl +xbM +xbM qOq -wwH -mcc +huG +xbM pah mbH goG -lAS -lAS -lAS -aIR -lAS -lAS -hIe +tOM +tOM +tOM +quL +tOM +tOM +tzU mxQ tUs mxQ tUs tUs -oYM +gbf rbK tUs mxQ mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vEK -fKv -kcz -aWo -kfA -atE -kfA -lAS -lAS -oYM -oYM +fFw +kGZ +fHI +pYB +eBS +pYB +tOM +tOM +gbf +gbf bzO bQM kPz @@ -77997,37 +77997,37 @@ eJQ jlH bUB uwk -lCD -aaK -dkj -kNz -vJD -roY +iTr +jWI +eow +lFB +vUP +mgz eov -svF -qtX +ihV +uvS eov -pgV -uMH +gXI +qxx jAW -vJD -tMr -vJD +vUP +tWs +vUP wef -aaK -kNz +jWI +lFB cKa -aaK -soQ +jWI +oyy cKa -xMR -roY -iZV -vJD +kjt +mgz +rLG +vUP cKa -pVq +sXe wef -pVq +sXe aSz jmG jmG @@ -78035,35 +78035,35 @@ uwk uwk jmG jmG -ozh -kxV -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -aDw +mEU +bbn +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +pUf kqC kqC -ulJ -mcc -vei -wBr +nBb +xbM +fHo +sKt kqC ryJ end @@ -78071,9 +78071,9 @@ kqC ryJ end kqC -pHu -mcc -dzj +dHD +xbM +rYK kqC ryJ end @@ -78092,38 +78092,38 @@ ecd kqC jTJ vMK -pmg -lAS -lAS -lAS -lAS -lAS -lAS +pFW +tOM +tOM +tOM +tOM +tOM +tOM vDO tUs mxQ vrF hvF -oYM +gbf hvF oBj tUs vDO -atE -nVq -jVW -oYM -oYM -sTV -hHv +eBS +fOT +epB +gbf +gbf +fWy +vUZ waN sfW sfW sfW sfW sfW -oqu -jKL +qRW +mOE bzO tan tan @@ -78210,36 +78210,36 @@ bce bce uwk uwk -xMR -roY -iZV -vJD -iKC +kjt +mgz +rLG +vUP +cEg eov -kzI -qfu +jGs +vRu eov -ldm -wMS +iFB +nVu hqD -wZE -vJD -azg +jiz +vUP +cfU hqD -ldm -usA +iFB +dUx cKa -ldm -xVv +iFB +qBT cKa -xMR -roY -iZV -vJD +kjt +mgz +rLG +vUP glj -pVq +sXe wef -pVq +sXe odQ uwk bQM @@ -78247,101 +78247,101 @@ bQM bQM bQM uwk -iOJ -cjF -jBL -cjF -cjF -cjF -cjF -cjF -cjF -cjF -krQ -cjF -gqe -sad -aPi +aZL +oPR +ldj +oPR +oPR +oPR +oPR +oPR +oPR +oPR +hoC +oPR +qBe +hdR +ksu ecM mlC mlC mlC ecM -qKF -gqe -oEI -jKb +okE +qBe +vcu +qQM abJ -pHu -mcc -vei -wBr +dHD +xbM +fHo +sKt kqC -avl -jms +qNF +mDO kqC -avl -jms +qNF +mDO kqC -ulJ -mcc -vei +nBb +xbM +fHo kqC -cCq -pDV +rzp +mwP kqC -cCq -pDV +rzp +mwP kqC -qOG -lAS -eBC -nVq -rev -qTy -nVq -rev -oYM -cFf +rKs +tOM +wGA +fOT +apu +hAs +fOT +apu +gbf +xXt vMK -tld -lAS -lAS -lAS -xsg -lAS -qLJ +bRC +tOM +tOM +tOM +sbU +tOM +aXv mxQ tUs tUs jXj mxQ -oYM +gbf mxQ tUs hvF mxQ -oYM -nVq -xUz -nbv -nbv -pdf -aWo +gbf +fOT +nBw +nvX +nvX +wuz +fHI hfd fIW htt htt qpM vjq -euC -euC -euC -ssD -iSi -ssD -hbC -cbb +fHb +fHb +fHb +tsc +bEk +tsc +ogf +mRM bQM bQM bQM @@ -78422,11 +78422,11 @@ cAW cAW bQM uwk -ikq -vII -dyM -vJD -urw +kXk +amn +tPB +vUP +kIO eov dRO pvD @@ -78434,9 +78434,9 @@ eov cKa cKa cKa -pEL -vJD -pqG +mZy +vUP +dFI hEs cKa cKa @@ -78444,14 +78444,14 @@ cKa cKa cKa cKa -jXD -roY -iZV -vJD +xVw +mgz +rLG +vUP glj -pVq +sXe wef -pVq +sXe vJh uwk kPz @@ -78459,35 +78459,35 @@ kPz kPz kPz uwk -gqe -naN -cjF -rsW -kJX -iOJ -ozh -rsW -kJX -iOJ -cjF -cjF -gqe -adY -sKS +qBe +rpt +oPR +roQ +ccZ +aZL +mEU +roQ +ccZ +aZL +oPR +oPR +qBe +jDe +ofl mlC kPz kPz kPz mlC -gqe -bKs -rUY -xNQ +qBe +eUP +sGa +jOb vRA -avl -lka -iUy -usz +qNF +eux +efW +ioc kqC kqC kqC @@ -78495,26 +78495,26 @@ mCF kqC kqC kqC -pHu -mcc -vei +dHD +xbM +fHo kqC -wII -bjk +qLi +dpe kqC -wII -bjk +qLi +dpe kqC -riu -boh -oYM -nVq -rev -kfA -nVq -rev -oYM -tld +lbz +gLk +gbf +fOT +apu +pYB +fOT +apu +gbf +bRC vMK goG iyf @@ -78528,18 +78528,18 @@ mxQ uZX mxQ mxQ -iuV +uOM mxQ uZX mxQ mxQ -jae -nVq -oYM -oYM -oYM -amx -lAS +mFS +fOT +gbf +gbf +gbf +arT +tOM hfd vfM oEK @@ -78553,7 +78553,7 @@ vzB fiq vzB bQM -gEU +bmT bQM bQM bQM @@ -78634,36 +78634,36 @@ cAW cAW bQM uwk -vJD -aaK -dkj -kNz -cgE +vUP +jWI +eow +lFB +dbh eov doe cAW eov -ocJ -rsE +bqu +rwm cKa -qBh -vJD -vJD +gzN +vUP +vUP cKa -ocJ -rsE +bqu +rwm cKa -ocJ -rsE +bqu +rwm cKa -xMR -lSY -iZV -vJD +kjt +xAq +rLG +vUP cKa -nmQ +dcv wef -pVq +sXe lMi uwk bQM @@ -78671,29 +78671,29 @@ bQM bQM bQM uwk -rsW -uyb -cjF -stq +roQ +vdW +oPR +kJJ jRL mlC mlC mlC ecM -qYc -cjF -cjF -gqe -jJM -dlE +iCE +oPR +oPR +qBe +xbE +fYf mlC bQM bQM bQM mlC -bKs -gqe -fum +eUP +qBe +xIq kqC kqC vRA @@ -78701,15 +78701,15 @@ blG kqC kqC kqC -mcc -mcc -mcc -lnU -mcc -mcc -pHu -mcc -dzj +xbM +xbM +xbM +kgQ +xbM +xbM +dHD +xbM +rYK kqC kqC kqC @@ -78718,54 +78718,54 @@ kqC kqC kqC mxQ -lAS -oYM -nVq -rev -kfA -nVq -rev -oYM -lAS -sPk -kfA -kfA -kfA +tOM +gbf +fOT +apu +pYB +fOT +apu +gbf +tOM +vuV +pYB +pYB +pYB mxQ oXS fUr wcW -tTK +wjT mxQ -oYM -rwt -nQS -oYM +gbf +aEC +gzh +gbf mxQ tUs tUs bMu -btB -nVq -lXf -nLl -nLl -jYd -mXT +gOk +fOT +jzP +ydK +ydK +qzb +tdq hfd ucj bBA bBA rZi eMU -euC -euC -euC -ssD -iSi -ssD -hbC -ogo +fHb +fHb +fHb +tsc +bEk +tsc +ogf +fWI bQM bQM bQM @@ -78846,31 +78846,31 @@ cAW jmG jmG jmG -iir -xMR -fnj -iZV -gHc +lSq +kjt +hjB +rLG +taI eov ivb cAW eov -ikq -dyM +kXk +tPB cKa -uvh -aZZ -vJD +fLH +gCK +vUP cKa -ikq -dSw +kXk +rhH cKa -ikq -dSw +kXk +rhH cKa -xMR -roY -iZV +kjt +mgz +rLG cKa cKa cKa @@ -78883,95 +78883,95 @@ hxq hxq vnr vnr -ozh -cjF -cjF -iOJ +mEU +oPR +oPR +aZL mlC bQM kPz bQM mlC -rsW -cjF -cjF -gqe -gtM -sbM +roQ +oPR +oPR +qBe +vtX +dYo mlC kPz kPz kPz mlC -gqe -gqe -gqe +qBe +qBe +qBe kqC kqC -heb -rIC +jva +gEX wzE kqC -qVe -lnU -tlS -fFf -pWm -usz -lnU -tno -mcc -vei +pai +kgQ +tSl +diJ +ddt +ioc +kgQ +diF +xbM +fHo kqC -bux -bZu +sfu +jyF kqC -bux -bZu +sfu +jyF kqC -lyg -cfj -oYM -nVq -rev -ppK -nVq -mel -oYM -pfW -fqD -cmV -cmV -cmV +hNj +ijd +gbf +fOT +apu +klN +fOT +wmm +gbf +vRP +anR +pca +pca +pca vDO tUs rbK tUs tUs uZX -kfA -kfA -ppb -kfA -kfA +pYB +pYB +hQM +pYB +pYB tUs vjl mxQ -oYM -nVq -rev -oYM -oYM -fKv -hHv +gbf +fOT +apu +gbf +gbf +fFw +vUZ tuX vEi vEi vEi vEi vEi -hhh -eKu +faD +oyO bzO tan tan @@ -79058,11 +79058,11 @@ cAW jmG cAW jmG -vJD -ikq -vII -dyM -nCl +vUP +kXk +amn +tPB +mpR eov hxJ qgd @@ -79070,9 +79070,9 @@ eov kzh tOp cKa -evU -vJD -pqG +oDH +vUP +dFI cKa kzh tOp @@ -79080,110 +79080,110 @@ cKa kzh tOp cKa -jXD -roY -fin +xVw +mgz +bOx cKa -vJD -vJD -vJD +vUP +vUP +vUP cKa -xyf -tMA -ycX -jsn -ycX -eOS +xRl +cPz +ixl +kJz +ixl +bjf vNq -srz -cjF -cjF -gqe +hsz +oPR +oPR +qBe mlC kPz kPz kPz mlC -sad -cjF -cjF -gqe -iOJ -dhN +hdR +oPR +oPR +qBe +aZL +nGB ecM mlC mlC mlC ecM -qBs -gqe -gqe -gqe -eTJ -rOm -gGB -rOm +eLU +qBe +qBe +qBe +jis +dQV +nGp +dQV kqC -qVe -lnU -cbe -fFf -kqP -usz -rgD -pHu -mcc -vei +pai +kgQ +nkg +diJ +iuC +ioc +pnP +dHD +xbM +fHo kqC -avl -jms +qNF +mDO kqC -avl -jms +qNF +mDO kqC -riu -mGx -oYM -nVq -rev -iCC -nVq -rev -oYM -oYM -oYM -mgU -oYM -lAS +lbz +hnh +gbf +fOT +apu +vTM +fOT +apu +gbf +gbf +gbf +uFg +gbf +tOM mxQ -xjv -xjv -xjv -xjv +kag +kag +kag +kag uZX -oYM -kvd -ihA -fmM -oYM +gbf +dtk +nnC +ota +gbf mxQ mxQ mxQ -oYM -nVq -rev -oYM +gbf +fOT +apu +gbf vEK -sTV -pVv -oYM -kfA -atE -kfA -lAS -lAS -oYM -oYM +fWy +lUv +gbf +pYB +eBS +pYB +tOM +tOM +gbf +gbf bzO bQM kPz @@ -79279,73 +79279,73 @@ eov eov eov eov -vJD +vUP wef -vJD -ceZ -vJD -vJD -jki -aaK -dkj -aPq -rfD -kNz -vJD -xMR -roY -iZV +vUP +ika +vUP +vUP +bjZ +jWI +eow +aiv +kGd +lFB +vUP +kjt +mgz +rLG lZA -aaK -dkj -kNz +jWI +eow +lFB lZA -ycX -ycX -qHZ -qYq -qYq -ycX -sun -gqe -cjF -cjF -rsW +ixl +ixl +ghS +hHH +hHH +ixl +rmX +qBe +oPR +oPR +roQ mlC bQM kPz bQM mlC -iOJ -cjF -cjF -gqe -gqe -mmh -gqe -bKs -gqe -gqe -gqe -gqe -gqe -sad -rsW -gqe -gqe -gqe -ijv +aZL +oPR +oPR +qBe +qBe +gbk +qBe +eUP +qBe +qBe +qBe +qBe +qBe +hdR +roQ +qBe +qBe +qBe +fjg kqC -qVe -lnU -kau -fFf -tnP -fFf -mcc -pHu -mcc -dzj +pai +kgQ +tTm +diJ +aga +diJ +xbM +dHD +xbM +rYK kqC ryJ end @@ -79354,48 +79354,48 @@ ryJ end kqC kqC -pmg -mTJ -nVq -tTr -wRG -mfd -xUz -nbv -nbv -nbv -bPS -oYM -qLJ +pFW +cTy +fOT +wua +kKP +eqw +nBw +nvX +nvX +nvX +beB +gbf +aXv bzO rzt rzt rzt rzt bzO -kfA -kfA -deW -kfA -kfA +pYB +pYB +xOm +pYB +pYB mxQ -sfw -sfw -nyQ -nVq -rev -oYM -oYM -fKv -hHv +rQN +rQN +fUD +fOT +apu +gbf +gbf +fFw +vUZ waN sfW sfW sfW sfW sfW -oqu -jKL +qRW +mOE bzO tan tan @@ -79490,95 +79490,95 @@ jmG cKa cKa cKa -xCW -vJD -vJD -vJD -vJD -pFg -vJD -bhR -ikq -xqj -qEn -vII -uZe -vJD -xMR -roY -iZV +rpf +vUP +vUP +vUP +vUP +mIr +vUP +knb +kXk +xYJ +qGB +amn +hkH +vUP +kjt +mgz +rLG wef -xMR -roY -iZV +kjt +mgz +rLG wef -ycX -ycX -ycX -ycX -ycX -ovj -mfo -cjF -cjF -cjF -stq +ixl +ixl +ixl +ixl +ixl +gpr +nnr +oPR +oPR +oPR +kJJ ecM mlC mlC mlC ecM -qYc -cjF -cjF -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -gqe -klv -ozh -gqe -gqe -gqe -eRY +iCE +oPR +oPR +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +qBe +rMw +mEU +qBe +qBe +qBe +jLe kqC kqC -lVP -kqP +sRJ +iuC coj -usz -usz -mcc -pHu -mcc -vei -usz -cCq -dHp -dHp -dHp -uFh -usz +ioc +ioc +xbM +dHD +xbM +fHo +ioc +rzp +vds +vds +vds +elO +ioc ntv -lAS -oYM -nVq -oYM -oYM -oYM -oYM -oYM -oYM -oYM -rev -oYM -lAS +tOM +gbf +fOT +gbf +gbf +gbf +gbf +gbf +gbf +gbf +apu +gbf +tOM bzO bQM kPz @@ -79591,29 +79591,29 @@ iyf mxQ mxQ mxQ -suB -lAS -ogX -nVq -xUz -nbv -nbv -pdf -aWo +jkW +tOM +kLs +fOT +nBw +nvX +nvX +wuz +fHI hfd fIW htt htt qpM vjq -euC -euC -euC -ssD -iSi -ssD -hbC -cbb +fHb +fHb +fHb +tsc +bEk +tsc +ogf +mRM bQM bQM bQM @@ -79703,9 +79703,9 @@ cKa cKa cKa cKa -vJD -vJD -vJD +vUP +vUP +vUP jfc wef wef @@ -79716,81 +79716,81 @@ rPS wef wef jfc -xMR -roY -iZV +kjt +mgz +rLG lZA -xMR -roY -iZV +kjt +mgz +rLG lZA -ycX -ycX -ycX -ycX -ycX -ycX -mfo -cjF -cjF -cjF -iOJ -fnt -rsW -gqe -iOJ -fnt -rsW -cjF -cjF -sad -rsW -gqe -gqe -sad -rsW -gqe -gqe -gqe -gqe -nis -mQD -gqe -gas -gqe -qnu +ixl +ixl +ixl +ixl +ixl +ixl +nnr +oPR +oPR +oPR +aZL +eLy +roQ +qBe +aZL +eLy +roQ +oPR +oPR +hdR +roQ +qBe +qBe +hdR +roQ +qBe +qBe +qBe +qBe +hYs +uou +qBe +mrW +qBe +fWV tHl -fBc +qCK lIJ -fBc -usz -fpY -usz -mcc -avl -xri -iUy -usz -avl -xri -xri -xri -iUy -usz +qCK +ioc +idj +ioc +xbM +qNF +xRI +efW +ioc +qNF +xRI +xRI +xRI +efW +ioc ntv -lAS -oYM -eNs -nLl -nLl -nLl -nLl -nLl -nLl -oiu -rev -oYM -kLN +tOM +gbf +rsR +ydK +ydK +ydK +ydK +ydK +ydK +kHv +apu +gbf +kbt bzO rzt rzt @@ -79798,20 +79798,20 @@ rzt rzt bzO tJR -kfA -oYM -kfA +pYB +gbf +pYB wcW mxQ -lAS -lAS -oYM -nVq -rOE -oYM -oYM -amx -lAS +tOM +tOM +gbf +fOT +xEW +gbf +gbf +arT +tOM hfd vfM oEK @@ -79825,7 +79825,7 @@ vzB fiq vzB bQM -gEU +bmT bQM bQM bQM @@ -79914,74 +79914,74 @@ jmG cKa cKa cKa -xCW -aaK -dkj -kNz +rpf +jWI +eow +lFB hqD -aaK -qwy +jWI +clA wef -aaK -kNz +jWI +lFB jfc -aaK -kNz +jWI +lFB rPS -xMR -roY -iZV +kjt +mgz +rLG wef -ikq -vII -dyM +kXk +amn +tPB wef -ycX -ycX -ycX -ycX -qHZ -ycX -jRp -vvX -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -cjF -iOJ -ozh -gqe -bKs -iOJ -ozh -gqe -gqe -gqe -gqe -nis -gqe -gqe -gqe -jvu +ixl +ixl +ixl +ixl +ghS +ixl +lpS +ooq +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +oPR +aZL +mEU +qBe +eUP +aZL +mEU +qBe +qBe +qBe +qBe +hYs +qBe +qBe +qBe +oHi miU -ecp +sgt vRA -sHH +upY vRA vRA -usz -fFf -mcc +ioc +diJ +xbM vRA -mcc -mcc +xbM +xbM kqC ryJ end @@ -79990,54 +79990,54 @@ kqC ecd kqC kqC -pmg -oYM -oYM -oYM -oYM -oYM -oYM -oYM -oYM -nVq -rev -oYM -guQ +pFW +gbf +gbf +gbf +gbf +gbf +gbf +gbf +gbf +fOT +apu +gbf +ivr vDO -prP -prP -prP -jqH -oYM +wkA +wkA +wkA +lOk +gbf tUs -kfA -ppb -kfA +pYB +hQM +pYB tUs vDO -atE -lAS -oYM -nVq -lXf -nLl -nLl -jYd -mXT +eBS +tOM +gbf +fOT +jzP +ydK +ydK +qzb +tdq hfd ucj bBA bBA rZi eMU -euC -euC -euC -ssD -iSi -ssD -hbC -ogo +fHb +fHb +fHb +tsc +bEk +tsc +ogf +fWI bQM bQM bQM @@ -80127,123 +80127,123 @@ cKa cKa cKa cKa -xMR -roY -iZV +kjt +mgz +rLG hqD -mHZ -usA +fRc +dUx hqD -ldm -usA +iFB +dUx jfc -ldm -usA +iFB +dUx wef -xMR -roY -iZV +kjt +mgz +rLG cKa -vJD -vJD -vJD +vUP +vUP +vUP cKa -xyf -ycX -ycX -ycX -ycX -eOS +xRl +ixl +ixl +ixl +ixl +bjf vNq -hvE -vvX -ozh -rsW -hmg -dyi -dQY -eIp -uch -flo -dQY -dPQ -gqe -gqe -hmg -uch -uch -cWU -sad -rsW -gqe -hYK -lpp -ppY -gqe -gqe -gqe -gqe +gvz +ooq +mEU +roQ +fyL +fje +rCe +etq +gGc +dIx +rCe +gPE +qBe +qBe +fyL +gGc +gGc +tzM +hdR +roQ +qBe +kHH +fFv +uoH +qBe +qBe +qBe +qBe oPN vRA -lOa +aXC vRA -fBc +qCK lIJ vRA -sHH -sHH -sHH -qOd +upY +upY +upY +tZe kqC -cCq -pDV +rzp +mwP mxQ fCZ nZQ sso mxQ -mKy -xjv -lAS -rII -rII -lAS -lAS -lAS -oYM -nVq -rev -oYM -lAS +bkg +kag +tOM +xsS +xsS +tOM +tOM +tOM +gbf +fOT +apu +gbf +tOM bzO bzO mxQ tUs rVM -oYM -oYM -pes -qWi -vMS -mNC +gbf +gbf +eBj +cLZ +atd +xGl vDO -atE -lAS -oYM -nVq -rev -lAS -lAS -fKv -hHv +eBS +tOM +gbf +fOT +apu +tOM +tOM +fFw +vUZ tuX vEi vEi vEi vEi vEi -hhh -eKu +faD +oyO bzO tan tan @@ -80339,9 +80339,9 @@ cKa cKa cKa cKa -dgx -roY -iZV +wdL +mgz +rLG hEs cKa cKa @@ -80352,63 +80352,63 @@ cKa cKa cKa cKa -jXD -roY -iZV +xVw +mgz +rLG jmG uwk uwk uwk jmG vnr -ycX -ycX -ycX -ycX -ycX +ixl +ixl +ixl +ixl +ixl vNq vNq -xrG -lHy -lHy -dBa +dAd +ode +ode +cry vNq vNq vnr mlC mlC ecM -mam -lPV -lPV -kDq +yfp +hEv +hEv +hbp ecM nSx -lZL -gCb -ejO -gqe -gqe -iOJ -ozh -gqe -gqe -mAA -atx -jxy +gVc +xbo +qzZ +qBe +qBe +aZL +mEU +qBe +qBe +ooO +faw +lux wjH -nph -vHG -pQq +cqW +ckS +voh dtg -usz -sHH -sHH -sHH -qOd +ioc +upY +upY +upY +tZe kqC -wII -bjk +qLi +dpe mxQ gRW ssO @@ -80419,43 +80419,43 @@ iyf mxQ pte bzO -fLs -fLs -fLs -oYM -nVq -rev -oYM -fLs +mOU +mOU +mOU +gbf +fOT +apu +gbf +mOU bzO bzO mxQ tUs uZX -oYM +gbf tUs -kfA -deW -kfA +pYB +xOm +pYB tUs mxQ -sfw -lAS -rOE -nVq -rev -lAS +rQN +tOM +xEW +fOT +apu +tOM aRk -fKv -pVv -oYM -kfA -atE -kfA -lAS -lAS -oYM -oYM +fFw +lUv +gbf +pYB +eBS +pYB +tOM +tOM +gbf +gbf bzO bQM kPz @@ -80548,76 +80548,76 @@ cAW cAW jmG cKa -ocJ -wVI +bqu +moQ cKa -xMR -roY -cHq +kjt +mgz +vwX cKa -ocJ -rsE +bqu +rwm cKa -ocJ -rsE +bqu +rwm cKa -ocJ -ukk +bqu +aLC cKa -xMR -roY -iZV +kjt +mgz +rLG uwk bQM kPz kPz bQM hxq -ycX -ycX -ycX -ycX -ycX -ycX -cJo -ycX -ycX -ycX -ycX -tih -ycX +ixl +ixl +ixl +ixl +ixl +ixl +bcX +ixl +ixl +ixl +ixl +tjp +ixl ezn kPz kPz hxq -jLs -bTe -eRi -llW +ovq +vyw +bix +uTb ecM nSx -nrq -uVQ -gqe -gqe -gqe -gqe -gqe -klg -gqe -gqe -atx +gux +eio +qBe +qBe +qBe +qBe +qBe +wKm +qBe +qBe +faw tHl -opB -mcc -tyb -hDr -mcc -cel -mcc -mcc -aYA -mcc +jYm +xbM +thz +suq +xbM +wFB +xbM +xbM +xdZ +xbM kqC kqC kqC @@ -80631,16 +80631,16 @@ tUs mxQ bzO bzO -oYM -oYM -oYM -sTV -eNs -snO -sTV -oYM -oYM -oYM +gbf +gbf +gbf +fWy +rsR +oEQ +fWy +gbf +gbf +gbf mxQ iyf mxQ @@ -80651,23 +80651,23 @@ hvF mxQ mxQ mxQ -ieU -cNn -oYM -nVq -rev -lAS -xmX -lqo -hHv +fob +rxM +gbf +fOT +apu +tOM +rbW +voP +vUZ waN sfW sfW sfW sfW sfW -oqu -jKL +qRW +mOE bzO tan tan @@ -80760,65 +80760,65 @@ cAW cAW jmG cKa -ikq -ikz +kXk +qRf cKa -xMR -roY -iZV +kjt +mgz +rLG cKa -ikq -chJ +kXk +jWY cKa -ikq -frw +kXk +lzz cKa -ikq -dSw +kXk +rhH cKa -ikq -vII -dyM +kXk +amn +tPB uwk bQM kPz kPz bQM hxq -ycX -ycX -ycX -ycX -ycX -ycX -ycX -qHZ -ycX -ycX -qHZ -ycX -ycX +ixl +ixl +ixl +ixl +ixl +ixl +ixl +ghS +ixl +ixl +ghS +ixl +ixl vnr hxq hxq vnr -dXz -dpt -ycX -aap +lOx +oRg +ixl +uvn ecM nSx -aah -ckD -mQZ -gqe -sad -rsW -mQZ -gqe -gqe -gqe -qgS +ayG +laK +gRA +qBe +hdR +roQ +gRA +qBe +qBe +qBe +hQT jTJ jTJ kqC @@ -80831,8 +80831,8 @@ blG jTJ jTJ jTJ -mCT -sRH +bMG +anl ffZ tUs fgU @@ -80841,51 +80841,51 @@ noa mxQ mxQ mxQ -nPa -kfA -lAS -lAS -oYM -oYM -kfA -kfA -oYM -oYM -lAS -lAS -kfA -vWs +xLD +pYB +tOM +tOM +gbf +gbf +pYB +pYB +gbf +gbf +tOM +tOM +pYB +jyo mxQ mxQ mxQ -tMz -lif +tVf +oEn mxQ -uod -lAS -raF -pVv -oYM -nVq -xUz -nbv -nbv -pdf -aWo +pRx +tOM +xbp +lUv +gbf +fOT +nBw +nvX +nvX +wuz +fHI hfd fIW htt htt qpM vjq -euC -euC -euC -ssD -iSi -ssD -hbC -cbb +fHb +fHb +fHb +tsc +bEk +tsc +ogf +mRM bQM bQM bQM @@ -80975,9 +80975,9 @@ cKa kzh tOp cKa -xMR -roY -iZV +kjt +mgz +rLG cKa kzh tOp @@ -80988,102 +80988,102 @@ cKa kzh tOp cKa -cOl -vJD -vJD +cIt +vUP +vUP uwk bQM kPz kPz bQM hxq -bTe -eRi -kJC -eRi -eRi -eRi -eRi -eRi -eRi -dJl -eRi -eRi -eRi -eRi -eRi -jSC -eRi -eRi -gHW -bra -hrX +vyw +bix +fOC +bix +bix +bix +bix +bix +bix +fKu +bix +bix +bix +bix +bix +xOU +bix +bix +uPl +dIh +kGc nSx cVV -glH +oWC xKX -jbk -mQZ -iOJ -sad -rsW -mQZ -gqe -gqe -uix -fII +qTt +gRA +aZL +hdR +roQ +gRA +qBe +qBe +uud +wXQ ntv -gXL -dHp -dHp -xAw -rdS -usz -usz -dpr +hqX +vds +vds +rQB +gdS +ioc +ioc +qxZ duF -euR +sFH rCt -rsh +xGd mxQ tUs kZy mxQ mxQ mxQ -kfA -kfA -eCA -lAS -oYM -oYM -lAS -oYM -kfA -kfA -oYM -lAS -oYM -oYM -lAS -lAS -kfA -dxJ +pYB +pYB +eTr +tOM +gbf +gbf +tOM +gbf +pYB +pYB +gbf +tOM +gbf +gbf +tOM +tOM +pYB +cyR mxQ mxQ mxQ mxQ uLr tUs -fXQ -ncQ -oYM -nVq -oYM -oYM -oYM -amx -lAS +brl +kyh +gbf +fOT +gbf +gbf +gbf +arT +tOM hfd vfM oEK @@ -81097,7 +81097,7 @@ vzB fiq vzB bQM -gEU +bmT bQM bQM bQM @@ -81184,132 +81184,132 @@ cAW cAW jmG cKa -aaK -dkj -dkj -frY -roY -qqZ -dkj -dkj -rfD +jWI +eow +eow +ufR +mgz +jna +eow +eow +kGd wef -dkj -dkj -dkj -dkj -kNz -vJD -aaK -dkj -kNz +eow +eow +eow +eow +lFB +vUP +jWI +eow +lFB uwk bQM kPz kPz bQM hxq -dpt -jLs -jLs -grO -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -jLs -aap +oRg +ovq +ovq +ehr +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +ovq +uvn nSx nSx xKX rGf xKX -bRU -mQZ -iOJ -ozh -rsW -gqe -gqe -gqe +qUw +gRA +aZL +mEU +roQ +qBe +qBe +qBe kqC kqC kqC -aKF -sHH -xAw -uJk -usz -usz -sJc +fKX +upY +rQB +iLl +ioc +ioc +sjZ kqC -dFC +huJ caF -njT +xKE mxQ cLu wBX mxQ -nPa -kfA -lAS -lAS -oYM -oYM -lAS -lAS -lAS -oYM -jax -kfA -oYM -lAS -lAS -lAS -oYM -oYM -lAS -lAS -kfA -xmg +xLD +pYB +tOM +tOM +gbf +gbf +tOM +tOM +tOM +gbf +fLu +pYB +gbf +tOM +tOM +tOM +gbf +gbf +tOM +tOM +pYB +xkm mxQ mxQ mWY tUs -amx -lAS -oYM -nVq -lXf -nLl -nLl -jYd -mXT +arT +tOM +gbf +fOT +jzP +ydK +ydK +qzb +tdq hfd ucj bBA bBA rZi eMU -euC -euC -euC -ssD -iSi -ssD -hbC -ogo +fHb +fHb +fHb +tsc +bEk +tsc +ogf +fWI bQM bQM bQM @@ -81396,70 +81396,70 @@ cAW cAW jmG cKa -xMR -roY -roY -roY -roY -roY -roY -roY -roY +kjt +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz wef -roY -roY -roY -roY -iZV -vJD -xMR -roY -iZV +mgz +mgz +mgz +mgz +rLG +vUP +kjt +mgz +rLG uwk bQM kPz kPz bQM hxq -dpt -jLs -mDV -iSQ -iSQ -iSQ -iSQ -iSQ -iSQ -xVP -jLs -mDV -iSQ -iSQ -iSQ -iSQ -iSQ -iSQ -xVP -jLs -aap +oRg +ovq +kDw +kgG +kgG +kgG +kgG +kgG +kgG +ujb +ovq +kDw +kgG +kgG +kgG +kgG +kgG +kgG +ujb +ovq +uvn cVV nSx -jzY +nVE xKX -sGb -ozh -gqe -mQZ -iOJ -ozh -gqe -gqe -uix -mNg +uGL +mEU +qBe +gRA +aZL +mEU +qBe +qBe +uud +mwu ntv -gXL -dHp -dHp +hqX +vds +vds jTJ jTJ vRA @@ -81467,55 +81467,55 @@ blG jTJ jTJ kqC -oSo +pim kqC mxQ tUs mxQ mxQ -kfA -lAS -oYM -oYM -xoF -lAS -lAS -kIc -pwi -fbT -mBV -wPL -fNc -pwi -uIa -lAS -lAS -bPS -oYM -oYM -lAS -kfA +pYB +tOM +gbf +gbf +ekx +tOM +tOM +dXT +egz +fpg +nmM +aMr +hDS +egz +xBu +tOM +tOM +beB +gbf +gbf +tOM +pYB mxQ mxQ uSY tUs -jYd -cNn -wPF -nVq -rev -oYM -oYM -sTV -hHv +qzb +rxM +uMN +fOT +apu +gbf +gbf +fWy +vUZ tuX vEi vEi vEi vEi vEi -hhh -eKu +faD +oyO bzO tan tan @@ -81608,126 +81608,126 @@ cAW cAW jmG cKa -eXC -vII -vII -vII -vII -vII -vII -vII -vII +ndQ +amn +amn +amn +amn +amn +amn +amn +amn ljc -vII -vII -vII -vII -dyM -vJD -ikq -raD -dyM +amn +amn +amn +amn +tPB +vUP +kXk +ylr +tPB uwk bQM kPz kPz bQM hxq -dpt -jLs -wGm +oRg +ovq +peP vnr hxq vnr vnr hxq vnr -elC -jLs -wGm +sTw +ovq +peP oUg -fPF -fPF +qFO +qFO oUg oUg oUg -ljA -jLs -wGm +yfA +ovq +peP nSx nSx -ajD -rsW -mQZ -gqe -sad -vEX +xgC +roQ +gRA +qBe +hdR +dVu nSx -qKF -gqe -gqe -gqe +okE +qBe +qBe +qBe kqC kqC kqC -mcc -sHH +xbM +upY sqC -cXY -kfl -kfl -dEo +vVx +qQb +qQb +tlF hfT -dAB -xng -dIq +ecU +iSg +vTA vDO tUs vDO -kfA -lAS -oYM -lAS -lAS -lAS -qvL -pwi -xcJ +pYB +tOM +gbf +tOM +tOM +tOM +tYD +egz +xkq mxQ mxQ -pwg -nYA +kKQ +vhk mxQ mxQ -ozg -pwi -qnc -lAS -lAS -lAS -oYM -lAS -kfA +tSL +egz +jOv +tOM +tOM +tOM +gbf +tOM +pYB mxQ -sfw -lAS -nBO -pVv -oYM -nVq -rev -oYM +rQN +tOM +rTD +lUv +gbf +fOT +apu +gbf vEK -sTV -pVv -oYM -kfA -atE -kfA -oYM -oYM -oYM -oYM +fWy +lUv +gbf +pYB +eBS +pYB +gbf +gbf +gbf +gbf bzO bQM kPz @@ -81823,19 +81823,19 @@ cKa cKa cKa cKa -yke -ggB -vJD -ggB -vJD -roY -roY -roY -vJD -ggB -czC -czC -czC +wsw +dVA +vUP +dVA +vUP +mgz +mgz +mgz +vUP +dVA +gtr +gtr +gtr cKa cKa cKa @@ -81845,100 +81845,100 @@ kPz kPz bQM hxq -dpt -jLs -aap +oRg +ovq +uvn hxq hoH bQM bQM bQM hxq -dpt -fPF -aap -dgB -jLs -hfl -lFO -eCg +oRg +qFO +uvn +jSZ +ovq +sIg +uwb +wvU oUg -dpt -tTV -aap -fvk -oHI -iOJ -sad -rsW -mQZ -iOJ -sad -ygS +oRg +vdN +uvn +uFC +qyM +aZL +hdR +roQ +gRA +aZL +hdR +dhc nSx -qKF -gqe -uix -fII +okE +qBe +uud +wXQ ntv -gXL -dHp -dHp +hqX +vds +vds ntv -mpT -jOO -xbB -ePf -jqX -kQY -xng -dIq +kUR +sIj +hkA +bDv +jCO +fOK +iSg +vTA bzO mxQ mxQ -kfA -lAS -oYM -lAS -kjA -pwi -xcJ +pYB +tOM +gbf +tOM +rko +egz +xkq mxQ jjg mxQ -eBC -kfA -kfA -ers +wGA +pYB +pYB +cwM mxQ jjg mxQ -aqW -pwi -uOb -lAS -oYM -lAS -kfA +cBn +egz +sGg +tOM +gbf +tOM +pYB mxQ mxQ mxQ -vkZ -ncQ -oYM -nVq -rev -oYM +sBW +kyh +gbf +fOT +apu +gbf mxk mxQ mxQ -lAS -lAS -lAS -lAS -lAS -lAS -lAS +tOM +tOM +tOM +tOM +tOM +tOM +tOM bzO bzO bzO @@ -82034,21 +82034,21 @@ jmG cKa cKa cKa -mUV -roY -roY -roY -roY -vJD -roY -roY -roY -vJD -roY -roY -xuw -vJD -vJD +pQc +mgz +mgz +mgz +mgz +vUP +mgz +mgz +mgz +vUP +mgz +mgz +mns +vUP +vUP tBP vNq vnr @@ -82057,91 +82057,91 @@ kPz kPz bQM hxq -dpt -jLs -aap +oRg +ovq +uvn hxq bQM bQM bQM bQM hxq -dpt -jLs -odH -dgB -dgB -iOG -jLs -aWP +oRg +ovq +ukg +jSZ +jSZ +mVk +ovq +cLS oUg -dpt -jLs -aap -jLs -oHI -mQZ -iOJ -ozh -rsW -mQZ -iOJ -pKz -rsW -mQZ -gqe -gqe +oRg +ovq +uvn +ovq +qyM +gRA +aZL +mEU +roQ +gRA +aZL +qEC +roQ +gRA +qBe +qBe kqC kqC kqC -qBQ -sHH +sKr +upY ntv -mpT -jOO -xbB -pOd -mwL -jOO -aRG -xbB +kUR +sIj +hkA +nZI +sWr +sIj +iBr +hkA bzO mxQ -kfA -eCA -oYM -xoF -lAS -neX +pYB +eTr +gbf +ekx +tOM +xpM mxQ jjg mxQ -jMz -lXf -oYM -kfA -kfA -oYM -nyk -swh +tVY +jzP +gbf +pYB +pYB +gbf +pWl +ogs mxQ jjg mxQ -hHv -lAS -bPS -wqx -eCA -kfA +vUZ +tOM +beB +jMv +eTr +pYB bzO bzO -oeG -lAS -oYM -nVq -rev -oYM -lAS +aGR +tOM +gbf +fOT +apu +gbf +tOM mxQ mxQ mxQ @@ -82247,20 +82247,20 @@ cKa cKa cKa cKa -roY -uTp -uTp -jkZ +mgz +rAw +rAw +xKP niw niw oKn niw jfp -dYP -roY -roY -vJD -vJD +pho +mgz +mgz +vUP +vUP tBP vNq vnr @@ -82269,95 +82269,95 @@ kPz kPz bQM hxq -dpt -jLs -aap +oRg +ovq +uvn hxq bQM bQM bQM bQM hxq -dpt -jLs -flm -iOG -dgB -eGg -tAk -mhu +oRg +ovq +lAE +mVk +jSZ +grg +uen +ujz oUg -dpt -kCK -aap -jLs -oHI -rsW -mQZ -iOJ -sad -vEX +oRg +jUP +uvn +ovq +qyM +roQ +gRA +aZL +hdR +dVu nSx -urc -sad -rsW -mQZ -uix -jGV +asf +hdR +roQ +gRA +uud +iIG ntv -gXL -dHp -dHp +hqX +vds +vds ntv -mpT -jOO -xbB -ngr -fKr -fAV -dxO -jLS +kUR +sIj +hkA +qTQ +jfT +drd +hEk +myJ bzO bzO -kfA -lAS -oYM -lAS -qvL -xcJ +pYB +tOM +gbf +tOM +tYD +xkq jjg -xTe -beV -rQP -rev -oYM -kfA -ycN -oYM -nVq -xUz -rzR -byn +vRk +pRD +bTC +apu +gbf +pYB +voI +gbf +fOT +nBw +fXW +ldF jjg -aqW -qnc -lAS -oYM -lAS -dxJ +cBn +jOv +tOM +gbf +tOM +cyR bzO bzO -pmg -lAS -oYM -nVq -rev -glI -lAS -oYM -lAS -oYM -lAS +pFW +tOM +gbf +fOT +apu +xdT +tOM +gbf +tOM +gbf +tOM bzO bzO bQM @@ -82457,22 +82457,22 @@ jmG jmG jmG jmG -vRj -vJD -roY -uTp -uTp -vvk +pcN +vUP +mgz +rAw +rAw +vsr nmm gWg nmm nmm wJd -kNz -xuw -roY -vJD -vJD +lFB +mns +mgz +vUP +vUP tBP vNq vnr @@ -82481,95 +82481,95 @@ kPz kPz bQM hxq -dpt -jLs -aap +oRg +ovq +uvn hxq bQM bQM bQM bQM hxq -eSg -bQx -aap -sJl -bpq -dnp -bpq -ovZ +erb +vhy +uvn +lpW +gyP +gPV +gyP +pBW oUg -dpt -ors -aap -jLs -oHI -ozh -rsW -mQZ -iOJ -ozh -qGl +oRg +xHi +uvn +ovq +qyM +mEU +roQ +gRA +aZL +mEU +nGO nSx -srz -ozh -rsW -mQZ +hsz +mEU +roQ +gRA kqC kqC kqC -mcc -sHH +xbM +upY jTJ -qDd -tEb -tEb -dwg +veW +vVN +vVN +uYo rBF rBF nhY mny bzO -oYM -lAS -oYM -lAS -lAS -neX +gbf +tOM +gbf +tOM +tOM +xpM mxQ mxQ -beV -oYM -oYM -lXf -oYM -kfA -kfA -oYM -klb -vDK -sAk -xUz +pRD +gbf +gbf +jzP +gbf +pYB +pYB +gbf +iYe +bnx +siy +nBw mxQ mxQ -hHv -lAS -lAS -oYM -lAS -xaK -oYM -lAS +vUZ +tOM +tOM +gbf +tOM +nup +gbf +tOM mxQ -oYM -nVq -rev -oYM -pmo -pmo -dyp -lAS -oYM +gbf +fOT +apu +gbf +buJ +buJ +xTf +tOM +gbf bzO bzO bzO @@ -82669,22 +82669,22 @@ cAW bQM fwn jmG -brS -vJD -roY -uTp -kfF -tyk +dVC +vUP +mgz +rAw +vrH +tAE nmm pqz nmm nmm wJd -iZV -roY -roY -aIp -jLN +rLG +mgz +mgz +rkF +qfi vNq vNq vNq @@ -82693,96 +82693,96 @@ vNq vNq vNq vNq -dpt -jLs -wGm +oRg +ovq +peP vnr hxq vnr vnr hxq vnr -ljA -jLs -wGm +yfA +ovq +peP oUg -fzt -umq +vnl +qcy oUg oUg oUg -ljA -jLs -aap -xnq +yfA +ovq +uvn +vja nSx -kcP -iOJ -rsW -mQZ -iOJ -sad -rsW -mQZ -iOJ -sad -rsW -jZR -wnz -wnz -cCq -uFh +oQS +aZL +roQ +gRA +aZL +hdR +roQ +gRA +aZL +hdR +roQ +cfa +qwH +qwH +rzp +elO jTJ -bxl -jOO -xbB -pOd -vlt -xOI -pOd -kZb +lmu +sIj +hkA +nZI +aoo +bcd +nZI +pxf bzO -oYM -lAS -oYM -lAS -kjA -xcJ +gbf +tOM +gbf +tOM +rko +xkq jjg -jMz -otq -oYM -oYM -rvW -cDZ -kfA -kfA +tVY +bxv +gbf +gbf +oox +lMV +pYB +pYB vjR doQ upM vjR -xUz -swh +nBw +ogs jjg -aqW -cNn -lAS -oYM -lAS -xaK -oYM -mKy -vaO -oYM -nVq -rev -dEF -hab -hab -oaX -vCv -lAS -ehg +cBn +rxM +tOM +gbf +tOM +nup +gbf +bkg +ivN +gbf +fOT +apu +xEi +uVL +uVL +sqR +lTW +tOM +wwo rzt bQM bQM @@ -82881,20 +82881,20 @@ cAW tan geF jmG -aDs -vJD -roY -uTp -uTp -bXk +qPL +vUP +mgz +rAw +rAw +uLj nmm rru nmm djB wJd -dyM -roY -avI +tPB +mgz +uhA oUg oUg oUg @@ -82905,96 +82905,96 @@ oUg oUg oUg oUg -dpt -hsd -uTi -wYG -eRi -eRi -eRi -eRi -eRi -gHW -nCC -uTi -eRi -eRi -kqr -eRi -eEh -eRi -gHW -eNm -cfc -lzW -oHI -mQZ -iOJ -ozh -vEX +oRg +nNS +sPi +sfe +bix +bix +bix +bix +bix +uPl +bww +sPi +bix +bix +mPf +bix +dWn +bix +uPl +kHS +iHB +reZ +qyM +gRA +aZL +mEU +dVu nSx -srz -ozh -rsW -mQZ -iOJ -ozh -jZR -sHH -wnz -avl -iUy +hsz +mEU +roQ +gRA +aZL +mEU +cfa +upY +qwH +qNF +efW jTJ -mgC -jOO -xbB -pOd -kwv -aRG -aRG -aRG -ewy -oYM -oYM -lAS -lAS -neX +hcB +sIj +hkA +nZI +scG +iBr +iBr +iBr +rtw +gbf +gbf +tOM +tOM +xpM mxQ mxQ -lXf -nLl -lXf -xMT -fOw -qOG -roS -kfA -vDK -dvV -lqi -kOZ -nLl -nyk +jzP +ydK +jzP +tlj +ekW +rKs +ngg +pYB +bnx +taS +jEa +hPu +ydK +pWl mxQ mxQ -kGw -lAS -lAS -oYM -xaK -oYM -lAS -kbg -oYM -nVq -rev -oYM -ngd -nbv -odN -lAS -oYM -ehg +jLD +tOM +tOM +gbf +nup +gbf +tOM +lDG +gbf +fOT +apu +gbf +oib +nvX +uTA +tOM +gbf +wwo rzt bQM bQM @@ -83095,18 +83095,18 @@ cAW jmG uwk jmG -roY -neH -wTV -rSh +mgz +xCg +iFP +kiT nmm nmm nmm nmm wJd -vJD -roY -roY +vUP +mgz +mgz oUg oUg oUg @@ -83115,97 +83115,97 @@ oUg oUg oUg oUg -llC +qZc qGn -dpt -jLs -jLs -jLs -dgB -jLs -bRu -lYr -jLs -jLs -jLs -tTV -jLs -bQx -lYr -jLs -mPA -jLs -jfD -jLs -aap -fvk -oHI -rsW -mQZ -iOJ -sad -vEX +oRg +ovq +ovq +ovq +jSZ +ovq +fun +xia +ovq +ovq +ovq +vdN +ovq +vhy +xia +ovq +sZZ +ovq +kvu +ovq +uvn +uFC +qyM +roQ +gRA +aZL +hdR +dVu nSx -srz -dDy +hsz +tad izZ -kcP -bGT +oQS +vao kqC -rGV -wnz +cYj +qwH mCF kqC jTJ -wXf -jOO -xbB -pOd -pOd -qzI -pOd -pOd -pOd -sTV -hll -oYM -oYM -dCb +oaa +sIj +hkA +nZI +nZI +pWc +nZI +nZI +nZI +fWy +dxW +gbf +gbf +gSg mxQ -cbx -oYM -oYM -oYM -sru -qOG -vuW -ufX +qyq +gbf +gbf +gbf +eEC +rKs +saL +qCx fEY bzO -oYM -kqF -oYM -oYM -oYM -iGW +gbf +drk +gbf +gbf +gbf +jHj mxQ -qIk -oYM -oYM -hll -sTV -oYM -oYM -oYM -oYM -nVq -rev -oYM -pmo -cRs -nLl -lAS -oYM +aNz +gbf +gbf +dxW +fWy +gbf +gbf +gbf +gbf +fOT +apu +gbf +buJ +qTW +ydK +tOM +gbf bzO bzO bQM @@ -83307,18 +83307,18 @@ cAW cAW cAW uwk -roY -roY -roY -tAf +mgz +mgz +mgz +jPM oBC jNl vrp mTa bsm -kNl -roY -roY +wqY +mgz +mgz oUg kSh wPz @@ -83327,98 +83327,98 @@ wPz wPz ofq oUg -llC +qZc qGn -nOF -iSQ -iSQ -iSQ -suj -iSQ -iSQ -iSQ -tHP -ilv -jLs -pYO -iSQ -fCz -iEz -gzy -iSQ -iSQ -xjW -osR -aap -jLs -oHI -ozh -rsW -mQZ -iOJ -ozh -rsW -mQZ -iOJ -gWf -mQZ -mQZ -aRG -aRG -aRG -aRG -aRG -oAv -wXf -jOO -ovE -xng -xng -xng -xng -xng -xng -fBd -kfA -kfA -kfA -ubT -xyK -kfA -kfA -kfA -kfA -ufX -kfA -kfA -kfA -kfA -kfA -kfA -kfA -cvp -kfA -kfA -kfA -iCR -nVH -kfA -kfA -kfA -xoF -nbv -nbv -nbv -nbv -beV -rev -dEF -xrn -jXC -gUn -vCv -lAS -ehg +wTC +kgG +kgG +kgG +gFZ +kgG +kgG +kgG +eRR +cXV +ovq +iKI +kgG +bRA +tMs +sTK +kgG +kgG +uTt +xZV +uvn +ovq +qyM +mEU +roQ +gRA +aZL +mEU +roQ +gRA +aZL +xNJ +gRA +gRA +iBr +iBr +iBr +iBr +iBr +qdf +oaa +sIj +iTE +iSg +iSg +iSg +iSg +iSg +iSg +waQ +pYB +pYB +pYB +ont +eGm +pYB +pYB +pYB +pYB +qCx +pYB +pYB +pYB +pYB +pYB +pYB +pYB +hpX +pYB +pYB +pYB +vuT +uBV +pYB +pYB +pYB +ekx +nvX +nvX +nvX +nvX +pRD +apu +xEi +nMn +icu +ugP +lTW +tOM +wwo rzt bQM bQM @@ -83519,18 +83519,18 @@ cAW cAW cAW jmG -roY -roY -roY -sTB +mgz +mgz +mgz +mUd ubQ okF fis lUs pqz -kNl -roY -roY +wqY +mgz +mgz mPW cpP aFK @@ -83541,96 +83541,96 @@ fnD oUg oUg qob -kSU -kSU -tBR +jGf +jGf +sdV oUg oUg oUg -kRM -sBr +jKv +tJH oUg -ljA -xoB -wGm +yfA +imG +peP oUg -jPO -dSz -aRY -nCw +uFd +hzF +aXp +iDA ggh -rmS -tVu -tYc -tVu -mQZ -iOJ -ozh -vYA -ozh -mQZ -mQZ -sDp -mQZ -fiI -mQZ -gNK -aRG -aRG -aRG -aRG -aRG -aRG -wXf -jOO -oZc -dxO -dxO -dxO -dxO -dxO -dxO -wpp -kfA -kfA -kfA -wPL -gbn -kfA -kfA -roS -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -kfA -jYd -mBV -kfA -kfA -kfA -eNs -nLl -nLl -nLl -nLl -nLl -fOw -oYM -iXz -hIu -xRg -lAS -oYM -ehg +acO +xFL +pmC +xFL +gRA +aZL +mEU +cGS +mEU +gRA +gRA +wOG +gRA +cum +gRA +eZW +iBr +iBr +iBr +iBr +iBr +iBr +oaa +sIj +tPC +hEk +hEk +hEk +hEk +hEk +hEk +mkn +pYB +pYB +pYB +aMr +jYV +pYB +pYB +ngg +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +pYB +qzb +nmM +pYB +pYB +pYB +rsR +ydK +ydK +ydK +ydK +ydK +ekW +gbf +pLM +jWk +eHQ +tOM +gbf +wwo rzt bQM bQM @@ -83731,18 +83731,18 @@ cAW cAW cAW uwk -roY -jyc -roY -sTB +mgz +xCh +mgz +mUd hpz hxM fHK iwT nmm -kNl -xvs -roY +wqY +pUG +mgz puE hTf qGn @@ -83753,96 +83753,96 @@ pbp qGn pbp qGn -dpt -eph -aap +oRg +kHF +uvn oUg -qvk -tCj -grO -jLs -sJl -dpt -jLs -aap -eBs -cWM -dCA -lFx -cky -laD -dpt -jLs -flm -xnq +mNN +wFM +ehr +ovq +lpW +oRg +ovq +uvn +nvi +wMe +jQc +hGW +lFm +nUm +oRg +ovq +lAE +vja nSx -srz -ozh -mQZ -oFv +hsz +mEU +gRA +dJt izZ bEX bEX bEX iCU -mQZ -mQZ -aRG -oAv -aRG -aRG -aRG -aRG -wXf -jOO -ere -wEn -wEn -pOd -pOd -pOd -eEk -sTV -oYM -hll -oYM -dCb +gRA +gRA +iBr +qdf +iBr +iBr +iBr +iBr +oaa +sIj +lHw +sFr +sFr +nZI +nZI +nZI +gRg +fWy +gbf +dxW +gbf +gSg mxQ -uLH -oYM -oYM -oYM -rhF -rhF +xcz +gbf +gbf +gbf +ubo +ubo mxQ -jxa -kfA -tuB -kAo -tLd -oYM -oYM -oYM -iGW +opM +pYB +tWz +duV +lAM +gbf +gbf +gbf +jHj mxQ -enh -oYM -hll -oYM -sTV -oYM -oYM -lAS -oYM -oYM -oYM -oYM -pmo -vNY -nLl -lAS -oYM -ehg +dNc +gbf +dxW +gbf +fWy +gbf +gbf +tOM +gbf +gbf +gbf +gbf +buJ +thV +ydK +tOM +gbf +wwo rzt bQM bQM @@ -83943,17 +83943,17 @@ cAW cAW cAW jmG -roY -roY -uTp -rSh +mgz +mgz +rAw +kiT wyU ujs nmm nmm wJd -vJD -roY +vUP +mgz wef puE cJv @@ -83965,96 +83965,96 @@ eqQ eqQ eqQ eqQ -dpt -eph -aap +oRg +kHF +uvn oUg -gDz -jLs -aWP -wQn -vyU -dpt -bQx -sjc -eBs -rjM -tTM -jeY -akc -laD -oHk -tVu -tYc -tVu -sad -ovB -vxp -qvx -ozh +mju +ovq +cLS +ekS +ePU +oRg +vhy +dkX +nvi +orD +oiX +qgv +aEQ +nUm +uVH +xFL +pmC +xFL +hdR +ntx +kSe +leN +mEU izZ -bzG -lEz -waz +fOe +rez +xJn bEX -uRe -mQZ +cRM +gRA bhX -aRG -vAi -mNJ -bVk -oan -nZT -jOO -ere -pOd -plc -utC -aRG -aRG -ewy -oYM -oYM -lAS -lAS -neX +iBr +xMO +iDg +urv +avT +gVT +sIj +lHw +nZI +xyw +cOB +iBr +iBr +rtw +gbf +gbf +tOM +tOM +xpM mxQ mxQ -kfA -joS -kfA -kfA -wDF -oYM -kfA -kfA -xLI -dZc -beV -beV -luU -med +pYB +uTw +pYB +pYB +nKf +gbf +pYB +pYB +hWG +qQy +pRD +pRD +khw +htT mxQ mxQ -hHv -lAS -lAS -oYM -xaK -oYM -lAS -lAS -lAS -lAS -oYM -vCv -hab -gIF -ptZ -vCv -lAS -ehg +vUZ +tOM +tOM +gbf +nup +gbf +tOM +tOM +tOM +tOM +gbf +lTW +uVL +hUj +dWp +lTW +tOM +wwo rzt bQM bQM @@ -84155,18 +84155,18 @@ cAW cAW cAW uwk -roY -uTp -uTp -vvk +mgz +rAw +rAw +vsr nmm nmm cYT nmm wJd -kNz +lFB wef -roY +mgz qrz puE lzn @@ -84177,95 +84177,95 @@ eqQ eqQ eqQ eqQ -dpt -eph -aap +oRg +kHF +uvn eUi -xup -bQx -jLs -rWZ -jLs -dpt -jLs -aap -eBs -igD -uin -rvR -aag -laD -dpt -jLs -aap -dfZ -iOJ -iOJ -ozh -mQZ -mQZ +bGB +vhy +ovq +pse +ovq +oRg +ovq +uvn +nvi +tPA +lou +fwg +qAe +nUm +oRg +ovq +uvn +uZP +aZL +aZL +mEU +gRA +gRA izZ -uFc +bIR gWq -waz +xJn bEX -eJP +lbL xKX iyc bhX -aRG -oAv -mNJ -aRG -wXf -jOO -xbB -pOd -aRG -wen -aRG -aRG -mTq -oYM -lAS -oYM -lAS -flg -wOc +iBr +qdf +iDg +iBr +oaa +sIj +hkA +nZI +iBr +fdC +iBr +iBr +myA +gbf +tOM +gbf +tOM +rdt +rsQ mxQ -oYM -oYM -oYM -wqx -kfA -oYM -kfA -qos -wAv -beV -fmM -oYM -lXf -uod +gbf +gbf +gbf +jMv +pYB +gbf +pYB +ioW +hXF +pRD +ota +gbf +jzP +pRx jjg -tQL -ncQ -lAS -oYM -lAS -xaK -oYM -qFg +tlC +kyh +tOM +gbf +tOM +nup +gbf +fvK qbY -lAS -lAS -oYM -gqd -hIu -nbv -nbv -lAS -oYM +tOM +tOM +gbf +uSX +jWk +nvX +nvX +tOM +gbf bzO bzO bQM @@ -84367,18 +84367,18 @@ cAW cAW cAW jmG -roY -uTp -uTp -vgS +mgz +rAw +rAw +gFN nmm nmm nmm nmm wJd -iZV -roY -xvs +rLG +mgz +pUG puE eqQ qGn @@ -84389,96 +84389,96 @@ qGn qGn qGn qGn -dpt -eph -aap +oRg +kHF +uvn oUg -ovZ -yhT -bQx -jLs -qvk -pYp -jLs -aap -eBs -hjb -gyI -eph -eph -laD -uGb -puB -kiW -jLs -mQZ -ovB -vxp -mQZ -mQZ +pBW +jew +vhy +ovq +mNN +wet +ovq +uvn +nvi +mrK +qRS +kHF +kHF +nUm +lBE +sNj +erh +ovq +gRA +ntx +kSe +gRA +gRA izZ -hiK +nyF tOc tOc bgd -mQZ -mQZ +gRA +gRA bhX mhR bhX -aRG -nrL -aRG -wXf -jOO -xbB -pOd -qZL -utC -aRG -lBJ -xbu -oYM -lAS -oYM -lAS -lAS -neX +iBr +dfA +iBr +oaa +sIj +hkA +nZI +qKq +cOB +iBr +aTL +vPF +gbf +tOM +gbf +tOM +tOM +xpM mxQ mxQ -lAS -uTk -oYM -lLU -kqF -kfA -kfA -oYM -beV -oYM -oYM -meG +tOM +gjr +gbf +fgq +drk +pYB +pYB +gbf +pRD +gbf +gbf +oLX mxQ mxQ -hHv -lAS -lAS -oYM -lAS -xaK -oYM -vDK +vUZ +tOM +tOM +gbf +tOM +nup +gbf +bnx qbY -gxN -lAS -oYM -egx -nLl -vZx -pmo -lAS -oYM -jfa +rVQ +tOM +gbf +mPg +ydK +lZm +buJ +tOM +gbf +jlU rzt bQM bQM @@ -84579,18 +84579,18 @@ bQM cAW cAW uwk -roY -uTp -uTp -dLF +mgz +rAw +rAw +srQ nmm sUX nmm nmm nEN -dyM -roY -roY +tPB +mgz +mgz mPW vvM tet @@ -84601,96 +84601,96 @@ fnD oUg oUg qob -kSU -kSU -tBR +jGf +jGf +sdV oUg oUg oUg -jLs -hXi +ovq +kbj oUg -rmS -tVu -lsU +acO +xFL +uVk oUg -gUx -eza -bfs -eir +njG +sli +fbX +nxW oUg -dzk -jLs -aap -jLs -jLs -iOJ -ozh -mQZ -smh +vmL +ovq +uvn +ovq +ovq +aZL +mEU +gRA +fXo izZ bEX mrG bEX izZ -kcP -fGM -vpk +oQS +lco +oZx bhX -uVv -vAi -fpl -aRG -wXf -jOO -xbB -pOd -aRG -aRG -aRG -uhb +ahm +xMO +rSU +iBr +oaa +sIj +hkA +nZI +iBr +iBr +iBr +aco bzO bzO -kfA -lAS -oYM -lAS -qMV -wOc +pYB +tOM +gbf +tOM +kTD +rsQ mxQ -lAS -lAS -oYM -kfA -oYM -kfA -kfA -oYM -nVq -lXf -meG -kaH +tOM +tOM +gbf +pYB +gbf +pYB +pYB +gbf +fOT +jzP +oLX +wYT jjg -tQL -tsu -lAS -oYM -lAS -dxJ +tlC +jrO +tOM +gbf +tOM +cyR bzO bzO -pmg +pFW yfE uBq baE -lAS -vCv -cyU -hab -tiW -vCv -oYM -jfa +tOM +lTW +lsO +uVL +iRG +lTW +gbf +jlU rzt bQM bQM @@ -84791,18 +84791,18 @@ kPz bce cAW jmG -roY -uTp -neH -jkZ +mgz +rAw +xCg +xKP spl oNx uuJ oNx jWy -vJD -roY -roY +vUP +mgz +mgz jqt pTU wPz @@ -84811,97 +84811,97 @@ wPz wPz jPK oUg -llC +qZc qGn -bTe -eRi -eRi -eRi -eRi -dJl -ami -eRi -lJa -gHW -jLs -uTi -eRi -tBe -eRi -eRi -jgW -lHL -gHW -jLs -vsq -ucr -jLs -jLs -jLs -wXf -wXf -wXf -bmO -wXf -bmO -wXf -bmO -wXf -uFE -wXf -iiP -pEY -vzZ -wXf -wXf -jOO -ere -pOd -plc -utC -aRG -nds +vyw +bix +bix +bix +bix +fKu +tTv +bix +wGX +uPl +ovq +sPi +bix +uZZ +bix +bix +bBr +eds +uPl +ovq +hkB +cOL +ovq +ovq +ovq +oaa +oaa +oaa +kMV +oaa +kMV +oaa +kMV +oaa +tbj +oaa +uKb +evC +wzg +oaa +oaa +sIj +lHw +nZI +xyw +cOB +iBr +ume bzO bzO -kfA -eCA -oYM -eNs -lAS -neX +pYB +eTr +gbf +rsR +tOM +xpM mxQ mxQ mxQ -jcB -kfA -dMm -kfA -kfA -oYM -pON -mLE +sHe +pYB +kBt +pYB +pYB +gbf +wdo +nEP mxQ jjg mxQ -hHv -lAS -snO -oYM -lAS -kfA +vUZ +tOM +oEQ +gbf +tOM +pYB bzO bzO -oYM +gbf qbY -gxN -lAS -oYM -lAS -nbv -hIu -nbv -lAS -eCA +rVQ +tOM +gbf +tOM +nvX +jWk +nvX +tOM +eTr bzO bzO bQM @@ -85003,18 +85003,18 @@ fiq cAW cAW uwk -roY -roY -roY -roY -roY -roY -roY -roY -roY -roY -roY -roY +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz +mgz oUg oUg oUg @@ -85023,98 +85023,98 @@ oUg oUg oUg oUg -llC +qZc qGn -dpt -eph -eph -eph -eph -eph -eph -skO -gxL -eph -rDl -aAH -eph -gxL -eph -eph -ybR -eph -eph -ybR -eph -xZk -eRi -dJl -eRi -xng -aQK -xng -pAt -kjz -vea -xng -vea -irK -hWJ -xng -iah -xng -mbe -xng -xng -bsJ -ere -pOd -aRG -aRG -aRG -xnW +oRg +kHF +kHF +kHF +kHF +kHF +kHF +nVN +ojj +kHF +vTL +kBm +kHF +ojj +kHF +kHF +hcs +kHF +kHF +hcs +kHF +jLC +bix +fKu +bix +iSg +cJS +iSg +fVY +alK +jOd +iSg +jOd +njg +xGr +iSg +tyt +iSg +eQX +iSg +iSg +dBZ +lHw +nZI +iBr +iBr +iBr +dcy bzO bzO mxQ -kfA -lAS -oYM -lAS -flg -lJy -wOc +pYB +tOM +gbf +tOM +rdt +jGC +rsQ mxQ mxQ mxQ -eRH -kfA -kfA -fKF +aLz +pYB +pYB +mPn mxQ jjg mxQ -tQL -lJy -ncQ -lAS -oYM -lAS -kfA +tlC +jGC +kyh +tOM +gbf +tOM +pYB mxQ mxQ mxQ -oYM -oYM -oYM -oYM -lAS -oYM -oYM -lAS -oYM -dgz -oYM -bGt +gbf +gbf +gbf +gbf +tOM +gbf +gbf +tOM +gbf +lNR +gbf +uXK bzO bzO bzO @@ -85215,18 +85215,18 @@ fiq fiq tan jmG -roY -roY -roY -roY -roY -vJD -vJD -vJD -vJD -roY -roY -roY +mgz +mgz +mgz +mgz +mgz +vUP +vUP +vUP +vUP +mgz +mgz +mgz oUg oUg oUg @@ -85237,96 +85237,96 @@ oUg oUg oUg oUg -nOF -iSQ -iSQ -iSQ -iSQ -iSQ -gjg -iSQ -njC -iSQ -iSQ -iSQ -iSQ -njC -iSQ -soc -iSQ -iSQ -iSQ -iSQ -iSQ -iSQ -sOp -sOp -iSQ -kJI -dxO -dxO -mjD -dxO -mjD -rmG -mjD -dxO -mki -dxO -dxO -dxO -dxO -dxO -dxO -dxO -gmy -pOd -plc -utC -aRG -gCY +wTC +kgG +kgG +kgG +kgG +kgG +vyK +kgG +pXJ +kgG +kgG +kgG +kgG +pXJ +kgG +lqN +kgG +kgG +kgG +kgG +kgG +kgG +slR +slR +kgG +iIx +hEk +hEk +nZU +hEk +nZU +irE +nZU +hEk +mqM +hEk +hEk +hEk +hEk +hEk +hEk +hEk +rVi +nZI +xyw +cOB +iBr +brR vDO tUs mxQ -kfA -lAS -oYM -lAS -lAS -lAS -qMV -lJy -wOc +pYB +tOM +gbf +tOM +tOM +tOM +kTD +jGC +rsQ mxQ mxQ -kPC -bPf +rqh +iAr mxQ mxQ -tQL -lJy -tsu -lAS -lAS -lAS -oYM -eCA -kfA +tlC +jGC +jrO +tOM +tOM +tOM +gbf +eTr +pYB mxQ tUs vDO -atE -oYM -oYM -lAS -eCA -boh -boh -boh -boh -lAS -lAS -okM +eBS +gbf +gbf +tOM +eTr +gLk +gLk +gLk +gLk +tOM +tOM +pti bzO bzO bzO @@ -85459,78 +85459,78 @@ hxq hxq hxq vnr -vtJ -kSU -kSU +fjV +jGf +jGf vNq -dpt -ycX -doB -kFM -ycX -aBm -ycX -ycX -ycX -ycX -aap -eix -dZA -eix -kaB -wXf -uCu -wXf -bmO -wXf -xCm -wXf -wXf -wXf -wXf -wXf -sde -tCf -tCf -wXf -aRG -aRG -aRG -aRG +oRg +ixl +cCh +qby +ixl +gtP +ixl +ixl +ixl +ixl +uvn +oty +tUD +oty +koK +oaa +sga +oaa +kMV +oaa +jft +oaa +oaa +oaa +oaa +oaa +iEF +rBu +rBu +oaa +iBr +iBr +iBr +iBr mxQ tUs mxQ mxQ -kfA -lAS -oYM -oYM -eNs -lAS -lAS -flg -lJy -jka -nVH -ubT -vyF -lJy -ncQ -lAS -lAS -snO -oYM -oYM -lAS -kfA +pYB +tOM +gbf +gbf +rsR +tOM +tOM +rdt +jGC +dOZ +uBV +ont +xcS +jGC +kyh +tOM +tOM +oEQ +gbf +gbf +tOM +pYB mxQ mxQ tUs bzO -lAS -lAS -oYM -lAS +tOM +tOM +gbf +tOM mxQ mLP uap @@ -85640,14 +85640,14 @@ cAW tan tan tan -mFf -hgp -cXw +tst +iPv +roH lRT -fhX -wHx -wHx -esE +gxn +ijC +ijC +fdu lRT cAW vnr @@ -85671,21 +85671,21 @@ bQM bQM kPz xDw -tRa -fLa -ltV +ibl +raC +tIW dOX -qqu -rZa -ljZ -kDg -rZa -qHC -arq -qHC -fxY -qcT -hlK +pmn +smR +fgN +bMF +smR +fDJ +fSp +fDJ +vlU +xSz +uYi lRT deL dzl @@ -85694,64 +85694,64 @@ dzl dzl dzl dzl -skM -fpl -aRG -dEy -gOs -wpf -fTx -wXf -fTx -gOs -fyQ -fTx -vOz -aRG -ogd +nie +rSU +iBr +enu +xNU +wkL +vMT +oaa +vMT +xNU +kKs +vMT +ksY +iBr +bnJ mxQ cLu kVk mxQ -nPa -kfA -lAS -lAS -oYM -oYM -lAS -lAS -lAS -oYM -kfA -kfA -oYM -lAS -lAS -lAS -oYM -oYM -lAS -lAS -kfA -pzG +xLD +pYB +tOM +tOM +gbf +gbf +tOM +tOM +tOM +gbf +pYB +pYB +gbf +tOM +tOM +tOM +gbf +gbf +tOM +tOM +pYB +bAf mxQ cZr tUs bzO -lAS -lAS +tOM +tOM vEK -lAS +tOM jjg -xoF -pkG -nbv -nbv -nbv -nbv -nbv -izJ +ekx +cqV +nvX +nvX +nvX +nvX +nvX +prL rzt bQM bQM @@ -85852,14 +85852,14 @@ cAW cAW pcu nfF -xdy +gID ruD -jVC +dde taY -voS -hKI -hKI -hlK +ann +nGZ +nGZ +uYi lRT cAW vnr @@ -85883,21 +85883,21 @@ xDw xDw xDw lRT -hTG -qHC -kjo +pVk +fDJ +hmq sIJ -iJf -qWa -lbe -sEi -kge -sEi -oMy -vED -sEi -ltV -hlK +qaL +hWk +vKz +dnX +hPO +dnX +qgk +jYt +dnX +tIW +uYi xDw cAW bQM @@ -85907,19 +85907,19 @@ sVv bQM rBF dzl -bVk -vAi -kwm -cll -qmO -lRe -wXf -kwm -xYB -luH -wDV -aRG -dGj +urv +xMO +gmg +nRQ +qNy +cdp +oaa +gmg +nLS +qpN +pwo +iBr +obE mxQ mxQ tUs @@ -85927,24 +85927,24 @@ cFX mxQ mxQ mxQ -xjv -kfA -eCA -lAS -oYM -oYM -lAS -oYM -kfA -kfA -oYM -lAS -oYM -oYM -lAS -eCA -kfA -kfA +kag +pYB +eTr +tOM +gbf +gbf +tOM +gbf +pYB +pYB +gbf +tOM +gbf +gbf +tOM +eTr +pYB +pYB mxQ iyf mxQ @@ -85952,18 +85952,18 @@ eoW tUs bzO bzO -lAS +tOM vEK -lAS +tOM jjg -nVq -oYM -oYM -vSk -sFN -oYM -oYM -vqM +fOT +gbf +gbf +gIo +wYq +gbf +gbf +xlx rzt bQM bQM @@ -86064,14 +86064,14 @@ fiq fiq pcu fiq -xdy -xdy -xdy +gID +gID +gID taY -iJf -hKI -hKI -hlK +qaL +nGZ +nGZ +uYi lRT cAW vnr @@ -86089,27 +86089,27 @@ bQM bQM xDw xDw -uri -lwO -eqC -foT -fxY -hsA -iJf -jOW -hlK +sda +qeN +wSD +bHP +vlU +lqI +qaL +gtT +uYi dOX -jdc -vbn -tRa -lbe -idq -sEi -lbe -fLa -eWh -hlK -rKB +onB +mbz +ibl +vKz +rpT +dnX +vKz +raC +bec +uYi +sDS xDw dhi fQV @@ -86119,19 +86119,19 @@ sHO fQV erT dzl -kng -aRG -fTx -lnf -aVA -fTx -vzZ -fTx -lnf -aVA -fTx -aRG -aRG +mQV +iBr +vMT +rZN +krE +vMT +wzg +vMT +rZN +krE +vMT +iBr +iBr ffZ tUs tlQ @@ -86141,20 +86141,20 @@ vFn mxQ iyf mxQ -nPa -kfA -lAS -lAS -oYM -oYM -kfA -kfA -oYM -oYM -lAS -lAS -kfA -kfA +xLD +pYB +tOM +tOM +gbf +gbf +pYB +pYB +gbf +gbf +tOM +tOM +pYB +pYB mxQ mxQ mxQ @@ -86164,18 +86164,18 @@ hpW tUs tUs bzO -lAS +tOM vEK -lAS +tOM jjg -eNs -nLl -nLl -nLl -nLl -nLl -nLl -qgq +rsR +ydK +ydK +ydK +ydK +ydK +ydK +eyj rzt bQM bQM @@ -86280,10 +86280,10 @@ fiq nfF nfF lRT -iJf -dlW -dlW -hlK +qaL +cUd +cUd +uYi lRT cAW bce @@ -86300,28 +86300,28 @@ kPz bQM xDw xDw -lwO -eqC -hKI -hKI -hKI -hKI -hsA -iJf -qHC -hlK +qeN +wSD +nGZ +nGZ +nGZ +nGZ +lqI +qaL +fDJ +uYi dOX -pkc -bGr -aCn -tRa -sEi -sEi -sEi -gnS -sYM -hlK -jBj +nSS +udE +utW +ibl +dnX +dnX +dnX +xEX +mfF +uYi +lOy lRT ajx afk @@ -86331,19 +86331,19 @@ afk afk iWq dzl -aRG -aRG -wXf -wXf -wXf -wXf -wXf -wXf -wXf -wXf -wXf -pOd -gCY +iBr +iBr +oaa +oaa +oaa +oaa +oaa +oaa +oaa +oaa +oaa +nZI +brR vDO tUs tUs @@ -86355,16 +86355,16 @@ tUs mxQ mxQ bzO -oYM -oYM -oYM -sTV -xoF -bPS -sTV -oYM -oYM -iGW +gbf +gbf +gbf +fWy +ekx +beB +fWy +gbf +gbf +jHj bzO mxQ mxQ @@ -86376,13 +86376,13 @@ tUs tUs tUs vDO -atE +eBS vEK -lAS +tOM mxQ -wMQ -kPv -cbC +lPE +qbR +gcD mxQ syV iyf @@ -86492,10 +86492,10 @@ pcu atp cAW lRT -hTG +pVk hjW hjW -cxe +mgE lRT cAW bce @@ -86511,29 +86511,29 @@ bQM kPz bQM xDw -jyR -fxY -hKI -hKI -eqC -hKI -nJC -own -wew -rXT -uxY +ssC +vlU +nGZ +nGZ +wSD +nGZ +kNk +sPh +gTy +ifN +ncb dOX -aKc -aQE -iJf -joD -dlW -dlW -dIa -uxY -xmM -hlK -iRy +kaF +kka +qaL +kqJ +cUd +cUd +tUC +ncb +hXG +uYi +sgJ xDw ajx afk @@ -86543,19 +86543,19 @@ afk afk iWq dzl -aRG -aRG -fTx -gOs -fyQ -fTx -wXf -fTx -gOs -fyQ -fTx -pOd -pOd +iBr +iBr +vMT +xNU +kKs +vMT +oaa +vMT +xNU +kKs +vMT +nZI +nZI mxQ mxQ mxQ @@ -86565,16 +86565,16 @@ mxQ mxQ iyf mxQ -oAH +xRo bzO bzO bzO -sKP -oYM -nVq -rev -oYM -sKP +iHT +gbf +fOT +apu +gbf +iHT bzO bzO bzO @@ -86588,17 +86588,17 @@ cZr eoW tUs bzO -lAS +tOM vEK -lAS +tOM mxQ -xVR -ipJ -kwy +nQJ +iys +iFZ bzO -loy -txS -jrn +eET +ldW +tyJ bzO bQM bQM @@ -86704,10 +86704,10 @@ pcu fiq cAW lRT -iJf -sEi -sEi -hlK +qaL +dnX +dnX +uYi lRT cAW bce @@ -86723,10 +86723,10 @@ bQM kPz bQM xDw -hKI -hKI -hKI -fxY +nGZ +nGZ +nGZ +vlU xDw xDw xDw @@ -86735,17 +86735,17 @@ hir hir hir dOX -fye -gEv -jyK -dlW -dIa -dlW -gxx -dlW -uxY -hlK -tGF +eqi +tYt +bxy +cUd +tUC +cUd +guv +cUd +ncb +uYi +qhP xDw ajx afk @@ -86755,38 +86755,38 @@ afk afk iWq dzl -vOz -aRG -kwm -kXH -jGP -wDV -wXf -kwm -cll -cDf -wDV -pOd -pOd -kfA -sTV -rOE -ers -oYM -ers -oYM -prP -lAS -lAS +ksY +iBr +gmg +nck +ayH +pwo +oaa +gmg +nRQ +vGM +pwo +nZI +nZI +pYB +fWy +xEW +cwM +gbf +cwM +gbf +wkA +tOM +tOM rzt bQM rzt -lAS -oYM -nVq -rev -oYM -qLJ +tOM +gbf +fOT +apu +gbf +aXv mxQ cZr eoW @@ -86800,17 +86800,17 @@ bzO bzO bzO bzO -lAS +tOM vEK -lAS +tOM mxQ -itq -oAL -aIE +llE +nfe +bvg bzO -lQd -btP -jrn +klt +qFf +tyJ bzO bQM bQM @@ -86916,48 +86916,48 @@ pcu cAW cAW xDw -iJf -dlW -dlW -hlK +qaL +cUd +cUd +uYi lRT lRT lRT cAW cAW lRT -nBB -nBB -nBB -nBB +gUu +gUu +gUu +gUu lRT bQM kPz bQM xDw -hKI -dYv -hKI +nGZ +ipz +nGZ xDw xDw bQM bQM xDw -thU -diR -tVX -qHC -iJf -ojh -dlW -dlW -dlW -pzV -dlW -dlW -dlW -uxY -tNu +tZz +jrT +vhd +fDJ +qaL +rrs +cUd +cUd +cUd +pvi +cUd +cUd +cUd +ncb +sXP xDw fdV jlH @@ -86967,38 +86967,38 @@ eOF jlH bUB rBF -goM -aRG -fTx -lnf -aVA -fTx -wXf -fTx -lnf -aVA -fTx -pOd -pOd -kfA -nbv -nbv -nbv -nbv -nbv -bPS -oYM -lAS -lAS +lwn +iBr +vMT +rZN +krE +vMT +oaa +vMT +rZN +krE +vMT +nZI +nZI +pYB +nvX +nvX +nvX +nvX +nvX +beB +gbf +tOM +tOM rzt kPz rzt -lAS -oYM -nVq -rev -oYM -guQ +tOM +gbf +fOT +apu +gbf +ivr vDO tUs tUs @@ -87012,13 +87012,13 @@ kPz bQM bQM bzO -lAS -xjv -kGW +tOM +kag +lKI mxQ -cGg -kte -tWq +wSb +gPp +tIf bzO rzt rzt @@ -87128,48 +87128,48 @@ pcu cAW cAW xDw -iJf +qaL hjW hjW -hlK -hKI -nvO +uYi +nGZ +gsX lRT lRT lRT lRT -eps -ffN -eps -ffN +rFw +nQF +rFw +nQF lRT lRT lRT lRT xDw -hKI -hKI -hKI +nGZ +nGZ +nGZ xDw bQM bQM bQM lRT -iuW +sLu hva -nSi -qHC -iJf -qHC -wdA -fsf -qHC -qHC -qHC -lHB -bFh -hKI -vYM +fUP +fDJ +qaL +fDJ +qLH +udB +fDJ +fDJ +fDJ +rPW +dmQ +nGZ +wBE xDw cAW bQM @@ -87179,38 +87179,38 @@ sVv bQM bQM rBF -aRG -aRG -aRG -aRG -aRG -wXf -wXf -wXf -aRG -pOd -aRG -pOd -pOd -kfA -nLl -nLl -nLl -nLl -oiu -rev -oYM -lAS -lAS +iBr +iBr +iBr +iBr +iBr +oaa +oaa +oaa +iBr +nZI +iBr +nZI +nZI +pYB +ydK +ydK +ydK +ydK +kHv +apu +gbf +tOM +tOM rzt bQM rzt -lAS -oYM -nVq -rev -oYM -lAS +tOM +gbf +fOT +apu +gbf +tOM mxQ bzO bzO @@ -87340,48 +87340,48 @@ cAW cAW cAW xDw -iJf -sEi -sEi -mcE -ltV -hKI -hKI -hKI -piy -nvO -hKI -hKI -hKI -hKI -rUc -rUc -gnR -rUc -hsA -hsA -hsA -lpm +qaL +dnX +dnX +nCm +tIW +nGZ +nGZ +nGZ +fNN +gsX +nGZ +nGZ +nGZ +nGZ +ntw +ntw +cTD +ntw +lqI +lqI +lqI +gBP xDw bQM bQM bQM xDw -yiD -aOJ -jUp -qHC -qyk -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -pbF -uxY +dNC +wAt +oJK +fDJ +bSm +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +dZQ +ncb lRT xDw xDw @@ -87396,34 +87396,34 @@ iRa iRa iRa dOX -aIh -hsA -hsA +bTp +lqI +lqI fjd -pOd -ltu -pOd -kLo -kfA -sTV -oYM -fKF -oYM -nVq -rev -oYM -lAS -eCA +nZI +xXY +nZI +jgz +pYB +fWy +gbf +mPn +gbf +fOT +apu +gbf +tOM +eTr bzO rzt bzO -pmg -oYM -nVq -rev -rOE -lAS -fLO +pFW +gbf +fOT +apu +xEW +tOM +kUo rzt kPz rzt @@ -87552,28 +87552,28 @@ cAW cAW cAW xDw -iJf -oWz -hKI -hKI -tRa -ltV -hKI -tRa -sEi -ltV -hKI -tRa -sEi -ltV -hKI -tRa -pJo -ltV -iJf -hKI -hKI -hKI +qaL +vOD +nGZ +nGZ +ibl +tIW +nGZ +ibl +dnX +tIW +nGZ +ibl +dnX +tIW +nGZ +ibl +eEQ +tIW +qaL +nGZ +nGZ +nGZ lRT sJN lRT @@ -87583,14 +87583,14 @@ hir hir hir dOX -xfd -rTb -rTb -rTb -rTb -rTb -rTb -qUZ +iIl +cEb +cEb +cEb +cEb +cEb +cEb +vBZ dOX sIJ dOX @@ -87603,39 +87603,39 @@ xDw bQM xAl xDw -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN +lqC +lqC +lqC +lqC +lqC +lqC +lqC +lqC fjd -pOd -pAB -pOd +nZI +mdY +nZI rBF rzt rzt rzt bzO -oYM -nVq -rev -oYM -rOE -oYM -oYM -oYM -oYM -wqx -oYM -nVq -rev -oYM -mKy -utf +gbf +fOT +apu +gbf +xEW +gbf +gbf +gbf +gbf +jMv +gbf +fOT +apu +gbf +bkg +gZg rzt bQM rzt @@ -87764,50 +87764,50 @@ cAW cAW cAW lRT -utV -tqQ -orA -hKI -iJf -hlK -hsA -iJf -hsA -hlK -hsA -iJf -hsA -hlK -hsA -iJf -hsA -hlK -iJf -hKI -hKI -hKI -hKI -pCF -hKI -mWx -hKI -hKI -lOb -hKI -rMP -hKI -hKI -hKI -iJf -hlK -hKI -hKI -hKI -jal -hKI -aai -ddc -qbT +rbI +nim +lPA +nGZ +qaL +uYi +lqI +qaL +lqI +uYi +lqI +qaL +lqI +uYi +lqI +qaL +lqI +uYi +qaL +nGZ +nGZ +nGZ +nGZ +jiq +nGZ +vzp +nGZ +nGZ +vSW +nGZ +hQR +nGZ +nGZ +nGZ +qaL +uYi +nGZ +nGZ +nGZ +rnn +nGZ +xpw +szP +edY xeO dNh dNh @@ -87815,14 +87815,14 @@ xDw bQM bQM xDw -cfN -hKI -hKI -hKI -hKI -hKI -hKI -cfN +lqC +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +lqC lRT rBF rBF @@ -87832,22 +87832,22 @@ bQM bQM bQM bzO -oYM -nVq -xUz -nbv -nbv -nbv -nbv -nbv -nbv -nbv -nbv -beV -rev -oYM -eCA -byt +gbf +fOT +nBw +nvX +nvX +nvX +nvX +nvX +nvX +nvX +nvX +pRD +apu +gbf +eTr +iwi rzt bQM rzt @@ -87977,64 +87977,64 @@ cAW cAW xDw xDw -jyK -tqQ -hKI -jyK -uxY -hKI -jyK -dlW -uxY -hKI -jyK -dlW -uxY -hKI -jyK -dlW -uxY -iJf -hKI -hKI +bxy +nim +nGZ +bxy +ncb +nGZ +bxy +cUd +ncb +nGZ +bxy +cUd +ncb +nGZ +bxy +cUd +ncb +qaL +nGZ +nGZ aHj -hKI +nGZ hjW hjW -hKI +nGZ wnq hjW -hKI +nGZ hjW -rMP -fxY -hKI -hKI -iJf -hlK -hKI +hQR +vlU +nGZ +nGZ +qaL +uYi +nGZ hjW hjW -fxY +vlU hjW -hKI -tRa -mDs -sEi +nGZ +ibl +cVu +dnX xeO smv xDw bQM bQM xDw -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN +lqC +lqC +lqC +lqC +lqC +lqC +lqC +lqC xDw kPz kPz @@ -88044,22 +88044,22 @@ kPz kPz kPz bzO -tnH -nVq -lXf -nLl -nLl -nLl -nLl -nLl -nLl -nLl -nLl -nLl -snO -oYM -lAS -htL +eJt +fOT +jzP +ydK +ydK +ydK +ydK +ydK +ydK +ydK +ydK +ydK +oEQ +gbf +tOM +oZS rzt kPz rzt @@ -88190,59 +88190,59 @@ cAW cAW xDw xDw -jyK -dlW -hBn -hKI -hKI -hKI -hKI -lmM -mcN -mcN -mcN -rBR -mcN -mcN -crw -mcN -iJf -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -qcK -hKI -hKI -iJf -hlK -hKI -hKI -hKI -hKI -hKI -hKI -iJf -hKI -qHC -nsC -hKI +bxy +cUd +vnM +nGZ +nGZ +nGZ +nGZ +rJW +hSO +hSO +hSO +pkB +hSO +hSO +ign +hSO +qaL +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +mSP +nGZ +nGZ +qaL +uYi +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +qaL +nGZ +fDJ +hbH +nGZ lRT xDw xDw lRT -aIh -hsA -hsA -hsA +bTp +lqI +lqI +lqI lRT fjd lRT @@ -88256,21 +88256,21 @@ bQM bQM kPz bzO -oYM -nVq -rev -oYM -oYM -oYM -oYM -oYM -oYM -oYM -oYM -oYM -oYM -oYM -lAS +gbf +fOT +apu +gbf +gbf +gbf +gbf +gbf +gbf +gbf +gbf +gbf +gbf +gbf +tOM mxQ bzO bzO @@ -88418,43 +88418,43 @@ lRT lRT lRT lRT -dhV -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -ltV -qHC -hlK +vgC +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +tIW +fDJ +uYi xeO -qDY -cfN -cfN -cfN -cfN -hKI -hKI -hKI +yiT +lqC +lqC +lqC +lqC +nGZ +nGZ +nGZ lRT xeO lRT @@ -88468,21 +88468,21 @@ bQM bQM bQM bzO -oYM -nVq -rev -oYM -lAS -lAS -kLQ -lAS -lAS -lAS -lAS -lAS -lAS -lAS -guQ +gbf +fOT +apu +gbf +tOM +tOM +aAk +tOM +tOM +tOM +tOM +tOM +tOM +tOM +ivr vDO tUs tUs @@ -88630,43 +88630,43 @@ bQM vzB gws vzB -iJf -hKI -hsA -wFk -nGk -uhH -uol -wFk -nGk -uhH -uol -wFk -nGk -uhH -uol -wFk -nGk -uhH -uol -wFk -nGk -uhH -uol -wFk -hsA -hlK -dlW -uxY -hKI -vQr -hKI -hKI -hKI -hKI -hKI -fxY -hKI +qaL +nGZ +lqI +eDp +qGe +unp +wKx +eDp +qGe +unp +wKx +eDp +qGe +unp +wKx +eDp +qGe +unp +wKx +eDp +qGe +unp +wKx +eDp +lqI +uYi +cUd +ncb +nGZ +gtg +nGZ +nGZ +nGZ +nGZ +nGZ +vlU +nGZ lRT xeO lRT @@ -88680,18 +88680,18 @@ kPz kPz kPz bzO -oYM -nVq -rev -dMm -lAS -lAS -lAS -lAS -eCA -lAS -lAS -lAS +gbf +fOT +apu +kBt +tOM +tOM +tOM +tOM +eTr +tOM +tOM +tOM vEK vEK fTs @@ -88842,9 +88842,9 @@ bQM vzB gws vzB -iJf -hKI -owG +qaL +nGZ +uNs iOa xeO xeO @@ -88866,19 +88866,19 @@ xeO xeO xeO iOa -nBR -hlK -hKI -hKI -hKI -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN +eLB +uYi +nGZ +nGZ +nGZ +lqC +lqC +lqC +lqC +lqC +lqC +lqC +lqC lRT xeO lRT @@ -88892,17 +88892,17 @@ bQM bQM bQM bzO -tnH -nVq -rev -oYM -kfA -kfA -kfA -kfA -aMz -kfA -kfA +eJt +fOT +apu +gbf +pYB +pYB +pYB +pYB +hZG +pYB +pYB bzO rzt rzt @@ -89046,17 +89046,17 @@ cAW cAW bQM bQM -pfi -hbC -hbC -hbC -hbC -ssD -iSi -ssD -tPi -viV -wJf +dPZ +ogf +ogf +ogf +ogf +tsc +bEk +tsc +dxc +pYD +ehy xeO xeO cCx @@ -89078,18 +89078,18 @@ xeO cCx xeO xeO -sLo -hlK -hKI -iWW +oGR +uYi +nGZ +ieA hQh hQh hQh hQh hQh hQh -qHC -qHC +fDJ +fDJ lRT lRT fjd @@ -89104,10 +89104,10 @@ bQM cAW bzO bzO -iqR -xnp -xnp -pIK +ofA +axx +axx +lbK bzO bzO bzO @@ -89258,7 +89258,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -89266,9 +89266,9 @@ bQM vzB gws vzB -iJf -bYS -jCp +qaL +czf +aTe xeO xeO xeO @@ -89290,48 +89290,48 @@ xeO xeO xeO xeO -pAN -hlK +rrD +uYi hjW -iWW +ieA xeO bym uKx uKx xew vem -eXr -eXr -yls -ssD -yls -ssD -iSi -hbC -iSi -hbC -hbC -hbC -hbC -hbC -ssD -kqe -eML -lNg -lNg -npz -ahR -vrN -dUZ -dUZ -dUZ +uGI +uGI +paI +tsc +paI +tsc +bEk +ogf +bEk +ogf +ogf +ogf +ogf +ogf +tsc +kSD +sNQ +aeo +aeo +dPr +cUU +mvF +kkU +kkU +kkU xDq naf naf cqz ggd -hbC -cbb +ogf +mRM bce cAW cAW @@ -89470,7 +89470,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -89478,9 +89478,9 @@ bQM vzB gws vzB -iJf -bYS -hHh +qaL +czf +tgK xeO xeO xeO @@ -89502,10 +89502,10 @@ xeO xeO xeO xeO -aVK -hlK +cfG +uYi hjW -iWW +ieA xeO lpl jVE @@ -89543,7 +89543,7 @@ kEy sDL bQM bQM -gEU +bmT bce cAW cAW @@ -89682,7 +89682,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -89690,9 +89690,9 @@ bQM vzB gws vzB -iJf -bYS -owG +qaL +czf +uNs xeO xeO xeO @@ -89714,48 +89714,48 @@ xeO xeO xeO mUA -nBR -hlK +eLB +uYi hjW -iWW +ieA xeO fSz lIv lIv xFP sov -eXr -eXr -yls -ssD -yls -ssD -iSi -hbC -iSi -hbC -hbC -hbC -hbC -hbC -ssD -hPW -lNg -lNg -lNg -lNg -hPW -vrN -dUZ -dUZ -dUZ +uGI +uGI +paI +tsc +paI +tsc +bEk +ogf +bEk +ogf +ogf +ogf +ogf +ogf +tsc +vmt +aeo +aeo +aeo +aeo +vmt +mvF +kkU +kkU +kkU iBP vcf vcf lku mzT -hbC -ogo +ogf +fWI bce cAW cAW @@ -89894,7 +89894,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -89902,9 +89902,9 @@ bQM vzB gws vzB -iJf -bYS -wJf +qaL +czf +ehy xeO xeO xeO @@ -89926,10 +89926,10 @@ xeO xeO xeO xeO -sLo -hlK -hKI -iWW +oGR +uYi +nGZ +ieA xeO xeO xeO @@ -90106,7 +90106,7 @@ bQM bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -90114,9 +90114,9 @@ bQM vzB gws vzB -iJf -bYS -jCp +qaL +czf +aTe xeO xeO xeO @@ -90138,48 +90138,48 @@ xeO xeO xeO xeO -pAN -hlK +rrD +uYi hjW -iWW +ieA xeO bym uKx uKx xew vem -eXr -eXr -yls -ssD -yls -ssD -iSi -hbC +uGI +uGI +paI +tsc +paI +tsc +bEk +ogf xDq naf naf cqz -bFj -hbC -ssD -hPW -lNg -lNg -lNg -lNg -hPW -vrN -dUZ -dUZ -dUZ -hbC -dUZ -hbC -hbC -hbC -hbC -cbb +cQv +ogf +tsc +vmt +aeo +aeo +aeo +aeo +vmt +mvF +kkU +kkU +kkU +ogf +kkU +ogf +ogf +ogf +ogf +mRM cAW bce bce @@ -90318,7 +90318,7 @@ cAW bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -90326,9 +90326,9 @@ bQM vzB gws vzB -iJf -bYS -hHh +qaL +czf +tgK xeO xeO xeO @@ -90350,10 +90350,10 @@ xeO xeO xeO xeO -aVK -hlK +cfG +uYi hjW -iWW +ieA xeO lpl jVE @@ -90391,7 +90391,7 @@ bQM bQM bQM bQM -gEU +bmT cAW cAW bce @@ -90530,7 +90530,7 @@ cAW bQM bQM bQM -gEU +bmT bQM bQM bQM @@ -90538,9 +90538,9 @@ bQM vzB gws vzB -iJf -bYS -owG +qaL +czf +uNs xeO xeO xeO @@ -90562,48 +90562,48 @@ xeO xeO xeO xeO -rPu -hlK +jKz +uYi hjW -iWW +ieA xeO fSz lIv lIv xFP sov -eXr -eXr -yls -ssD -yls -ssD -iSi -hbC +uGI +uGI +paI +tsc +paI +tsc +bEk +ogf iBP vcf vcf lku -bOz -hbC -ssD -hPW -lNg -lNg -lNg -lNg -hPW -vrN -dUZ -dUZ -dUZ -hbC -dUZ -hbC -hbC -hbC -hbC -ogo +vev +ogf +tsc +vmt +aeo +aeo +aeo +aeo +vmt +mvF +kkU +kkU +kkU +ogf +kkU +ogf +ogf +ogf +ogf +fWI cAW cAW bce @@ -90742,17 +90742,17 @@ cAW bQM bQM bQM -qvn -hbC -hbC -hbC -hbC -ssD -iSi -ssD -tPi -oSK -wJf +qmv +ogf +ogf +ogf +ogf +tsc +bEk +tsc +dxc +pqY +ehy doA xeO cCx @@ -90774,18 +90774,18 @@ xeO cCx xeO xeO -lGh -hlK -hKI -iWW +kIh +uYi +nGZ +ieA giX giX giX giX giX giX -qHC -qHC +fDJ +fDJ scM scM xkv @@ -90962,9 +90962,9 @@ bQM vzB gws vzB -iJf -hKI -jCp +qaL +nGZ +aTe iOa xeO xeO @@ -90986,40 +90986,40 @@ xeO xeO xeO iOa -pAN -hlK -hKI -hKI -qyc -eps -tbs -eps -mYZ -hKI -hKI -hKI +rrD +uYi +nGZ +nGZ +fBD +rFw +joU +rFw +pCG +nGZ +nGZ +nGZ lnK -jUK -qVt -jUK +bcp +akZ +bcp scM xdE xdE xdE xdE scM -mli -qVt -atm +jZk +akZ +lOe lnK -jeh -bnK -bnK -qjC +uFs +hqb +hqb +nuX lnK -jGd -ctz -voa +vJL +eZi +qKx scM scM cAW @@ -91174,65 +91174,65 @@ bQM vzB gws vzB -iJf -hKI -hsA -tZV -lYA -wfp -xjw -tZV -lYA -wfp -xjw -tZV -lYA -wfp -xjw -tZV -lYA -wfp -xjw -tZV -lYA -wfp -xjw -tZV -hsA -hlK -sEi -ltV -hKI -hKI +qaL +nGZ +lqI +laz +dDI +vrA +hTh +laz +dDI +vrA +hTh +laz +dDI +vrA +hTh +laz +dDI +vrA +hTh +laz +dDI +vrA +hTh +laz +lqI +uYi +dnX +tIW +nGZ +nGZ kdR hjW -hKI +nGZ hjW hjW -hKI -vfR -ydX -hDL +nGZ +eVj +sYB +oTP qQl -jTk -kmB -kmB -kmB -hiu -kmB -iXL -ydX -hDL -bbT -iXL +ekb +tuA +tuA +tuA +fQa +tuA +ssb +sYB +oTP +qDq +ssb qQl qQl -iXL -jTk -sbj -jGj -uqp -jTk +ssb +ekb +epY +hrl +jBv +ekb xdE cAW cAW @@ -91386,65 +91386,65 @@ bQM lRT lRT lRT -utV -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -otB -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -uxY -qHC -hlK -sEi -sEi -sEi -sEi -sEi -sEi -sEi -sEi -fXe -inh -ydX -hDL -iXL -ydX -ydX -bUH -bUH -bUH -ydX -hDL -pGi -jTk +rbI +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +ipV +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +ncb +fDJ +uYi +dnX +dnX +dnX +dnX +dnX +dnX +dnX +dnX +qes +rRo +sYB +oTP +ssb +sYB +sYB +eot +eot +eot +sYB +oTP +hZi +ekb qQl -ydX -vlT +sYB +xmV qQl -jTk -ydX -bUH -jlW -iXL +ekb +sYB +eot +nMg +ssb xdE bce bce @@ -91598,65 +91598,65 @@ bQM lRT lRT lRT -pCF -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -hKI -iJf -qHC -qHC -hlK -dlW -dlW -dlW -dlW -dlW -dlW -dlW -dlW -bHl -inh -gFq -nes -iXL -gFq -gFq -pEw -pEw -pEw -gFq -nes -pGi -jTk +jiq +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +nGZ +qaL +fDJ +fDJ +uYi +cUd +cUd +cUd +cUd +cUd +cUd +cUd +cUd +jYU +rRo +aic +ckr +ssb +aic +aic +xZA +xZA +xZA +aic +ckr +hZi +ekb qQl -gFq -nes +aic +ckr qQl -jTk -gFq -pEw -nes -iXL +ekb +aic +xZA +ckr +ssb xdE cAW bce @@ -91810,65 +91810,65 @@ bQM bQM bQM lRT -hKI -hKI +nGZ +nGZ hjW hjW -hKI -krG -udY -cmI -eJq -pGf -cXq -klG -aHA -rTb -dKI -rTb -rTb -oLB +nGZ +oyk +wzK +wbL +rSN +mGN +prG +cpv +sjd +cEb +nFJ +cEb +cEb +hjC iUO iUO iUO iUO iUO -jmO -jyK -dlW -dlW -uxY -hKI -hKI +wzT +bxy +cUd +cUd +ncb +nGZ +nGZ hjW hjW -hKI +nGZ hjW hjW -hKI -nhd -gFq -nes +nGZ +fWs +aic +ckr qQl -jTk -tBy -tBy -tBy -tBy -tBy -rOa -gFq -nes -jTk -iXL +ekb +csL +csL +csL +csL +csL +sZt +aic +ckr +ekb +ssb qQl qQl -iXL -jTk -sbj -jGj -uqp -jTk +ssb +ekb +epY +hrl +jBv +ekb xdE cAW cAW @@ -92022,12 +92022,12 @@ bQM bQM bQM lRT -hKI -hKI +nGZ +nGZ hjW hjW -hKI -ycj +nGZ +vwx xeO xeO xeO @@ -92042,26 +92042,26 @@ xeO mUA xeO xeO -cXm -uXm +xfb +yat xeO -cvr -hKI -hKI -lmM -hKI -hKI -lmM -hKI -hKI -lmM -hKI -hKI -qDD +oIg +nGZ +nGZ +rJW +nGZ +nGZ +rJW +nGZ +nGZ +rJW +nGZ +nGZ +tpw lnK -iVb -dIK -iJM +mVn +gHo +nwS scM xdE xdE @@ -92069,17 +92069,17 @@ xdE xdE scM scM -jUK -jUK -jTk -jTk -jTk -jTk -jTk +bcp +bcp +ekb +ekb +ekb +ekb +ekb lnK -jGd -iXL -voa +vJL +ssb +qKx scM scM bce @@ -92235,30 +92235,30 @@ bQM bQM lRT lRT -gDP -hKI -hKI -hKI -ycj +ntZ +nGZ +nGZ +nGZ +vwx bym uKx uKx -tke -tke -yls -yls -yls -tHU +rcl +rcl +paI +paI +paI +dRx xeO sTd xeO mUA xeO -gqZ -ybY +cAU +uyp xeO vUf -hKI +nGZ lRT lRT atl @@ -92281,13 +92281,13 @@ pcu iWq bQM scM -sws -dBR -mss -tBy -tBy -tBy -gaL +aOC +dKB +gmp +csL +csL +csL +uLq scM scM scM @@ -92450,8 +92450,8 @@ lRT lRT lRT lRT -fLr -ycj +hTo +vwx lpl jVE vzn @@ -92460,17 +92460,17 @@ xeO xeO mUA xeO -rUr +fxa bHv ylu xeO xeO xeO -awx +mQB aTE xeO -yaz -hKI +aRv +nGZ lRT lRT xDw @@ -92493,8 +92493,8 @@ pcu iWq bQM scM -laP -imn +eNv +lFM scM xdE xdE @@ -92662,27 +92662,27 @@ bQM bQM bQM xDw -oQz -ycj +oEN +vwx fSz lIv lIv xFP sov -yls -yls -yls -qDc +paI +paI +paI +eeH dFM sov xeO xeO xeO -dIp -oDn +fCW +myf xeO -wqM -hKI +tOP +nGZ xDw bQM bQM @@ -92875,7 +92875,7 @@ bQM bQM lRT lRT -tvM +piw tFA tFA tFA @@ -92893,7 +92893,7 @@ tFA tFA tFA tFA -koV +nnG lRT lRT bQM 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 22c8cb543d98..34dc51f305fb 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -553,7 +553,7 @@ dir = 4; pixel_y = 24 }, -/obj/item/toy/plushie_cade{ +/obj/item/toy/plush/barricade{ pixel_x = 1; pixel_y = -9 }, @@ -731,7 +731,7 @@ dir = 8; pixel_y = 24 }, -/obj/item/toy/plushie_cade{ +/obj/item/toy/plush/barricade{ pixel_x = -3; pixel_y = -9 }, @@ -763,7 +763,7 @@ pixel_y = 5; layer = 3.1 }, -/obj/item/toy/farwadoll{ +/obj/item/toy/plush/farwa{ pixel_x = -5; pixel_y = 4 }, @@ -847,7 +847,7 @@ /area/template_noop) "FD" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/toy/therapy_blue{ +/obj/item/toy/plush/therapy/blue{ pixel_y = 4 }, /obj/item/reagent_container/food/drinks/bottle/whiskey{ @@ -1271,7 +1271,7 @@ dir = 4; pixel_y = 24 }, -/obj/item/toy/plushie_cade{ +/obj/item/toy/plush/barricade{ pixel_x = 1; pixel_y = -9 }, @@ -1452,7 +1452,7 @@ dir = 8; pixel_y = 24 }, -/obj/item/toy/plushie_cade{ +/obj/item/toy/plush/barricade{ pixel_x = -1; pixel_y = -9 }, 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 aaaaeb0c1199..73bac536752f 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/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index a79ef352f94b..eb5f1afabaed 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -2534,6 +2534,14 @@ icon = 'icons/turf/floors/desert_water_toxic.dmi' }, /area/kutjevo/interior/oob) +"dtV" = ( +/obj/structure/machinery/blackbox_recorder, +/obj/item/prop/almayer/flight_recorder/colony{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/kutjevo/interior/complex/botany/east_tech) "duu" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ name = "\improper South Power Shutters" @@ -17217,6 +17225,12 @@ /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) +"xPU" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "communications" + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/construction) "xQz" = ( /turf/open/floor/kutjevo/colors/cyan/inner_corner{ dir = 1 @@ -39694,7 +39708,7 @@ xWK bKH xWK xWK -xWK +xPU xWK jhx bKH @@ -40558,7 +40572,7 @@ hws qwg vcY jhS -htT +dtV dkE tfx dkE diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm new file mode 100644 index 000000000000..235f370b4321 --- /dev/null +++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm @@ -0,0 +1,549 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aA" = ( +/obj/structure/girder/displaced, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"cm" = ( +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 8 + }, +/area/template_noop) +"cL" = ( +/obj/item/clothing/suit/storage/hazardvest/yellow, +/turf/open/floor/kutjevo/tan, +/area/template_noop) +"cW" = ( +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"di" = ( +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 1 + }, +/area/template_noop) +"dl" = ( +/obj/structure/girder/displaced, +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"gD" = ( +/obj/item/stack/rods, +/obj/item/tool/warning_cone, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"ix" = ( +/obj/item/tool/warning_cone, +/obj/item/paper/crumpled{ + pixel_x = 5; + pixel_y = -8 + }, +/obj/item/paper/crumpled{ + pixel_x = -4; + pixel_y = 14 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"lD" = ( +/obj/structure/machinery/door_display{ + desc = "A work schedule monitor. It appears to be broken."; + name = "Schedule Monitor" + }, +/turf/closed/wall/kutjevo/colony, +/area/template_noop) +"lZ" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"mv" = ( +/obj/structure/girder, +/turf/open/floor/plating/kutjevo, +/area/template_noop) +"nn" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"oB" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 8; + layer = 2.8 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"oK" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"oU" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/message_server, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"pP" = ( +/obj/structure/largecrate/random{ + pixel_y = 19; + layer = 3.02 + }, +/obj/structure/largecrate/random{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 4 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"qp" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + req_one_access = null + }, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 1 + }, +/area/template_noop) +"qI" = ( +/obj/structure/window/framed/kutjevo, +/turf/open/space/basic, +/area/template_noop) +"qM" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/warning_cone, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"rm" = ( +/obj/structure/surface/rack, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"ry" = ( +/obj/item/stack/rods, +/obj/structure/fence, +/turf/open/auto_turf/sand/layer1, +/area/template_noop) +"rG" = ( +/obj/item/stack/rods, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"rP" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"sQ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 1 + }, +/area/template_noop) +"uS" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp/on{ + pixel_x = 9; + pixel_y = 15; + layer = 3.04 + }, +/obj/item/clipboard{ + pixel_x = -6 + }, +/obj/item/tool/pen/blue/clicky{ + pixel_x = 9 + }, +/obj/item/paper_bin{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/paper{ + info = "It has been three weeks since I was relocated to the 'finished' comms office. Me and Paul have been trying to work with this infernal racket going on, but by all that's holy I can't think- let alone recalibrate the new computers. Speaking of, these new computers are all fine and dandy but the sensor uplink tower still hasn't been setup properly after the accident with the apprentice, you know, the one that piled up those debris filled trash bags by Paul's 'desk' and then left. Anyway, like you said the builders didn't lay down the protective matting for the new flooring so there's dirt everywhere. For your sake Jeff, I hope your holiday doesn't end too soon, you still don't even have a desk yet."; + pixel_x = -5; + icon_state = "paper_words"; + name = "I should have gone on holiday" + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"wh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"wC" = ( +/obj/structure/surface/rack, +/obj/item/notepad/blue, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"wO" = ( +/obj/structure/filingcabinet{ + density = 0; + layer = 3.0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/filingcabinet/chestdrawer{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/prop/rock{ + pixel_x = -8; + pixel_y = -5 + }, +/obj/structure/prop/rock{ + layer = 3.1; + pixel_y = 3 + }, +/obj/structure/prop/rock{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/structure/flora/pottedplant/random/unanchored{ + pixel_y = 16; + layer = 3.3 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"yQ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/power/apc/weak{ + dir = 1 + }, +/obj/structure/surface/rack, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"zb" = ( +/turf/open/floor/kutjevo/tan/grey_edge, +/area/template_noop) +"zh" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/tool, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Af" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 4 + }, +/area/template_noop) +"Ca" = ( +/obj/structure/window/framed/kutjevo, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Ci" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 1 + }, +/area/template_noop) +"DY" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 4 + }, +/area/template_noop) +"EK" = ( +/obj/structure/window/framed/kutjevo, +/turf/open/floor/plating/kutjevo, +/area/template_noop) +"GH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/paper/crumpled{ + pixel_x = -4; + pixel_y = 14 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"IR" = ( +/obj/item/paper/crumpled, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Jg" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 4 + }, +/area/template_noop) +"Jz" = ( +/obj/item/stack/sheet/metal, +/obj/item/stack/rods, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 4 + }, +/area/template_noop) +"Ks" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"KC" = ( +/obj/structure/bed/chair/comfy{ + dir = 1; + pixel_y = 11 + }, +/obj/item/paper/crumpled{ + pixel_x = -12; + pixel_y = 14 + }, +/obj/item/paper/crumpled{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/paper/crumpled{ + pixel_x = 5; + pixel_y = -8 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"KD" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/closed/wall/kutjevo/colony, +/area/template_noop) +"LG" = ( +/obj/structure/fence, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"LO" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/prop/alien/hugger, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"LR" = ( +/obj/structure/prop/almayer/computers/sensor_computer2, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"MV" = ( +/obj/structure/largecrate/random{ + pixel_y = 1 + }, +/obj/structure/largecrate/random{ + pixel_y = 19; + layer = 3.02; + pixel_x = -3 + }, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 4 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 8 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Nr" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Or" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Pp" = ( +/obj/structure/prop/almayer/computers/sensor_computer1, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Re" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/warning_cone, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"Rj" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/warning_cone, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"RK" = ( +/turf/closed/wall/kutjevo/colony, +/area/template_noop) +"SZ" = ( +/turf/closed/wall/kutjevo/colony/reinforced, +/area/template_noop) +"Ul" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + req_one_access = null + }, +/turf/open/floor/kutjevo/tan/grey_edge, +/area/template_noop) +"Um" = ( +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 4 + }, +/area/template_noop) +"Vc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/warning_cone, +/turf/open/auto_turf/sand/layer0, +/area/template_noop) +"Xi" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/tan/grey_edge, +/area/template_noop) +"Xq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 8 + }, +/area/template_noop) +"XS" = ( +/obj/structure/fence{ + desc = "A large metal mesh strewn between two poles. A 'Keep Out! Under Construction' sign dangles from one of the fence posts." + }, +/turf/open/auto_turf/sand/layer1, +/area/template_noop) +"Yo" = ( +/obj/item/clothing/head/hardhat/orange, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 1 + }, +/area/template_noop) +"YG" = ( +/obj/structure/machinery/power/port_gen/pacman, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) +"YO" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/kutjevo/tan/grey_edge{ + dir = 8 + }, +/area/template_noop) +"Zf" = ( +/obj/structure/window/framed/kutjevo, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3 + }, +/turf/open/floor/kutjevo/grey/plate, +/area/template_noop) + +(1,1,1) = {" +SZ +RK +RK +RK +qp +Ul +RK +RK +RK +RK +RK +RK +"} +(2,1,1) = {" +RK +pP +cW +cW +Ci +zb +Ca +Pp +oK +nn +oU +RK +"} +(3,1,1) = {" +KD +Nr +Ks +cW +di +Xi +Zf +uS +KC +IR +Or +RK +"} +(4,1,1) = {" +SZ +MV +Or +rP +Yo +zb +lD +LR +ix +GH +Re +EK +"} +(5,1,1) = {" +qI +wC +rG +LO +sQ +cL +cm +Xq +Xq +cm +cm +YO +"} +(6,1,1) = {" +qI +rm +lZ +nn +Or +Af +Um +Jg +Um +Jz +wh +DY +"} +(7,1,1) = {" +SZ +yQ +oB +wO +gD +zh +Rj +dl +YG +Vc +qM +RK +"} +(8,1,1) = {" +SZ +mv +RK +RK +aA +RK +LG +LG +mv +ry +XS +mv +"} 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 d000153afd71..69e040e98ea2 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -25,6 +25,15 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/outdoors/n_rockies) +"abe" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/emergency_oxygen/double, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "abo" = ( /turf/closed/wall/strata_outpost, /area/lv522/oob) @@ -111,10 +120,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) -"acC" = ( -/obj/structure/largecrate/random, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "acD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat, @@ -188,6 +193,12 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, /area/lv522/indoors/b_block/bridge) +"aem" = ( +/obj/structure/barricade/plasteel/metal, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "aeD" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, @@ -201,14 +212,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) -"afa" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "afn" = ( /obj/item/reagent_container/spray/cleaner/drone{ pixel_x = -3; @@ -418,6 +421,12 @@ "akM" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/oob) +"akP" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "akV" = ( /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/shale/layer1, @@ -456,13 +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/landmark/objective_landmark/medium, @@ -618,6 +620,14 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"apC" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "apS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -782,6 +792,18 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) +"aue" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "aut" = ( /turf/open/floor/corsat{ dir = 5; @@ -812,13 +834,6 @@ /obj/item/stack/rods, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) -"awm" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/vehicle/train/cargo/trolley, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "awI" = ( /obj/item/explosive/plastic/breaching_charge{ unacidable = 1 @@ -868,16 +883,6 @@ icon_state = "plate" }, /area/lv522/atmos/reactor_garage) -"ayf" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/vehicle/train/cargo/trolley, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "ayn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -922,10 +927,6 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/corpo/glass) -"azJ" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/admin) "azK" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison, @@ -952,12 +953,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"aAX" = ( -/obj/item/ammo_box/magazine/misc/mre/empty, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "aBm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lattice_prop{ @@ -1196,12 +1191,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) -"aId" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "aIf" = ( /obj/structure/machinery/light{ dir = 1 @@ -1304,10 +1293,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) -"aKE" = ( -/obj/item/prop/alien/hugger, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "aKK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/pipes/standard/simple/hidden/green{ @@ -1477,6 +1462,13 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/medical) +"aQf" = ( +/obj/structure/surface/table/almayer, +/obj/item/map/lv522_map, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "aQs" = ( /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ @@ -1516,6 +1508,13 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"aRB" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "aRH" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -1714,6 +1713,17 @@ /obj/structure/ore_box, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"aWd" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Radio Tower Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/t_comm) "aWl" = ( /obj/structure/barricade/wooden, /obj/structure/pipes/standard/simple/hidden/green, @@ -1814,6 +1824,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"aYE" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + id = "East_Lock"; + name = "Emergency Lockdown" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/hallway) "aYF" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -2053,6 +2078,16 @@ icon_state = "cement4" }, /area/lv522/outdoors/nw_rockies) +"bdY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/weapon/gun/launcher/grenade/m81/m79, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "beb" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -2136,10 +2171,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/north) -"bgw" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "bgJ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "Sec-Kitchen-Lockdown"; @@ -2251,6 +2282,15 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"biZ" = ( +/obj/structure/barricade/sandbags{ + dir = 8 + }, +/obj/item/trash/uscm_mre, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "bjd" = ( /turf/closed/wall/strata_outpost/reinforced, /area/lv522/atmos/sewer) @@ -2649,15 +2689,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor) -"byb" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/barricade/wooden{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "bye" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -2674,22 +2705,6 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) -"byD" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/obj/effect/decal{ - icon = 'icons/mob/xenos/effects.dmi'; - icon_state = "acid_weak"; - layer = 2; - name = "weak acid"; - pixel_x = -10; - pixel_y = 4 - }, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "byJ" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -2763,13 +2778,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) -"bAn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "bAo" = ( /obj/item/prop/colony/usedbandage{ dir = 10 @@ -3021,6 +3029,11 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical) +"bHk" = ( +/obj/structure/barricade/sandbags, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "bHA" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -3164,6 +3177,14 @@ /obj/item/stack/folding_barricade, /turf/open/floor/prison, /area/lv522/atmos/way_in_command_centre) +"bJY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/atmos/way_in_command_centre) "bJZ" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -3181,10 +3202,15 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) -"bKf" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) +"bKj" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/plasteel/small_stack, +/obj/item/ore/uranium, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/mining) "bKk" = ( /turf/open/floor/corsat{ dir = 8; @@ -3206,12 +3232,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) -"bKu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "bKO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -3319,6 +3339,15 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) +"bNy" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Corporate Office Airlock"; + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo) "bNA" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ @@ -3383,6 +3412,12 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"bOX" = ( +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "bPH" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -3435,6 +3470,10 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) +"bQA" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "bQC" = ( /obj/structure/bed/chair{ dir = 1 @@ -3464,18 +3503,10 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"bQP" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_y = -6 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_y = 10 - }, -/obj/structure/barricade/wooden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) +"bRv" = ( +/obj/item/trash/uscm_mre, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "bRN" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -3593,6 +3624,10 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"bUy" = ( +/obj/structure/cargo_container/wy/left, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "bUJ" = ( /obj/structure/largecrate/random/mini{ pixel_x = -2; @@ -3689,10 +3724,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/w_rockies) -"bWv" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "bWA" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 4; @@ -3767,16 +3798,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"bXU" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper B-Block Bar" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bar) "bXZ" = ( /obj/structure/platform{ dir = 1 @@ -3960,11 +3981,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) -"cbb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset/full, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "cbn" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -4118,6 +4134,18 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) +"cfz" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/bridge) "cfT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -4142,14 +4170,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"cgG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Cargo Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/bridge) "chm" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, @@ -4253,6 +4273,15 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"cjy" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Corporate Office Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/bridges/corpo) "cjE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -4329,6 +4358,17 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"cmC" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/fitness) "cmF" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_fuel"; @@ -4516,15 +4556,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) -"cqL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "cqP" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -4575,12 +4606,6 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor) -"csl" = ( -/obj/structure/barricade/plasteel/metal, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "csv" = ( /obj/structure/platform{ dir = 1 @@ -4598,6 +4623,15 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) +"csC" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/garage) "csK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -4632,6 +4666,15 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) +"ctu" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Casino Airlock"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/casino) "ctE" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, @@ -4861,6 +4904,10 @@ "czC" = ( /turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor/east) +"czE" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "czG" = ( /obj/structure/sign/safety/radio_rad{ pixel_y = 26 @@ -5242,6 +5289,15 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/east) +"cIo" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper C-Block - Cargo Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/cargo) "cIr" = ( /obj/structure/bed/chair{ dir = 4 @@ -5323,17 +5379,6 @@ icon_state = "brown" }, /area/lv522/oob) -"cJc" = ( -/obj/item/prop/colony/used_flare, -/obj/structure/cargo_container/wy/right, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/north_east_street) -"cJg" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/asphalt/cement{ - icon_state = "cement9" - }, -/area/lv522/outdoors/colony_streets/north_street) "cJh" = ( /obj/structure/window/reinforced{ dir = 4 @@ -5367,6 +5412,13 @@ }, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) +"cJF" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/item/stack/sheet/wood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "cJW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -5610,6 +5662,18 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor) +"cPg" = ( +/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) "cPi" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno, @@ -5696,10 +5760,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"cQv" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "cQB" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/pipes/standard/simple/hidden/green{ @@ -5780,6 +5840,15 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/west) +"cSf" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/cargo) "cSh" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -6388,6 +6457,10 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) +"dcR" = ( +/obj/effect/alien/weeds/node/alpha, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/w_rockies) "ddo" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -6404,15 +6477,6 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) -"ddq" = ( -/obj/structure/surface/rack, -/obj/item/device/analyzer, -/obj/effect/landmark/objective_landmark/close, -/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{ @@ -6581,6 +6645,16 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"dfV" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock"; + welded = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "dgb" = ( /obj/structure/cryofeed, /turf/open/floor/bluegrid, @@ -6655,12 +6729,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) -"dhj" = ( -/obj/item/prop/colony/used_flare, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/colony_streets/north_street) "dhH" = ( /turf/open/asphalt/cement{ icon_state = "cement12" @@ -6779,16 +6847,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"djL" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/closet/emcloset, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "djM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6888,20 +6946,6 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) -"dlM" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "dmm" = ( /obj/item/weapon/twohanded/folded_metal_chair{ pixel_y = -8 @@ -7289,20 +7333,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"dtl" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper A-Block Canteen Airlock"; - welded = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen/glass) "dtr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -7325,6 +7355,10 @@ icon_state = "plate" }, /area/lv522/atmos/reactor_garage) +"dtU" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "dua" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -7349,6 +7383,19 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/west) +"dvn" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "dvp" = ( /obj/structure/largecrate/supply, /obj/structure/largecrate/supply{ @@ -7638,13 +7685,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) -"dBQ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/prop/colony/used_flare, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "dCx" = ( /obj/structure/closet/crate/radiation, /turf/open/floor/corsat{ @@ -7806,14 +7846,6 @@ dir = 6 }, /area/lv522/indoors/c_block/mining) -"dFE" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "dFH" = ( /obj/structure/machinery/power/port_gen/pacman{ layer = 3.1; @@ -7899,14 +7931,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor) -"dHx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "dHy" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -8124,19 +8148,6 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) -"dMo" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "dMp" = ( /obj/structure/machinery/light{ dir = 4 @@ -8456,11 +8467,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/east) -"dSJ" = ( -/obj/structure/largecrate/random/secure, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "dSW" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 1; @@ -8515,16 +8521,6 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) -"dUr" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Dorms And Office Airlock"; - welded = 1 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "dUD" = ( /obj/item/prop/colony/proptag{ desc = "A fallen marine's information dog tag. It reads, Ensign Robert 'Roach' Yangley" @@ -8852,6 +8848,10 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"ebe" = ( +/obj/item/storage/pouch/autoinjector/full, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "ebn" = ( /turf/open/floor/prison{ icon_state = "darkredfull2" @@ -8928,6 +8928,16 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"edi" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/vehicle/train/cargo/trolley, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "edk" = ( /turf/open/floor/corsat{ dir = 8; @@ -9116,6 +9126,13 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor) +"egj" = ( +/obj/structure/machinery/floodlight, +/turf/open/floor/plating{ + dir = 8; + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "egt" = ( /obj/structure/powerloader_wreckage, /turf/open/floor/corsat{ @@ -9234,6 +9251,20 @@ icon_state = "brown" }, /area/lv522/oob) +"eiC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger{ + pixel_x = -7; + pixel_y = -5 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "eiP" = ( /obj/structure/coatrack{ pixel_x = -6; @@ -9254,6 +9285,12 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"eiY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "eiZ" = ( /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_west_street) @@ -9503,6 +9540,18 @@ }, /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) +"eoi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/barricade/metal{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "eov" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "Marked_1"; @@ -9586,6 +9635,10 @@ icon_state = "plate" }, /area/lv522/atmos/west_reactor) +"epe" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "epq" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/light{ @@ -9632,18 +9685,6 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical/glass) -"eqb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/barricade/deployable, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "eqe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9691,6 +9732,10 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"eqV" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "erw" = ( /obj/vehicle/train/cargo/trolley, /obj/effect/landmark/objective_landmark/close, @@ -9736,13 +9781,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) -"esx" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/item/stack/sheet/wood, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "esB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -9796,6 +9834,20 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/medical) +"eum" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Canteen Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen/glass) "eur" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -9821,6 +9873,13 @@ }, /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) +"euT" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/vehicle/train/cargo/engine, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "evu" = ( /obj/structure/tunnel/maint_tunnel{ pixel_y = 6 @@ -9863,14 +9922,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/corpo/glass) -"evQ" = ( -/obj/structure/barricade/sandbags, -/obj/item/trash/uscm_mre{ - pixel_x = -8; - pixel_y = 10 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "evS" = ( /obj/structure/platform, /obj/structure/platform{ @@ -10583,6 +10634,16 @@ icon_state = "cement4" }, /area/lv522/landing_zone_2) +"eLl" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + dir = 2; + name = "\improper A-Block - Colony Medical Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/medical) "eLx" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ @@ -10597,13 +10658,19 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "eLK" = ( -/obj/structure/tunnel/maint_tunnel{ - pixel_y = 6 +/obj/structure/showcase{ + desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Display synthetic" }, -/obj/structure/machinery/light/small, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) +/obj/structure/window/reinforced, +/obj/structure/sign/safety/synth_storage{ + pixel_x = 23; + pixel_y = 29 + }, +/turf/open/floor/bluegrid, +/area/lv522/indoors/a_block/corpo/glass) "eLN" = ( /obj/structure/machinery/light, /turf/open/floor{ @@ -10689,6 +10756,18 @@ icon_state = "cement12" }, /area/lv522/outdoors/colony_streets/south_street) +"eNc" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Cargo Airlock"; + welded = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/cargo) "eNf" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/spawner/gibspawner/xeno, @@ -10910,12 +10989,6 @@ icon_state = "platebot" }, /area/lv522/indoors/c_block/cargo) -"eSM" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/asphalt/cement{ - icon_state = "cement9" - }, -/area/lv522/outdoors/colony_streets/north_street) "eSO" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light{ @@ -10955,15 +11028,6 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"eTw" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Tornado) "eTQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -11013,6 +11077,20 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"eUz" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/bridge) "eUO" = ( /turf/open/floor/corsat{ icon_state = "marked" @@ -11278,6 +11356,13 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) +"faJ" = ( +/obj/item/trash/uscm_mre{ + pixel_x = 12; + pixel_y = -7 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "faK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -11340,12 +11425,6 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/south_east_street) -"fbY" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Tornado) "fcd" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ @@ -11382,6 +11461,16 @@ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) +"fdb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper C-Block - Casino Airlock"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/casino) "fdf" = ( /turf/open/asphalt/cement{ icon_state = "cement15" @@ -11773,15 +11862,6 @@ /obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049, /turf/open/floor/wood, /area/lv522/indoors/a_block/security) -"fmg" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Corporate Office Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/bridges/corpo) "fms" = ( /obj/structure/bed/chair/comfy, /obj/effect/decal/cleanable/dirt, @@ -11985,19 +12065,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"frc" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Security Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen) "frH" = ( /obj/item/clothing/head/hardhat/dblue{ layer = 6.1; @@ -12096,11 +12163,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"fto" = ( -/obj/item/storage/belt/grenade, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "fts" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/decal/cleanable/dirt, @@ -12123,6 +12185,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"ftD" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/fitness/glass) "ftK" = ( /obj/structure/bed/chair, /turf/open/floor/plating, @@ -12170,12 +12240,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) -"fvc" = ( -/obj/structure/barricade/sandbags, -/turf/open/asphalt/cement{ - icon_state = "cement14" - }, -/area/lv522/outdoors/colony_streets/north_street) "fvk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -12489,6 +12553,15 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"fAY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Fitness Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/fitness) "fBg" = ( /turf/open/floor/corsat{ icon_state = "marked" @@ -12532,6 +12605,12 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"fBY" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "fCb" = ( /obj/structure/platform{ dir = 1 @@ -12774,6 +12853,10 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/hydro) +"fGw" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "fGH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12908,6 +12991,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) +"fJr" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "fKf" = ( /obj/structure/platform{ dir = 1 @@ -13021,6 +13110,16 @@ /obj/structure/prop/dam/crane, /turf/open/floor/prison, /area/lv522/atmos/outdoor) +"fLZ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper B-Block Bar" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/bar) "fMd" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 8; @@ -13257,12 +13356,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/admin) -"fRw" = ( -/obj/structure/girder, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/colony_streets/north_street) "fRP" = ( /obj/structure/prop/vehicles/crawler{ layer = 3.3 @@ -13379,16 +13472,6 @@ icon_state = "brown" }, /area/lv522/atmos/west_reactor) -"fTK" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Corporate Office Airlock"; - req_access_txt = "100" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo) "fTN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -13410,12 +13493,6 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) -"fUc" = ( -/obj/structure/girder, -/turf/open/asphalt/cement{ - icon_state = "cement15" - }, -/area/lv522/outdoors/colony_streets/north_street) "fUf" = ( /obj/effect/decal{ icon = 'icons/mob/xenos/effects.dmi'; @@ -13438,15 +13515,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"fUQ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "fUT" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -13463,6 +13531,18 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"fVC" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = 10 + }, +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "fVU" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1 @@ -13488,6 +13568,20 @@ "fWG" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) +"fWH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Kitchen Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen) "fWW" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1 @@ -13647,6 +13741,15 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"fZo" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "fZy" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 @@ -13864,6 +13967,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"gdA" = ( +/obj/structure/barricade/deployable, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "gdJ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/corsat{ @@ -13966,6 +14076,13 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) +"geI" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -12; + pixel_y = 25 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "geP" = ( /obj/structure/machinery/light{ dir = 1 @@ -13991,6 +14108,20 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"gfl" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/hallway) +"gfs" = ( +/obj/item/prop/alien/hugger, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gfu" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/green, @@ -14113,18 +14244,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) -"ghE" = ( -/obj/item/clothing/head/helmet/marine/grenadier{ - armor_bullet = 10; - desc = "Pairs with the M3-G4 heavy grenadier plating. A distant cousin of the experimental B18 defensive helmet. Decorated with a blue stripe the large hole in the side of this helmet somewhat limits its protection."; - name = "\improper damaged M3-G4 grenadier helmet"; - pixel_x = 3; - pixel_y = 13 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "gib" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/stairs/perspective{ @@ -14262,6 +14381,14 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) +"gkH" = ( +/obj/structure/tunnel/maint_tunnel{ + pixel_y = 6 + }, +/obj/structure/machinery/light/small, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gkY" = ( /obj/structure/closet/bombcloset, /turf/open/asphalt/cement, @@ -14467,6 +14594,15 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) +"gpr" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/cargo) "gpu" = ( /obj/item/fuelCell{ pixel_x = -8; @@ -14577,13 +14713,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) -"gsn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/vehicle/train/cargo/engine, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "gsM" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -14768,53 +14897,14 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) -"gvK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/uscm_mre{ - pixel_x = -12; - pixel_y = 7 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "gvT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness) -"gvU" = ( -/obj/structure/prop/invuln/minecart_tracks, -/obj/structure/closet/crate/miningcar{ - layer = 3.1; - name = "\improper materials storage bin"; - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/ore/slag, -/obj/item/ore/slag, -/obj/item/ore/slag, -/obj/item/ore/slag, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "gwb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) -"gwg" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bridge) "gwk" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -14830,6 +14920,13 @@ /obj/effect/alien/resin/sticky, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) +"gwH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "gwK" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -14857,18 +14954,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) -"gwU" = ( -/obj/structure/barricade/sandbags{ - dir = 8 - }, -/obj/item/prop/alien/hugger{ - pixel_x = 13; - pixel_y = -5 - }, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "gxb" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -14887,11 +14972,6 @@ icon_state = "plate" }, /area/lv522/atmos/command_centre) -"gxe" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/spawner/gibspawner/human, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) "gxl" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC, @@ -15210,6 +15290,11 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/cargo) +"gEx" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "gEA" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 8; @@ -15287,6 +15372,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"gFy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "gFD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine, @@ -15520,6 +15609,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"gKa" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/south_east_street) "gKg" = ( /obj/structure/platform, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -15589,25 +15684,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"gLw" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Security Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Sec-Corpo-Bridge-Lockdown" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/security) -"gLy" = ( -/obj/structure/surface/table/almayer, -/obj/item/map/lv522_map, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "gLK" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -15676,11 +15752,6 @@ icon_state = "cement9" }, /area/lv522/outdoors/colony_streets/south_west_street) -"gMT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/prop/alien/hugger, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "gMV" = ( /obj/structure/machinery/light{ dir = 1 @@ -15895,13 +15966,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"gRi" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal/medium_stack, -/obj/item/ore/uranium, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "gRj" = ( /obj/structure/platform{ dir = 4 @@ -15909,10 +15973,6 @@ /obj/item/prop/colony/used_flare, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) -"gRl" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "gRp" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison{ @@ -15949,11 +16009,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"gRS" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "gRU" = ( /obj/item/paper_bin/uscm{ pixel_x = -7; @@ -16068,13 +16123,6 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) -"gUT" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -12; - pixel_y = 25 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "gUY" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/vomit, @@ -16142,6 +16190,13 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"gWc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 4 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gWg" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, @@ -16300,6 +16355,14 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) +"gYH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/bridges/op_centre) "gYK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -16366,6 +16429,14 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/hydro) +"gZv" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Shared Dorms Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorm_north) "gZJ" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -16540,6 +16611,16 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_2) +"hbw" = ( +/obj/item/explosive/grenade/high_explosive/m15{ + pixel_x = 8 + }, +/obj/item/prop/alien/hugger{ + pixel_x = -7; + pixel_y = -5 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "hbF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/bed/chair/comfy{ @@ -16571,11 +16652,18 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/east) -"hbO" = ( -/obj/structure/largecrate/random/case/small, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) +"hcd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "hcv" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -16601,14 +16689,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"hcG" = ( -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "hcO" = ( /obj/structure/platform_decoration, /turf/open/floor/plating, @@ -16620,15 +16700,6 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) -"hcX" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 8 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 11 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "hcZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -17043,6 +17114,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) +"hkr" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_street) "hku" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/green{ @@ -17267,24 +17344,6 @@ icon_state = "brown" }, /area/lv522/atmos/west_reactor) -"hnG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - req_access_txt = "100" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/atmos/way_in_command_centre) -"hnX" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper A-Block Dorms And Office Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "hoq" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent4"; @@ -17380,15 +17439,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"hpO" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Emergency Engineering" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/lone_buildings/engineering) "hqp" = ( /obj/structure/coatrack{ pixel_x = 11 @@ -17397,15 +17447,13 @@ icon_state = "blue1" }, /area/lv522/indoors/a_block/dorm_north) -"hqr" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldpack{ - pixel_y = 2 - }, +"hqB" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement{ - icon_state = "cement4" + icon_state = "cement3" }, -/area/lv522/outdoors/colony_streets/north_west_street) +/area/lv522/outdoors/colony_streets/north_street) "hqD" = ( /turf/open/floor/corsat{ dir = 1; @@ -17849,6 +17897,16 @@ icon_state = "floor_plate" }, /area/lv522/atmos/way_in_command_centre) +"hAd" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper A-Block Dorms And Office Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "hAg" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1 @@ -18030,6 +18088,18 @@ "hDa" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/command_centre) +"hDe" = ( +/obj/item/tool/lighter/zippo{ + layer = 3.1; + pixel_x = 12; + pixel_y = 18 + }, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "hDh" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ @@ -18227,6 +18297,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"hIz" = ( +/obj/structure/surface/table/almayer, +/obj/item/handcuffs{ + pixel_y = 12 + }, +/obj/item/handcuffs{ + pixel_y = 6 + }, +/obj/item/handcuffs, +/obj/item/weapon/classic_baton, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security/glass) "hIA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, @@ -18519,6 +18603,13 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) +"hNt" = ( +/obj/item/trash/uscm_mre, +/obj/structure/surface/table/almayer, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "hNz" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -18692,16 +18783,6 @@ }, /turf/open/floor/wood/ship, /area/lv522/atmos/way_in_command_centre) -"hPT" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "hQh" = ( /obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ @@ -19133,20 +19214,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) -"hZf" = ( -/obj/structure/showcase{ - desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Display synthetic" - }, -/obj/structure/window/reinforced, -/obj/structure/sign/safety/synth_storage{ - pixel_x = 23; - pixel_y = 29 - }, -/turf/open/floor/bluegrid, -/area/lv522/indoors/a_block/corpo/glass) +"hZc" = ( +/obj/item/prop/colony/used_flare, +/obj/structure/cargo_container/wy/right, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "hZg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/server_equipment/laptop/closed, @@ -19163,6 +19235,13 @@ icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) +"hZC" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/medium_stack, +/obj/item/ore/uranium, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "hZK" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ pixel_x = 3 @@ -19229,16 +19308,6 @@ icon_state = "plate" }, /area/lv522/atmos/filt) -"iaD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "iaM" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, @@ -19279,10 +19348,6 @@ icon_state = "23" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"ibS" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "ibT" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -19300,6 +19365,11 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/hydro) +"ica" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/alien/hugger, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ici" = ( /obj/effect/decal/cleanable/vomit{ icon_state = "vomit_4" @@ -19448,6 +19518,22 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor) +"ieE" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal{ + icon = 'icons/mob/xenos/effects.dmi'; + icon_state = "acid_weak"; + layer = 2; + name = "weak acid"; + pixel_x = -10; + pixel_y = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "ieW" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -19466,6 +19552,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"ifg" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Tornado) "ifh" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ dir = 1; @@ -19724,15 +19819,6 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) -"ikp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/item/stack/folding_barricade, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "ikr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -20236,15 +20322,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"iuQ" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Cargo Airlock"; - welded = 1 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/cargo) "iuW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -20276,16 +20353,6 @@ /obj/item/tool/wet_sign, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"ivs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "ivy" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe/jackhammer, @@ -20313,12 +20380,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"ivY" = ( -/obj/item/prop/colony/used_flare, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "iwb" = ( /obj/structure/stairs/perspective{ dir = 6; @@ -20396,6 +20457,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) +"ixV" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ixW" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -20476,6 +20541,14 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"izb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "izj" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 8 @@ -20562,15 +20635,6 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) -"iBd" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Garage Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/garage) "iBe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20687,6 +20751,18 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) +"iDC" = ( +/obj/item/clothing/head/helmet/marine/grenadier{ + armor_bullet = 10; + desc = "Pairs with the M3-G4 heavy grenadier plating. A distant cousin of the experimental B18 defensive helmet. Decorated with a blue stripe the large hole in the side of this helmet somewhat limits its protection."; + name = "\improper damaged M3-G4 grenadier helmet"; + pixel_x = 3; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "iDD" = ( /obj/item/stack/tile/plasteel{ name = "ceiling tile"; @@ -20715,13 +20791,6 @@ icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) -"iFe" = ( -/obj/structure/closet/crate, -/obj/item/weapon/stunprod, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/landing_zone_2) "iFk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -21131,19 +21200,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"iML" = ( -/obj/structure/largecrate/random, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/barricade/metal{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "iMQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, @@ -21283,6 +21339,17 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"iPy" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper A-Block Dorms And Office Airlock"; + welded = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "iPD" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "West LZ Storage"; @@ -21335,6 +21402,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) +"iQt" = ( +/obj/structure/cargo_container/wy/mid, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "iQF" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -21378,6 +21449,16 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"iRW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "iRY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -21402,6 +21483,10 @@ icon_state = "rasputin8" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"iSx" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "iSF" = ( /obj/structure/surface/table/almayer, /obj/structure/prop/server_equipment/laptop/on, @@ -21419,6 +21504,23 @@ icon_state = "blue_plate" }, /area/lv522/indoors/c_block/mining) +"iTf" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Security Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/security) "iTn" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ @@ -21727,6 +21829,12 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"iYG" = ( +/obj/item/stack/sandbags_empty/small_stack, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "iYL" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -22006,14 +22114,6 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) -"jdI" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Radio Tower Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/t_comm) "jeb" = ( /obj/vehicle/powerloader{ dir = 8 @@ -22028,12 +22128,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) -"jeh" = ( -/obj/item/stack/sandbags/small_stack, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "jey" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -22131,6 +22225,11 @@ "jfO" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) +"jfP" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "jfZ" = ( /obj/structure/platform{ dir = 8 @@ -22328,15 +22427,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"jjc" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Electronics Storage" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/lone_buildings/outdoor_bot) "jjg" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -22590,6 +22680,11 @@ "jmG" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/c_block/cargo) +"jmN" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/w_rockies) "jmU" = ( /obj/structure/barricade/handrail, /turf/open/floor/coagulation{ @@ -22740,12 +22835,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) -"joV" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "jpa" = ( /obj/structure/bedsheetbin{ pixel_y = 7 @@ -22756,13 +22845,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"jpb" = ( -/obj/structure/closet/crate, -/obj/item/storage/pouch/shotgun/large/slug, -/obj/item/storage/pouch/general/large/m39ap, -/obj/item/storage/pouch/flamertank, -/turf/open/floor/prison, -/area/lv522/landing_zone_2) "jpc" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison, @@ -22824,15 +22906,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"jqV" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Corporate Office Airlock"; - req_access_txt = "100" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo) "jrd" = ( /obj/structure/girder/displaced, /turf/open/asphalt/cement, @@ -22850,6 +22923,23 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"jro" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "LV522CIC_1"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/admin) "jru" = ( /obj/structure/platform{ dir = 8 @@ -22878,6 +22968,18 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) +"jrE" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "jrJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/reinforced/prison, @@ -22910,6 +23012,15 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"jsk" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "jsy" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -22978,13 +23089,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) -"jub" = ( -/obj/structure/machinery/floodlight, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "jud" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 @@ -23105,11 +23209,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"jwO" = ( -/obj/structure/largecrate/random/barrel/blue, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) +"jwP" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/garage) "jwT" = ( /obj/item/tool/wet_sign, /turf/open/floor/corsat{ @@ -23173,6 +23283,20 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/atmos/outdoor) +"jxT" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Security Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen) "jyf" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3; @@ -23311,16 +23435,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) -"jAA" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/prison{ - dir = 8; - icon_state = "cell_stripe" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "jAI" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, @@ -23759,6 +23873,14 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1) +"jIA" = ( +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/garage) "jIG" = ( /obj/item/tool/wet_sign{ pixel_x = -11; @@ -24098,6 +24220,23 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"jOx" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/bridge) "jOF" = ( /obj/effect/acid_hole, /turf/closed/wall/shiva/prefabricated/reinforced, @@ -24111,19 +24250,6 @@ }, /turf/open/floor/plating, /area/lv522/oob) -"jPd" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "jPg" = ( /obj/structure/platform_decoration, /obj/structure/stairs/perspective{ @@ -24345,6 +24471,19 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"jUc" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/barricade/metal{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "jUe" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -24473,6 +24612,20 @@ /obj/structure/cargo_container/kelland/right, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"jVV" = ( +/obj/structure/prop/invuln/minecart_tracks, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "jWr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, @@ -24541,6 +24694,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"jYc" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "jYj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -24857,6 +25018,10 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"kcY" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/admin) "kda" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ @@ -24912,6 +25077,20 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"kdw" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Corporate Office Airlock"; + req_access_txt = "100" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo) "kdx" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/shale/layer1, @@ -24954,25 +25133,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) -"keA" = ( -/obj/structure/girder, -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, -/area/lv522/outdoors/colony_streets/north_street) -"kfa" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Security Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/security) "kfi" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -25160,6 +25320,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"khR" = ( +/obj/structure/largecrate/random, +/obj/item/storage/box/packet/high_explosive{ + pixel_x = -5; + pixel_y = -14 + }, +/obj/item/storage/pill_bottle/packet/oxycodone{ + pixel_x = -1; + pixel_y = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "kib" = ( /obj/item/clothing/head/hardhat/white, /obj/item/prop/alien/hugger{ @@ -25452,6 +25626,19 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"kmw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/uscm_mre{ + pixel_x = -12; + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "kmz" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -25808,6 +25995,25 @@ icon_state = "plate" }, /area/lv522/indoors/c_block/mining) +"ksO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/barricade/metal{ + dir = 1 + }, +/obj/structure/barricade/metal{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "kti" = ( /obj/structure/platform, /obj/structure/platform{ @@ -25829,6 +26035,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/dorms) +"kua" = ( +/obj/effect/landmark/objective_landmark/close, +/obj/structure/closet/crate, +/obj/item/stack/sheet/plasteel/large_stack, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/lv522/indoors/c_block/cargo) "kug" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/pistachios, @@ -25998,6 +26212,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) +"kxH" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "kxW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -26308,15 +26528,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"kCQ" = ( -/obj/structure/largecrate/random, -/obj/item/explosive/plastic/breaching_charge{ - pixel_y = -2 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "kDH" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ @@ -26704,6 +26915,12 @@ icon_state = "2,0" }, /area/lv522/oob) +"kKj" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/north_east_street) "kKD" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/pipes/standard/simple/hidden/green, @@ -26850,6 +27067,16 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"kNY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Dorms And Office Airlock"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "kOa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -27128,13 +27355,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) -"kSh" = ( -/obj/structure/closet/crate, -/obj/item/storage/pouch/pressurized_reagent_canister/revival, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "kSm" = ( /obj/structure/machinery/light{ dir = 8 @@ -27297,6 +27517,14 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) +"kUM" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Corporate Office Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/security) "kUP" = ( /obj/structure/machinery/light{ dir = 1 @@ -27579,13 +27807,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/damage) -"lae" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "lag" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/weak{ @@ -27613,23 +27834,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"laB" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "LV522CIC_1"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/admin) "laX" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8; @@ -27771,6 +27975,13 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"ldr" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "ldu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -27916,6 +28127,13 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"lfA" = ( +/obj/structure/closet/crate, +/obj/item/weapon/classic_baton, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/landing_zone_2) "lfS" = ( /turf/open/asphalt/cement{ icon_state = "cement2" @@ -27934,10 +28152,6 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) -"lgR" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "lgY" = ( /obj/structure/platform_decoration{ dir = 1 @@ -27961,6 +28175,18 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) +"lhp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/barricade/deployable, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "lhC" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 5 @@ -28105,15 +28331,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"lkr" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Casino Airlock"; - welded = 1 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/casino) "lkH" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -28230,6 +28447,15 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"lmI" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Dorms And Office Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "lmJ" = ( /obj/structure/prop/dam/crane/cargo, /turf/open/floor/plating, @@ -28240,6 +28466,15 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"lmW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/stack/folding_barricade, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "lmY" = ( /turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor/south) @@ -28353,11 +28588,6 @@ icon_state = "blue1" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"loX" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "lpi" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -28401,6 +28631,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/atmos/outdoor) +"lqI" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 9; + pixel_y = 25 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "lqL" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/wooden, @@ -29161,16 +29399,6 @@ icon_state = "brown" }, /area/lv522/atmos/filt) -"lFM" = ( -/obj/structure/prop/invuln/pipe_water{ - pixel_x = 3; - pixel_y = 10 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "lFO" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -29269,6 +29497,13 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/c_block/cargo) +"lHk" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "lHl" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/snacks/sliceable/cheesewheel{ @@ -29333,6 +29568,19 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) +"lIy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "lIB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29422,12 +29670,6 @@ icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) -"lKH" = ( -/obj/structure/machinery/colony_floodlight, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/outdoors/colony_streets/south_east_street) "lLl" = ( /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, @@ -29618,6 +29860,12 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_street) +"lPM" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/lv522/outdoors/colony_streets/north_street) "lPT" = ( /obj/structure/bed/chair{ dir = 4 @@ -29641,15 +29889,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) -"lQA" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/colony_streets/north_street) "lQS" = ( /obj/structure/prop/vehicles/crawler{ dir = 8; @@ -29658,16 +29897,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) -"lRi" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -12; - pixel_y = -1 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "lRx" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -29818,14 +30047,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) -"lUy" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Shared Dorms Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) "lUJ" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -29845,6 +30066,16 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"lUU" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Corporate Office Airlock"; + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo) "lUV" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -29958,6 +30189,10 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor) +"lXO" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "lXQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -30299,6 +30534,15 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/corpo) +"meK" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper C-Block - Cargo Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/bridge) "mfh" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -30329,16 +30573,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"mfS" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper C-Block - Casino Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/casino) "mfV" = ( /obj/structure/machinery/light{ dir = 8 @@ -30442,15 +30676,6 @@ }, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/south_east_street) -"mji" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Corporate Office Airlock"; - req_access_txt = "100" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo/glass) "mjq" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ @@ -30563,14 +30788,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) -"mkT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Security Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/bridges/op_centre) "mkW" = ( /obj/structure/bed/chair{ dir = 4 @@ -30652,20 +30869,6 @@ icon_state = "plate" }, /area/lv522/atmos/reactor_garage) -"mlY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/prop/alien/hugger{ - pixel_x = -7; - pixel_y = -5 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "mlZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -30850,6 +31053,14 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness/glass) +"moQ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper A-Block Shared Dorms Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "moZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat{ @@ -30863,6 +31074,20 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"mpF" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/bridge) "mpI" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -31112,6 +31337,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"muB" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "muO" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -31210,11 +31441,6 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) -"mwn" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "mwp" = ( /obj/effect/spawner/random/tool, /turf/open/auto_turf/sand_white/layer0, @@ -31227,6 +31453,15 @@ }, /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) +"mwL" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Corporate Office Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo/glass) "mwT" = ( /obj/structure/prop/dam/truck, /obj/structure/prop/holidays/wreath{ @@ -31244,6 +31479,12 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"mxg" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/garden) "mxo" = ( /obj/structure/surface/rack, /obj/item/clothing/head/hardhat, @@ -31367,6 +31608,10 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1/ceiling) +"mzi" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "mzP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger{ @@ -31552,14 +31797,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) -"mEn" = ( -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/garage) "mEp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -31639,6 +31876,14 @@ /obj/structure/platform/stair_cut/alt, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"mFO" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Radio Tower Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/t_comm) "mFZ" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -31726,12 +31971,6 @@ icon_state = "E"; pixel_x = 1 }, -/obj/structure/reagent_dispensers/fueltank{ - layer = 2.9 - }, -/obj/structure/barricade/metal{ - dir = 4 - }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -31807,6 +32046,15 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) +"mJG" = ( +/obj/structure/surface/rack, +/obj/item/device/analyzer, +/obj/effect/landmark/objective_landmark/close, +/obj/item/stack/sheet/cardboard/full_stack, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, +/area/lv522/indoors/c_block/mining) "mJQ" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -31853,14 +32101,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) -"mKK" = ( -/obj/structure/barricade/deployable{ - dir = 8 - }, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "mKN" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/corsat{ @@ -31873,6 +32113,16 @@ icon_state = "squares" }, /area/lv522/atmos/cargo_intake) +"mKZ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 6; + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "mLb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -32213,27 +32463,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"mPQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Dorms And Office Airlock"; - welded = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "mPR" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) -"mPV" = ( -/obj/structure/largecrate/random/barrel, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "mPY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /obj/effect/landmark/xeno_spawn, @@ -32267,12 +32502,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) -"mQo" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "mQq" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 8 @@ -32770,16 +32999,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) -"naM" = ( -/obj/item/explosive/grenade/high_explosive/m15{ - pixel_x = 8 - }, -/obj/item/prop/alien/hugger{ - pixel_x = -7; - pixel_y = -5 - }, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "naN" = ( /obj/item/stack/rods, /obj/structure/machinery/light{ @@ -32892,18 +33111,15 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/south_street) -"ncs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"ncp" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper B-Block Bar" }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/turf/open/floor/corsat{ + icon_state = "marked" }, -/area/lv522/outdoors/colony_streets/north_street) +/area/lv522/indoors/b_block/bar) "ncv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33287,11 +33503,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"nkm" = ( -/obj/item/prop/alien/hugger, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "nkt" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -33356,13 +33567,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) -"nlO" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal/large_stack, -/turf/open/floor/plating{ - icon_state = "platebot" - }, -/area/lv522/indoors/c_block/cargo) "nlR" = ( /obj/structure/window/reinforced{ dir = 4; @@ -33443,20 +33647,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/atmos/outdoor) -"nmL" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Kitchen Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen) "nmX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -33533,6 +33723,14 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) +"noH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Casino Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/casino) "noL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -33847,6 +34045,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"ntk" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Garage Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/garage) "ntq" = ( /obj/structure/prop/invuln/overhead_pipe{ name = "overhead pipe"; @@ -33907,19 +34113,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) -"nue" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "nuo" = ( /obj/structure/machinery/light, /turf/open/floor/strata{ @@ -33981,12 +34174,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/op_centre) -"nvA" = ( -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "nvB" = ( /obj/structure/cargo_container/kelland/right, /turf/open/auto_turf/shale/layer1, @@ -34045,11 +34232,27 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) +"nxu" = ( +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "nxF" = ( /obj/structure/machinery/light/small, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) +"nxJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "nxO" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -34084,6 +34287,12 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) +"nyv" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/north_street) "nyJ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -34239,10 +34448,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) -"nDo" = ( -/obj/item/prop/colony/used_flare, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "nDt" = ( /obj/structure/platform_decoration{ dir = 4 @@ -34354,18 +34559,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) -"nFQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "nGc" = ( /obj/effect/alien/resin/sticky, /turf/open/gm/river, @@ -34433,17 +34626,17 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1) +"nHl" = ( +/obj/structure/barricade/sandbags, +/turf/open/asphalt/cement{ + icon_state = "cement14" + }, +/area/lv522/outdoors/colony_streets/north_street) "nHA" = ( /turf/open/floor/prison{ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) -"nHM" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/colony_streets/north_street) "nHT" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -34515,6 +34708,13 @@ /obj/structure/noticeboard, /turf/closed/wall/strata_outpost, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"nJW" = ( +/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) "nKh" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -34573,13 +34773,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) -"nKZ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "nLe" = ( /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/cobweb2, @@ -34695,15 +34888,6 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) -"nMP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "nMT" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3; @@ -34884,6 +35068,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"nPn" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Tornado) "nPo" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -34928,6 +35121,17 @@ icon_state = "cement14" }, /area/lv522/outdoors/colony_streets/north_east_street) +"nQk" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement2" + }, +/area/lv522/outdoors/colony_streets/north_street) "nQn" = ( /obj/item/stack/rods, /obj/structure/machinery/light{ @@ -34956,6 +35160,16 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"nQL" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -12; + pixel_y = -1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "nQM" = ( /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/asphalt/cement{ @@ -35012,6 +35226,15 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"nRI" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "nRJ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine, @@ -35036,6 +35259,11 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/t_comm) +"nRY" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "nSm" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, @@ -35161,19 +35389,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/filt) -"nUF" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/structure/largecrate/random/case/small, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "nUO" = ( /obj/structure/closet/crate/trashcart, /turf/open/auto_turf/shale/layer1, @@ -35215,6 +35430,11 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"nVr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "nVN" = ( /obj/item/ammo_magazine/flamer_tank/empty, /obj/effect/decal/cleanable/liquid_fuel, @@ -35377,23 +35597,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"nXI" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bridge) "nXK" = ( /obj/structure/barricade/wooden{ dir = 8; @@ -35408,6 +35611,18 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"nXM" = ( +/obj/structure/barricade/sandbags{ + dir = 8 + }, +/obj/item/prop/alien/hugger{ + pixel_x = 13; + pixel_y = -5 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "nXO" = ( /obj/item/ammo_box/magazine/misc/flares, /turf/open/floor/prison, @@ -35495,14 +35710,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"nZn" = ( -/obj/effect/landmark/objective_landmark/close, -/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; @@ -35517,15 +35724,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"nZx" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/plasteel/small_stack, -/obj/item/ore/uranium, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/lv522/indoors/c_block/mining) "nZF" = ( /turf/open/floor/prison{ icon_state = "floor_plate" @@ -35633,6 +35831,20 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"oda" = ( +/obj/structure/prop/invuln/minecart_tracks, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal/small_stack, +/obj/item/ore/slag, +/obj/item/ore/slag, +/obj/item/ore/slag, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "odg" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/plaincakeslice{ @@ -35645,10 +35857,6 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/kitchen) -"odi" = ( -/obj/effect/spawner/gibspawner/human, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/w_rockies) "odt" = ( /obj/structure/window_frame/strata, /obj/item/stack/rods, @@ -35962,12 +36170,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) -"oik" = ( -/obj/structure/machinery/colony_floodlight, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/garden) "oim" = ( /obj/structure/machinery/light{ dir = 4 @@ -36090,6 +36292,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"ojA" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper C-Block - Cargo Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/bridge) "ojW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -36170,13 +36380,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) -"omv" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_y = -6 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "omG" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -36254,11 +36457,14 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) -"oow" = ( -/obj/effect/spawner/gibspawner/human, -/obj/item/device/defibrillator/compact, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/w_rockies) +"oox" = ( +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ooG" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -36481,6 +36687,15 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) +"osE" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Corporate Office Airlock"; + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo/glass) "osN" = ( /turf/open/asphalt/cement{ icon_state = "cement4" @@ -36527,12 +36742,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/sewer) -"otC" = ( -/obj/structure/machinery/colony_floodlight, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/outdoors/colony_streets/north_east_street) "otH" = ( /obj/structure/surface/table/almayer, /obj/item/prop/colony/proptag{ @@ -36598,10 +36807,6 @@ }, /turf/open/gm/river, /area/lv522/outdoors/colony_streets/south_street) -"ous" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "ouv" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname, @@ -36653,11 +36858,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"ovB" = ( +"ovC" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/item/trash/uscm_mre, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -36987,15 +37192,6 @@ icon_state = "white_cyan4" }, /area/lv522/indoors/a_block/medical) -"oCW" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "oDj" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1 @@ -37197,6 +37393,13 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security/glass) +"oHW" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/large_stack, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/lv522/indoors/c_block/cargo) "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -37465,16 +37668,28 @@ }, /turf/open/floor/wood/ship, /area/lv522/atmos/way_in_command_centre) +"oMt" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/security) "oML" = ( /turf/open/floor/corsat{ icon_state = "brown" }, /area/lv522/atmos/north_command_centre) -"oMO" = ( -/obj/structure/tent/big, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, +"oMX" = ( +/obj/item/storage/belt/grenade, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_street) "oNd" = ( /obj/effect/decal/cleanable/dirt, @@ -37612,16 +37827,6 @@ /obj/structure/largecrate/random/case, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"oQV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/stack/sandbags/small_stack, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "oQW" = ( /obj/structure/machinery/light{ dir = 8 @@ -37961,6 +38166,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) +"oXd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "oXk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -38006,14 +38217,6 @@ /obj/structure/barricade/deployable, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) -"oXV" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Electronics Storage" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/lone_buildings/outdoor_bot) "oXX" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -38212,6 +38415,19 @@ }, /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) +"pdq" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper B-Block - Hydroponics Airlock"; + welded = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "pdr" = ( /obj/structure/curtain/red, /obj/effect/decal/cleanable/dirt, @@ -38852,6 +39068,12 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) +"ppX" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "pqj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c1000, @@ -38860,10 +39082,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"pqk" = ( -/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, /obj/effect/landmark/objective_landmark/close, @@ -38913,26 +39131,11 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"pqX" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 9; - pixel_y = 25 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "pqZ" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "102" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"prs" = ( -/obj/effect/decal/cleanable/blood/xeno{ - icon_state = "xgib3" - }, -/obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "prD" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "5" @@ -39113,15 +39316,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"pvE" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Cargo Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/cargo) "pvW" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -12; @@ -39142,18 +39336,6 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) -"pwk" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/pouch/medkit/full_advanced, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "pwu" = ( /obj/structure/platform_decoration{ dir = 8 @@ -39188,6 +39370,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) +"pwF" = ( +/obj/structure/prop/invuln/pipe_water{ + pixel_x = 3; + pixel_y = 10 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "pwH" = ( /obj/effect/landmark/lv624/fog_blocker/short, /obj/structure/machinery/landinglight/ds1/delayone{ @@ -39205,6 +39397,15 @@ icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"pwR" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldpack{ + pixel_y = 2 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_west_street) "pwT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -39230,15 +39431,6 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"pxp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Dorms And Office Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "pxN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ @@ -39567,17 +39759,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/kitchen/glass) -"pDG" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper A-Block Fitness Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/fitness) "pDM" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -39846,6 +40027,14 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"pJb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Fitness Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/fitness) "pJd" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/surface/table/almayer, @@ -39994,16 +40183,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) -"pLN" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - dir = 2; - name = "\improper A-Block - Colony Medical Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/medical) "pLP" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/warning_stripes{ @@ -40023,18 +40202,6 @@ /obj/effect/decal/strata_decals/grime/grime3, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) -"pMc" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "pMd" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -40064,15 +40231,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"pMt" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - dir = 2; - name = "\improper A-Block - Colony Medical Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/medical) "pMz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -40159,6 +40317,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) +"pOa" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/east_central_street) +"pOb" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "pOd" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -40238,6 +40406,21 @@ /obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/nw_rockies) +"pPv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "pPC" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/nw_rockies) @@ -40252,6 +40435,11 @@ icon_state = "white_cyan2" }, /area/lv522/indoors/a_block/dorms) +"pQq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "pQx" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ @@ -40368,24 +40556,6 @@ icon_state = "brown" }, /area/lv522/atmos/cargo_intake) -"pSh" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) -"pSj" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bridge) "pSs" = ( /obj/structure/machinery/light{ dir = 4 @@ -40494,6 +40664,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"pUf" = ( +/obj/structure/tent/big, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "pUo" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -40678,6 +40854,10 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison, /area/lv522/landing_zone_2) +"pXv" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "pXx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -40702,10 +40882,14 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"pXH" = ( -/obj/effect/alien/weeds/node/alpha, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/w_rockies) +"pXR" = ( +/obj/structure/barricade/sandbags, +/obj/item/trash/uscm_mre{ + pixel_x = -8; + pixel_y = 10 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "pYf" = ( /obj/structure/machinery/light{ dir = 8 @@ -40905,15 +41089,6 @@ /obj/structure/sign/safety/high_voltage, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"qbL" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Dorms And Office Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "qbW" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -41016,15 +41191,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) -"qdV" = ( -/obj/structure/barricade/sandbags{ - dir = 8 - }, -/obj/item/trash/uscm_mre, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "qer" = ( /obj/structure/prop/invuln/minecart_tracks{ layer = 2.6 @@ -41095,6 +41261,19 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"qfP" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen) "qgj" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -41115,10 +41294,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) -"qhk" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "qhm" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -41501,6 +41676,14 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"qoj" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "qot" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/cardboard/full_stack, @@ -41574,6 +41757,20 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_2/ceiling) +"qpJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper A-Block Canteen Airlock"; + welded = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "Sec-Kitchen-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/kitchen/glass) "qqc" = ( /obj/structure/filingcabinet, /turf/open/floor/prison{ @@ -41712,6 +41909,11 @@ icon_state = "plate" }, /area/lv522/atmos/filt) +"qrG" = ( +/obj/structure/surface/table/almayer, +/obj/item/map/lv522_map, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "qsd" = ( /obj/structure/pipes/standard/simple/visible{ dir = 10 @@ -41968,10 +42170,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"qxe" = ( -/obj/item/prop/colony/used_flare, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "qxf" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, @@ -42052,6 +42250,13 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) +"qxO" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_y = -6 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "qxX" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -42274,10 +42479,6 @@ /obj/item/trash/plate, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"qBH" = ( -/obj/structure/cargo_container/wy/left, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/north_east_street) "qBQ" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -42461,6 +42662,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) +"qEr" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper C-Block - Casino Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/casino) "qEu" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -42492,6 +42703,21 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"qFc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/reagent_dispensers/fueltank{ + layer = 2.9 + }, +/obj/structure/barricade/metal{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "qFs" = ( /turf/closed/shuttle/dropship2/tornado/typhoon{ icon_state = "66" @@ -42625,6 +42851,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"qIt" = ( +/obj/structure/largecrate/random/barrel/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "qIu" = ( /obj/structure/bed/bedroll{ dir = 1; @@ -43034,6 +43265,12 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical) +"qPm" = ( +/obj/item/ammo_box/magazine/misc/mre/empty, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "qPq" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -43079,14 +43316,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"qPS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Corporate Office Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/security) "qPT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -43518,6 +43747,14 @@ icon_state = "64" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"qVo" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Electronics Storage" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/lone_buildings/outdoor_bot) "qVN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -43795,6 +44032,15 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"rah" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/trash/uscm_mre, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "raj" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -44227,18 +44473,15 @@ /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 +"rgS" = ( +/obj/structure/platform_decoration{ + dir = 4 }, -/obj/item/toy/farwadoll, -/turf/open/floor/strata{ - icon_state = "blue1" +/obj/structure/barricade/wooden{ + dir = 1 }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "rhh" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/decal/cleanable/dirt, @@ -44371,18 +44614,6 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/central_streets) -"rjD" = ( -/obj/item/tool/lighter/zippo{ - layer = 3.1; - pixel_x = 12; - pixel_y = 18 - }, -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "rjJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -44437,15 +44668,6 @@ "rlB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"rlE" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Security Airlock"; - welded = 1 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/bridges/op_centre) "rlI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -44481,22 +44703,6 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges) -"rmk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/item/weapon/gun/launcher/grenade/m81/m79, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) -"rmm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "rmp" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating, @@ -44599,10 +44805,6 @@ icon_state = "cement12" }, /area/lv522/landing_zone_1) -"rnX" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "rod" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -44765,6 +44967,12 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) +"rrB" = ( +/obj/vehicle/powerloader, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/lv522/landing_zone_forecon/UD6_Tornado) "rrI" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -44813,6 +45021,14 @@ /obj/item/toy/beach_ball, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) +"rsD" = ( +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/largecrate/random/barrel, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "rsF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -45144,12 +45360,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/hallway) -"ryb" = ( -/obj/item/prop/colony/used_flare, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "ryj" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -45181,6 +45391,15 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) +"ryI" = ( +/obj/structure/largecrate/random, +/obj/item/explosive/plastic/breaching_charge{ + pixel_y = -2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/outdoors/colony_streets/north_street) "ryO" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/curtain/red, @@ -45201,12 +45420,6 @@ icon_state = "greenfull" }, /area/lv522/landing_zone_1) -"ryW" = ( -/obj/item/stack/sandbags_empty/small_stack, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "rza" = ( /turf/open/floor/corsat{ dir = 8; @@ -45256,15 +45469,6 @@ icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) -"rAt" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Tornado) "rAu" = ( /obj/structure/platform_decoration, /obj/effect/landmark/lv624/fog_blocker/short, @@ -45290,6 +45494,10 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) +"rAM" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "rAX" = ( /turf/open/floor{ dir = 4; @@ -45302,12 +45510,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) -"rBg" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement4" - }, -/area/lv522/outdoors/colony_streets/north_street) "rBy" = ( /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, @@ -45324,6 +45526,11 @@ icon_state = "41" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"rBV" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "rBZ" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "97" @@ -45390,6 +45597,10 @@ icon_state = "cement2" }, /area/lv522/outdoors/colony_streets/south_east_street) +"rCV" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "rDb" = ( /obj/item/device/m56d_post, /turf/open/shuttle/dropship{ @@ -45434,6 +45645,15 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"rEj" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + dir = 2; + name = "\improper A-Block - Colony Medical Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/medical) "rEm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair{ @@ -45443,12 +45663,10 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) -"rEo" = ( -/obj/structure/machinery/colony_floodlight, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/outdoors/colony_streets/east_central_street) +"rEP" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/w_rockies) "rEV" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat{ @@ -45543,18 +45761,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 @@ -45646,14 +45852,13 @@ icon_state = "cement15" }, /area/lv522/outdoors/colony_streets/south_west_street) -"rJz" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper A-Block Fitness Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" +"rJB" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" }, -/area/lv522/indoors/a_block/fitness/glass) +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "rJC" = ( /obj/structure/window_frame/strata, /obj/item/shard{ @@ -45662,17 +45867,6 @@ /obj/item/stack/rods, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"rJG" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/obj/structure/barricade/deployable{ - dir = 8 - }, -/turf/open/asphalt/cement{ - icon_state = "cement2" - }, -/area/lv522/outdoors/colony_streets/north_street) "rJH" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/green, @@ -45778,6 +45972,12 @@ icon_state = "marked" }, /area/lv522/indoors/b_block/hydro) +"rLk" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "rLq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -46067,18 +46267,6 @@ icon_state = "wood" }, /area/lv522/indoors/b_block/bar) -"rRc" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Cargo Airlock"; - welded = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/cargo) "rRm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -46224,17 +46412,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) -"rSQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/uscm_mre, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "rSW" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 8 @@ -46302,20 +46479,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"rUJ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Security Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen) "rUX" = ( /obj/structure/shuttle/engine/heater{ dir = 4; @@ -46470,10 +46633,6 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) -"rYp" = ( -/obj/effect/spawner/gibspawner/human, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/w_rockies) "rYq" = ( /obj/structure/platform, /obj/structure/platform{ @@ -46485,6 +46644,14 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_west_street) +"rYu" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "rYD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -46579,15 +46746,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/admin) -"sau" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "say" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ @@ -46973,6 +47131,11 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"she" = ( +/obj/structure/machinery/floodlight, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "shm" = ( /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/dirt, @@ -47027,6 +47190,14 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/cargo) +"siB" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "siT" = ( /obj/structure/bed/chair{ dir = 1 @@ -47046,6 +47217,12 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"sjb" = ( +/obj/item/stack/sandbags/small_stack, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/lv522/outdoors/colony_streets/north_street) "sjd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -47158,17 +47335,6 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/south) -"skn" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper A-Block Dorms And Office Airlock"; - welded = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "skC" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/decal/cleanable/dirt, @@ -47181,15 +47347,6 @@ icon_state = "63" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"skQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Fitness Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/fitness) "skS" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -47350,11 +47507,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/c_block/mining) -"snI" = ( -/obj/structure/machinery/floodlight, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "snP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/surface/table/almayer, @@ -47507,12 +47659,6 @@ icon_state = "cement15" }, /area/lv522/outdoors/colony_streets/central_streets) -"sqr" = ( -/obj/structure/girder, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "sqH" = ( /obj/structure/machinery/door_display/research_cell{ dir = 8; @@ -47565,6 +47711,12 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) +"srE" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Tornado) "srJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/liquid_fuel, @@ -47759,15 +47911,6 @@ "svW" = ( /turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor) -"swf" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper C-Block - Cargo Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/cargo) "swr" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "45" @@ -47904,6 +48047,18 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"szh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/barricade/deployable, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "szo" = ( /obj/structure/platform{ dir = 8 @@ -48089,6 +48244,18 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/north) +"sCP" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/pouch/medkit/full_advanced, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "sDa" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -48132,23 +48299,6 @@ "sDS" = ( /turf/open/floor/prison, /area/lv522/outdoors/nw_rockies) -"sDY" = ( -/obj/structure/surface/table/almayer, -/obj/item/handcuffs{ - pixel_y = 12 - }, -/obj/item/handcuffs{ - pixel_y = 6 - }, -/obj/item/handcuffs, -/obj/item/weapon/baton{ - pixel_x = -2; - pixel_y = 10 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security/glass) "sEa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -48420,14 +48570,6 @@ /obj/item/key/cargo_train, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"sJP" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "sKa" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/asphalt/cement{ @@ -48628,11 +48770,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"sLT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "sLU" = ( /obj/structure/sign/safety/synth_storage{ pixel_x = 23; @@ -48914,6 +49051,12 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"sPU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "sQb" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ @@ -48937,6 +49080,10 @@ icon_state = "cement3" }, /area/lv522/outdoors/n_rockies) +"sQA" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_street) "sQD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -49209,18 +49356,6 @@ icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) -"sUN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/barricade/deployable, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "sVJ" = ( /obj/structure/barricade/handrail{ layer = 3.7 @@ -49363,6 +49498,11 @@ icon_state = "blue1" }, /area/lv522/indoors/a_block/dorm_north) +"sZz" = ( +/obj/structure/largecrate/random/case/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "taj" = ( /obj/structure/closet/crate, /turf/open/asphalt/cement{ @@ -49669,6 +49809,15 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"teO" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper C-Block - Cargo Airlock"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/cargo) "tfb" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -49734,6 +49883,14 @@ /obj/structure/machinery/prop/almayer/CICmap, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"tgn" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Dorms And Office Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/dorms) "tgq" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ @@ -49891,6 +50048,20 @@ /mob/living/simple_animal/mouse, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"tku" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper B-Block - Hydroponics Airlock" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "LV_522_Hydro-Lockdown"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/b_block/hydro) "tkx" = ( /obj/structure/machinery/light{ dir = 1 @@ -49909,13 +50080,6 @@ icon_state = "cement1" }, /area/lv522/landing_zone_2) -"tkC" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/largecrate/random, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "tkL" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -49979,23 +50143,6 @@ /obj/structure/platform, /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) -"tlF" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) -"tlM" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Garage Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/garage) "tlR" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine{ @@ -50022,11 +50169,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"tms" = ( -/obj/structure/largecrate/random, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "tmy" = ( /obj/structure/machinery/light{ dir = 1 @@ -50036,19 +50178,6 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/b_block/bridge) -"tmA" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock"; - welded = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/hydro) "tmC" = ( /obj/structure/platform{ dir = 1 @@ -50144,6 +50273,16 @@ icon_state = "whiteyellowfull" }, /area/lv522/indoors/a_block/corpo/glass) +"tnU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "tog" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -50263,21 +50402,6 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) -"tqG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV522CIC_1"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/admin) "tqU" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -50444,6 +50568,15 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/storage_blocks) +"ttE" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Electronics Storage" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/lone_buildings/outdoor_bot) "ttT" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -50741,6 +50874,13 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"tzM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "tzY" = ( /obj/structure/bed{ layer = 2.7; @@ -50845,6 +50985,15 @@ }, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) +"tCg" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Emergency Engineering" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/lone_buildings/engineering) "tCh" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -50894,16 +51043,6 @@ icon_state = "rasputin7" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"tDq" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper A-Block Fitness Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/fitness) "tDu" = ( /obj/structure/machinery/computer/operating, /obj/structure/surface/table/reinforced/prison, @@ -51066,12 +51205,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) -"tFC" = ( -/obj/structure/barricade/wooden{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "tFZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -51104,14 +51237,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"tGm" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Corporate Liason Office " - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo) "tGo" = ( /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) @@ -51223,11 +51348,16 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/east_central_street) -"tIQ" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) +"tIS" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "tIT" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -51519,6 +51649,10 @@ /obj/structure/largecrate, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"tNS" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/storage_blocks) "tNT" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_covered_bed"; @@ -51653,6 +51787,16 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"tQe" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper A-Block Corporate Office Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo) "tQi" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) @@ -51668,20 +51812,6 @@ icon_state = "marked" }, /area/lv522/atmos/east_reactor/west) -"tQE" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Canteen Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen/glass) "tQF" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "Sec-Corpo-Bridge-Lockdown" @@ -51695,10 +51825,13 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/bridges) -"tRu" = ( -/obj/structure/cargo_container/wy/mid, +"tRs" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/largecrate/random, /turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/north_east_street) +/area/lv522/landing_zone_1/tunnel) "tRI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv{ @@ -51747,10 +51880,6 @@ icon_state = "73" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"tSF" = ( -/obj/item/trash/uscm_mre, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "tSJ" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -51924,14 +52053,19 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_east_street) -"tWy" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 +"tWv" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 6; + pixel_y = -6 }, -/turf/open/asphalt/cement{ - icon_state = "cement3" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 6; + pixel_y = 6 }, -/area/lv522/outdoors/colony_streets/north_street) +/obj/structure/largecrate/random/case/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "tWC" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ @@ -51975,6 +52109,13 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) +"tXc" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/vehicle/train/cargo/trolley, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "tXd" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -52017,14 +52158,6 @@ icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) -"tXS" = ( -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/largecrate/random/barrel, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "tXW" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/south_east_street) @@ -52804,6 +52937,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) +"ukT" = ( +/obj/structure/closet/crate, +/obj/item/storage/pouch/pressurized_reagent_canister/revival, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "ulh" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "3" @@ -52853,15 +52993,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) -"unE" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "unM" = ( /obj/structure/platform{ dir = 4 @@ -53269,13 +53400,6 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) -"uuy" = ( -/obj/effect/decal/cleanable/blood/xeno{ - icon_state = "xgib3" - }, -/obj/effect/spawner/gibspawner/xeno, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "uuA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -53359,18 +53483,16 @@ icon_state = "white_cyan3" }, /area/lv522/indoors/a_block/medical/glass) -"uvJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "uwb" = ( /obj/structure/machinery/light/double, /turf/open/asphalt/cement{ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/north_west_street) +"uwe" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "uwk" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -53456,20 +53578,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) -"uye" = ( -/obj/structure/largecrate/random, -/obj/item/storage/box/packet/high_explosive{ - pixel_x = -5; - pixel_y = -14 - }, -/obj/item/storage/pill_bottle/packet/oxycodone{ - pixel_x = -1; - pixel_y = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/north_street) "uyt" = ( /turf/open/floor/prison{ icon_state = "darkredfull2" @@ -53590,10 +53698,27 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) +"uBd" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/hallway) "uBm" = ( /obj/structure/girder, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/east_central_street) +"uBs" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 11 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "uBX" = ( /obj/structure/machinery/light{ dir = 1; @@ -53647,13 +53772,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/east) -"uDF" = ( -/obj/item/trash/uscm_mre{ - pixel_x = 12; - pixel_y = -7 - }, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_street) "uDM" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -53681,13 +53799,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) -"uEj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "uEl" = ( /obj/structure/machinery/conveyor{ dir = 10; @@ -54110,11 +54221,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/kitchen/glass) -"uKk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/random/case, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "uKw" = ( /obj/structure/bed/chair{ dir = 1 @@ -54388,6 +54494,12 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/bridges/corpo_fitness) +"uOP" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/lv522/outdoors/colony_streets/north_street) "uPc" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/west_reactor) @@ -54445,13 +54557,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) -"uQa" = ( -/obj/item/trash/uscm_mre, -/obj/structure/surface/table/almayer, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/colony_streets/north_street) "uQf" = ( /obj/structure/platform{ dir = 1 @@ -54619,16 +54724,6 @@ icon_state = "31" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"uSI" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper A-Block Corporate Office Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo) "uSJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -54805,9 +54900,6 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_1) -"uVS" = ( -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "uVU" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/wy{ @@ -54917,6 +55009,18 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"uXZ" = ( +/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) "uYi" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -54924,6 +55028,11 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) +"uYk" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "uYq" = ( /obj/structure/cargo_container/grant/left, /turf/open/floor/plating{ @@ -55174,6 +55283,15 @@ icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) +"vdz" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper C-Block - Garage Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/c_block/bridge) "vdH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -55221,10 +55339,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) -"veA" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "veD" = ( /obj/structure/surface/rack, /obj/structure/machinery/light{ @@ -55403,23 +55517,6 @@ icon_state = "6" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"vil" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Security Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/security) "vir" = ( /obj/structure/closet/wardrobe/engineering_yellow, /obj/effect/decal/warning_stripes{ @@ -55670,14 +55767,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/a_block/fitness) -"vmp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Casino Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/casino) "vmG" = ( /obj/structure/surface/table/gamblingtable, /obj/item/reagent_container/food/drinks/drinkingglass{ @@ -55695,12 +55784,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) -"vmM" = ( -/obj/structure/girder, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "vmQ" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -55752,15 +55835,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/bridges/op_centre) -"vnB" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Corporate Office Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo/glass) "vnX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata{ @@ -55934,6 +56008,15 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/shale/layer2, /area/lv522/landing_zone_1) +"vqF" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/lv522/outdoors/colony_streets/north_street) "vqH" = ( /obj/structure/machinery/light{ dir = 1 @@ -56170,12 +56253,6 @@ icon_state = "marked" }, /area/lv522/landing_zone_1/ceiling) -"vuF" = ( -/obj/vehicle/powerloader, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/lv522/landing_zone_forecon/UD6_Tornado) "vuH" = ( /obj/structure/largecrate, /obj/effect/landmark/lv624/fog_blocker/short, @@ -56241,13 +56318,6 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"vwW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/deployable{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "vxa" = ( /obj/structure/closet/crate, /obj/item/clothing/under/colonist, @@ -56317,21 +56387,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"vxT" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "East_Lock"; - name = "Emergency Lockdown" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "vxY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -56345,15 +56400,6 @@ icon_state = "cyan2" }, /area/lv522/indoors/a_block/medical) -"vyk" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper C-Block - Cargo Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/bridge) "vyz" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -56448,15 +56494,13 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) -"vzE" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper B-Block Bar" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bar) +"vzz" = ( +/obj/structure/closet/crate, +/obj/item/storage/pouch/shotgun/large/slug, +/obj/item/storage/pouch/general/large/m39ap, +/obj/item/storage/pouch/flamertank, +/turf/open/floor/prison, +/area/lv522/landing_zone_2) "vzV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -56567,6 +56611,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) +"vBL" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/lv522/outdoors/colony_streets/north_street) "vBM" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -56580,14 +56630,17 @@ /obj/structure/bed/chair, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"vCv" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper A-Block Shared Dorms Airlock" +"vBV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/corsat{ - icon_state = "marked" +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/uscm_mre, +/turf/open/floor/prison{ + icon_state = "darkredfull2" }, -/area/lv522/indoors/a_block/dorm_north) +/area/lv522/outdoors/colony_streets/north_street) "vCy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -56680,6 +56733,21 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) +"vDT" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV522CIC_1"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/admin) "vDV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -56780,14 +56848,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"vFS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Fitness Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/fitness) "vGb" = ( /obj/structure/machinery/colony_floodlight{ density = 0; @@ -56830,6 +56890,15 @@ icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) +"vHd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "vHo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -57066,20 +57135,6 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/casino) -"vKm" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper B-Block - Hydroponics Airlock" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV_522_Hydro-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/b_block/bridge) "vKA" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/under/redpyjamas, @@ -57176,15 +57231,6 @@ icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"vLW" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper C-Block - Cargo Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/cargo) "vMg" = ( /obj/structure/safe, /turf/open/floor/prison{ @@ -57329,19 +57375,6 @@ icon_state = "squares" }, /area/lv522/atmos/command_centre) -"vOR" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Corporate Office Airlock"; - req_access_txt = "100" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo/glass) "vOT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva{ @@ -57392,6 +57425,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/admin) +"vPm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/lv522/outdoors/colony_streets/north_street) "vPs" = ( /obj/structure/prop/dam/crane/damaged, /obj/structure/platform, @@ -57404,20 +57443,6 @@ /obj/structure/platform, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"vPA" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block Corporate Office Airlock"; - req_access_txt = "100" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/corpo) "vPO" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 8; @@ -57589,6 +57614,12 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/north_east_street) +"vTH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "vTK" = ( /obj/structure/prop/vehicles{ icon_state = "van_damaged" @@ -57762,16 +57793,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"vWp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper C-Block - Casino Airlock"; - welded = 1 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/casino) "vWv" = ( /obj/structure/stairs/perspective{ dir = 5; @@ -57942,6 +57963,12 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) +"waj" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "wan" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ @@ -58009,6 +58036,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) +"wbo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "wbt" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer1, @@ -58088,6 +58119,11 @@ icon_state = "white_cyan1" }, /area/lv522/indoors/a_block/corpo/glass) +"wcM" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "wcO" = ( /obj/structure/machinery/light{ dir = 4 @@ -58122,6 +58158,11 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"wcY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/case, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "wdd" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/dirt, @@ -58273,6 +58314,13 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"wft" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_street) "wfC" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -58353,18 +58401,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"whp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/barricade/metal{ - dir = 1 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "whs" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -58941,13 +58977,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) -"wtO" = ( -/obj/structure/barricade/deployable, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/north_street) "wtT" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating{ @@ -59033,6 +59062,14 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/north) +"wvX" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Shared Dorms Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/outdoors/colony_streets/windbreaker/observation) "wvY" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/plating, @@ -59596,20 +59633,6 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/cargo) -"wFC" = ( -/obj/structure/largecrate/random/secure, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) -"wFL" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "wFP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair{ @@ -59747,6 +59770,24 @@ /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"wHX" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) +"wHY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/hallway) "wIi" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3 @@ -59861,6 +59902,16 @@ "wLp" = ( /turf/closed/wall/mineral/bone_resin, /area/lv522/atmos/east_reactor/west) +"wLw" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "wLN" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/coffee, @@ -59950,15 +60001,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) -"wOq" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper C-Block - Garage Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/bridge) "wOu" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -59989,14 +60031,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) -"wPA" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper A-Block Shared Dorms Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/outdoors/colony_streets/windbreaker/observation) "wPL" = ( /obj/structure/platform_decoration/strata{ dir = 8 @@ -60015,6 +60049,13 @@ icon_state = "wood-broken6" }, /area/lv522/indoors/b_block/bar) +"wPV" = ( +/obj/structure/closet/crate, +/obj/item/storage/xeno_tag_case, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "wQa" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_2) @@ -60132,19 +60173,6 @@ /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) -"wSz" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV522CIC_1"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/admin) "wSF" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -60152,21 +60180,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"wSW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "wTf" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/monkeyburger{ @@ -60758,10 +60771,6 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) -"xfD" = ( -/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/transmitter/colony_net{ @@ -60876,14 +60885,6 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security/glass) -"xhz" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/colony_streets/north_street) "xhB" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ @@ -60919,13 +60920,6 @@ icon_state = "32" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"xig" = ( -/obj/structure/closet/crate, -/obj/item/storage/xeno_tag_case, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "xiu" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -61115,6 +61109,10 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) +"xlU" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "xlV" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -61279,6 +61277,16 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"xoC" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/hallway) "xpg" = ( /turf/closed/wall/strata_outpost/reinforced, /area/lv522/outdoors/nw_rockies) @@ -61383,17 +61391,6 @@ /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"xsi" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Garage Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/garage) "xsq" = ( /obj/structure/machinery/landinglight/ds2{ dir = 8 @@ -61410,6 +61407,11 @@ }, /turf/open/gm/river, /area/lv522/atmos/sewer) +"xsN" = ( +/obj/structure/largecrate/random/barrel, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "xtb" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/fitness) @@ -61437,9 +61439,10 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) -"xto" = ( -/obj/item/storage/pouch/autoinjector/full, -/turf/open/auto_turf/shale/layer2, +"xtH" = ( +/obj/effect/spawner/gibspawner/human, +/obj/item/device/defibrillator/compact, +/turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/w_rockies) "xtO" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -61507,6 +61510,19 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) +"xvj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block - Colony Operations Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "LV522CIC_1"; + name = "\improper Storm Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/admin) "xvl" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/c_block/bridge) @@ -61558,6 +61574,16 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/hydro) +"xwK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/item/stack/sandbags/small_stack, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/outdoors/colony_streets/north_street) "xwO" = ( /obj/structure/cargo_container/seegson/left, /turf/open/floor/prison, @@ -61600,16 +61626,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) -"xxz" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 6; - pixel_x = 6; - pixel_y = 6 - }, -/obj/structure/largecrate/random, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "xxJ" = ( /obj/structure/cargo_container/seegson/mid, /obj/effect/decal/warning_stripes{ @@ -61674,11 +61690,6 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/central_streets) -"xyU" = ( -/obj/structure/surface/table/almayer, -/obj/item/map/lv522_map, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) "xzj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -61801,6 +61812,19 @@ icon_state = "darkredfull2" }, /area/lv522/indoors/a_block/security) +"xBi" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper A-Block Corporate Office Airlock"; + req_access_txt = "100" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo/glass) "xBo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 @@ -61879,10 +61903,6 @@ "xDu" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/corpo/glass) -"xDz" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_street) "xDC" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 1; @@ -62032,6 +62052,16 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"xFH" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper A-Block Fitness Centre Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/fitness) "xGa" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" @@ -62044,6 +62074,18 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"xGd" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Sec-Corpo-Bridge-Lockdown" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/security) "xGf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -62078,20 +62120,6 @@ icon_state = "squares" }, /area/lv522/atmos/east_reactor/south) -"xHj" = ( -/obj/structure/prop/invuln/minecart_tracks, -/obj/structure/closet/crate/miningcar{ - layer = 3.1; - name = "\improper materials storage bin"; - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/small_stack, -/obj/item/ore/slag, -/obj/item/ore/slag, -/obj/item/ore/slag, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "xHr" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname, @@ -62100,6 +62128,20 @@ }, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"xHz" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Corporate Liason Office " + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/corpo) +"xHO" = ( +/obj/structure/girder, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/lv522/outdoors/colony_streets/north_street) "xIr" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -62375,15 +62417,6 @@ icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"xNw" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper A-Block - Colony Operations Centre Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/hallway) "xNG" = ( /obj/structure/machinery/computer/crew/colony{ density = 0; @@ -62566,13 +62599,11 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) -"xQZ" = ( -/obj/effect/decal/cleanable/blood/xeno{ - icon_state = "xgib3" +"xQR" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_street) +/area/lv522/indoors/lone_buildings/storage_blocks) "xRg" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -62659,17 +62690,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) -"xRI" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper C-Block - Radio Tower Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/c_block/t_comm) "xRK" = ( /turf/open/asphalt/cement{ icon_state = "cement2" @@ -62969,11 +62989,6 @@ "xXg" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) -"xXh" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "xXo" = ( /obj/structure/surface/table/almayer, /obj/structure/bed/chair{ @@ -63501,14 +63516,6 @@ icon_state = "marked" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"ygJ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper A-Block Dorms And Office Airlock" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorms) "yhi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -63605,6 +63612,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) +"yja" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper A-Block Security Airlock"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/a_block/bridges/op_centre) "yje" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -63680,25 +63696,6 @@ icon_state = "radiator_tile2" }, /area/lv522/indoors/a_block/bridges/corpo) -"yjD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/barricade/metal{ - dir = 1 - }, -/obj/structure/barricade/metal{ - dir = 4 - }, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/outdoors/colony_streets/north_street) "yjK" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -66443,7 +66440,7 @@ vtc cpy cpy vZY -pXH +dcR bQq sRA rWS @@ -67373,7 +67370,7 @@ vhd sRA sRA sRA -rYp +rEP ien cpy cpy @@ -67599,8 +67596,8 @@ rFp vhC uiK uiK -gxe -xto +jmN +ebe ien ien ien @@ -67826,7 +67823,7 @@ tbl vhJ uiK sRA -odi +dtU ien ien jTJ @@ -67854,7 +67851,7 @@ czW sjY ien lSg -hqr +pwR ylo ylo ylo @@ -68053,7 +68050,7 @@ uEX vhO hPM uiK -oow +xtH ien sON ezH @@ -68083,7 +68080,7 @@ hJZ hJZ sus ylo -pwk +sCP tfZ wHi pYf @@ -68097,7 +68094,7 @@ hYf wHi jZe wky -xig +wPV tyl ylo ien @@ -68323,8 +68320,8 @@ emt pck hYf erS -sau -kSh +abe +ukT ofS ylo ien @@ -68779,9 +68776,9 @@ isG vBM hYf wHi -jAA -loX -aId +tIS +xQR +waj ien ien vXc @@ -69005,10 +69002,10 @@ bZd yfu yfu bZd -loX -rmm -gRl -uVS +xQR +vTH +gFy +nxu ien vXc vXc @@ -69231,11 +69228,11 @@ yfu bZd bZd yfu -cQv -gRl -gRl -xXh -qhk +tNS +gFy +gFy +rBV +iSx ien vXc vXc @@ -69459,10 +69456,10 @@ yfu bZd bZd bZd -nvA -gRl -cQv -loX +bOX +gFy +tNS +xQR ien ien vXc @@ -69687,8 +69684,8 @@ qpc nKj dGK qpc -snI -jub +she +egj ylo ien vXc @@ -70840,7 +70837,7 @@ gcX kvq ivK wng -hpO +tCg ivK xvQ xvQ @@ -71032,7 +71029,7 @@ nLm nLm nLm eBA -qbL +lmI nLm nLm nLm @@ -71708,7 +71705,7 @@ clY sjY sjY oNQ -ygJ +tgn vJT uOs tUM @@ -71717,7 +71714,7 @@ uOs tUM uOs kcS -ygJ +tgn spo yiM yiM @@ -72394,7 +72391,7 @@ nLm nLm pMd eBA -dUr +kNY pMd nLm nLm @@ -72844,14 +72841,14 @@ iIK uUB lLl gcv -skn +iPy xIr pQA jhl sPk dnM pxS -hnX +hAd eIk cDH cDH @@ -74072,7 +74069,7 @@ bPJ bPJ bPJ bPJ -pMc +aue wfP dnO bPJ @@ -74171,7 +74168,7 @@ qNM oiZ rod kvJ -rIa +uXZ seJ xtb myP @@ -74299,11 +74296,11 @@ kEl peM jba bPJ -ayf -aKE +edi +pXv wfP -cbb -sLT +pQq +nVr bPJ cpy cpy @@ -74473,7 +74470,7 @@ mBF mBF mBF oPx -vzE +ncp mBF mBF mBF @@ -74527,10 +74524,10 @@ hTe jFl aQH mJs -ous +czE wfP wfP -uKk +wcY bPJ bPJ cpy @@ -74625,7 +74622,7 @@ qOn qYc rpe bQl -rJz +ftD bQl xtb xWF @@ -74755,10 +74752,10 @@ sHd bPJ eeb wfP -bgw +ixV wfP wfP -pSh +uwe bPJ bPJ cpy @@ -74846,7 +74843,7 @@ ien ien clY bry -vFS +pJb xOb oiZ oiZ @@ -74854,7 +74851,7 @@ jBs oiZ xOb xOb -vFS +pJb xqd uEC xTs @@ -74862,7 +74859,7 @@ xTs uEC uEC pVx -vFS +pJb rZF tYZ kdy @@ -74870,7 +74867,7 @@ kdy kdy tMk lEF -ygJ +tgn vJT oot fjP @@ -74887,14 +74884,14 @@ ktx biY bNJ seG -mPQ +dfV osU uyP esa qvJ jDJ osU -pxp +jsk enP dnM dnM @@ -74910,7 +74907,7 @@ dnM esa gYF kcS -ygJ +tgn qQM vXc wth @@ -74981,7 +74978,7 @@ bPJ bPJ bPJ bPJ -veA +rAM wfP wfP wfP @@ -75212,7 +75209,7 @@ qxf wfP wfP wfP -aKE +pXv sRM bPJ cpy @@ -75663,10 +75660,10 @@ cpy cpy bPJ bPJ -nkm +gfs wfP wfP -vwW +gWc wfP bPJ cpy @@ -75891,9 +75888,9 @@ cpy cpy bPJ bPJ -bQP -omv -lFM +fVC +qxO +pwF bPJ bPJ cpy @@ -75985,7 +75982,7 @@ xtb xtb xtb xyL -pDG +cmC xyL xtb xtb @@ -76347,7 +76344,7 @@ cpy bPJ bPJ wfP -bgw +ixV bPJ bPJ cpy @@ -76575,7 +76572,7 @@ cpy bPJ wfP wfP -bgw +ixV bPJ cpy bMX @@ -76800,7 +76797,7 @@ cpy cpy cpy bPJ -gMT +ica wfP fvn bPJ @@ -77424,7 +77421,7 @@ rAf rAf toF rlI -bXU +fLZ wCJ ghu cbp @@ -77458,7 +77455,7 @@ cpy max max yjT -oXV +qVo oDZ wvt vou @@ -77467,7 +77464,7 @@ lUf lmF aGQ tML -jjc +ttE wzH max cpy @@ -77481,7 +77478,7 @@ max osN bPJ oeN -byb +rgS wfP hiL bPJ @@ -77580,13 +77577,13 @@ rLq siT xTs pVx -vFS +pJb vIe uEC roT uEC xqd -vFS +pJb pVx gvT jLF @@ -77707,8 +77704,8 @@ max max osN bPJ -awm -tFC +tXc +fJr wfP wfP bPJ @@ -77934,8 +77931,8 @@ max max osN aQH -gsn -tFC +euT +fJr wfP bPJ bPJ @@ -78072,7 +78069,7 @@ qDR dnM sPk pxS -pxp +jsk fqD oFr lOi @@ -78162,9 +78159,9 @@ max osN bPJ cLB -esx +cJF wfP -eLK +gkH bPJ cpy bMX @@ -78389,7 +78386,7 @@ pAj fnA bPJ bPJ -uEj +aRB jJF bPJ bPJ @@ -78784,7 +78781,7 @@ tSL ibW tSL tSL -jPd +dvn tSL rdz kTF @@ -78799,7 +78796,7 @@ tSL phn kzT xNR -dMo +nxJ hpq ofi ofi @@ -78977,7 +78974,7 @@ nLm nLm nLm eBA -qbL +lmI nLm nLm nLm @@ -79040,7 +79037,7 @@ fnA wIr wIr vLI -pSj +mpF wIr wIr kmq @@ -79071,7 +79068,7 @@ cpy cpy bPJ wfP -pSh +uwe sRM bPJ cpy @@ -79180,7 +79177,7 @@ xAO xAO xAO xyL -ivY +kxH ugV hNR xhL @@ -79411,7 +79408,7 @@ tvO ugV hNR ugV -cJg +uOP yjm nLm lfe @@ -79421,7 +79418,7 @@ nLm ahP wCC fjr -xfD +rCV fjr fjr bPH @@ -79523,7 +79520,7 @@ vDL wIr wIr bPJ -mPV +xsN wfP wfP bPJ @@ -79623,7 +79620,7 @@ kcw sjp ohP oZC -tDq +xFH oZC cZN rrN @@ -79639,11 +79636,11 @@ ugV hNR ugV ugV -eSM +vBL cHw cHw hhD -dhj +ppX hhD wCC ugV @@ -79750,8 +79747,8 @@ hhI vDL wIr wIr -dSJ -pSh +nRY +uwe wfP bPJ cpy @@ -79865,7 +79862,7 @@ tvO ugV hNR ugV -nDo +pOb ugV fjr fjr @@ -79874,7 +79871,7 @@ fjr ugV ugV ugV -xQZ +wft ugV ugV fjr @@ -79978,7 +79975,7 @@ hhI lBd wIr guh -acC +bQA wfP bPJ cpy @@ -80091,10 +80088,10 @@ xyL tvO ugV spe -hcX +uBs vwi vwi -gRS +gEx vwi vwi vwi @@ -80103,7 +80100,7 @@ vwi vwi vwi vwi -pqX +lqI nQx rvx fZy @@ -80140,7 +80137,7 @@ tBQ yiM yiM fXx -tmA +pdq xNR wnM kzT @@ -80151,7 +80148,7 @@ qNl kzT wnM yfS -nFQ +jrE yfS wnM wnM @@ -80161,16 +80158,16 @@ kzT kzT kzT kDY -nue +lIy xNR yfS yfS kLO -gwg +cfz jmv tkf dgY -gwg +cfz cHb qzQ oLa @@ -80180,7 +80177,7 @@ tkf fTP fTP pCG -gwg +cfz jmv oLa oLa @@ -80193,7 +80190,7 @@ tkf tkf tkf dgY -gwg +cfz cHb oqp oLa @@ -80204,9 +80201,9 @@ qzQ hhI hLx wIr -hcG -lgR -aKE +oox +mzi +pXv bPJ cpy cpy @@ -80316,25 +80313,25 @@ xAO xAO xtb tvO -nDo +pOb ugV hNR -rJG -mKK -tWy -lae -uvJ -gwU -jeh -qdV -byD -sqr +nQk +rYu +siB +hqB +oXd +nXM +sjb +biZ +ieE +akP tNr ugV spe nQx fjr -xfD +rCV crH pQE pQE @@ -80431,9 +80428,9 @@ qzQ aPu jmv ueY -tkC -rnX -acC +tRs +eqV +bQA bPJ cpy cpy @@ -80528,7 +80525,7 @@ xtb xtb xtb rMb -skQ +fAY xtb xtb xtb @@ -80546,18 +80543,18 @@ tEJ fjr ugV hNR -keA -wSW -gvK -nMP -ovB -ikp +hkr +pPv +kmw +ovC +rah +lmW cVR -ivs -nMP -eqb -joV -pqk +iRW +ovC +szh +rLk +epe ugV jXQ nQx @@ -80658,8 +80655,8 @@ fTP aPu pfq wIr -tXS -acC +rsD +bQA wfP bPJ cpy @@ -80773,20 +80770,20 @@ wCC fjr ugV hNR -keA +hkr vCy -ryb -ghE -sJP +fBY +iDC +qoj urY urY -ryW +iYG fIr -sUN -bKu -pqk +lhp +eiY +epe ugV -ibS +lXO jXQ iKF sQL @@ -80826,7 +80823,7 @@ tSL ibW ibW ily -dlM +tku ibW ibW tSL @@ -80885,7 +80882,7 @@ aPu mOJ wIr wIr -lgR +mzi wfP jJF bPJ @@ -80999,23 +80996,23 @@ fjr fjr fjr fjr -fUQ -rBg -whp -uye -naM +vHd +vPm +eoi +khR +hbw uAa -fto -uDF -mQo +oMX +faJ +nyv urY -dHx -wtO +izb +gdA ugV fjr fjr fjr -ibS +lXO miz tRd xvW @@ -81224,22 +81221,22 @@ fjr fjr fjr cpy -bKf +sQA fjr -nKZ -rBg -iML -kCQ -rjD -ryW -tlF +tzM +vPm +jUc +ryI +hDe +iYG +nRI fIr -ryb +fBY urY -dHx -csl +izb +aem ugV -xfD +rCV cpy fjr fjr @@ -81436,14 +81433,14 @@ xtb xtb xtb rMb -skQ +fAY xtb xtb xtb xtb xtb rMb -skQ +fAY xtb xtb tvO @@ -81452,19 +81449,19 @@ fjr cpy cpy cpy -xDz -bAn +fGw +lHk crH -yjD +ksO +qFc +vBV +tnU +bdY +eiC mIa -rSQ -iaD -rmk -mlY -cqL -oQV -ncs -vmM +xwK +hcd +xHO fjr fjr cpy @@ -81537,7 +81534,7 @@ bYV wIr wIr bZV -pSj +mpF wIr wIr rZK @@ -81564,7 +81561,7 @@ srk vLI wIr bPJ -djL +wLw wfP wfP wfP @@ -81680,18 +81677,18 @@ cpy cpy cpy cpy -dBQ +gwH sSn -xhz +jYc hhD -xhz -nHM -oMO +jYc +sPU +pUf hhD hhD -lQA -fRw -fUc +vqF +muB +lPM fjr cpy cpy @@ -81791,7 +81788,7 @@ oIu tOo bPJ bPJ -oCW +fZo wfP wfP wfP @@ -81907,19 +81904,19 @@ cpy cpy cpy fjr -lRi +nQL ugV ugV ugV -xyU -tSF +qrG +bRv ugV ugV -pqk -tIQ +epe +bHk ugV ugV -gUT +geI cpy cpy cpy @@ -82138,16 +82135,16 @@ hNR ugV xRK emH -uQa -gLy -aAX +hNt +aQf +qPm emH -uvJ -fvc +oXd +nHl fjr fjr fjr -prs +ldr cpy fjr fjr @@ -82370,7 +82367,7 @@ sjy sjy sjy sjy -evQ +pXR tNr fjr fjr @@ -82805,7 +82802,7 @@ yjp beB beB uPk -vnB +mwL beB wrC wrC @@ -82813,10 +82810,10 @@ xXR emH emH tNr -dBQ +gwH fjr xRK -uuy +rJB sjy uxn ckT @@ -83253,7 +83250,7 @@ ugV ugV crH beB -hZf +eLK tmC tDQ ueR @@ -83269,7 +83266,7 @@ wrC tvO jDO xRK -qxe +xlU sjy sjy sjy @@ -83499,7 +83496,7 @@ crH sjy sjy mhn -sDY +hIz kTm oHR ort @@ -83609,7 +83606,7 @@ eso sCi jas nQu -tms +uYk jas cpy cpy @@ -83836,7 +83833,7 @@ vpe wHz jas nQu -bWv +wbo jas cpy cpy @@ -84379,14 +84376,14 @@ pSK kgR kwg anb -hnG +bJY jSU xDu xDu xDu raI jSU -mji +osE ijE nTx eHn @@ -84397,10 +84394,10 @@ vBI nTx vNy mvR -jqV +bNy jyx xmN -fTK +lUU kgQ mLO fIr @@ -84428,7 +84425,7 @@ hnk xGf xGf xiG -dtl +qpJ fCl yca jfO @@ -84743,7 +84740,7 @@ hBp eso vpe jas -bWv +wbo nQu jas cpy @@ -84882,7 +84879,7 @@ hnk lxL lxL tVN -dtl +qpJ gDz jfO xXo @@ -84970,7 +84967,7 @@ cwe vpe oCs jas -bWv +wbo nQu jas cpy @@ -85076,7 +85073,7 @@ beB beB beB uam -vOR +xBi wrC sgT sgT @@ -85197,7 +85194,7 @@ yak qbB snR jas -tms +uYk nQu jas cpy @@ -85826,9 +85823,9 @@ jmG jmG jmG khd -rRc +eNc wZy -iuQ +teO khd aZj aZj @@ -85850,7 +85847,7 @@ bYV wIr wIr bZV -pSj +mpF wIr wIr rZK @@ -85984,7 +85981,7 @@ jyx uuA wrC vpO -vPA +kdw wrC sgT sgT @@ -86037,7 +86034,7 @@ wdy rMF jmG six -swf +cIo jmG jmG jmG @@ -86206,7 +86203,7 @@ crH wrC wrC wrC -tGm +xHz wrC wrC wrC @@ -86453,7 +86450,7 @@ sjy sjy sjy nAu -vil +iTf sjy sjy sjy @@ -86475,7 +86472,7 @@ lVp lVp lVp qVb -tQE +eum lVp kqb kqb @@ -86772,7 +86769,7 @@ nax nax fki jas -ddq +mJG eso eso eso @@ -86890,7 +86887,7 @@ tpz tGY uiO uwn -uSI +tQe itl aVD oLu @@ -86925,13 +86922,13 @@ ucM cpJ cLi ycv -frc +qfP ycv uKa ucM uKa ycv -frc +qfP ycv uKa uKa @@ -86942,12 +86939,12 @@ eSY tPs tPs jUI -vLW +cSf grP jze grP grP -vLW +cSf xNd iYt oFU @@ -86970,17 +86967,17 @@ grP aVA xNd xNd -vLW +cSf oFU tPs tPs tPs oFU -pvE +gpr tZc pOs tZc -vKm +eUz vUe hoy qzU @@ -87007,8 +87004,8 @@ xFv bxr iqV iqV -xHj -gvU +oda +jVV boQ vpe tuK @@ -87129,7 +87126,7 @@ nTx nTx nTx mvR -qPS +kUM oGp xxs eUh @@ -87610,7 +87607,7 @@ kqb kqb kqb mUS -nmL +fWH kqb kqb kqb @@ -88080,7 +88077,7 @@ bmg xXg jmG gEk -swf +cIo jmG jmG jmG @@ -88347,7 +88344,7 @@ xzK wIr wIr vLI -nXI +jOx wIr wIr xzK @@ -88482,7 +88479,7 @@ wKg wKg wKg vQT -fmg +cjy wKg wKg wKg @@ -88946,14 +88943,14 @@ opl opl kEN ben -gLw +xGd ygw ndb vbX tjM ndb ygw -kfa +oMt ogf nLD xen @@ -89646,7 +89643,7 @@ sjy kqb kqb mUS -rUJ +jxT kqb kqb pGl @@ -89896,7 +89893,7 @@ cpy tTD tTD lpi -vmp +noH sCr uew xMO @@ -89929,7 +89926,7 @@ jwM ild ild vBd -nZn +kua jmG fEY fWG @@ -90156,7 +90153,7 @@ ild uqP wjF ngL -nlO +oHW jmG fEY fWG @@ -90319,7 +90316,7 @@ ulZ ulZ wIE mVi -oik +mxg tAu hre oTY @@ -90814,7 +90811,7 @@ vNk vNk vNk vKl -vWp +fdb vNk vNk vNk @@ -90872,7 +90869,7 @@ lHS phq aam jas -wFC +wcM aEF jas cpy @@ -91099,7 +91096,7 @@ phq phq qYq jas -bWv +wbo aEF jas cpy @@ -91326,7 +91323,7 @@ eJd ptU jas jas -bWv +wbo aEF jas cpy @@ -91411,7 +91408,7 @@ fSf cZH jDN mqx -amy +nJW hvh eZF lfj @@ -91444,12 +91441,12 @@ xjF xFp dHF xZP -mkT +gYH xAZ xAZ xOw ykT -rlE +yja buI mSe nYF @@ -91459,12 +91456,12 @@ mSe nDn hYV mZj -rlE +yja xAZ qqx pag bia -mkT +gYH lDE tTD tTD @@ -91479,7 +91476,7 @@ cpy cpy rnB plN -rEo +pOa jKb tTD rnB @@ -91723,12 +91720,12 @@ nYW vkD ngx sSG -lkr +ctu cXf qDw ngx wNp -lkr +ctu xgA bsG vOT @@ -91773,8 +91770,8 @@ qHr vpe vxa ppU -bWv -bWv +wbo +wbo nQu nQu nQu @@ -92001,13 +91998,13 @@ vpe ahZ jas jas -mwn -xxz +jfP +mKZ pYO pYO -afa -afa -nUF +apC +apC +tWv jas jas cpy @@ -92107,7 +92104,7 @@ eJR iDH eJR rtX -lUy +wvX tJm vGp vGp @@ -92213,10 +92210,10 @@ xxq xzK jas jas -nZx +bKj vpe eso -gRi +hZC coR jas sjA @@ -92328,7 +92325,7 @@ alI alI alI wDj -rgW +cPg eJR kbH iHD @@ -92458,7 +92455,7 @@ ctE jas aEF nQu -wFC +wcM jas cpy cpy @@ -92631,7 +92628,7 @@ uQr wpd hMT hFG -mfS +qEr osV qAt wMq @@ -92685,7 +92682,7 @@ ctE jas kFd nQu -jwO +qIt jas cpy cpy @@ -92816,7 +92813,7 @@ gUi jHi fkj mVi -oik +mxg tAu mHU fkj @@ -92910,9 +92907,9 @@ ctE ctE ctE jas -wFL +wHX nQu -hbO +sZz jas cpy cpy @@ -93137,7 +93134,7 @@ ctE ctE ctE jas -wFL +wHX nQu fZA jas @@ -93263,7 +93260,7 @@ xAw pKX pKX kIZ -laB +jro pKX pKX pKX @@ -93468,7 +93465,7 @@ iJE rtX vGB ncz -otC +kKj pgp umR qSH @@ -93505,7 +93502,7 @@ gdO gdO gdO ayn -xNw +wHY gdO gdO tTK @@ -93918,7 +93915,7 @@ wDj wDj wDj vGB -wPA +moQ vGB wDj qSH @@ -94456,7 +94453,7 @@ vOT xgA acE kEQ -vyk +meK otS fWG cpy @@ -94620,7 +94617,7 @@ xuk kHP wxZ ldg -tqG +vDT kSb nIa jvu @@ -95097,7 +95094,7 @@ niE seA tNC fyD -pLN +eLl sBy qqk tMl @@ -95282,7 +95279,7 @@ sOL rlB eJR rtX -lUy +wvX nTp qSH qSH @@ -95544,14 +95541,14 @@ hYw hKJ mjT eOl -unE +gfl mMQ mWF njH psT poQ pzs -pMt +rEj vyH rYD aNP @@ -95758,7 +95755,7 @@ tDS tDS thc kIZ -laB +jro thc tDS tDS @@ -96040,7 +96037,7 @@ oNd uuD xXg imT -cgG +ojA ffb xhD bsG @@ -96214,7 +96211,7 @@ dEy iss lbA ufs -wSz +xvj sQb lOk mqv @@ -96642,7 +96639,7 @@ dRL dRL dRL rJf -vCv +gZv rJf dRL dRL @@ -97393,9 +97390,9 @@ uuD uuD uuD uuD -jdI +mFO rWP -xRI +aWd uuD uuD uuD @@ -97667,7 +97664,7 @@ wQa dkX rBd nPb -iFe +lfA rVR hIf rqn @@ -97859,7 +97856,7 @@ wrY xvl xvl lot -wOq +vdz xvl xvl xWO @@ -98074,9 +98071,9 @@ cUG cUG cUG cUG -tlM +ntk wao -xsi +jwP cUG cUG cUG @@ -98483,7 +98480,7 @@ svf rEc wWV kAj -azJ +kcY tgj svo bqo @@ -98531,7 +98528,7 @@ tum tum pRH gEd -iBd +csC pRH pRH pRH @@ -98574,7 +98571,7 @@ hIf qvA qvA bYx -jpb +vzz hbu qvA qvA @@ -99407,7 +99404,7 @@ gdO gdO psC ayn -xNw +wHY psC gdO tTK @@ -99440,7 +99437,7 @@ nKK fzf sHY wao -mEn +jIA tID uaI wqA @@ -99837,7 +99834,7 @@ vGp vGp vGp ncz -otC +kKj pgp umR gMG @@ -99864,7 +99861,7 @@ bHF kpN seA ojW -hPT +xoC gAU lBu ipN @@ -99901,7 +99898,7 @@ xCY bnf cUG cUG -xsi +jwP cUG cUG cUG @@ -100587,7 +100584,7 @@ inA xjO hMz fac -lKH +gKa spW uwT uwT @@ -100996,7 +100993,7 @@ gdO gdO gdO ayn -xNw +wHY gdO gdO gdO @@ -101901,12 +101898,12 @@ aoi aoi dcc vxG -vxT +aYE vCG vUj puJ pej -dFE +uBd lDE rnB rnB @@ -103705,9 +103702,9 @@ dqn dic uDM tth -eTw +nPn lVs -qBH +bUy lAn krH nTp @@ -103931,10 +103928,10 @@ tCR fTm uKQ uKQ -vuF -fbY +rrB +srE qUL -tRu +iQt lAn krH nTp @@ -104159,9 +104156,9 @@ vbk xNu vjs tIF -rAt +ifg gOZ -cJc +hZc lAn krH nTp diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 336dc6a90212..3d97333ad161 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -4035,7 +4035,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 @@ -15262,7 +15262,7 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "idz" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -19886,7 +19886,7 @@ /turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "thn" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -6; pixel_y = 7 }, @@ -21227,7 +21227,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index 9289d3454327..8f7c741d80c6 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -474,7 +474,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "iN" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -6; pixel_y = 7 }, @@ -885,7 +885,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 @@ -1132,7 +1132,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) "BI" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -1215,7 +1215,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 @@ -1257,7 +1257,7 @@ dir = 4; health = 80 }, -/obj/item/weapon/claymore/mercsword/machete{ +/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" }, diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index bcbf6a54774c..8643676807fc 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -260,7 +260,7 @@ /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( -/obj/item/weapon/claymore/mercsword, +/obj/item/weapon/sword, /turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "hA" = ( @@ -686,7 +686,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 @@ -1012,7 +1012,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "BI" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -1096,7 +1096,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index 4c53a79e90d7..10a6618c681d 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -127,6 +127,16 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship) +"eD" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/spawner/random/toolbox, +/obj/item/toy/deck/uno{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/wood, +/area/lv624/lazarus/crashed_ship) "eG" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/gm/dirt, @@ -288,6 +298,21 @@ /obj/item/weapon/gun/smg/fp9000, /turf/open/floor/plating, /area/lv624/lazarus/crashed_ship) +"hZ" = ( +/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, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/lv624/lazarus/crashed_ship) "id" = ( /turf/open/floor/plating{ dir = 5; @@ -406,6 +431,19 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) +"kO" = ( +/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) "kY" = ( /obj/structure/machinery/door/airlock/almayer/generic, /turf/open/floor{ @@ -453,13 +491,6 @@ "lr" = ( /turf/open/floor/plating/plating_catwalk, /area/lv624/lazarus/crashed_ship) -"lv" = ( -/obj/item/stack/rods, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - icon_state = "platingdmg1" - }, -/area/lv624/lazarus/crashed_ship) "lC" = ( /obj/item/ammo_magazine/sniper/svd, /turf/open/floor/plating, @@ -544,19 +575,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, @@ -662,19 +680,6 @@ icon_state = "green" }, /area/lv624/lazarus/crashed_ship) -"sI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/obj/structure/transmitter/clf_net/rotary{ - phone_category = "CR-116"; - phone_color = "yellow"; - phone_id = "Engineering" - }, -/obj/effect/landmark/objective_landmark/close, -/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, @@ -958,6 +963,13 @@ icon_state = "whitebluefull" }, /area/lv624/lazarus/crashed_ship) +"zJ" = ( +/obj/item/stack/rods, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/crashed_ship) "Aa" = ( /obj/effect/vehicle_spawner/van/fixed{ color = "#4a9eed"; @@ -1056,16 +1068,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, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor{ - icon_state = "platingdmg1" - }, -/area/lv624/lazarus/crashed_ship) "Ct" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 8; @@ -1131,6 +1133,15 @@ icon_state = "green" }, /area/lv624/lazarus/crashed_ship) +"DO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "emerald" + }, +/area/lv624/lazarus/crashed_ship) "DS" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/firstaid/regular{ @@ -1246,16 +1257,6 @@ icon_state = "emerald" }, /area/lv624/lazarus/crashed_ship) -"GO" = ( -/obj/structure/surface/table/woodentable, -/obj/effect/spawner/random/toolbox, -/obj/item/toy/deck/uno{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/wood, -/area/lv624/lazarus/crashed_ship) "GQ" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/plating, @@ -1270,21 +1271,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, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/lv624/lazarus/crashed_ship) "Hg" = ( /obj/structure/cargo_container/arious/rightmid, /turf/open/floor{ @@ -1595,6 +1581,19 @@ /obj/structure/machinery/floodlight, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"OZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/structure/transmitter/clf_net/rotary{ + phone_category = "CR-116"; + phone_color = "yellow"; + phone_id = "Engineering" + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/lv624/lazarus/crashed_ship) "Pu" = ( /obj/effect/landmark/corpsespawner/clf, /turf/open/floor{ @@ -1819,6 +1818,16 @@ icon_state = "emeraldcorner" }, /area/lv624/lazarus/crashed_ship) +"Up" = ( +/obj/structure/surface/table/almayer, +/obj/item/tank/oxygen/red, +/obj/item/storage/bag/trash, +/obj/item/tool/screwdriver, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/crashed_ship) "Uv" = ( /obj/item/ammo_magazine/smg/fp9000, /turf/open/floor/plating{ @@ -1956,15 +1965,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/crashed_ship) -"Xa" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/lv624/lazarus/crashed_ship) "Xm" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -2485,7 +2485,7 @@ xh wV lr gQ -sI +OZ Xq Qj lr @@ -2534,7 +2534,7 @@ lr DY HR Xq -Xa +DO Ud lr ch @@ -2571,7 +2571,7 @@ te UV Ro Sy -Cs +Up ok dN Bc @@ -2954,7 +2954,7 @@ wx LG ln Bg -GO +eD uX Xq Mz @@ -3187,7 +3187,7 @@ vo lr RS Xq -ox +kO Dv sH IG @@ -3199,7 +3199,7 @@ jr Xq ou dN -lv +zJ Qf Hg dN @@ -3377,7 +3377,7 @@ Ab Ab Ab Ns -GY +hZ IP Xq Nw diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index e03bf8cdcbe4..aeddb1aa1021 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -4928,7 +4928,7 @@ "dhQ" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/colonist, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/carpet, /area/varadero/interior/chapel) "dhV" = ( @@ -5652,12 +5652,6 @@ icon_state = "red" }, /area/varadero/interior/hall_N) -"dKm" = ( -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/bunks) "dKy" = ( /obj/structure/closet/crate/freezer/cooler/oj, /obj/item/reagent_container/food/drinks/cans/beer, @@ -7259,15 +7253,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, @@ -7371,9 +7356,6 @@ /obj/item/circuitboard/airlock, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) -"eOK" = ( -/turf/open/floor/plating, -/area/varadero/interior_protected/caves/central) "eOZ" = ( /obj/structure/bed/chair{ dir = 1 @@ -8588,28 +8570,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 @@ -10632,11 +10592,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"gPE" = ( -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior_protected/caves/central) "gPG" = ( /turf/open/gm/dirt{ icon_state = "desert2" @@ -13981,6 +13936,13 @@ icon_state = "blue" }, /area/varadero/interior/maintenance) +"jab" = ( +/obj/structure/closet/secure_closet/scientist, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purple" + }, +/area/varadero/interior/research) "jai" = ( /obj/structure/filingcabinet/security, /obj/effect/landmark/objective_landmark/far, @@ -15343,6 +15305,12 @@ "jTR" = ( /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/monsoon) +"jTY" = ( +/obj/structure/closet/secure_closet/personal/patient, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/bunks) "jUt" = ( /obj/item/tool/weldingtool/experimental, /turf/open/floor/plating/icefloor{ @@ -15547,6 +15515,9 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"kce" = ( +/turf/open/floor/plating, +/area/varadero/interior_protected/caves/central) "kcn" = ( /obj/item/stack/sandbags_empty/full, /turf/open/auto_turf/sand_white/layer1, @@ -16148,33 +16119,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/comms2) -"kxW" = ( -/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/purple{ - pixel_y = 13 - }, -/obj/item/bedsheet/hos{ - layer = 3.1 - }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) "kyh" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ @@ -18298,6 +18242,15 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/eastbeach) +"lNq" = ( +/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) "lNw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/prop/server_equipment/laptop/closed{ @@ -20096,6 +20049,28 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) +"mSc" = ( +/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) "mSf" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva{ @@ -21745,14 +21720,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/hall_NW) -"nYi" = ( -/obj/structure/machinery/sensortower{ - pixel_x = -9 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior_protected/caves/central) "nYx" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -24509,6 +24476,31 @@ icon_state = "multi_tiles" }, /area/varadero/interior/morgue) +"pMy" = ( +/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, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "pMG" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ @@ -26679,9 +26671,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"raW" = ( -/turf/closed/wall, -/area/varadero/interior_protected/caves/central) "rbd" = ( /obj/item/stack/sheet/wood/small_stack, /turf/open/floor/plating/icefloor{ @@ -27543,10 +27532,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"rAt" = ( -/obj/structure/window/framed/colony, -/turf/open/floor/plating, -/area/varadero/interior_protected/caves/central) "rAy" = ( /obj/structure/bedsheetbin, /turf/open/floor/shiva{ @@ -28194,6 +28179,14 @@ icon_state = "white" }, /area/varadero/interior/toilets) +"rWG" = ( +/obj/structure/machinery/sensortower{ + pixel_x = -9 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior_protected/caves/central) "rWJ" = ( /obj/item/stool, /turf/open/floor/shiva{ @@ -28406,6 +28399,33 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"seZ" = ( +/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/purple{ + pixel_y = 13 + }, +/obj/item/bedsheet/hos{ + layer = 3.1 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "sff" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -29185,13 +29205,6 @@ dir = 1 }, /area/varadero/interior/cargo) -"sCK" = ( -/obj/structure/closet/secure_closet/scientist, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purple" - }, -/area/varadero/interior/research) "sCV" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -30659,6 +30672,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"tCl" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior_protected/caves/central) "tCA" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -32260,6 +32277,9 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"uIR" = ( +/turf/closed/wall, +/area/varadero/interior_protected/caves/central) "uIW" = ( /turf/open/gm/coast/north, /area/varadero/exterior/lz2_near) @@ -32351,31 +32371,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" @@ -35970,6 +35965,11 @@ default_name = "shallow ocean" }, /area/varadero/exterior/pool) +"wSM" = ( +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/caves/central) "wSX" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -42760,7 +42760,7 @@ rQV rQV nuQ lKS -sCK +jab cjU nLw fay @@ -49842,7 +49842,7 @@ wQd sWp dBB maN -uMN +pMy qcN oHo qqA @@ -53340,9 +53340,9 @@ etv xxk xxk mCF -raW -rAt -rAt +uIR +tCl +tCl cty hoC mCF @@ -53522,9 +53522,9 @@ toU cto xxk meS -eOK -gPE -gPE +kce +wSM +wSM cty cty mCF @@ -53704,9 +53704,9 @@ etv xxk xxk aOg -eOK -gPE -nYi +kce +wSM +rWG cty aOg aOg @@ -53885,9 +53885,9 @@ ixr toU xxk xxk -eOK +kce mCF -gPE +wSM cty cty aOg @@ -54068,7 +54068,7 @@ mMZ xxk xxk mCF -eOK +kce cty cty cty @@ -54589,7 +54589,7 @@ tcq jyw xya ydx -fDn +mSc wpX qQt jNT @@ -54958,7 +54958,7 @@ yhy sJq iwo tMY -dKm +jTY xxo uLP xNR @@ -55681,7 +55681,7 @@ pbt qvQ bLy ydx -kxW +seZ pbd mnm kWj @@ -60799,7 +60799,7 @@ lxy qhZ bUg vpV -eKW +lNq obS ryD wXs diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 334c7e71f8b6..19a7717a7e67 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -44406,7 +44406,7 @@ aac aac acX acX -acX +uvZ acX aSj hkA @@ -44991,7 +44991,7 @@ acX acX acX acX -acX +uvZ acX acX aac diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index fb842c754dd9..95352008b2ae 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -529,19 +529,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"abQ" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "abR" = ( /obj/item/tank/phoron, /turf/open/floor/almayer{ @@ -567,6 +554,18 @@ icon_state = "tcomms" }, /area/almayer/shipboard/weapon_room) +"acc" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + dir = 2; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "acf" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/starboard_garden) @@ -1640,18 +1639,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{ @@ -1973,6 +1960,24 @@ "agu" = ( /turf/open/floor/almayer, /area/almayer/living/officer_study) +"agv" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + access_modified = 1; + dir = 2; + name = "\improper Requisitions Break Room"; + req_one_access_txt = "19;21" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/req) "agw" = ( /obj/structure/machinery/light{ dir = 8 @@ -2370,19 +2375,6 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"ahX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/upper_hull/u_a_s) "ahY" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -2660,13 +2652,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"aiQ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "aiR" = ( /obj/structure/stairs{ dir = 8; @@ -2761,14 +2746,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{ @@ -3352,12 +3329,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"akX" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "akY" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -3449,13 +3420,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"alm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "alo" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_18" @@ -3489,15 +3453,6 @@ /obj/item/device/radio, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"alv" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_f_p) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -3730,15 +3685,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, @@ -3961,63 +3907,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; @@ -5653,22 +5542,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{ @@ -5867,14 +5740,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"asV" = ( -/obj/structure/machinery/floodlight/landing{ - name = "bolted floodlight" - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "asW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -6094,15 +5959,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{ @@ -6646,14 +6502,6 @@ icon_state = "cargo" }, /area/almayer/engineering/engineering_workshop/hangar) -"auJ" = ( -/obj/structure/machinery/floodlight/landing{ - name = "bolted floodlight" - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "auK" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -6710,15 +6558,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, @@ -7827,28 +7666,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/navigation) -"ayy" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 15 - }, -/obj/structure/machinery/light, -/obj/structure/transmitter/rotary/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) "ayz" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -8112,18 +7929,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"; @@ -8497,47 +8302,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"aAD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "CIC Lockdown"; - name = "CIC Lockdown"; - pixel_x = -7; - pixel_y = 9; - req_access_txt = "1" - }, -/obj/structure/machinery/door_control{ - id = "Hangar Lockdown"; - name = "Hangar Lockdown"; - pixel_x = -7; - pixel_y = 2; - req_access_txt = "1" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/obj/structure/machinery/door_control{ - id = "bot_armory"; - name = "Armory Lockdown"; - pixel_x = -7; - pixel_y = -5; - req_one_access_txt = "1;4" - }, -/obj/structure/transmitter/rotary/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) "aAE" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -8927,18 +8691,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) -"aBN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Port Railguns and Viewing Room" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/upper_hull/u_f_p) "aBP" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -8965,30 +8717,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aBV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/transmitter/rotary/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) "aBW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -9124,12 +8852,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"aCu" = ( -/obj/structure/sink{ - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_a_s) "aCv" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -9226,13 +8948,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering) -"aDf" = ( -/obj/structure/machinery/shower{ - pixel_y = 16 - }, -/obj/item/tool/soap, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_a_s) "aDg" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -10017,6 +9732,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"aGi" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "aGj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -10367,6 +10088,12 @@ }, /turf/open/floor/engine, /area/almayer/engineering/airmix) +"aHT" = ( +/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) "aHU" = ( /obj/structure/platform{ dir = 1 @@ -10593,24 +10320,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"; @@ -11458,13 +11167,6 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) "aMM" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" @@ -12161,18 +11863,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"aQA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/hull/upper_hull/u_a_s) "aQF" = ( /turf/closed/wall/almayer, /area/almayer/living/offices) @@ -12294,21 +11984,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"aRk" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/hull/upper_hull/u_a_s) "aRo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -12530,6 +12205,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"aSh" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "aSl" = ( /obj/structure/machinery/light, /obj/structure/machinery/cm_vending/sorted/medical, @@ -13541,12 +13225,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"aWN" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "aWR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -13848,10 +13526,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) -"aYU" = ( -/obj/structure/largecrate/supply/supplies/flares, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "aYV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -14443,26 +14117,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"bbI" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "laddernortheast"; - name = "\improper North East Ladders Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"bbJ" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/starboard_hallway) "bbL" = ( /turf/open/floor/almayer{ dir = 8; @@ -14488,18 +14142,6 @@ "bbS" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) -"bbU" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "bbV" = ( /obj/structure/machinery/light{ dir = 8 @@ -14802,31 +14444,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) -"bdp" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernortheast"; - name = "\improper North East Ladders Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"bdq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernortheast"; - name = "\improper North East Ladders Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "bdr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) @@ -15104,12 +14721,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"beO" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/hull/lower_hull/l_m_s) "beP" = ( /obj/item/stack/catwalk, /obj/structure/disposalpipe/segment{ @@ -15170,12 +14781,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"bfa" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/lower_hull/l_m_s) "bfb" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -15540,12 +15145,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_one) -"bgF" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hull/lower_hull/l_m_s) "bgG" = ( /obj/structure/window/framed/almayer/white, /turf/open/floor/plating, @@ -15720,18 +15319,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; @@ -15843,10 +15430,10 @@ }, /area/almayer/living/starboard_garden) "biV" = ( -/obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 8 }, +/obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/starboard_garden) "bja" = ( @@ -17024,12 +16611,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"bpf" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_a_s) "bph" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -17489,10 +17070,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"brT" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_a_s) "brW" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -17516,42 +17093,10 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/carpet, /area/almayer/command/corporateliason) -"bsd" = ( -/obj/item/device/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/structure/machinery/door_control{ - id = "cl_shutters"; - name = "Privacy Shutters"; - pixel_x = -5; - pixel_y = 6; - req_access_txt = "200" - }, -/obj/structure/machinery/door_control{ - id = "RoomDivider"; - name = "Room Divider"; - pixel_x = -5; - pixel_y = -3; - req_access_txt = "200" - }, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/almayer/command/corporateliason) "bse" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) -"bsf" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/largecrate/random, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_f_s) "bsj" = ( /obj/structure/machinery/line_nexter/med{ dir = 4 @@ -18554,6 +18099,22 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"bxC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "bxD" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -18867,15 +18428,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; @@ -18941,19 +18493,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"bzG" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "bzH" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -19480,21 +19019,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"bCf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; - name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/briefing) "bCg" = ( /obj/structure/machinery/light{ dir = 8 @@ -20536,13 +20060,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bGz" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "bGF" = ( /obj/structure/machinery/landinglight/ds2{ dir = 1 @@ -20843,15 +20360,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"bHM" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/lower_hull/l_m_s) "bHP" = ( /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) @@ -20993,17 +20501,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"bIu" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/generic{ - access_modified = 1; - name = "Storage"; - req_one_access_txt = "19;21" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/req) "bIw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -21461,21 +20958,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bKo" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/disposal/broken, -/obj/item/reagent_container/food/drinks/cans/beer{ - layer = 3.1; - pixel_x = -7; - pixel_y = 16 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "bKp" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -22124,6 +21606,21 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) +"bMY" = ( +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/hull/upper_hull/u_a_s) "bNa" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black, @@ -22270,15 +21767,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"bNz" = ( -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/lower_hull/l_m_s) "bNA" = ( /obj/structure/machinery/computer/ordercomp, /obj/structure/sign/safety/galley{ @@ -23052,14 +22540,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"bQS" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo{ - icon_state = "req_ammo_wall" - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/squads/req) "bQU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -23780,8 +23260,14 @@ }, /area/almayer/living/briefing) "bUc" = ( -/obj/structure/foamed_metal, -/turf/open/floor/plating, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Secretroom"; + indestructible = 1; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/almayer/hull/lower_hull/l_m_s) "bUd" = ( /turf/open/floor/almayer{ @@ -23823,25 +23309,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{ @@ -23995,19 +23462,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) -"bUR" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "bUT" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -24111,25 +23565,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bVr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) -"bVt" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "bVw" = ( /turf/open/floor/almayer{ dir = 4; @@ -24345,12 +23780,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"bWy" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/lower_hull/l_m_s) "bWC" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -24448,6 +23877,24 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engineering_workshop) +"bXc" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/snacks/mre_pack/xmas2{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/effect/landmark/map_item{ + layer = 3.03; + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/mre_pack/xmas3{ + pixel_x = 5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) @@ -24683,15 +24130,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo{ - icon_state = "req_guns_wall" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/squads/req) "bYc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -25784,6 +25222,17 @@ icon_state = "plate" }, /area/almayer/engineering/lower_engineering) +"ccF" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "ccG" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -26383,6 +25832,18 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"cgz" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/sign/poster{ + desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; + icon_state = "poster7"; + name = "EAT - poster"; + pixel_x = 27 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "cgA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26639,6 +26100,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) +"cij" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -27025,13 +26492,42 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"ckD" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +"ckE" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 }, -/turf/closed/wall/almayer, -/area/almayer/hull/lower_hull/l_m_p) +/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) "ckI" = ( /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -27380,15 +26876,9 @@ }, /area/almayer/hull/lower_hull/l_m_p) "clR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "blue" }, /area/almayer/hallways/port_hallway) "clS" = ( @@ -27449,29 +26939,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"cmb" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"cmc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "cmd" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -28081,6 +27548,15 @@ icon_state = "greencorner" }, /area/almayer/squads/req) +"crK" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "crP" = ( /obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/almayer{ @@ -28100,24 +27576,18 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"csw" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "csz" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"csG" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/item/trash/popcorn, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "csI" = ( /turf/open/floor/almayer{ dir = 8; @@ -28291,6 +27761,20 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"cwQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/no_build{ @@ -28705,6 +28189,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) +"cEG" = ( +/obj/structure/sign/poster{ + icon_state = "poster14"; + pixel_x = -27 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "cEO" = ( /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ @@ -28993,6 +28485,13 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/port) +"cKX" = ( +/obj/structure/platform, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "cKY" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -29054,6 +28553,12 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"cLV" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "cMl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29297,6 +28802,16 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"cSK" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "cSN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light{ @@ -29662,26 +29177,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"dac" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddernortheast"; + name = "\improper North East Ladders Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "daj" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) -"dav" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 2; - req_one_access = list(2,34,30) - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_f_s) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -29819,13 +29334,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) -"ddG" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "ddK" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -29838,6 +29346,12 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"ddN" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "deb" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -29871,6 +29385,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"deT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "emerald" + }, +/area/almayer/living/port_emb) "dfa" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -30017,6 +29543,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_umbilical) +"diw" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -30055,6 +29590,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"diM" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "djm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -30163,6 +29706,15 @@ icon_state = "red" }, /area/almayer/living/briefing) +"dkH" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -30401,6 +29953,21 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"dpo" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/waterhazard{ + pixel_y = 32 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 14; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "dpy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30439,6 +30006,13 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"dqg" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "dqj" = ( /turf/open/floor/almayer{ dir = 4; @@ -30915,6 +30489,17 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) +"dzF" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddernortheast"; + name = "\improper North East Ladders Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "dAb" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -30933,6 +30518,13 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"dAO" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "dAX" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -31307,21 +30899,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"dGW" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; - name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/briefing) "dHd" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -31642,6 +31219,15 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"dQs" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "dQv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31880,6 +31466,28 @@ icon_state = "blue" }, /area/almayer/living/briefing) +"dVm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Railguns and Viewing Room" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_f_p) +"dVs" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/living/port_emb) "dVu" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -31970,15 +31578,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"dXo" = ( -/obj/structure/machinery/photocopier, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dXr" = ( /obj/structure/bed/chair{ dir = 8; @@ -32055,6 +31654,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"dYX" = ( +/obj/structure/machinery/door/airlock/almayer/marine/bravo{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "dZd" = ( /turf/open/floor/almayer{ dir = 10; @@ -32089,10 +31700,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/general_equipment) -"eai" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "ean" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -32142,6 +31749,26 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ebt" = ( +/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) +"ebz" = ( +/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) "ebD" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -32355,16 +31982,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"efa" = ( -/obj/item/frame/camera{ - desc = "The Staff Officer insisted he needed to monitor everyone at all times."; - layer = 2.9; - name = "broken camera"; - pixel_x = -7; - pixel_y = -6 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "efh" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -32549,15 +32166,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"ehZ" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_p) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32720,6 +32328,9 @@ /obj/structure/machinery/door/airlock/almayer/generic/glass{ name = "\improper Memorial Room" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -32734,17 +32345,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"elh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cic_hallway) "elq" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -32856,6 +32456,9 @@ /area/almayer/shipboard/brig/evidence_storage) "enx" = ( /obj/structure/pipes/vents/pump, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "green" @@ -32880,6 +32483,18 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) +"eoM" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/beer_pack, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = -27; + serial_number = 11 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_s) "eoP" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -32903,6 +32518,20 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"epq" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/sign/poster{ + desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; + icon_state = "poster12"; + name = "Beach Babe Pinup"; + pixel_x = 27; + serial_number = 12 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "epu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -33153,15 +32782,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"etB" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/storage{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "etE" = ( /obj/structure/prop/almayer/name_stencil, /turf/open/floor/almayer_hull{ @@ -33278,6 +32898,16 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) +"ewr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) "ewO" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -33359,6 +32989,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"eyv" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33571,6 +33207,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"eCS" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/item/trash/popcorn, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "eDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -33587,6 +33233,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) +"eDz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "eDG" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -33818,21 +33474,6 @@ icon_state = "plate" }, /area/almayer/command/corporateliason) -"eHq" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -15 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/pipe_water{ - pixel_x = 17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "eHx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/faxmachine/uscm/command, @@ -33991,19 +33632,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"eMn" = ( -/obj/structure/machinery/light, -/obj/structure/sign/safety/waterhazard{ - pixel_y = -32 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 14; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -34164,6 +33792,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"eRt" = ( +/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) "eRu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -34231,27 +33872,6 @@ icon_state = "outerhull_dir" }, /area/space) -"eSV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Delta Overwatch Telephone"; - phone_category = "Command"; - 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) "eTd" = ( /obj/structure/surface/table/almayer, /obj/item/trash/boonie{ @@ -34262,6 +33882,27 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) +"eTh" = ( +/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) "eTo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -34275,6 +33916,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"eTx" = ( +/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) "eTO" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -34384,11 +34032,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"eVy" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/beer_pack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "eVQ" = ( /obj/structure/machinery/light{ dir = 4 @@ -34452,12 +34095,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/offices) -"eXE" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "eYr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34485,12 +34122,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"eYv" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/port_emb) "eYz" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 1 @@ -34827,19 +34458,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"feC" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "feD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -34879,6 +34497,17 @@ icon_state = "plating" }, /area/almayer/command/airoom) +"ffV" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt, +/obj/structure/transmitter/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) "fgh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35019,6 +34648,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"fkO" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "fkW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35064,24 +34700,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"fmf" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ - access_modified = 1; - dir = 2; - name = "\improper Requisitions Break Room"; - req_one_access_txt = "19;21" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/req) "fmv" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35123,6 +34741,21 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"fnx" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/window/eastright{ + access_modified = 1; + dir = 8; + req_access_txt = "19" + }, +/obj/effect/landmark/map_item, +/obj/structure/machinery/door/window/eastleft{ + req_access_txt = "19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "fnA" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -35339,29 +34972,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"; @@ -35434,8 +35044,8 @@ }, /area/almayer/shipboard/brig/armory) "fsH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/almayer{ dir = 1; @@ -35457,6 +35067,14 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) +"fsU" = ( +/obj/structure/machinery/floodlight/landing{ + name = "bolted floodlight" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "fsV" = ( /obj/structure/target, /turf/open/floor/almayer{ @@ -35532,6 +35150,20 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/perma) +"fuY" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "fvd" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -35597,14 +35229,6 @@ icon_state = "plate" }, /area/almayer/living/starboard_garden) -"fwF" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_f_s) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35691,6 +35315,9 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) +"fza" = ( +/turf/open/floor/almayer, +/area/almayer/hull/lower_hull/l_m_s) "fzq" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -35767,19 +35394,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"fBx" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"fBA" = ( -/obj/item/device/assembly/mousetrap/armed, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "fBD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -35916,17 +35530,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"fEo" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - access_modified = 1; - name = "Kitchen"; - req_one_access_txt = "30;19" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/grunt_rnr) "fEC" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -35969,17 +35572,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"fFz" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "Secretroom"; - indestructible = 1; - unacidable = 1 +"fFq" = ( +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/hull/lower_hull/l_m_p) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -36194,18 +35796,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) -"fJA" = ( -/obj/structure/coatrack, -/obj/structure/sign/poster/clf{ - pixel_x = -28 - }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "fJO" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -36444,6 +36034,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fOh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -36555,15 +36152,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) -"fQS" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_f_p) "fRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -36603,32 +36191,13 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"fSF" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_x = 26 - }, -/obj/structure/bedsheetbin{ - pixel_x = 26; - pixel_y = 5 - }, -/obj/item/tool/soap/syndie, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) -"fSG" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +"fSK" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "fTi" = ( /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ @@ -36752,6 +36321,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"fXt" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/squads/req) "fXx" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -36772,19 +36351,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"fXE" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = -4 - }, -/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, @@ -36849,6 +36415,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"fZq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cic_hallway) "fZx" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -36872,6 +36446,17 @@ /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) +"gac" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "gai" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -37396,37 +36981,22 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"gjL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt, -/obj/structure/transmitter/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) "gjN" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ 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, /area/almayer/hull/lower_hull/l_f_p) +"gkJ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "gkK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/reinforced/almayer_B, @@ -37489,6 +37059,20 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"gmb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; + dir = 1; + name = "Storage"; + req_one_access_txt = "19;21" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/req) "gmj" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ @@ -37547,6 +37131,24 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/weapon_room) +"goy" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Dorms" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/port_emb) "goD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37583,15 +37185,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"gpE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "gpI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -37603,6 +37196,25 @@ "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) +"gqq" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/largecrate/random, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_s) +"gqF" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "gqK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -37656,6 +37268,31 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) +"gsg" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "Alpha_1"; + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_x = 23; + specialfunctions = 4 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "gsm" = ( /obj/structure/machinery/status_display{ pixel_x = -32 @@ -37693,15 +37330,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"gte" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "gtp" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -37731,8 +37359,7 @@ dir = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" + icon_state = "green" }, /area/almayer/hallways/port_hallway) "guC" = ( @@ -37745,21 +37372,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) -"guG" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_x = 26 - }, -/obj/item/tool/soap, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "guS" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -37880,7 +37492,7 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"gwO" = ( +"gwM" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ pixel_y = 32 @@ -37900,7 +37512,12 @@ pixel_x = 23; specialfunctions = 4 }, -/turf/open/floor/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, /area/almayer/living/port_emb) "gwR" = ( /obj/item/device/flashlight/lamp/green, @@ -38206,6 +37823,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"gBW" = ( +/obj/structure/machinery/floodlight/landing{ + name = "bolted floodlight" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "gCd" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -38291,6 +37916,36 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"gEI" = ( +/obj/item/device/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/machinery/door_control{ + id = "cl_shutters"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 8; + req_access_txt = "200" + }, +/obj/structure/machinery/door_control{ + id = "RoomDivider"; + name = "Room Divider"; + pixel_x = -5; + pixel_y = -4; + req_access_txt = "200" + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control{ + pixel_x = -5; + pixel_y = 2; + req_access_txt = "200"; + name = "Evac Pod Door Control"; + id = "cl_evac"; + normaldoorcontrol = 1 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliason) "gEK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38338,6 +37993,31 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"gGl" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/taperecorder, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) +"gGo" = ( +/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) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -38403,27 +38083,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"gHl" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 16 - }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Alpha Overwatch Telephone"; - phone_category = "Command"; - 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) "gHo" = ( /obj/structure/machinery/door/airlock/almayer/marine/delta/tl, /turf/open/floor/almayer{ @@ -38491,6 +38150,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"gJs" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/squads/req) "gJP" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -38519,6 +38184,13 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) +"gKH" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/item/trash/uscm_mre, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "gKJ" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -38567,12 +38239,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"gLu" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "gLz" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -38701,6 +38367,15 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"gNi" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "gNp" = ( /turf/open/floor/almayer{ dir = 9; @@ -38936,6 +38611,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"gUr" = ( +/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) "gUv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -39176,6 +38859,16 @@ /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"gZG" = ( +/obj/structure/largecrate/supply/supplies/mre, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "gZK" = ( /turf/open/floor/almayer, /area/almayer/living/auxiliary_officer_office) @@ -39266,27 +38959,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hbx" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"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{ @@ -39425,6 +39097,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"heb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "hec" = ( /turf/open/floor/almayer{ dir = 8; @@ -39443,12 +39124,28 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) +"hey" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "heH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) +"heK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Tool Closet" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/port_emb) "heQ" = ( /obj/structure/bed/chair, /obj/structure/extinguisher_cabinet{ @@ -39522,6 +39219,10 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"hfy" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_a_s) "hfO" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner, @@ -39715,6 +39416,17 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"hjB" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; + name = "Kitchen"; + req_one_access_txt = "30;19" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/grunt_rnr) "hki" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ @@ -39887,20 +39599,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"hnI" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - name = "\improper Flight Crew Quarters"; - req_access_txt = null; - req_one_access_txt = "19;22" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/pilotbunks) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -40122,6 +39820,21 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"huU" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + dir = 2; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "huX" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light{ @@ -40317,12 +40030,6 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) -"hzb" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "hzc" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/notunnel) @@ -40405,17 +40112,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"hzP" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/machinery/recharger, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/living/grunt_rnr) "hzV" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -40560,6 +40256,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"hDL" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "hDR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/syringe_case{ @@ -40641,6 +40344,14 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"hGa" = ( +/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) "hGB" = ( /obj/structure/machinery/light, /turf/open/floor/wood/ship, @@ -40766,6 +40477,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"hJh" = ( +/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) "hJk" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -40860,6 +40584,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"hLS" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "hMi" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -40910,21 +40646,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) -"hNL" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "hNM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal{ @@ -41079,22 +40800,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"hRg" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = -15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "hRi" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -41438,6 +41143,24 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"hXm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cic_hallway) +"hXS" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_p) "hXV" = ( /obj/structure/machinery/light{ dir = 1 @@ -41758,6 +41481,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"ift" = ( +/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) "ifR" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -41860,6 +41592,19 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"iii" = ( +/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) "iit" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -42064,6 +41809,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) +"imW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "ina" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -42074,6 +41827,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"inh" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) "ins" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -42271,16 +42033,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"irI" = ( -/obj/structure/sign/safety/maint{ - pixel_y = 32 - }, -/obj/structure/sign/safety/storage{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "irJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -42551,6 +42303,17 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"iwI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; + name = "Storage"; + req_one_access_txt = "19;21" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/req) "iwJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -42685,6 +42448,17 @@ icon_state = "plate" }, /area/almayer/living/offices) +"izr" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/obj/structure/sign/poster/propaganda{ + pixel_x = -27 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "izx" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -42817,6 +42591,14 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"iCz" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_s) "iCF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -42841,6 +42623,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) +"iDN" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "iDT" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner{ @@ -42957,13 +42749,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"iGE" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "iGK" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -43008,17 +42793,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cells) -"iHO" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/item/storage/fancy/crayons{ - layer = 3.1; - pixel_x = -11; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/grunt_rnr) "iIl" = ( /obj/structure/sink{ dir = 8; @@ -43084,20 +42858,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"iKa" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_x = 26 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "iKb" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -43225,15 +42985,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"iLQ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "iMm" = ( /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) @@ -43389,22 +43140,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"iQL" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 2; - req_one_access = list(2,34,30) - }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "iRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -43444,6 +43179,52 @@ /obj/item/trash/chips, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iSm" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/mirror{ + desc = "Do you remember who you are?"; + icon_state = "mirror_broke"; + name = "broken mirror"; + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/item/device/cassette_tape/nam{ + layer = 2.9; + pixel_x = -6; + pixel_y = 11 + }, +/obj/structure/machinery/door_control{ + id = "Delta_2"; + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_x = 23; + specialfunctions = 4 + }, +/obj/item/prop{ + desc = "A handful of rounds to reload on the go."; + icon = 'icons/obj/items/weapons/guns/handful.dmi'; + icon_state = "bullet_2"; + name = "handful of pistol bullets (9mm)"; + pixel_x = -8; + pixel_y = 29 + }, +/obj/item/prop{ + desc = "A bunch of tiny bits of shattered metal."; + icon = 'icons/obj/items/shards.dmi'; + icon_state = "shrapnelsmall"; + name = "piece of shrapnel"; + pixel_x = -1; + pixel_y = 24 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "iSZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43518,6 +43299,18 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iUk" = ( +/obj/structure/machinery/door/airlock/almayer/marine/charlie{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "iUo" = ( /obj/structure/sign/safety/terminal{ pixel_x = 7; @@ -43539,6 +43332,14 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"iUC" = ( +/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) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43587,15 +43388,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"iVY" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cic_hallway) "iVZ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/black, @@ -43610,6 +43402,16 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"iWb" = ( +/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) "iWc" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -43639,6 +43441,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"iWE" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "iWL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -43965,12 +43776,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) -"jcl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/grunt_rnr) "jcK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -44028,6 +43833,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_three) +"jdQ" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/item/tool/soap, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_a_s) "jea" = ( /obj/structure/sign/safety/autoopenclose{ pixel_y = 32 @@ -44328,16 +44140,6 @@ icon_state = "silver" }, /area/almayer/hull/upper_hull/u_m_p) -"jip" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - access_modified = 1; - name = "\improper Main Kitchen"; - req_one_access_txt = "30;19" - }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, -/area/almayer/living/grunt_rnr) "jiw" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -44346,6 +44148,25 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"jiU" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/surface/rack{ + density = 0; + pixel_x = 26 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "jiX" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -44376,14 +44197,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"jjK" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/living/grunt_rnr) "jjM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -44658,6 +44471,20 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) +"jog" = ( +/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) "jox" = ( /obj/structure/machinery/brig_cell/cell_3{ pixel_x = -32 @@ -44822,6 +44649,12 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) +"juf" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jup" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -44940,6 +44773,19 @@ "jvY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/telecomms) +"jwD" = ( +/obj/structure/prop/almayer/computers/sensor_computer2, +/obj/structure/machinery/door_control{ + id = "Secretroom"; + indestructible = 1; + layer = 2.5; + name = "Shutters"; + use_power = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "jwK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -45308,17 +45154,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "jJe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "green" }, /area/almayer/hallways/port_hallway) +"jJk" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "jJq" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -45421,6 +45276,15 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"jLv" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "jLK" = ( /obj/structure/machinery/light{ dir = 4 @@ -45668,22 +45532,6 @@ dir = 8 }, /area/almayer/medical/containment/cell) -"jQA" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hull/lower_hull/l_m_s) -"jRn" = ( -/obj/structure/machinery/light/small, -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "jRz" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -45724,6 +45572,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"jRZ" = ( +/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) "jSo" = ( /obj/item/tool/warning_cone, /turf/open/floor/almayer{ @@ -45750,6 +45607,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"jSy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/grunt_rnr) "jSU" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -45845,6 +45711,15 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"jUo" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "jUs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -46139,9 +46014,25 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"kam" = ( +/obj/item/tool/screwdriver{ + layer = 2.9; + pixel_x = -21; + pixel_y = -14 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "kan" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lower_medical_medbay) +"kat" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hull/lower_hull/l_m_s) "kaA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46184,30 +46075,20 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"kaJ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "kaN" = ( /obj/structure/platform{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"kaS" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_x = -9; - pixel_y = 16 - }, -/obj/item/storage/photo_album{ - pixel_x = -6; - pixel_y = -17 - }, -/obj/item/clothing/mask/cigarette/pipe, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "kbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -46327,16 +46208,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"keO" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "keR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -46348,15 +46219,6 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"kfp" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "kfv" = ( /obj/structure/surface/table/almayer, /obj/item/stack/nanopaste{ @@ -46504,6 +46366,18 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"kio" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/closet, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "kiF" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/warning_stripes{ @@ -46551,40 +46425,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, @@ -46709,6 +46549,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"knT" = ( +/obj/structure/safe/cl_office, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "koc" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -46774,6 +46618,14 @@ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) +"kpo" = ( +/obj/structure/machinery/floodlight/landing{ + name = "bolted floodlight" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "kpQ" = ( /obj/structure/machinery/door_control{ id = "engidorm"; @@ -46954,6 +46806,12 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) +"ksv" = ( +/obj/structure/closet/secure_closet/securecom, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "ksA" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ @@ -46999,26 +46857,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{ @@ -47082,12 +46920,6 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) -"kvN" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/hull/lower_hull/l_m_s) "kvU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, @@ -47145,6 +46977,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"kxd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "kxo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -47632,18 +47477,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"kHA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "kHK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47789,6 +47622,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"kKL" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "kKR" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -47823,6 +47663,20 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"kLp" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/starboard_hallway) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47867,14 +47721,6 @@ icon_state = "outerhull_dir" }, /area/almayer/engineering/upper_engineering/port) -"kMU" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "kNi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47913,6 +47759,16 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"kNC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer, +/area/almayer/living/port_emb) "kNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -47926,12 +47782,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"kNQ" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "kNY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -48001,12 +47851,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"kOH" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "kPo" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -48099,6 +47943,17 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) +"kQU" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "kRd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48176,28 +48031,18 @@ 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 +"kSU" = ( +/obj/structure/transmitter/no_dnd{ + name = "Requisition Telephone"; + phone_category = "Almayer"; + phone_id = "Requisition"; + pixel_y = 30 }, -/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/almayer{ + dir = 5; + icon_state = "plating" }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/area/almayer/squads/req) "kTq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -48213,6 +48058,16 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) +"kTx" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "kTM" = ( /obj/item/frame/rack{ layer = 3.1; @@ -48243,19 +48098,23 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"kUh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - dir = 1; - name = "\improper Flight Crew Quarters"; - req_access_txt = null; - req_one_access_txt = "19;22" - }, +"kUb" = ( +/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 = "test_floor4" + icon_state = "plate" }, -/area/almayer/living/pilotbunks) +/area/almayer/command/combat_correspondent) "kUt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -48433,6 +48292,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"kYv" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "kYP" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48532,12 +48397,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"laP" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "laQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -48645,6 +48504,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"ldj" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/platform, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "ldl" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48827,6 +48691,21 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"lhu" = ( +/obj/structure/coatrack, +/obj/structure/sign/poster/clf{ + pixel_x = -28 + }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 30 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "lhv" = ( /obj/structure/machinery/door_control{ id = "CMO Shutters"; @@ -49022,6 +48901,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"llt" = ( +/obj/structure/machinery/conveyor{ + id = "req_belt" + }, +/obj/structure/plasticflaps, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/squads/req) +"llD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "llM" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -49062,23 +48957,6 @@ "lmK" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/securestorage) -"lmW" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "Alpha_2"; - name = "Door Lock"; - normaldoorcontrol = 1; - pixel_x = 23; - specialfunctions = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "lne" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -49301,14 +49179,6 @@ icon_state = "orange" }, /area/almayer/living/port_emb) -"lqZ" = ( -/obj/structure/machinery/floodlight/landing{ - name = "bolted floodlight" - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "lra" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Disposals" @@ -49341,15 +49211,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"lru" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/closet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "lrF" = ( /obj/structure/machinery/light, /obj/structure/surface/table/almayer, @@ -49465,12 +49326,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) -"ltU" = ( -/obj/structure/filingcabinet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "ltX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -49628,47 +49483,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"lwA" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/mirror{ - desc = "Do you remember who you are?"; - icon_state = "mirror_broke"; - name = "broken mirror"; - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/item/device/cassette_tape/nam{ - layer = 2.9; - pixel_x = -6; - pixel_y = 11 - }, -/obj/structure/machinery/door_control{ - id = "Delta_2"; - name = "Door Lock"; - normaldoorcontrol = 1; - pixel_x = 23; - specialfunctions = 4 - }, -/obj/item/prop{ - desc = "A handful of rounds to reload on the go."; - icon = 'icons/obj/items/weapons/guns/handful.dmi'; - icon_state = "bullet_2"; - name = "handful of pistol bullets (9mm)"; - pixel_x = -8; - pixel_y = 29 - }, -/obj/item/prop{ - desc = "A bunch of tiny bits of shattered metal."; - icon = 'icons/obj/items/shards.dmi'; - icon_state = "shrapnelsmall"; - name = "piece of shrapnel"; - pixel_x = -1; - pixel_y = 24 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "lwC" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -49774,6 +49588,14 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"lzn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_s) "lzq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -49904,6 +49726,13 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"lBz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "lBF" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -49931,6 +49760,20 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) +"lCn" = ( +/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) "lCt" = ( /turf/open/floor/almayer{ dir = 10; @@ -50061,21 +49904,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"lEL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/prop/ice_colony/tiger_rug{ - desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; - icon_state = "HotlineAlt"; - layer = 2.9; - name = "Richard the tiger" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "lEO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -50231,13 +50059,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"lGO" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "lHc" = ( /obj/effect/landmark/start/doctor, /obj/structure/sign/safety/maint{ @@ -50251,6 +50072,20 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) +"lHG" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + req_one_access = null; + req_one_access_txt = "30;19" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/grunt_rnr) "lIa" = ( /obj/item/robot_parts/arm/l_arm, /obj/item/robot_parts/leg/l_leg, @@ -50411,6 +50246,20 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"lLN" = ( +/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) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50730,21 +50579,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"lSO" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "lTt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -50768,6 +50602,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"lUv" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "lVl" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, @@ -50786,6 +50626,27 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"lVX" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/overwatch/almayer{ + dir = 8; + layer = 3.2; + pixel_x = -17; + pixel_y = 16 + }, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Alpha Overwatch Telephone"; + phone_category = "Command"; + 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) "lWh" = ( /obj/structure/machinery/pipedispenser/orderable, /turf/open/floor/almayer{ @@ -51553,29 +51414,10 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"moU" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/squads/req) "moY" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/squads/req) -"mqc" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -51638,6 +51480,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"mrB" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -51662,6 +51513,19 @@ icon_state = "green" }, /area/almayer/squads/req) +"msg" = ( +/obj/structure/machinery/light, +/obj/structure/sign/safety/waterhazard{ + pixel_y = -32 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 14; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "msi" = ( /obj/structure/filingcabinet/filingcabinet{ density = 0; @@ -51768,22 +51632,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"mtS" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) -"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 @@ -51799,6 +51647,48 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"mus" = ( +/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) "mux" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -52018,16 +51908,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; @@ -52172,6 +52052,22 @@ icon_state = "emerald" }, /area/almayer/living/briefing) +"mEb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -52196,32 +52092,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"mFD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"mFM" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "mFN" = ( /obj/effect/step_trigger/ares_alert/mainframe, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -52409,6 +52279,12 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"mJi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/grunt_rnr) "mJj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -52419,6 +52295,13 @@ "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) +"mJx" = ( +/obj/structure/prop/server_equipment/broken, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "mJL" = ( /turf/open/floor/almayer{ dir = 5; @@ -52548,6 +52431,20 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"mLb" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/item/toy/deck/uno{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/toy/deck{ + pixel_x = -6; + pixel_y = -2 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "mLu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -52611,14 +52508,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"mMu" = ( -/obj/structure/machinery/floodlight/landing{ - name = "bolted floodlight" - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, @@ -52804,17 +52693,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"mRc" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = -16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "mRl" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -52853,6 +52731,16 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"mRS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -52931,15 +52819,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"mTk" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "mTm" = ( /turf/open/floor/almayer{ dir = 4; @@ -53061,6 +52940,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mVZ" = ( +/obj/structure/sign/poster{ + desc = "It says DRUG."; + icon_state = "poster2"; + pixel_x = -27 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "mWe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -53186,18 +53074,6 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) -"mYZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "mZb" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -53311,6 +53187,15 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) +"nbr" = ( +/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) "nbB" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /turf/open/floor/almayer{ @@ -53600,6 +53485,22 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"nik" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/port_emb) "nim" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ access_modified = 1; @@ -53820,6 +53721,11 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"nna" = ( +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "nnc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -53885,16 +53791,6 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"nob" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "noj" = ( /obj/structure/largecrate, /obj/structure/prop/server_equipment/laptop{ @@ -53957,6 +53853,22 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"npB" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/surface/rack{ + density = 0; + pixel_x = 26 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54268,6 +54180,17 @@ /obj/item/tool/lighter/zippo/gold, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"nww" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -54401,6 +54324,16 @@ "nyQ" = ( /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"nza" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/item/trash/uscm_mre, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "nzv" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/clipboard, @@ -54466,12 +54399,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"nBl" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "nBo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54545,26 +54472,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) "nDh" = ( /obj/structure/transmitter/rotary{ name = "CL Office Telephone"; @@ -54693,18 +54600,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"nFy" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "nFI" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -54734,6 +54629,16 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"nFV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -54865,6 +54770,17 @@ }, /turf/open/floor/almayer, /area/almayer/living/basketball) +"nIW" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "nJo" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -54974,6 +54890,21 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"nLZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "nMc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -55013,6 +54944,52 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"nMM" = ( +/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) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -55066,23 +55043,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"nNT" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "Alpha_1"; - name = "Door Lock"; - normaldoorcontrol = 1; - pixel_x = 23; - specialfunctions = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "nNV" = ( /obj/structure/bed/chair{ dir = 8; @@ -55207,6 +55167,12 @@ icon_state = "plate" }, /area/almayer/squads/req) +"nQg" = ( +/obj/structure/sink{ + pixel_y = 24 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_a_s) "nQv" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -55245,6 +55211,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"nSj" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/squads/req) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -55264,6 +55237,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) +"nSN" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "nSS" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -55405,17 +55384,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"nVU" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "nVX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D1"; @@ -55745,16 +55713,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"odM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cic_hallway) "odN" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -55865,6 +55823,16 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"ohl" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56003,6 +55971,22 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"ojR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -56053,6 +56037,17 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"okB" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "okD" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer6" @@ -56155,22 +56150,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; @@ -56192,6 +56171,13 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"omW" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "onN" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -56377,13 +56363,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"oqY" = ( -/obj/structure/machinery/conveyor{ - id = "req_belt" - }, -/obj/structure/plasticflaps, -/turf/open/floor/almayer, -/area/almayer/squads/req) "oqZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/microwave{ @@ -56534,6 +56513,18 @@ "otu" = ( /turf/closed/wall/almayer/research/containment/wall/connect_w, /area/almayer/medical/containment/cell) +"otK" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + dir = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "otX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56683,12 +56674,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"owN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/grunt_rnr) "owW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -56943,20 +56928,24 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"oDu" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_s) "oDv" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "red" }, /area/almayer/living/gym) +"oDx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + req_one_access = null; + req_one_access_txt = "30;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/port_emb) "oDE" = ( /obj/structure/surface/rack, /obj/item/reagent_container/spray/cleaner{ @@ -56981,6 +56970,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"oDO" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "oDR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -57051,6 +57046,15 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"oES" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_p) "oEX" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -57162,13 +57166,6 @@ icon_state = "orange" }, /area/almayer/shipboard/brig/perma) -"oIm" = ( -/obj/structure/prop/server_equipment/broken, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "oIn" = ( /obj/structure/bed/chair{ dir = 8; @@ -57267,18 +57264,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"oLg" = ( -/obj/structure/machinery/conveyor{ - id = "req_belt" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/squads/req) "oLi" = ( /obj/effect/landmark/start/marine/medic/bravo, /obj/effect/landmark/late_join/bravo, @@ -57416,14 +57401,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; @@ -57520,6 +57497,21 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"oQj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "oQo" = ( /obj/item/stool, /obj/effect/landmark/yautja_teleport, @@ -57782,17 +57774,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) -"oWX" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - access_modified = 1; - dir = 1; - name = "\improper Kitchen Hydroponics"; - req_one_access_txt = "30;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/grunt_rnr) "oXb" = ( /obj/effect/landmark/start/marine/charlie, /obj/effect/landmark/late_join/charlie, @@ -57939,6 +57920,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"pbl" = ( +/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) "pbp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -57978,6 +57968,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"pcj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/shipboard/brig/cic_hallway) "pcl" = ( /turf/open/floor/almayer{ icon_state = "cargo" @@ -58115,6 +58115,18 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"pfe" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item{ + pixel_x = 5 + }, +/obj/item/facepaint/black{ + pixel_x = -10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "pfh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -58163,6 +58175,13 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"pgt" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/hull/lower_hull/l_m_s) "pgD" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) @@ -58198,21 +58217,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"phj" = ( -/obj/item/clothing/head/helmet/marine/reporter, -/obj/item/clothing/suit/storage/marine/light/reporter, -/obj/item/clothing/head/cmcap/reporter, -/obj/item/clothing/head/fedora, -/obj/structure/closet/secure_closet, -/obj/item/storage/box/tapes, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -58354,6 +58358,18 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/delta) +"pmv" = ( +/obj/structure/machinery/door/airlock/almayer/marine/alpha{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "pmH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -58818,14 +58834,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"pyB" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "pyC" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/machinery/light{ @@ -58864,16 +58872,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"pzi" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_p) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -59268,21 +59266,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"pIX" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"pJb" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/living/grunt_rnr) "pJi" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -59290,6 +59273,25 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"pJD" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/item/tool/soap, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "pJE" = ( /obj/structure/closet/secure_closet{ name = "\improper Execution Firearms" @@ -59355,13 +59357,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"pLv" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "pLO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -59567,6 +59562,25 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"pPV" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "Alpha_2"; + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_x = 23; + specialfunctions = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "pQq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -59670,6 +59684,23 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"pRT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 8; + name = "\improper Tool Closet" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/port_emb) "pRX" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -59815,24 +59846,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; @@ -60156,6 +60169,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"qbh" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "qbt" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -60215,21 +60237,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"qcq" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/waterhazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 14; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -60257,6 +60264,38 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"qdv" = ( +/obj/item/bedsheet/purple{ + layer = 3.2 + }, +/obj/item/bedsheet/purple{ + pixel_y = 13 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/clothing/head/beret/royal_marine, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "emerald" + }, +/area/almayer/living/port_emb) "qdz" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -60294,6 +60333,21 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"qep" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; + dir = 2; + name = "\improper Field Surgery Equipment"; + req_access_txt = "20"; + req_one_access = null + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/lower_medical_medbay) "qer" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -60397,6 +60451,12 @@ icon_state = "test_floor4" }, /area/almayer/living/starboard_garden) +"qgw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "qgG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -60500,10 +60560,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull) -"qif" = ( -/obj/structure/sign/dartboard, -/turf/closed/wall/almayer, -/area/almayer/hallways/hangar) "qih" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -60523,6 +60579,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"qin" = ( +/obj/structure/sign/poster/safety{ + pixel_x = 27 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "qit" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -60575,6 +60638,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"qkb" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "qki" = ( /obj/effect/landmark/start/marine/smartgunner/charlie, /obj/effect/landmark/late_join/charlie, @@ -60587,6 +60659,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"qkP" = ( +/obj/item/frame/light_fixture{ + anchored = 1; + desc = "A broken fluorescent tube light."; + dir = 8; + icon_state = "tube-broken"; + name = "broken light fixture" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "qld" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -60708,6 +60800,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"qmL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "qmP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm, @@ -60823,13 +60921,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"qoX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "qoY" = ( /obj/structure/machinery/vending/hydroseeds, /turf/open/floor/almayer{ @@ -60869,27 +60960,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; @@ -60983,6 +61053,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/ce_room) +"qtn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -61265,13 +61344,28 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) -"qyK" = ( +"qyJ" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) +"qyM" = ( /obj/structure/surface/table/almayer, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 8 + }, +/obj/structure/transmitter/rotary{ + name = "Reporter Telephone"; + phone_category = "Almayer"; + phone_id = "Reporter"; + pixel_x = -4; + pixel_y = 6 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/living/grunt_rnr) +/area/almayer/command/combat_correspondent) "qyW" = ( /obj/structure/bed/chair{ dir = 4 @@ -61336,6 +61430,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"qBM" = ( +/obj/item/storage/fancy/crayons{ + layer = 3.1; + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/living/grunt_rnr) "qCc" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -61632,21 +61737,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"; @@ -62095,6 +62185,19 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"qRL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "qRT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -62721,6 +62824,26 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"rfT" = ( +/obj/item/frame/camera{ + desc = "The Staff Officer insisted he needed to monitor everyone at all times."; + layer = 2.9; + name = "broken camera"; + pixel_x = -7; + pixel_y = -6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "rgy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -62775,6 +62898,17 @@ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) +"rhD" = ( +/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) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -62789,6 +62923,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"ril" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "riA" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -62870,6 +63015,44 @@ icon_state = "plate" }, /area/almayer/command/corporateliason) +"rjV" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/wooden_tv/prop{ + dir = 8; + layer = 3.2; + pixel_x = -3; + pixel_y = 6 + }, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 + }, +/obj/item/trash/pistachios{ + layer = 2; + pixel_x = 6; + pixel_y = -6 + }, +/obj/structure/machinery/recharger{ + layer = 3.1; + pixel_y = 22 + }, +/obj/item/ammo_magazine/rifle/incendiary{ + current_rounds = 0; + desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; + pixel_x = 10; + pixel_y = 2 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "rka" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -62971,15 +63154,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"rlG" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "rlQ" = ( /turf/open/floor/almayer{ dir = 1; @@ -63275,14 +63449,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"rsj" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "rsx" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/high_voltage{ @@ -63448,6 +63614,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"rwT" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "rwY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -63508,14 +63680,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"ryR" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ - req_access = list(1) - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "rzf" = ( /obj/effect/landmark/late_join/working_joe, /obj/effect/landmark/start/working_joe, @@ -63541,19 +63705,24 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) -"rzM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cic_hallway) "rzN" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"rzP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_a_s) "rAb" = ( /turf/open/floor/almayer{ icon_state = "bluecorner" @@ -63944,6 +64113,15 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"rGg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "rGj" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -64104,6 +64282,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rJg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "rJh" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -64223,14 +64406,6 @@ icon_state = "containment_window_h" }, /area/almayer/medical/containment/cell/cl) -"rLF" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "rLU" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 @@ -64245,23 +64420,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"rNW" = ( -/obj/structure/machinery/door_control{ - id = "Secretroom"; - indestructible = 1; - layer = 2.5; - name = "Shutters"; - use_power = 0 - }, -/obj/structure/prop/almayer/computers/sensor_computer1, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "rOc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64492,12 +64650,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"rSW" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -64525,18 +64677,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"rTY" = ( -/obj/structure/transmitter/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) "rTZ" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -64718,6 +64858,17 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) +"rZz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "rZB" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 @@ -65297,6 +65448,27 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) +"snI" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/overwatch/almayer{ + dir = 8; + layer = 3.2; + pixel_x = -17; + pixel_y = -17 + }, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Delta Overwatch Telephone"; + phone_category = "Command"; + 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) "snM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65420,12 +65592,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"soZ" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/lower_hull/l_m_s) "spF" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -65562,18 +65728,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 @@ -65851,6 +66005,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/numbertwobunks) +"szX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/hull/upper_hull/u_a_s) "sAc" = ( /obj/structure/bed/chair{ dir = 8; @@ -65877,20 +66043,6 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"sBp" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "sBF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -66008,15 +66160,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"sDQ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) "sEa" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -66116,6 +66259,13 @@ icon_state = "cargo" }, /area/almayer/shipboard/starboard_missiles) +"sFh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "sFC" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -66410,6 +66560,12 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"sNI" = ( +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "sNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -66475,27 +66631,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 @@ -66629,6 +66764,30 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sSG" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/overwatch/almayer{ + dir = 8; + layer = 3.2; + pixel_x = -17; + pixel_y = -17 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/transmitter/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) "sSR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -66760,7 +66919,7 @@ pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "greencorner" + icon_state = "green" }, /area/almayer/hallways/port_hallway) "sVi" = ( @@ -66896,23 +67055,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{ @@ -66975,6 +67117,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"sZF" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_p) "sZH" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/bronze{ @@ -67035,6 +67184,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"tat" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/living/port_emb) "taA" = ( /obj/structure/machinery/light{ dir = 4 @@ -67108,6 +67262,21 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) +"tda" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; + dir = 2; + name = "\improper Security Checkpoint"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) "tdc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -67212,6 +67381,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"teH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/maint{ + pixel_y = 32 + }, +/obj/structure/sign/safety/storage{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "teY" = ( /obj/structure/machinery/light{ dir = 1 @@ -67242,9 +67423,6 @@ name = "General Listening Channel"; pixel_y = 28 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -67396,6 +67574,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tit" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "tiw" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -67481,12 +67666,13 @@ }, /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{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "tkq" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -67724,6 +67910,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) +"tpt" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "tpD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68014,42 +68206,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tuv" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/item/clothing/head/beret/centcom/captain{ - color = "#4b5320"; - desc = "Dusty beret bearing the logo of the royal marines. How did this get here?"; - name = "dusty beret"; - pixel_y = -6 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "tuA" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/port_missiles) @@ -68383,6 +68539,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"tBP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_s) "tCb" = ( /obj/structure/surface/rack, /obj/item/device/radio{ @@ -68556,6 +68719,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"tGG" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "tGO" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -68564,41 +68735,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"tHc" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/wooden_tv/prop{ - dir = 8; - layer = 3.2; - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 27; - serial_number = 11 - }, -/obj/item/trash/pistachios{ - layer = 2; - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/machinery/recharger{ - layer = 3.1; - pixel_y = 22 - }, -/obj/item/ammo_magazine/rifle/incendiary{ - current_rounds = 0; - desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; - pixel_x = 10; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "tHh" = ( /obj/structure/sign/safety/ladder{ pixel_x = 8; @@ -68651,15 +68787,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"tIb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -68717,20 +68844,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"tJa" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - access_modified = 1; - dir = 1; - name = "Storage"; - req_one_access_txt = "19;21" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) "tJi" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/paper_bin/uscm, @@ -68994,6 +69107,20 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tQo" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "tQE" = ( /obj/item/clothing/head/welding, /turf/open/floor/almayer{ @@ -69005,6 +69132,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"tQM" = ( +/obj/structure/safe/co_office, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -69093,6 +69224,28 @@ icon_state = "orangecorner" }, /area/almayer/living/briefing) +"tSF" = ( +/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) "tTp" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -69135,17 +69288,6 @@ /obj/item/tool/pen, /turf/open/floor/almayer, /area/almayer/command/cic) -"tUv" = ( -/obj/structure/machinery/iv_drip, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/lower_medical_medbay) "tUx" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -69270,21 +69412,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) -"tXG" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door/window/eastright{ - access_modified = 1; - dir = 8; - req_access_txt = "19" - }, -/obj/effect/landmark/map_item, -/obj/structure/machinery/door/window/eastleft{ - req_access_txt = "19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/briefing) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -69486,6 +69613,13 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"uay" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) "uaI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/processor{ @@ -69545,6 +69679,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"ucz" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/overwatch/almayer{ + dir = 8; + layer = 3.2; + pixel_x = -17; + pixel_y = 15 + }, +/obj/structure/machinery/light, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Bravo Overwatch Telephone"; + 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) +"udb" = ( +/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) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -69598,6 +69763,14 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"udV" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "udZ" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -69703,6 +69876,16 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"ufS" = ( +/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) "ugs" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law{ @@ -69787,6 +69970,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"uig" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "uim" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -69875,6 +70067,13 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/engineering/engineering_workshop/hangar) +"ukA" = ( +/obj/structure/platform, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "ukS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69894,17 +70093,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"ukW" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/briefing) "ula" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ name = "Evidence Room" @@ -69948,6 +70136,16 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) +"umv" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 8; + req_one_access = list(2,34,30) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/lower_hull/l_m_s) "umy" = ( /obj/structure/machinery/light{ dir = 1 @@ -69989,6 +70187,14 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"umY" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -70039,6 +70245,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"uoh" = ( +/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) "uoi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -70086,6 +70326,14 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"upt" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -70153,19 +70401,6 @@ "uqo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"uqr" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "uqA" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -70672,49 +70907,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, @@ -70835,10 +71027,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"uBM" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "uBN" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -71170,6 +71358,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"uJB" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/hull/lower_hull/l_m_s) "uJU" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -71453,6 +71648,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"uQo" = ( +/obj/structure/machinery/disposal, +/obj/item/reagent_container/food/drinks/cans/beer{ + layer = 3.3; + pixel_x = -4; + pixel_y = 15 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/port_emb) "uQU" = ( /obj/structure/stairs{ dir = 1 @@ -71497,20 +71704,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"uRI" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -8 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "uRM" = ( /obj/structure/bed{ can_buckle = 0 @@ -71705,6 +71898,13 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) +"uVb" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hull/lower_hull/l_m_s) "uVd" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -71842,6 +72042,15 @@ dir = 8 }, /area/almayer/medical/containment/cell) +"uXu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "uXL" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -71864,12 +72073,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"uYO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "uZo" = ( /obj/structure/bed/stool, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -71893,19 +72096,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" @@ -71953,13 +72143,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"vbR" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/squads/req) "vbS" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -72072,9 +72255,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"vdU" = ( -/turf/open/floor/wood/ship, -/area/almayer/living/grunt_rnr) "vdW" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -72108,16 +72288,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"veI" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72483,6 +72653,18 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"vjD" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_p) "vjK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -72586,6 +72768,13 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) +"vlR" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "vlX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -72650,6 +72839,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"vnY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "vot" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72691,6 +72887,22 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"vpt" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 + }, +/obj/item/stack/folding_barricade, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "vpI" = ( /obj/effect/landmark/start/police, /turf/open/floor/plating/plating_catwalk, @@ -72791,6 +73003,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"vrB" = ( +/obj/structure/closet/crate{ + desc = "One of those old special operations crates from back in the day. After a leaked report from a meeting of SOF leadership lambasted the crates as 'waste of operational funds' the crates were removed from service."; + name = "special operations crate" + }, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "vrI" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -72862,19 +73095,6 @@ 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" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "vsJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -72940,6 +73160,20 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"vtB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "vtT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -72963,6 +73197,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/briefing) +"vuF" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + access_modified = 1; + dir = 1; + name = "\improper Kitchen Hydroponics"; + req_one_access_txt = "30;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/grunt_rnr) "vuG" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -73027,6 +73272,30 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"vvY" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/surface/rack{ + density = 0; + pixel_x = 26 + }, +/obj/structure/bedsheetbin{ + pixel_x = 26; + pixel_y = 5 + }, +/obj/item/tool/soap/syndie, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "vwF" = ( /obj/structure/machinery/light{ dir = 1 @@ -73176,6 +73445,15 @@ "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) +"vyU" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "vzl" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -73373,18 +73651,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"vDh" = ( -/obj/item/weapon/dart/green, -/turf/open/floor/plating, -/area/almayer/hull/lower_hull/l_f_p) -"vEf" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "vEj" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -73392,6 +73658,17 @@ /obj/effect/landmark/start/synthetic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) +"vEn" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/item/stack/sheet/mineral/uranium{ + layer = 2.99 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "vEr" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -73419,21 +73696,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer, /area/almayer/living/briefing) -"vEI" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - access_modified = 1; - dir = 2; - name = "\improper Field Surgery Equipment"; - req_access_txt = "20"; - req_one_access = null - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/lower_medical_medbay) "vFb" = ( /obj/structure/surface/table/almayer, /obj/item/attachable/lasersight, @@ -73445,17 +73707,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"vFh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/tool/wrench, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "vFv" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -73530,6 +73781,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHq" = ( +/obj/item/device/assembly/mousetrap/armed, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "vHs" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -73537,6 +73805,47 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"vHt" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "CIC Lockdown"; + name = "CIC Lockdown"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/obj/structure/machinery/door_control{ + id = "Hangar Lockdown"; + name = "Hangar Lockdown"; + pixel_x = -7; + pixel_y = 2; + req_access_txt = "1" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/obj/structure/machinery/door_control{ + id = "bot_armory"; + name = "Armory Lockdown"; + pixel_x = -7; + pixel_y = -5; + req_one_access_txt = "1;4" + }, +/obj/structure/transmitter/rotary/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) "vHO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -73789,6 +74098,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"vMC" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "vME" = ( /turf/open/floor/almayer{ dir = 9; @@ -74120,6 +74437,14 @@ icon_state = "cargo" }, /area/almayer/squads/delta) +"vTt" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "vTu" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -74232,6 +74557,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"vVh" = ( +/obj/item/weapon/dart/green, +/obj/structure/dartboard{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_f_p) "vVs" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -74501,6 +74833,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) +"vZJ" = ( +/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) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -74529,6 +74871,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"wbe" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item{ + layer = 3.03; + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/prop/helmetgarb/spacejam_tickets{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/prop/helmetgarb/spacejam_tickets{ + pixel_x = -8; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "wbh" = ( /obj/structure/machinery/light{ dir = 4 @@ -74694,6 +75055,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"wdv" = ( +/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) "wdz" = ( /obj/effect/landmark/start/marine/engineer/charlie, /obj/effect/landmark/late_join/charlie, @@ -74741,20 +75111,6 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) -"weB" = ( -/obj/item/tool/screwdriver{ - layer = 2.9; - pixel_x = -21; - pixel_y = -14 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "weC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -74882,16 +75238,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"whd" = ( -/obj/item/frame/light_fixture{ - anchored = 1; - desc = "A broken fluorescent tube light."; - dir = 8; - icon_state = "tube-broken"; - name = "broken light fixture" - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "whA" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/living/briefing) @@ -75191,6 +75537,14 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"wmz" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "wmE" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 4"; @@ -75258,16 +75612,6 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"wom" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "wos" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ density = 0; @@ -75360,27 +75704,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/stern_hallway) -"wqr" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = 29 - }, -/obj/structure/transmitter/rotary{ - name = "Reporter Telephone"; - phone_category = "Almayer"; - phone_id = "Reporter"; - pixel_x = -17; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "wqu" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -75458,6 +75781,31 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"wsP" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/item/prop/helmetgarb/gunoil{ + layer = 4.2; + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/prop/helmetgarb/gunoil{ + layer = 4.2; + pixel_x = -10; + pixel_y = 1 + }, +/obj/item/prop/helmetgarb/gunoil{ + layer = 4.2; + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/weapon/broken_bottle{ + pixel_x = 11; + pixel_y = -2 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "wsR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -75565,18 +75913,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"wvl" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - access_modified = 1; - dir = 2; - name = "\improper Security Checkpoint"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/briefing) "wvI" = ( /obj/item/paper_bin/uscm{ pixel_y = 7 @@ -75608,6 +75944,18 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) +"wwk" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/item/stack/folding_barricade, +/obj/item/stack/sheet/mineral/uranium{ + layer = 2.99 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "wwr" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -75617,6 +75965,15 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"wwu" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "wwD" = ( /obj/structure/bed/chair/comfy/orange, /turf/open/floor/almayer{ @@ -75730,16 +76087,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"wyK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silvercorner" - }, -/area/almayer/shipboard/brig/cic_hallway) "wyO" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -75791,6 +76138,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_medbay) +"wAd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -75802,6 +76156,15 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"wAU" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/structure/sign/poster/music{ + pixel_x = -27 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "wBY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -75861,12 +76224,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"wDl" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "wDm" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -76061,12 +76418,6 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"wGI" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/port_missiles) "wGX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -76074,6 +76425,25 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/auxiliary_officer_office) +"wHj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/prop/ice_colony/tiger_rug{ + desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; + icon_state = "HotlineAlt"; + layer = 2.9; + name = "Richard the tiger" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "emerald" + }, +/area/almayer/living/port_emb) "wHo" = ( /turf/open/floor/almayer{ icon_state = "emerald" @@ -76303,6 +76673,12 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"wLV" = ( +/obj/structure/bed/chair/comfy/charlie, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "wMm" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -76442,6 +76818,16 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wQa" = ( +/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) "wQg" = ( /turf/open/floor/almayer{ dir = 1; @@ -76647,28 +77033,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"wUD" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 16 - }, -/obj/structure/prop/almayer/computers/sensor_computer3, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "wUN" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ @@ -76725,25 +77089,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 @@ -76792,9 +77137,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"wVK" = ( -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "wVP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -76858,6 +77200,14 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"wWJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "wWL" = ( /obj/item/tool/screwdriver, /obj/structure/platform_decoration{ @@ -76901,12 +77251,14 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"wXv" = ( -/obj/structure/prop/invuln/joey, +"wXh" = ( +/obj/structure/machinery/floodlight/landing{ + name = "bolted floodlight" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, -/area/almayer/hull/lower_hull/l_m_s) +/area/almayer/lifeboat_pumps/north2) "wXH" = ( /obj/structure/bed/chair{ dir = 1 @@ -77200,23 +77552,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) -"xeP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/spacecash/c10{ - pixel_x = 6 - }, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/turf/open/floor/almayer, -/area/almayer/living/grunt_rnr) "xfc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/cryo{ @@ -77343,24 +77678,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"xgM" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 16 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_m_p) "xgS" = ( /obj/structure/largecrate/supply/supplies/mre{ desc = "A supply crate containing everything you need to stop a CLF uprising."; @@ -77431,6 +77748,13 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) +"xiz" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_s) "xiC" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -77441,6 +77765,16 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engine_core) +"xjb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + access_modified = 1; + name = "\improper Main Kitchen"; + req_one_access_txt = "30;19" + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/almayer/living/grunt_rnr) "xjw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -77516,16 +77850,13 @@ "xkd" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cells) -"xkw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"xkC" = ( +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" + dir = 8; + icon_state = "emerald" }, /area/almayer/hallways/port_hallway) "xlk" = ( @@ -77686,28 +78017,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{ @@ -77773,12 +78082,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"xqg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "xqp" = ( /obj/structure/machinery/body_scanconsole{ dir = 8; @@ -77822,6 +78125,11 @@ }, /turf/closed/wall/almayer, /area/almayer/command/securestorage) +"xqM" = ( +/obj/structure/platform, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "xqS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -77887,20 +78195,12 @@ icon_state = "cargo" }, /area/almayer/hallways/vehiclehangar) -"xtC" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_one_access = null; - req_one_access_txt = "30;19" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, +"xtg" = ( +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "redfull" }, -/area/almayer/living/grunt_rnr) +/area/almayer/command/cic) "xtD" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -77918,6 +78218,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"xub" = ( +/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) "xuc" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -78091,19 +78402,6 @@ /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"xwv" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = -27; - serial_number = 11 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "xwG" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -78268,6 +78566,12 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"xyE" = ( +/obj/structure/toilet{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_a_s) "xyY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -78296,6 +78600,17 @@ }, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_a_p) +"xzp" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "xzu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -78464,6 +78779,22 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"xDQ" = ( +/obj/structure/platform, +/obj/item/trash/USCMtray{ + pixel_y = 4 + }, +/obj/item/trash/USCMtray{ + pixel_y = 6 + }, +/obj/item/trash/USCMtray{ + pixel_y = 8 + }, +/obj/item/trash/USCMtray{ + pixel_y = 10 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "xEc" = ( /turf/open/floor/almayer{ dir = 9; @@ -78794,22 +79125,13 @@ /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) "xMh" = ( -/obj/structure/closet/crate{ - desc = "One of those old special operations crates from back in the day. After a leaked report from a meeting of SOF leadership lambasted the crates as 'waste of operational funds' the crates were removed from service."; - name = "special operations crate" +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 }, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, +/obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -78844,15 +79166,6 @@ "xMs" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_two) -"xMt" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/squads/req) "xMA" = ( /obj/structure/machinery/computer/med_data, /obj/structure/sign/safety/terminal{ @@ -78868,12 +79181,6 @@ dir = 6 }, /area/almayer/command/cic) -"xMK" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) "xML" = ( /obj/structure/machinery/computer/cameras/wooden_tv/prop{ pixel_x = -4; @@ -78986,19 +79293,19 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"xPg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "xPE" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"xPR" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "xPZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -79327,14 +79634,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"xUV" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "xVc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -79529,6 +79828,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) +"xZf" = ( +/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) "xZz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/command/capt, @@ -79659,13 +79965,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"ybV" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "ybZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/transmitter{ @@ -79857,6 +80156,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"yeX" = ( +/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) "yfm" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -79873,6 +80179,15 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"yfw" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/starboard_hallway) "yfy" = ( /obj/structure/surface/table/almayer, /obj/item/trash/crushed_cup, @@ -79925,6 +80240,22 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"ygK" = ( +/obj/structure/prop/almayer/computers/sensor_computer3, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) +"ygM" = ( +/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) "yhI" = ( /turf/open/floor/almayer{ dir = 4; @@ -80046,6 +80377,13 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"ykF" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hull/lower_hull/l_m_s) "ykP" = ( /obj/structure/filingcabinet{ density = 0; @@ -80095,21 +80433,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ylm" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Dorms" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/port_emb) "ylJ" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -90969,7 +91292,7 @@ eZH ohJ thL thL -tjU +aHT liZ rUk jVa @@ -91160,7 +91483,7 @@ gaJ gaJ tRA lMc -gjL +ffV cMl oeB rkL @@ -91551,9 +91874,9 @@ pCi rPC rwS lrq -kTc +fFq uqo -wVw +rhD cqn gTx eRL @@ -91754,9 +92077,9 @@ ahE rPC nfI lrq -omu +eTx uqo -sYB +hGa cqn ldu eRL @@ -91957,9 +92280,9 @@ ahE rPC heV lrq -frJ +lCn uqo -ktn +xub cqn nBb mdS @@ -92160,9 +92483,9 @@ ahE wcn nBc lrq -vsI +ebt uqo -xoS +lLN lrq mAT lrq @@ -92363,7 +92686,7 @@ pCi wcn wcn lrq -mAr +yeX uqo fsT jnA @@ -92566,7 +92889,7 @@ pCi oCL wcn lrq -uZY +ebz uqo uqo uqo @@ -92769,7 +93092,7 @@ pCi rPC aou lrq -mAr +yeX uqo uvy tfO @@ -94323,7 +94646,7 @@ bSv aIX aIX bSv -ehZ +oES eXo vRz aag @@ -94998,9 +95321,9 @@ adG adG adG adG -bsf -fwF -dav +gqq +iCz +aFN rPC rPC kDb @@ -95036,7 +95359,7 @@ mnm kIV wNU kIV -alv +mrB tuA tuA tuA @@ -96651,13 +96974,13 @@ vGA uwN pYX xuZ -wyK -elh -rzM -aBN -fQS -bVr -bVr +pcj +hXm +fZq +dVm +qkb +vnY +vnY bpd bqT vZv @@ -96853,8 +97176,8 @@ awz vSN mPj rWs -iVY -odM +inh +ewr lPC mgy wWT @@ -96925,7 +97248,7 @@ aaa nXP ndx uNL -nDd +eRt soS sgy nsu @@ -97128,9 +97451,9 @@ aaa nXP hJp uNL -gka +lUv bwQ -oNf +gUr uNL aNw kXJ @@ -97269,7 +97592,7 @@ vcK mBA kCi kCi -wGI +kCi kCi vmW nIE @@ -97365,8 +97688,8 @@ baH fVz bHB bBN -qif -vDh +bcm +vVh kCT kCT kCT @@ -97472,7 +97795,7 @@ ukU bfP fvv vcK -vcK +wAd tuA tuA tuA @@ -98670,9 +98993,9 @@ wVW wVW wVW swH -ayy +ucz wVW -aBV +sSG sEM wVW wVW @@ -98871,13 +99194,13 @@ apo fHh wVW lZs -gHl +lVX sni ayz dAX aQg vpV -eSV +snI aGp wVW aDv @@ -100498,7 +100821,7 @@ wVW rOC soX azX -aAD +vHt aCb aDv aEC @@ -100897,7 +101220,7 @@ sBF amY vtT wVW -abQ +nww atN cEl sOi @@ -101100,9 +101423,9 @@ agj aic aov wVW -atx +qyJ qEk -ajm +ksv wVW arP alX @@ -101114,7 +101437,7 @@ hkG wVW fvB qEk -auR +aGi wVW aKn aKz @@ -101303,7 +101626,7 @@ agj aic aov wVW -atx +qyJ qEk ato wVW @@ -101317,7 +101640,7 @@ aEB wVW fvB qEk -auR +aGi wVW aKn aKz @@ -101506,7 +101829,7 @@ agj aic aov wVW -ssW +nbr qEk hrm wVW @@ -101520,7 +101843,7 @@ aEC wVW dNZ qEk -mtX +xZf wVW aKn aKz @@ -101698,7 +102021,7 @@ cnX lIh agj mXj -afo +tQM lue ahw aiG @@ -101709,7 +102032,7 @@ agj aic aoA wVW -atx +qyJ jvX ato wVW @@ -101721,9 +102044,9 @@ alX aIf aED wVW -ryR +xtg jvX -auR +aGi wVW aKn aKy @@ -103520,7 +103843,7 @@ awW add add add -add +juf add add add @@ -103566,7 +103889,7 @@ baw aJU aJU aJU -wDl +hey aJU aJU aJU @@ -103717,7 +104040,7 @@ bdH aaC abs adq -qcq +dpo ajI add add @@ -103775,7 +104098,7 @@ gjq aJU aJU tiW -eMn +msg pgD tQV aaC @@ -103923,13 +104246,13 @@ adq jWH ajI add -auJ +fsU aHU aTm awW aTm jgF -auJ +fsU add ajI add @@ -103969,13 +104292,13 @@ aJU aJU tiW aJU -lqZ +gBW ouQ iun baw vPm qys -lqZ +gBW aJU tiW pUe @@ -104150,7 +104473,7 @@ umS yjM qbO aqw -hnI +qRL bYe amO wZM @@ -104532,13 +104855,13 @@ adq add ajI add -auJ +fsU aHU aTm awW aTm jgF -auJ +fsU add ajI add @@ -104578,13 +104901,13 @@ aJU aJU tiW aJU -lqZ +gBW ouQ vbB baw tBq qys -lqZ +gBW aJU tiW aJU @@ -104941,7 +105264,7 @@ aoC add add add -add +juf add add add @@ -104987,7 +105310,7 @@ baw aJU aJU aJU -aJU +eyv aJU aJU aJU @@ -105770,7 +106093,7 @@ aiX aiX aiX sHM -kUh +otK aiX aiX aiX @@ -108407,7 +108730,7 @@ dtM akU ajC sqf -anp +wQa wjz fnA jZY @@ -108610,7 +108933,7 @@ dtM aii ajC sqf -sOZ +udb oNJ eDo eDo @@ -108813,7 +109136,7 @@ dtM ajt aik sqf -anq +eTh awn xsz jTj @@ -109016,11 +109339,11 @@ dtM aii ajC sqf -anr +vZJ awn tEi -asu -hbI +iWb +ygM sqf ajl vtx @@ -110338,7 +110661,7 @@ iMI rlZ rlZ rlZ -vEI +qep cnr qqK qqK @@ -110540,7 +110863,7 @@ kan avW bZn dXr -tUv +uay vhX gDW rlZ @@ -110981,7 +111304,7 @@ uaa uaa fiq oed -uqH +oDf yhQ ajZ bdH @@ -111086,11 +111409,11 @@ eGz csz czu aaa -aaa -aaa -aaa -aaa -aaa +aac +aaf +aaf +aaf +ajY aaa aaa aaa @@ -111111,15 +111434,15 @@ aaa aab aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -111187,13 +111510,13 @@ oed oed yhQ ajZ -bdH -aaa -aaa -aaa -aaa -aaa aaa +avo +avo +avo +avo +avo +avo aaa aaa aaa @@ -111216,14 +111539,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111289,13 +111612,13 @@ vGk csz czu aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aag +aag +aag +aag +aaf +ajY aaa aaa aaa @@ -111314,15 +111637,15 @@ aaa aab aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -111387,10 +111710,17 @@ bJt bJt bJt oed -oDf +eHf yhQ ajZ -bdH +avo +avo +avs +avs +avs +avs +avo +avo aaa aaa aaa @@ -111399,34 +111729,27 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(155,1,1) = {" aaa aaa +aab aaa aaa aaa -aab +bdH +bdH +aaa aaa aaa -"} -(155,1,1) = {" aaa aaa -aab aaa aaa aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH aaa aaa aaa @@ -111491,14 +111814,14 @@ qVM vGk ofs czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -111517,8 +111840,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -111582,7 +111905,7 @@ gSk bDs bDs bDs -jip +xjb fbo duo iIl @@ -111590,10 +111913,17 @@ bDs ujV bJt oed -bxX +oed yhQ ajZ -bdH +avo +avs +avs +hAG +vtr +avs +avs +avo aaa aaa aaa @@ -111602,34 +111932,27 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(156,1,1) = {" aaa aaa +aab aaa aaa aaa -aab +bdH +bdH +aaa aaa aaa -"} -(156,1,1) = {" aaa aaa -aab aaa aaa aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH aaa aaa aaa @@ -111694,14 +112017,14 @@ qVM vGk csz czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -111720,8 +112043,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -111793,10 +112116,17 @@ hAz fhQ bJt vhI -oDf -yhQ -ajZ -bdH +oed +avo +avo +avo +avs +rKn +awa +awa +umm +avs +avo aaa aaa aaa @@ -111805,34 +112135,27 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(157,1,1) = {" aaa aaa +aab aaa aaa aaa -aab +bdH +bdH +aaa aaa aaa -"} -(157,1,1) = {" aaa aaa -aab aaa aaa aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH aaa aaa aaa @@ -111897,14 +112220,14 @@ qVM csz qVM czu -aaa -aac -aaf -aaf -aaf -ajY -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ bdH bdH aaa @@ -111923,8 +112246,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -111987,7 +112310,7 @@ nFI qdk vzP bJt -fEo +hjB bJt dpn bDs @@ -111997,16 +112320,16 @@ pdt bJt kTq oed -yhQ -ajZ -aaa -avo -avo -avo -avo -avo +lpy +avC +avC +wEg +axa +axa +dSZ +oMs +avs avo -aaa bdH aaa aaa @@ -112028,14 +112351,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112087,7 +112410,7 @@ awE bqy bYj eUR -bsd +gEI nDh bYj xne @@ -112100,14 +112423,14 @@ qVM hoX qVM czu -aaa -aad aag aag aag aag -aaf -ajY +aag +aag +aag +ajZ bdH bdH aaa @@ -112126,8 +112449,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -112199,16 +112522,16 @@ reL wiI bJt nnr -eHf -yhQ -ajZ +eep +avo avo avo avs +awa +awa +awa +qUp avs -avs -avs -avo avo bdH aaa @@ -112231,14 +112554,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112303,7 +112626,7 @@ qVM csz qVM czu -aaf +aah aag aag aag @@ -112329,8 +112652,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -112402,14 +112725,14 @@ bDs vwI bJt koz -oed +oDf yhQ ajZ avo avs avs -hAG -vtr +loK +wpg avs avs avo @@ -112434,14 +112757,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bdH aaa aaa @@ -112506,14 +112829,14 @@ qVM vGk csz czu +aaa +aad aag aag aag aag -aag -aag -aag -ajZ +aah +afm bdH bdH aaa @@ -112532,8 +112855,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -112605,17 +112928,17 @@ bDs oMd bJt oDf -oed -avo +uqH +yhQ +ajZ avo avo avs -rKn -awa -awa -umm +avs +avs avs avo +avo bdH aaa aaa @@ -112637,14 +112960,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bdH bdH aaa @@ -112709,14 +113032,14 @@ qVM vGk csz czu -aag -aag -aag -aag -aag -aag -aag -ajZ +aaa +aae +aah +aah +aah +afm +aaa +aaa bdH bdH aaa @@ -112735,8 +113058,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -112808,17 +113131,17 @@ bDs pdt bJt sIx -oed -lpy -avC -avC -wEg -axa -axa -dSZ -oMs -avs +bxX +yhQ +ajZ +aaa +avo avo +avo +avo +avo +avo +aaa bdH aaa aaa @@ -112840,14 +113163,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bdH aaa aaa @@ -112912,14 +113235,14 @@ qVM vGk ofs czu -aag -aag -aag -aag -aag -aag -aag -ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH aaa @@ -112938,8 +113261,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -113011,17 +113334,17 @@ bDs knK bJt oed -eep -avo -avo -avo -avs -awa -awa -awa -qUp -avs -avo +vgQ +yhQ +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa @@ -113043,14 +113366,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bdH aaa aaa @@ -113115,14 +113438,14 @@ csz vGk csz czu -aah -aag -aag -aag -aag -aag -aag -ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH aaa @@ -113141,8 +113464,8 @@ aaa aab aaa aaa -aaa -aaa +bdH +bdH bdH bdH bdH @@ -113175,27 +113498,27 @@ aQF aLG aYO aLG -bCf +tda ngI dkq lRZ -wvl +acc beH beH dwl bdd bdd -ukW +gac bdd bdd aMt beH beH -wvl +acc qby btY bAJ -dGW +huU buH bHL buH @@ -113214,17 +113537,17 @@ ljG tSp bJt oed -oDf +sHg yhQ ajZ -avo -avs -avs -loK -wpg -avs -avs -avo +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa @@ -113246,14 +113569,14 @@ aaa aaa bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bdH aaa aaa @@ -113318,14 +113641,14 @@ qVM csz qVM czu -aaa -aad -aag -aag -aag -aag -aah -afm +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH aaa @@ -113406,7 +113729,7 @@ bJt wbC lHu oiL -loY +qBM wXI nUd lkd @@ -113417,17 +113740,17 @@ oDE bJt bJt oed -uqH +oDf yhQ ajZ -avo -avo -avs -avs -avs -avs -avo -avo +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa @@ -113457,7 +113780,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa ahx @@ -113521,14 +113844,14 @@ qVM hoX qVM czu -aaa -aae -aah -aah -aah -afm -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH aaa @@ -113608,8 +113931,8 @@ bCj rde vjC iMm -xeP -fSG +mJi +iMm iMm mkc bJt @@ -113620,17 +113943,17 @@ luS bJt iGg oed -bxX +oDf yhQ ajZ -aaa -avo -avo -avo -avo -avo -avo -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa @@ -113660,7 +113983,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa lYA @@ -113768,18 +114091,18 @@ aKW aSm aSm hhw -baY -bfb -bNz +beG dIR yky +bfb +baY hhw -xnY -xnY +aLF +bPV +yaG +bPU aSm -aLf -aLf -soZ +bPS hhw bwd auv @@ -113808,31 +114131,31 @@ bCh bCi bCo bCi +ejw +xML +iMm +jSy +wGb +iMm +rjn bJt -hzP -vdU -owN -vdU -vdU -jjK -lkd wUX bDs gSk vSp -xtC +lHG qgH oDf oDf yhQ ajZ bdH -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -113856,16 +114179,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa bdH -aaa -aaa +bdH +aac +aaf +aaf +aaf +aaf +aaf +aaf +aaf lYA aiS aao @@ -113915,7 +114238,7 @@ rne rne fAo awE -bhM +knT wQv bBi awE @@ -113927,14 +114250,14 @@ qVM vGk csz czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +ajY aaa aaa aaa @@ -113959,66 +114282,66 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -aaa -bdH -aad +aac +aKW +aKW +aKW +aKW +aKW +aKW +aKW aKW aSm aLf hhw -beG -bgF -jQA -bgF -kvN -hhw -aSm -aLf -aSm -aSm -aLf -aSm -hhw +beI +bTQ +tBP +jfm +lYu +maw +fAS +jfm +lzn +eDz +jfm +jfm +bUP aLG aYO aLG -bCf +tda mng wTm wCI -wvl +acc beH beH beH -wvl +acc mng wTm wCI -wvl +acc beH beH beH -wvl +acc mng wTm wCI -bCf +tda buH bHL buH -ejw -qyK -vdU -owN -vdU -vdU -pJb -lkd +bJt +swE +wpI +ocm +wpI +wnL +kHd +bJt hSw qxE rui @@ -114026,16 +114349,16 @@ vSp bJt wuH oed -vgQ +uqH yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa +yhQ +yhQ +yhQ +yhQ +yhQ +yhQ +yhQ +ajY aaa aaa aaa @@ -114059,16 +114382,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa bdH -aaa -aaa +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA aiT aap @@ -114130,14 +114453,14 @@ qVM oLw csz czu -aaa -aaa -aaa -aaa -aaa -aaa -bdH -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -114162,32 +114485,32 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -aaa -bdH -aad aKW -uDB +aKW +bPU +lLV +aLf +aLf +aLf +jiX +aSm +aSm aLf ahU -beI -bTQ -qoX -jfm -lYu -maw -fAS -jfm -jfm -fAS -jfm -jfm -bUP -aem +aLf +fza +kat +uJB +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +teH mUa xNB bdd @@ -114200,7 +114523,7 @@ fUA qYZ bdd vuA -tXG +fnx vuA bdd qCc @@ -114213,32 +114536,32 @@ vuA bdd bSj bHL -buH -ejw -xML -vdU -jcl -iHO -vdU -rjn -bJt -bJt +bIR +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd bJt cDC -oWX +vuF bJt bJt +oed +oDf +oDf +oDf +qNy +cLV +oDf +oDf oDf -sHg yhQ -ajZ -bdH -bdH -aaa -aaa -aaa -aaa -aaa +yhQ aaa aaa aaa @@ -114262,16 +114585,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa bdH -aaa -aaa +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA aiU aap @@ -114322,7 +114645,7 @@ rne wft awE hpf -byY +pbl igp awE hoX @@ -114333,14 +114656,14 @@ qVM vGk ofs czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -114365,32 +114688,32 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -aaa -bdH -aad aKW +bPV +aLf +xlD aSm +aSm +aSm +aLf +aLf +aLf aMs hhw -beO -bgH +pgt +ykF bgH -bgH -bPV -hhw -aLF -bPV -lGO -oDu -bPU -bPS -hhw -irI +uVb +bdd +pfe +wsP +izr +aSh +ccF +tGG +tGG +bdg +aLG awb aLG bdg @@ -114417,31 +114740,31 @@ bdg buH hOR buH -bJt -swE -wpI -ocm -wpI -wnL -kHd -bJt -bJt +bdg +sNI +wAU +diw +csG +sNI +wNT +wbe +bdd qXo feq loY aDU bJt +oed +oDf +oed +oDf +mOU +oDf +oDf +oed +oed oDf -vFh yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -114465,16 +114788,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa bdH -aaa -aaa +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA aiZ aap @@ -114536,14 +114859,14 @@ qVM noV csz czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -114568,31 +114891,31 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -aaa -bdH -aad aKW -bhC aSm -hhw -bfa -bHM -bWy -iGE -nsY +aLf nsY nsY +pRT nsY nsY nsY nsY nsY nsY +hhw +hhw +umv +hhw +bdd +bqZ +kbV +tGG +tGG +tGG +tGG +tGG +bdg aLG aYO aLG @@ -114620,31 +114943,31 @@ bdg buH bHL buH +bdg +sNI +sNI +sNI +sNI +dkH +cKX +bqZ +bdd +tLc +rsM +iMm +hTT nsY nsY +nik nsY nsY nsY nsY nsY nsY -nsY -tLc -rsM -iMm -hTT -bJt +upt oDf -jRn yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -114668,16 +114991,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA adf aao @@ -114739,14 +115062,14 @@ iid csz qVM czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -114771,31 +115094,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -aad aKW aLf aSm -hhw -hhw -hhw -hhw -hhw nsY xWT -rSW +kxd jgk nsY rSG -rSW +wWJ oqS nsY +lhu +btk +aSm +eoM +bdd +vTt +kbV +tGG +tGG +tGG +tGG +tGG +bdg aLG aYO aLG @@ -114823,31 +115146,31 @@ bdg buH bHL buH +bdg +sNI +csG +sNI +sNI +gNi +wNT +cab +bdd +hxZ +rsM +iMm +gzV nsY xWT -rSW +kxd viu nsY rSG -whd +qkP oqS nsY -hxZ -rsM -iMm -gzV -bJt oDf -oed +oDf yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -114871,16 +115194,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA fZF aWs @@ -114942,14 +115265,14 @@ qVM hoX qVM czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -114974,31 +115297,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -aad aKW aLf aSm -hhw -fJA -btk -xwv -eVy nsY xWT -wVK +kxd viu nsY iIP -wVK +nna dDt nsY +xiz +aSm +aSm +kOf +bdd +bDQ +kbV +tGG +okB +tGG +crK +tGG +bdg beB aYT beB @@ -115026,31 +115349,31 @@ bCx buH bHL buH +bdg +sNI +sNI +sNI +sNI +eCS +xqM +udV +bdd +hTf +rsM +oos +sBL nsY xWT -efa +rfT viu nsY dmR -wVK +kxd dDt nsY -hTf -rsM -oos -sBL -bJt -pzi -uNW +oDf +oed yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -115074,16 +115397,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +aad +aag +aag +aag +aag +aag +aag +aag lYA aar aar @@ -115145,14 +115468,14 @@ qVM csz qVM czu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aag +aag +aag +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -115177,33 +115500,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -aad aKW -rsj -sxe -iQL -glr -mhl +aLa aSm -ylY nsY -nNT -fBA -fSF +gsg +vHq +vvY nsY -lmW -mtS -iKa +pPV +umY +npB nsY -aLG -aZi +glr +mhl +aSm +ylY +bdd +bqZ +qgw +beH +qMR +vlR +dRT +qin +pmv +tBF +fSK aLG nyw bqZ @@ -115227,33 +115550,33 @@ eBg vKe eVv bFu -pIX -buH -nsY -gwO -mtS -guG -nsY -lwA -mtS -iKa -nsY -tuo +omW +bFu +hLS +eBg +eBg +eBg +eBg +fOk +epq +bqZ +bdd +hTf rKO wGb gUf -bJt -ddG +nsY +gwM +bxC +pJD +nsY +iSm +bxC +jiU +nsY +oDf oed yhQ -ajZ -bdH -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -115380,22 +115703,9 @@ aaa aac aaf aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aag aKW -mRc aLf -hhw -jFe -sxe -xZI -mNZ +aSm nsY nsY qxC @@ -115405,6 +115715,19 @@ nsY ntx nsY nsY +jFe +sxe +xZI +mNZ +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd aLG awb aLG @@ -115432,6 +115755,19 @@ bdg buH hOR buH +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +tuo +rsM +oos +gUf nsY nsY iFM @@ -115441,22 +115777,9 @@ nsY gLZ nsY nsY -hTf -rsM -oos -gUf -bJt oDf -oed +uqH yhQ -aag -aaf -aaf -aaf -aaf -aaf -aaf -aaf aaf aaf ajY @@ -115584,20 +115907,7 @@ aad aKW aKW aKW -aKW -aKW -aKW -aKW -aKW -aKW -aKW -aKW aSm -vUi -hhw -xCN -pOB -hfk aLf nsY tUS @@ -115606,10 +115916,23 @@ wNl nGh fPp lqN -kjV +uoh nsY -aLG -awb +xCN +pOB +hfk +aLf +bdd +bqZ +kKL +aLJ +eBg +dAO +cEG +ckE +dYX +tBF +lBz aLG iuy bqZ @@ -115633,32 +115956,32 @@ beH bqZ bdg buH -hOR -buH +uXu +bFu +iUk +eBg +gkJ +eBg +eBg +mVZ +kTx +bqZ +bdd +hTf +wRO +iMm +gUf nsY aaq -lEL -tuv -eYv +wHj +qdv +uQo iQt uZo xmJ nsY -hTf -wRO -iMm -gUf -bJt -nBl -ndQ -yhQ -yhQ -yhQ -yhQ -yhQ -yhQ -yhQ -yhQ +oed +oDf yhQ yhQ yhQ @@ -115785,25 +116108,12 @@ aaa aaa aKW aKW -bPV -aSm -aSm -jiX -bPU bPT -uJo -aSm jiX aSm -aSm -aSm -hhw -nEA -lQu -lQu -aSm +aLf nsY -lru +kio sJY qJY qLH @@ -115811,6 +116121,19 @@ xTW oGP cnM nsY +nEA +lQu +lQu +aSm +bdd +bDQ +iWE +jUo +wmz +wmz +wwk +wmz +bdg aLG awb aLG @@ -115838,30 +116161,30 @@ bdg buH hOR buH +bdg +wLV +nza +wLV +wLV +wLV +ukA +bqZ +bdd +gKB +rsM +oos +gUf nsY mKJ -tIb +deT uAC rhQ pyc uMn ivz nsY -gKB -rsM -oos -gUf -bJt -oDf -oed -oed -sow oed oDf -oDf -oDf -laP -oDf oed oed yhQ @@ -115987,26 +116310,13 @@ aaa aaa aaa aKW -aLF -aLf -aLf -aLf -aSm +ygK aLf aLf aLf aLf -aLf -aSm -aLf -bPW -hhw -hhw -yfy -ugV -vUi -nsY -weB +heK +kam axc juD twW @@ -116014,6 +116324,19 @@ vHh pvh rgJ nsY +hhw +yfy +ugV +vUi +bdd +vTt +kbV +xzp +vEn +wmz +wmz +wmz +bdg aLG aYO bad @@ -116041,30 +116364,30 @@ bdd bGe bHL buH -nsY -eiN -gLu -eai -veI -xuQ -uPW -bKo -nsY +bdg +wLV +wLV +wLV +wLV +gKH +ldj +cab +bdd sOt cNX cdI sBL -bJt -oed -oDf -alm -hGZ +nsY +eiN +dVs +tat +kNC +xuQ +uPW +kYv +oDx +tbK tbK -hGZ -etB -hGZ -gpE -kHA tbK lNy oed @@ -116190,24 +116513,11 @@ aaa aaa aaa aKW -aSm +jwD aLf +uig hhw hhw -hhw -hhw -hhw -hhw -bPV -aLF -aSm -bzG -hhw -hhw -sSe -aLf -qce -aSm nsY wpz oEX @@ -116217,7 +116527,20 @@ xxm qSK ieu nsY -kfp +sSe +aLf +qce +aSm +bdd +bqZ +xPR +nIW +wmz +wmz +wmz +wmz +bdg +beB aYT beB beB @@ -116244,31 +116567,31 @@ bJz bJz bHT bJz +bdg +wLV +wLV +nMM +wLV +wLV +wNT +udV +bdd +pEl +roU +oos +uVh nsY kzK lFh -uzP +mus pVA mzV pML ivz nsY -pEl -roU -oos -uVh -bJt -aYU -bVt -wlp -aYU -bVt -fiq -fiq -fFz -fiq -fiq jZO +oDf +oed wlp ndQ yhQ @@ -116393,24 +116716,11 @@ aaa aaa aaa aKW -uDB +cSK +aSm aSm -hhw -bUc -bUc -bUc bUc -aLB -aLB -aLB -bbI -aLB -aLB -wXv -aLf -aLf -tRc -qEW +nSN nsY xgS dbn @@ -116420,6 +116730,19 @@ uRM ipe ehR nsY +aLf +aLf +tRc +qEW +bdd +gGo +mLb +wmz +vpt +kQU +wmz +wmz +bdg aLG aYO aLG @@ -116447,31 +116770,31 @@ buH buH bHL buH +bdg +gKH +cgz +vyU +wLV +wLV +xDQ +bXc +bdd +pcO +tJV +qoY +uCh nsY tXT -kOH +jJk wLG tyb sZH -tHc +rjV ivz nsY -pcO -tJV -qoY -uCh -bJt -bGb -bGb -cmb -bGb -bGb -fiq -xgM -eHq -uRI -ckD -wUD +fuY +sZF +vjD lFF ndM yhQ @@ -116598,22 +116921,9 @@ aaa aKW aLf aLf -hhw -bUc -bUc -bUc +xlD bUc -aLB -aWN -pyB -beB -bbU -aLB -aLB -aLB -aLB -aLB -aLB +vrB nsY nsY nsY @@ -116623,7 +116933,20 @@ nsY nsY nsY nsY -aLG +hhw +hhw +hhw +hhw +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +hDL aYO aNO aLG @@ -116649,34 +116972,34 @@ bdg buH bHa bHL -buH +bIR +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bdd +bJt +bJt +bJt +bJt nsY nsY nsY nsY -ylm +goy nsY nsY nsY nsY -bJt -bJt -bJt -bJt -bJt -bGb -mFM -bHW -kMU -fBx -fiq -hRg -oDf +gZG xMh -fiq -rNW +ril kRu -oDf +hXS yhQ aaa aaa @@ -116808,22 +117131,22 @@ hhw hhw aLB acF -akX -akX +heb cqa -bdp +bBh +aMV dRG -yiq -sBp aMV +yiq +kLp aMV bBh tCN -tCN -kNQ -awb -iLQ lDJ +tCN +tCN +yfw +tCN bBh aLG aLG @@ -116856,9 +117179,9 @@ buH buH cbD iZH -sDQ -hOR -xMK +xkC +njL +njL njL njL cbD @@ -116867,10 +117190,10 @@ bUM mYw iAT rdY -clR -eXE -gte -eXE +bUM +cbD +rGg +qtn kJV fiq fiq @@ -117011,20 +117334,20 @@ nHF cmE aLB nyG -aNO -uYO -xqg -bdq -aQt -aQt -aQt -aQt -aQt -sOm -aQt -aQt -aQt -wom +iDN +tit +nFV +tBL +tBL +tBL +tBL +tBL +tBL +mRS +tBL +tBL +tBL +tBL tBL tBL luz @@ -117054,13 +117377,13 @@ bqZ bdg buH bHa -mTk -hbx -hvp -keO -hbx -hbx -nob +wwu +buI +bFu +cbE +buI +buI +buI buI buI buI @@ -117070,10 +117393,10 @@ buI buI buI buI -feC -bFu -mFD -bHa +buI +rpd +fkO +bHY kro bGb uaa @@ -117214,10 +117537,10 @@ nHF nHF aLB csl -aQt -bbJ -csw -bdp +gjn +jJs +bBh +aMM aMM aNG bga @@ -117272,11 +117595,11 @@ ciU rOj bUd bUF -bUR clR -uqr -xkw -buI +clR +cbD +dQs +sFh guc bGb uaa @@ -117417,8 +117740,8 @@ nHF nHF jUx aLG -aNO -cmc +qmL +rZz jeb jeb jeb @@ -117479,7 +117802,7 @@ vra vra vra jJe -bHa +bHY buH vfo uaa @@ -117682,7 +118005,7 @@ mgF asX vra tfw -bHa +bHY sVf bGb uaa @@ -117824,7 +118147,7 @@ nHF aLB udF aNO -nVU +nLZ jeb obE tdE @@ -117884,8 +118207,8 @@ lpt qYQ ptj vra -lSO -bHa +mEb +bHY haT bGb uaa @@ -118025,9 +118348,9 @@ hhw hhw hhw aLB -rlG -aNO -nFy +dzF +dzF +dac jeb vlX thA @@ -118087,9 +118410,9 @@ cgo hQc asX vra -hNL -bHa -rLF +cwQ +vtB +tQo bGb fiq fiq @@ -118230,7 +118553,7 @@ cmE aLB enx aQt -xPg +oQj jeb vlX tdE @@ -118290,8 +118613,8 @@ lpt qYQ asX vra -mYZ -buI +ojR +tki lQQ bGb uaa @@ -118433,7 +118756,7 @@ nHF aLB ewo aNO -jJs +jLv jeb obE thA @@ -118494,7 +118817,7 @@ eBV ptj vra fsH -bHa +bHY pBn bGb uaa @@ -118636,7 +118959,7 @@ nHF cmC aLG aNO -jJs +uBw jeb vlX tdE @@ -118696,8 +119019,8 @@ lpt qYQ asX vra -mqc -ybV +pJJ +bHY buH cnd uaa @@ -120493,7 +120816,7 @@ rbY gwD bOK bPD -bYa +nSj bPD jOk bNB @@ -120696,7 +121019,7 @@ rbY bEc bKA bCA -bQS +gJs bCA bKA bEc @@ -120774,7 +121097,7 @@ aeA aeC aeC aeC -aeC +tpt aeC aeC aeC @@ -120822,7 +121145,7 @@ lJY vcE vcE vcE -vcE +oDO vcE vcE vcE @@ -120895,7 +121218,7 @@ bDY bCA bCA nLt -tJa +gmb bNQ bNQ bNQ @@ -121099,7 +121422,7 @@ bdj bri bLX bdl -rTY +kSU bNP bmD bNP @@ -121177,13 +121500,13 @@ acx aeC ajs aeC -asV +wXh ayn atr aeA aex ciw -asV +wXh aeC ydz ayb @@ -121225,13 +121548,13 @@ agJ sSl kkx vcE -mMu +kpo iMx tGi lJY bXe eyG -mMu +kpo vcE kUV vcE @@ -121299,7 +121622,7 @@ bkY bdl lOr lOr -bIu +iwI lOr bdl bEt @@ -121786,13 +122109,13 @@ acx umR ajs aeC -asV +wXh ayn atr aeA bXz ciw -asV +wXh aeC ajs qon @@ -121834,13 +122157,13 @@ vuv dHe kUV vcE -mMu +kpo iMx bXe lJY mzF eyG -mMu +kpo vcE kUV pPF @@ -122195,7 +122518,7 @@ amH aeC aeC aeC -aeC +tpt aeC aeC aeC @@ -122243,7 +122566,7 @@ kKR vcE vcE vcE -vcE +oDO vcE vcE vcE @@ -122327,8 +122650,8 @@ bxg bZr bNQ bNQ -xMt -bGz +bNQ +ohl hMs cbw iEb @@ -122530,8 +122853,8 @@ bxh bZr krN krN -oLg -oqY +krN +llt can buH iEb @@ -122637,9 +122960,9 @@ alG anG apf oIB -oIB -oIB -oIB +tSF +qyM +jog oIB sFR vuv @@ -122733,8 +123056,8 @@ bxg bZr ibc uly -moU -vbR +bNN +fXt pky cbv cbS @@ -122840,9 +123163,9 @@ alG aYD uPI oIB -fXE -kaS -aiQ +hJh +vMC +iUC oIB sFR vuv @@ -123043,9 +123366,9 @@ sUF anG apd oIB -wqr -hzb -xUV +ufS +bZw +kaJ oIB sFR hPo @@ -123140,7 +123463,7 @@ bZr bKA dyx eYr -bUo +iii uys cbz cbU @@ -123247,8 +123570,8 @@ aYD aTS qgK tEB -uBM -dXo +llD +gGl oIB lBR nVu @@ -123343,7 +123666,7 @@ bmD bKA dyx hGN -pVx +ddN uys ttM iEb @@ -123450,8 +123773,8 @@ anG mPX oIB wKF -bZw -ltU +fOh +diM oIB fbx cFA @@ -123538,7 +123861,7 @@ ycp bdl bdl rtj -fmf +agv bdl bdl bdl @@ -123652,9 +123975,9 @@ aSC aZH iAB oIB -phj -vEf -pxj +gqF +imW +qbh oIB fbx cxo @@ -123855,9 +124178,9 @@ rFY ctC gPF oIB -oIB -oIB -oIB +kUb +rJg +pxj oIB fbx gHg @@ -125877,8 +126200,8 @@ auu aoT aFm xBe -aIV -qqr +cij +jRZ arH xBe alG @@ -126051,7 +126374,7 @@ pVZ xlX psm psm -ahX +rzP psm psm fnZ @@ -126253,9 +126576,9 @@ aag pVZ xlX psm -aCu -aQA -bpf +nQg +szX +xyE psm eKD pBW @@ -126285,7 +126608,7 @@ anO nFX atv auV -amE +ift xBe alG aDZ @@ -126456,9 +126779,9 @@ aag pVZ yeP psm -aDf -aRk -brT +jdQ +bMY +hfy psm eKD nZF @@ -126488,7 +126811,7 @@ atc nFX atv auV -amE +ift xBe alG aYj @@ -126892,8 +127215,8 @@ atq aDr aFu xBe -azp -qJf +rwT +wdv anV xBe alG @@ -133568,7 +133891,7 @@ bdH bdH aad cuC -oIm +mJx rtd odb cuC @@ -133771,7 +134094,7 @@ bdH bdH cuC cuC -pLv +dqg rtd fcP cuC 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 eb4f5fdb6025..36c8e9abe717 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 f8b3028a68ff..7c5d633286f0 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -672,7 +672,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword/machete/arnold{ +/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" @@ -1271,36 +1271,36 @@ color = "#6b675e"; layer = 2.79 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 12 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 8 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 4 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -4 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -12 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -8 @@ -1883,24 +1883,24 @@ color = "#6b675e"; layer = 2.79 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore" }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; pixel_x = -5 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; pixel_x = 5 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; @@ -1955,7 +1955,7 @@ color = "#6b675e" }, /obj/item/storage/large_holster/katana, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -2246,7 +2246,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword/ceremonial, +/obj/item/weapon/sword/ceremonial, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm index 93392c6b7f5e..895e8ae84c91 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/maps/shuttles/escape_shuttle_e_cl.dmm b/maps/shuttles/escape_shuttle_e_cl.dmm index df10125c3a3a..490f0abdfa95 100644 --- a/maps/shuttles/escape_shuttle_e_cl.dmm +++ b/maps/shuttles/escape_shuttle_e_cl.dmm @@ -42,7 +42,7 @@ /turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "v" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ +/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison{ pixel_y = 30 }, /turf/open/shuttle/escapepod{ @@ -50,8 +50,9 @@ }, /area/shuttle/escape_pod) "y" = ( -/obj/structure/machinery/door/airlock/evacuation{ - name = "\improper Evacuation Airlock CL-1" +/obj/structure/machinery/door/airlock/evacuation/liaison{ + name = "\improper Evacuation Airlock CL-1"; + id_tag = "cl_evac" }, /turf/open/floor/almayer{ icon_state = "test_floor4" diff --git a/nano/templates/clan_menu.tmpl b/nano/templates/clan_menu.tmpl index 98ac3057a10a..cd987e9079f6 100644 --- a/nano/templates/clan_menu.tmpl +++ b/nano/templates/clan_menu.tmpl @@ -46,7 +46,7 @@ } #clan_list { - border-collapse: collapse; + border-collapse: collapse; width: 100%; } @@ -76,9 +76,6 @@

{{:data.clan_name}}

{{:data.clan_description}}
- {{if data.clan_honor != null}} -

Honor: {{:data.clan_honor}}

- {{/if}}
Extras
Emergency Response TeamEmergency Response TeamSurvivorSurvivorAgentAgent
{{if data.player_rename_clan}} @@ -111,7 +108,6 @@ - {{if data.player_modify_ranks}} {{/if}} @@ -128,7 +124,6 @@ - {{if data.player_rank_pos > keys.rank_pos}} {{if data.player_modify_ranks}} @@ -142,4 +137,4 @@ {{/if}} {{/props}} -
Name RankHonor {{:keys.name}} {{:keys.rank}}{{:keys.honor}}
{{:helper.link('Set Rank', '', { 'clan_target_href' : keys.player_id, 'clan_action': 'modifyrank' })}}
\ No newline at end of file + diff --git a/sound/effects/creak1.ogg b/sound/effects/creak1.ogg new file mode 100644 index 000000000000..0cad4802ffa9 Binary files /dev/null and b/sound/effects/creak1.ogg differ diff --git a/sound/effects/creak2.ogg b/sound/effects/creak2.ogg new file mode 100644 index 000000000000..707bf39e338e Binary files /dev/null and b/sound/effects/creak2.ogg differ diff --git a/sound/effects/creak3.ogg b/sound/effects/creak3.ogg new file mode 100644 index 000000000000..88ff37a339ed Binary files /dev/null and b/sound/effects/creak3.ogg differ diff --git a/sound/effects/Heart Beat Short.ogg b/sound/effects/heart_beat_short.ogg similarity index 100% rename from sound/effects/Heart Beat Short.ogg rename to sound/effects/heart_beat_short.ogg diff --git a/sound/items/whistle.ogg b/sound/items/whistle.ogg index 8e276d522669..3223f52cae36 100644 Binary files a/sound/items/whistle.ogg and b/sound/items/whistle.ogg differ diff --git a/strings/marinetips.txt b/strings/marinetips.txt index cf808884f1e5..416c9ef0a4dd 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -53,35 +53,51 @@ A misloaded OB can deviate severely from the intended target area - ensure you l The XO and CO are trained in Power Loader use and engineering, and can load the OB. You can change what your SL tracker beacon is tracking by right clicking on your headset and clicking "Switch Tracker Target". Boilers emit light - not every glow from around the corner is friendly! +The amount of items in Requisitions and Squad Preparations depend on how many players readied up at the start of the round. You can carry a variety of items inside your helmet - from gauze and cigarettes to flares and screwdrivers. CIC staff can track every USCM-aligned person via the suit sensors console and overwatch console - useful for finding escaped prisoners or dead marines. When the M7 RPG is fired, it creates a substantial shockwave behind it that can stun and harm marines standing too close. Watch your backblast! Remember that you need to put a defibrillator's paddles away in order to store it. -W-Y PMCs do not have marine IFF. Don't fire Smartguns through them! -To talk on multiple radio channels at once, put a COMMA [,] before your message and add up to four prefixes. E.g, ,abcd talks on all squad channels at once. +W-Y PMCs do not have marine IFF. Don't fire Smartguns at them! +To talk on multiple radio channels at once, put a COMMA [,] before your message and add up to four prefixes. E.g, ,abcd talks on the main four squad channels at once. Put .w or :w before your message to whisper. Another way to whisper is to use the verb "whisper" in the IC tab or command bar. For Vehicle Crewmen : it is often safer to repair the parts of your APC or tank inside the vehicle than outside it. It is almost always faster to do surgery manually than in the autodoc. To check your skills, go to the IC tab and click "view skills". +Minirockets pack the most punch per cost as far as CAS weaponry is concerned. The U7 underbarrel shotgun can instantly break down both resin doors and mechanical airlocks, and it's not bad at breaking walls down either. You can find breaching charges in Requisitions or the Squad Engineer vendor. They function like C4, but can be deployed and explode much quicker, and release powerful shrapnel on the opposite side. They require minor engineering knowledge, which can be obtained from pamphlets. Armor piercing ammunition does less damage to unarmored targets. +Requisitions may not grant you service if you are a 'pajamarine' : a marine in cryosleep attire. Be sure to dress up! You can insert empty pill bottles into ChemMasters before creating pills to have them automatically inserted. Nurses can practice a full range of surgeries on Professor DUMMY. Ask the gods to give you one if you see (or are) a nurse practicing. Drinks from the hot drinks machine warm you up. Be careful! Barricades block grenades, and indeed all thrown items, from the front if they're barbed up. +CAS Fire Missions doubles the accuracy of fired weapons, which can be substantial. Painkillers do not stack. Only the strongest has any effect. +Don't underestimate the mortar: with ammo and proper communication it can hit surprisingly hard. +You can shoot through tents, but they won't protect you much in return. +Reqs doesn't have an infinite budget. +Good Reqs can land supplies anywhere outside - given coords - and sometimes in a minimal amount of time. +A ‘point blank’ or ‘PB’ is a type of attack with a firearm where you click directly on a mob next to you. These attacks are not effected by accuracy allowing you to quickly fire with weapons like a shotgun to great effect. Intel Officers can be put in a squad by going to CIC and requesting it. Any marine can perform CPR. On dead marines, this will increase the time they have until they become unrevivable. If you've been pounced on and your squad is unloading into the target, you can hit the 'rest' button to stay down so you don't get filled with lead after getting up. You can check the landing zone as a marine in the status panel. +The Colonial Marshals may come to crack down on too heavy of a Black Market usage. Functioning night vision goggles can be recharged with batteries. Broken night vision goggles can be repaired by an Engineer with a screwdriver. Not the loadout ones though, those cannot be fixed. You can put a pistol belt on your suit slot. (Just grab a rifle instead.) Alt-clicking the Squad Leader tracker lets you track your fireteam leader instead. Armor has a randomized reduction in effectiveness, and does not protect the digits. Take the wiki damage values as a best-case scenario. You can click on your Security Access Tuner (multitool) in your hand to locate the area's APC if there is one. +Need help learning the game and these tips aren't enough? Use MentorHelp or try to get ahold of your ship's Senior Enlisted Advisor. Clicking on your sprite with help intent will let you check your body, seeing where your fractures and other wounds are. Armor has insulative properties - taking it off will help you cool off and take less damage faster if you've been set on fire. Both foldable cades & plasteel cades if loosened and folded down can be transported in crates! In this way, you can use the crate as a portable breach-repair kit, or dragged (or carried via Power Loader) to an unsecure area for quick defensive set up. The fuel tank pouch doesn't just carry fuel for an incinerator- they can also carry full-size extinguishers. Toolbelts & tool pouches also may hold miniature extinguishers. The M2C heavy machine gunner belt rig can also carry C4, breaching charges, and most tools. +You can always multitask as Medic, such as by using pills or healing kits at the same time as defibrillator. +The nuclear ordnance requires BOTH communication towers to be actively held to decrypt the nuclear codes. +ARES will periodically report the amount of available tech points on Command Channel. +The quick wield keys generally prioritize wieldable gear going from left to right on your inventory bar. +Orbital Bombardment warheads respect roofing and hive core protection. They won't hit inside of protected areas. diff --git a/strings/memetips.txt b/strings/memetips.txt index e05ac2f66bdb..abfe0872180c 100644 --- a/strings/memetips.txt +++ b/strings/memetips.txt @@ -12,17 +12,39 @@ Contrary to popular belief, turning off IFF as a Smartgunner does not actually i When playing as a Xenomorph, remember to aim for the groin to inflict additional psychological damage to marines. Never tell an officer that you're smarter than them - especially if it's true. There is no USS Sulaco. -There is no such thing as an Intel Officer. +There is no such thing as a Radio-Telephone Operator. There is no such thing as a techweb. +There is no such thing as a tip. +There is no such thing as a Fatty. +Dropship update is dropping tomorrow. +Don't forget your ceramic plates. Echo Squad does not exist. +Reqs should always spend all its resources on the Black Market. Foxtrot Squad DEFINITELY does not exist. +Intel Squad is a unicorn. Spec rolls are not actually random. +Watch out for Queen's charge ability. Never, ever attempt to correct a Provost about anything. If you die, make sure to ahelp so staff can restart the round! +You can obtain spec tokens by climbing outside the map and into space. There is no alcohol on Whiskey Outpost, other than in the Ground Commander's locker. Hitting enemies with weapons damages them. +Don't swap East and West. AGAIN. +Don't swap Minus and Positive coordinates... AGAIN. +OB'ing the FOB is always an option. +OB'ing the FOB is the best way to get some recognition from the aCO. +The sky erupts into flames right above you! This tip is a lie. +Stay hydrated. +Have a good day. +There is no tip. +These tips suck. Please write more. +This tip is not ready, please wait until next round. +Someone stole this tip, ask staff for a new one. If it's stupid but it works, it isn't stupid. If it's stupid but it works, it's still stupid and you got lucky. Corroders aren't real. They can't hurt you. ARES is not sentient. It has no feelings and its only thoughts are pre-programmed subroutines. +Remember that as Yautja HPCs are your primary weapons. +You can always bully staff into giving you more awesome tips. +Embrace the suck. diff --git a/strings/metatips.txt b/strings/metatips.txt index f694da02b5bf..a28c90239593 100644 --- a/strings/metatips.txt +++ b/strings/metatips.txt @@ -1,13 +1,22 @@ Remember hotkeys and macros can be customized to your liking. Hotkeys can be accessed in your preferences, and macros can be edited in the Byond macro editor, available in the top left drop down menu (click the Byond logo in the corner of the game window). -If you're unsure about a gameplay mechanic, use the 'mentorhelp' verb in the Admin tab to ask veteran players on the subject. +If you're unsure about a gameplay mechanic, use the 'mentorhelp' verb in the Admin tab to ask veteran players on the subject. It is also available from the pause menu, pressing ESCAPE. Try not to get too mad about dying. We’re all here to have fun. +You can get information on current TestMerges by pressing 'Show Server Revision' in 'OOC' tab. After dying, ask yourself what you did wrong and make a mental note to not make the same mistake again. Communication, be it from a marine to a marine, a drone to the queen, or command to everyone, is vital and information on flanks can change how the entire round plays out. As an alien or marine, be careful of the flank, regardless of if the push is going well or stalling out. Half of getting good is knowing to be aggressive. The other half is knowing when not to be aggressive. Alt-click a storage item to draw the last item in it (last non-weapon if it's a weapon belt). Middle-click a storage item to immediately open it, and middle-click structures to attempt to vault them. Use "North, South, West, East" when referring to locations in-game rather than "up, down, left, right". +As a mentor, you can become the imaginary friend of a new player to teach them! You shouldn't ignore what your allies are up to. Sometimes they can be organizing a flank in hivemind/radio, sometimes they can be walking up behind you with a slug-loaded shotgun. Either way, it pays to be alert to what they're doing, as much to as what the enemies are. The Wiki (https://cm-ss13.com/wiki) is a very useful repository of information about the game, such as weapons, equipment, xenomorph castes and their strains. It may not be fully up to date much of the time, but the basics are usually accurate. As an observer, you may see how much remaining hijack time is left in the status panel. -Embrace the suck. +You can always AdminHelp with the F1 key to question a member of staff regarding rules or game bugs. +As ghost you are given extra tools for spectating the round: you can jump and follow specific players, get notifications about CAS and OB strikes, can see all health bars, and such. +You can press ESC key to bring up the game pause menu. It allows you change settings, AdminHelp and MentorHelp, and even access the Web Maps of game by clicking at top right. +Dead? You can take that moment to 'Edit Characters' from Preferences or Escape menus, to flesh out your characters or change your settings. +Control of intelligence is important: be it for retrieving it as marine, or denying it as Xeno. +If the lobby music is too loud or bothering you, you can disable it in Preferences tab at top right. +Maps can and will be unpredictably modified by the Nightmare system - stay frosty while roaming around! +You can go to GitHub to view code of the game and propose modifications of your own. diff --git a/strings/xenotips.txt b/strings/xenotips.txt index 2ca2964ae2d5..8674146de655 100644 --- a/strings/xenotips.txt +++ b/strings/xenotips.txt @@ -32,5 +32,7 @@ You can join the hive as a living Facehugger by clicking on the hive's Eggmorphe Playable Facehuggers can leap onto targets with a one-second windup, but this will only infect them if they are adjacent to it. Otherwise, it will simply knock them down for a small duration. As a Facehugger, you cannot talk in hivemind, but you can still open Hive Status and overwatch your sisters. This can be useful if you're locating other Facehuggers, flanker castes, or trying to learn from experienced Facehugger players. Shift-clicking the Queen indicator will tell you what area you are in, on the map. +As a Ravager your abilities become greatly enhanced when you empower with three or more people around you. Resisting on a water tile will immediately put out fires. Make sure you're alone though - It's usually better to let a friendly Xenomorph pat you out than it is to expose yourself to open water. You can filter out the Xenomorphs displayed in hive status by health, allowing you to look only for wounded sisters. +Each xeno has their own ‘tackle counter’ on a marine. The range to successfully tackle can be anywhere from two to six tackles based on caste. If a marine gets stunned or knocked over by other means it will reset everyone's tackle counters and they may get up! diff --git a/tgui/packages/tgui/interfaces/Autodispenser.js b/tgui/packages/tgui/interfaces/Autodispenser.js index 0c8ce91512e5..5d029b72b894 100644 --- a/tgui/packages/tgui/interfaces/Autodispenser.js +++ b/tgui/packages/tgui/interfaces/Autodispenser.js @@ -11,7 +11,6 @@ export const Autodispenser = (_props, context) => { multiplier, cycle_limit, automode, - linked_storage, networked_storage, smartlink, outputmode, diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx index 6943c96a79fa..65a67524f5b4 100644 --- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx +++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx @@ -18,7 +18,6 @@ interface DropshipNavigationProps extends NavigationProps { door_status: Array; has_flight_optimisation?: 0 | 1; is_flight_optimised?: 0 | 1; - flight_configuration: 'flyby' | 'ferry'; can_fly_by?: 0 | 1; can_set_automated?: 0 | 1; primary_lz?: string; @@ -116,7 +115,7 @@ export const DropshipDestinationSelection = (_, context) => { ); return (
@@ -182,41 +181,6 @@ const DestinationSelector = (props: DestinationProps, context) => { ); }; -const FlybyControl = (props, context) => { - const { act, data } = useBackend(context); - return ( -
- {data.flight_configuration === 'flyby' && ( - - )} - {data.has_flyby_skill === 1 && data.flight_configuration === 'ferry' && ( - - )} - {data.has_flyby_skill === 1 && data.shuttle_mode === 'called' && ( - - )} - {data.has_flyby_skill === 1 && data.shuttle_mode === 'idle' && ( - - )} - - } - /> - ); -}; - export const TouchdownCooldown = (_, context) => { const { data } = useBackend(context); return ( @@ -317,14 +281,7 @@ const RenderScreen = (props, context) => { return ( <> {data.can_set_automated === 1 && } - {data.can_fly_by === 1 && - (data.shuttle_mode === 'idle' || data.shuttle_mode === 'called') && ( - - )} - {data.shuttle_mode === 'idle' && - data.flight_configuration !== 'flyby' && ( - - )} + {data.shuttle_mode === 'idle' && } {data.shuttle_mode === 'igniting' && } {data.shuttle_mode === 'pre-arrival' && } {data.shuttle_mode === 'recharging' && } diff --git a/tgui/packages/tgui/interfaces/EscapePodConsole.tsx b/tgui/packages/tgui/interfaces/EscapePodConsole.tsx index b4bc410a433d..8153008adbee 100644 --- a/tgui/packages/tgui/interfaces/EscapePodConsole.tsx +++ b/tgui/packages/tgui/interfaces/EscapePodConsole.tsx @@ -7,6 +7,7 @@ interface EscapePodProps { door_lock: 0 | 1; door_state: 0 | 1; can_delay: 0 | 1; + launch_without_evac: number; } export const EscapePodConsole = (_props, context) => { @@ -21,6 +22,9 @@ export const EscapePodConsole = (_props, context) => { case 4: statusMessage = 'NO EVACUATION'; buttonColor = 'neutral'; + if (data.launch_without_evac) { + operable = 1; + } break; case 5: statusMessage = 'SYSTEMS DOWN'; diff --git a/tgui/packages/tgui/interfaces/NavigationShuttle.tsx b/tgui/packages/tgui/interfaces/NavigationShuttle.tsx index 19ff7a0c7149..d262fa81dc3c 100644 --- a/tgui/packages/tgui/interfaces/NavigationShuttle.tsx +++ b/tgui/packages/tgui/interfaces/NavigationShuttle.tsx @@ -41,7 +41,7 @@ export const CancelLaunchButton = (_, context) => { export const LaunchButton = (_, context) => { const { act } = useBackend(context); - const [siteselection] = useSharedState( + const [siteselection, setSiteSelection] = useSharedState( context, 'target_site', undefined @@ -50,7 +50,10 @@ export const LaunchButton = (_, context) => { ); @@ -156,9 +159,15 @@ export const LaunchCountdown = (_, context) => { }; export const InFlightCountdown = (_, context) => { - const { data } = useBackend(context); + const { data, act } = useBackend(context); return ( -
+
act('cancel-flyby')}>Cancel + ) + }>
diff --git a/tgui/packages/tgui/interfaces/WorkingJoe.js b/tgui/packages/tgui/interfaces/WorkingJoe.js index 6881d731db1b..6e6372326d9a 100644 --- a/tgui/packages/tgui/interfaces/WorkingJoe.js +++ b/tgui/packages/tgui/interfaces/WorkingJoe.js @@ -870,24 +870,20 @@ const AccessTickets = (props, context) => { can_claim = 'No'; } let can_update = 'Yes'; - if (ticket.assignee !== logged_in) { - can_update = 'No'; - } else if (ticket.lock_status === 'CLOSED') { + if (ticket.lock_status === 'CLOSED') { can_update = 'No'; } let view_status = 'Ticket is pending assignment.'; let view_icon = 'circle-question'; - let update_tooltip = 'Update Access'; - if (ticket.status === 'assigned') { - view_status = 'Ticket is assigned.'; - view_icon = 'circle-plus'; - update_tooltip = 'Grant Access'; - } else if (ticket.status === 'rejected') { + let update_tooltip = 'Grant Access'; + if (ticket.status === 'rejected') { view_status = 'Ticket has been rejected.'; view_icon = 'circle-xmark'; + update_tooltip = 'Ticket rejected. No further changes possible.'; } else if (ticket.status === 'cancelled') { view_status = 'Ticket was cancelled by reporter.'; view_icon = 'circle-stop'; + update_tooltip = 'Ticket cancelled. No further changes possible.'; } else if (ticket.status === 'granted') { view_status = 'Access ticket has been granted.'; view_icon = 'circle-check'; @@ -902,19 +898,19 @@ const AccessTickets = (props, context) => { update_tooltip = 'Access self-returned. No further changes possible.'; } + let can_reject = 'Yes'; + if (can_update === 'No') { + can_reject = 'No'; + } + if (ticket.status !== 'pending') { + can_reject = 'No'; + } return ( - {!!ticket.priority_status && ( - - {ticket.id} - - )} - {!ticket.priority_status && ( - - {ticket.id} - - )} + + {ticket.id} + {ticket.time} @@ -929,18 +925,20 @@ const AccessTickets = (props, context) => {