diff --git a/.gitignore b/.gitignore index 210efc84d75b..105a74f3dbaf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ test_environment.txt # byond-tracy backend, not shipped with the codebase so it shouldn't be maintained prof.dll libprof.so + +code\__DEFINES\__rust_g.dm diff --git a/.tgs.yml b/.tgs.yml index ba3fc6b26c66..733fc80a74f1 100644 --- a/.tgs.yml +++ b/.tgs.yml @@ -3,6 +3,7 @@ byond: "514.1588" static_files: - name: config - name: data + - name: local.db linux_scripts: PreCompile.sh: tools/tgs_scripts/PreCompile.sh WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 97e4b0dbd1e8..4eba0bb90498 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -37,6 +37,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_KITCHEN 30 #define ACCESS_MARINE_CO 31 #define ACCESS_MARINE_TL_PREP 32 +#define ACCESS_MARINE_WALKER 33 #define ACCESS_MARINE_MAINT 34 #define ACCESS_MARINE_OT 35 diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm index 241bcb469622..0820c709cdae 100644 --- a/code/__DEFINES/conflict.dm +++ b/code/__DEFINES/conflict.dm @@ -26,7 +26,7 @@ #define AMMO_IGNORE_RESIST (1<<10) #define AMMO_BALLISTIC (1<<11) #define AMMO_IGNORE_COVER (1<<12) -// (1<<13) unused, previously was AMMO_SCANS_NEARBY +#define AMMO_ANTIVEHICLE (1<<13) #define AMMO_STOPPED_BY_COVER (1<<14) #define AMMO_SPECIAL_EMBED (1<<15) /// If the projectile hits a dense turf it'll do on_hit_turf on the turf just in front of the turf instead of on the turf itself diff --git a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm index 323e0ee6966c..9eff6fa3ddc8 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm @@ -116,3 +116,9 @@ #define COMSIG_MOB_MOUSEDRAG "mob_mousedrag" //from /client/MouseDrag(): (atom/src_object, atom/over_object, turf/src_location, turf/over_location, src_control, over_control, params) #define COMSIG_MOB_CLICK_CANCELED (1<<0) #define COMSIG_MOB_CLICK_HANDLED (1<<1) + +#define COMSIG_MOB_DEPLOYED_BIPOD "mob_deployed_bipod" +#define COMSIG_MOB_UNDEPLOYED_BIPOD "mob_undeployed_bipod" + +/// From /obj/item/proc/pickup() : (obj/item/picked_up) +#define COMSIG_MOB_PICKUP_ITEM "mob_pickup_item" diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm index b7bbca9f64a3..6c31b77f76a4 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -55,6 +55,11 @@ #define COMSIG_GUN_BURST_SHOTS_TO_FIRE_MODIFIED "gun_burst_shots_to_fire_modified" #define COMSIG_GUN_BURST_SHOT_DELAY_MODIFIED "gun_burst_shot_delay_modified" +#define COMSIG_GUN_VULTURE_FIRED_ONEHAND "gun_vulture_fired_onehand" +#define COMSIG_VULTURE_SCOPE_MOVED "vulture_scope_moved" +#define COMSIG_VULTURE_SCOPE_SCOPED "vulture_scope_scoped" +#define COMSIG_VULTURE_SCOPE_UNSCOPED "vulture_scope_unscoped" + /// from /obj/item/weapon/gun/proc/recalculate_attachment_bonuses() : () #define COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES "gun_recalculate_attachment_bonuses" diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 461eae27a2a3..ccfc9e4773da 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -233,6 +233,8 @@ #define SLOT_LEGS (1<<13) #define SLOT_ACCESSORY (1<<14) #define SLOT_SUIT_STORE (1<<15) //this allows items to be stored in the suit slot regardless of suit +/// Anything with this flag cannot be worn in suit storage, period. +#define SLOT_BLOCK_SUIT_STORE (1<<16) //================================================= //slots diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index eac5121f173e..ec9496009e86 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -76,9 +76,10 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST #define JOB_PILOT "Pilot Officer" #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief" #define JOB_CREWMAN "Vehicle Crewman" +#define JOB_WALKER "Mech Operator" #define JOB_INTEL "Intelligence Officer" #define JOB_AUXILIARY_ROLES /datum/timelock/auxiliary -#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL) +#define JOB_AUXILIARY_ROLES_LIST list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_INTEL) #define JOB_POLICE "Military Police" #define JOB_WARDEN "Military Warden" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index b55a1b7ce583..8904c0295abf 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -153,6 +153,8 @@ #define FULLSCREEN_BLIND_LAYER 17.15 /// pain flashes #define FULLSCREEN_PAIN_LAYER 17.2 +/// Vulture sniper/spotter scope +#define FULLSCREEN_VULTURE_SCOPE_LAYER 17.21 /// in critical #define FULLSCREEN_CRIT_LAYER 17.25 diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 6ca6a142beb2..a9475a27b07a 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -6,7 +6,7 @@ #define SHUTTLE_LOCK_COOLDOWN 10 MINUTES #define MONORAIL_LOCK_COOLDOWN 3 MINUTES #define SHUTTLE_LOCK_TIME_LOCK 1 MINUTES -#define EVACUATION_AUTOMATIC_DEPARTURE 10 MINUTES //All pods automatically depart in 10 minutes, unless they are full or unable to launch for some reason. +#define EVACUATION_AUTOMATIC_DEPARTURE (10 MINUTES) //All pods automatically depart in 10 minutes, unless they are full or unable to launch for some reason. #define EVACUATION_ESTIMATE_DEPARTURE ((evac_time + EVACUATION_AUTOMATIC_DEPARTURE - world.time) * 0.1) #define EVACUATION_STATUS_STANDING_BY 0 @@ -109,12 +109,12 @@ //================================================= //Role defines, specifically lists of roles for job bans, crew manifests and the like. -var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) +var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN) //Marine roles -#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) +#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO) -var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) +var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT) var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH) var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH) @@ -125,7 +125,7 @@ var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MAR //Groundside roles var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH) -var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR) +var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR, JOB_WALKER) var/global/list/ROLES_SPECIAL = list(JOB_SURVIVOR) var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES - ROLES_WO @@ -138,7 +138,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE) var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER) //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc. -#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\ +#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\ JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index fdd1a8f083ad..8a2ad0b4f7d5 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -51,12 +51,14 @@ #define SKILL_SPEC_GRENADIER 5 /// Can use heavy flamers #define SKILL_SPEC_PYRO 6 +/// Can use Heavy-Shield and N45 +#define SKILL_SPEC_ST 7 /// Can use smartguns -#define SKILL_SPEC_SMARTGUN 7 +#define SKILL_SPEC_SMARTGUN 8 /// UPP special training -#define SKILL_SPEC_UPP 8 +#define SKILL_SPEC_UPP 9 /// Can use ALL specialist weapons -#define SKILL_SPEC_ALL 9 +#define SKILL_SPEC_ALL 10 //construction skill #define SKILL_CONSTRUCTION_DEFAULT 0 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index bc939fc2450b..793e7b6b2f35 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -177,6 +177,8 @@ #define TRAIT_USING_WHEELCHAIR "t_using_wheelchair" /// If the mob will instantly go permadead upon death #define TRAIT_HARDCORE "t_hardcore" +/// If the mob is able to use the vulture rifle or spotting scope +#define TRAIT_VULTURE_USER "t_vulture_user" // -- ability traits -- /// Xenos with this trait cannot have plasma transfered to them @@ -203,6 +205,9 @@ // GUN TRAITS #define TRAIT_GUN_SILENCED "t_gun_silenced" + +#define TRAIT_GUN_BIPODDED "t_gun_bipodded" + #define TRAIT_GUN_LIGHT_DEACTIVATED "t_gun_light_deactivated" // Miscellaneous item traits. @@ -239,7 +244,8 @@ GLOBAL_LIST_INIT(mob_traits, list( TRAIT_LEADERSHIP, TRAIT_DEXTROUS, TRAIT_REAGENT_SCANNER, - TRAIT_ABILITY_BURROWED + TRAIT_ABILITY_BURROWED, + TRAIT_VULTURE_USER, )) /* @@ -271,6 +277,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_EMOTE_CD_EXEMPT" = TRAIT_EMOTE_CD_EXEMPT, "TRAIT_LISPING" = TRAIT_LISPING, "TRAIT_CANNOT_EAT" = TRAIT_CANNOT_EAT, + "TRAIT_VULTURE_USER" = TRAIT_VULTURE_USER, ), /mob/living/carbon/xenomorph = list( "TRAIT_ABILITY_NO_PLASMA_TRANSFER" = TRAIT_ABILITY_NO_PLASMA_TRANSFER, @@ -299,6 +306,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( ), /obj/item/weapon/gun = list( "TRAIT_GUN_SILENCED" = TRAIT_GUN_SILENCED, + "TRAIT_GUN_BIPODDED" = TRAIT_GUN_BIPODDED, ), /obj/structure/surface/table = list( "TRAIT_STRUCTURE_FLIPPING" = TRAIT_TABLE_FLIPPING, diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 4d9268220f2b..ea032444b086 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -17,6 +17,7 @@ #define URL_WIKI_CONSTRUCTION "https://cm-ss13.com/wiki/Guide_to_construction" #define URL_WIKI_ENGINEERING "https://cm-ss13.com/wiki/Guide_to_Engineering" #define URL_WIKI_HACKING "https://cm-ss13.com/wiki/Guide_to_Engineering#Hacking" +#define URL_WIKI_APC "https://cm-ss13.com/wiki/Guide_to_Engineering#APC_Maintenance" #define URL_WIKI_SURGERY "https://cm-ss13.com/wiki/Surgery" #define URL_WIKI_MEDICAL "https://cm-ss13.com/wiki/Guide_to_Medicine" @@ -37,6 +38,7 @@ #define URL_WIKI_ASO_GUIDE "https://cm-ss13.com/wiki/Auxiliary_Support_Officer" // Auxiliary Support #define URL_WIKI_PO_GUIDE "https://cm-ss13.com/wiki/Pilot_Officer" #define URL_WIKI_DCC_GUIDE "https://cm-ss13.com/wiki/Dropship_Crew_Chief" +#define URL_WIKI_VC_GUIDE "https://cm-ss13.com/wiki/Vehicle_Crewman" #define URL_WIKI_IO_GUIDE "https://cm-ss13.com/wiki/Intelligence_Officer" #define URL_WIKI_SYN_GUIDE "https://cm-ss13.com/wiki/Synthetic" #define URL_WIKI_CE_GUIDE "https://cm-ss13.com/wiki/Chief_Engineer" // Engineering diff --git a/code/__DEFINES/vehicle.dm b/code/__DEFINES/vehicle.dm index 9c6685085788..ed9809968808 100644 --- a/code/__DEFINES/vehicle.dm +++ b/code/__DEFINES/vehicle.dm @@ -11,7 +11,9 @@ #define HDPT_LAYER_SUPPORT 2 #define HDPT_LAYER_ARMOR 3 #define HDPT_LAYER_TURRET 4 -#define HDPT_LAYER_MAX 4 +#define HDPT_LAYER_SECONDARY_GUN 5 +#define HDPT_LAYER_PRIMARY_GUN 6 +#define HDPT_LAYER_MAX 6 #define VEHICLE_DRIVER "driver" #define VEHICLE_GUNNER "primary gunner" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 04ee5ffef2b6..95eec1bf8405 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -34,6 +34,10 @@ #define VEHICLE_ALL_AVAILABLE (VEHICLE_INTEGRAL_AVAILABLE|VEHICLE_PRIMARY_AVAILABLE|VEHICLE_SECONDARY_AVAILABLE|VEHICLE_SUPPORT_AVAILABLE|VEHICLE_ARMOR_AVAILABLE|VEHICLE_TREADS_AVAILABLE) +#define MECH_GUN "mech_gun" +#define MECH_ALL_AVAIBALE list(MECH_GUN = 2) + + #define VENDOR_THEME_COMPANY 0 #define VENDOR_THEME_USCM 1 #define VENDOR_THEME_CLF 2 diff --git a/code/__DEFINES/weapon_stats.dm b/code/__DEFINES/weapon_stats.dm index 590223426a66..beac54d98892 100644 --- a/code/__DEFINES/weapon_stats.dm +++ b/code/__DEFINES/weapon_stats.dm @@ -136,6 +136,7 @@ As such, don't expect any values assigned to common firearms to even consider ho //How many ticks you have to wait between firing. Burst delay uses the same variable! */ +#define FIRE_DELAY_TIER_VULTURE 20 #define FIRE_DELAY_TIER_1 12 #define FIRE_DELAY_TIER_2 10 #define FIRE_DELAY_TIER_3 9 diff --git a/code/__HELPERS/job.dm b/code/__HELPERS/job.dm index 43902b07cfd9..9e9d70ae2aa6 100644 --- a/code/__HELPERS/job.dm +++ b/code/__HELPERS/job.dm @@ -62,6 +62,8 @@ JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, + JOB_CREWMAN, + JOB_WALKER, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_ENGINEER, diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index d4d9eb320633..527a7c1aac88 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -27,13 +27,13 @@ //Removes a few problematic characters /proc/sanitize_simple(text, list/repl_chars = list("\n"=" ","\t"=" ","�"=" ")) for(var/char in repl_chars) - text = replacetext(text, char, repl_chars[char]) + text = replacetext_char(text, char, repl_chars[char]) return text /proc/readd_quotes(text) var/list/repl_chars = list(""" = "\"", "'" = "'") for(var/char in repl_chars) - text = replacetext(text, char, repl_chars[char]) + text = replacetext_char(text, char, repl_chars[char]) return text //Runs byond's sanitization proc along-side sanitize_simple @@ -54,12 +54,12 @@ //Runs sanitize and strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' after sanitize() calls byond's html_encode() /proc/strip_html(text, limit=MAX_MESSAGE_LEN) - return copytext((sanitize(strip_html_simple(text))), 1, limit) + return copytext_char((sanitize(strip_html_simple(text))), 1, limit) //Runs byond's sanitization proc along-side strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' that html_encode() would cause /proc/adminscrub(text, limit=MAX_MESSAGE_LEN) - return copytext((html_encode(strip_html_simple(text))), 1, limit) + return copytext_char((html_encode(strip_html_simple(text))), 1, limit) //Returns null if there is any bad text in the string /proc/reject_bad_text(text, max_length=512) @@ -202,7 +202,7 @@ //Returns a string with the first element of the string capitalized. /proc/capitalize(t as text) - return uppertext(copytext(t, 1, 2)) + copytext(t, 2) + return uppertext(copytext_char(t, 1, 2)) + copytext_char(t, 2) /proc/stringpercent(text,character = "*") //This proc returns the number of chars of the string that is the character @@ -234,7 +234,7 @@ return "[copytext(string, 1, len - 3)]..." /proc/strip_improper(input_text) - return replacetext(replacetext(input_text, "\proper", ""), "\improper", "") + return replacetext_char(replacetext_char(input_text, "\proper", ""), "\improper", "") // Used to remove the string shortcuts for a clean transfer /proc/sanitize_filename(t) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 575071b76833..9a6ee4362088 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -2066,3 +2066,30 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( if(stop_type && istype(turf_to_check, stop_type)) break return turf_to_check + +/// Given a direction, return the direction and the +-45 degree directions next to it +/proc/get_related_directions(direction = NORTH) + switch(direction) + if(NORTH) + return list(NORTH, NORTHEAST, NORTHWEST) + + if(EAST) + return list(EAST, NORTHEAST, SOUTHEAST) + + if(SOUTH) + return list(SOUTH, SOUTHEAST, SOUTHWEST) + + if(WEST) + return list(WEST, NORTHWEST, SOUTHWEST) + + if(NORTHEAST) + return list(NORTHEAST, NORTH, EAST) + + if(SOUTHEAST) + return list(SOUTHEAST, EAST, SOUTH) + + if(SOUTHWEST) + return list(SOUTHWEST, SOUTH, WEST) + + if(NORTHWEST) + return list(NORTHWEST, NORTH, WEST) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index a497f4d01dfb..53dd40ff6035 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -249,6 +249,7 @@ DEFINE_BITFIELD(valid_equip_slots, list( "SLOT_LEGS" = SLOT_LEGS, "SLOT_ACCESSORY" = SLOT_ACCESSORY, "SLOT_SUIT_STORE" = SLOT_SUIT_STORE, + "SLOT_BLOCK_SUIT_STORE" = SLOT_BLOCK_SUIT_STORE, )) DEFINE_BITFIELD(flags_alarm_state, list( diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 36058a44fc37..a5766fadd8e1 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -94,7 +94,8 @@ GLOBAL_LIST_INIT(resin_build_order_ovipositor, list( /datum/resin_construction/resin_obj/acid_pillar, /datum/resin_construction/resin_obj/sticky_resin, /datum/resin_construction/resin_obj/fast_resin, - /datum/resin_construction/resin_obj/resin_spike + /datum/resin_construction/resin_obj/resin_spike, + /datum/resin_construction/resin_obj/sunken_colony )) //Xeno Leader Mark Meanings @@ -478,7 +479,8 @@ var/global/list/available_specialist_sets = list( "Sniper Set", "Demolitionist Set", "Heavy Grenadier Set", - "Pyro Set" + "Pyro Set", + "Stormtrooper Set" ) //Similar thing, but used in /obj/item/spec_kit @@ -488,6 +490,7 @@ var/global/list/available_specialist_kit_boxes = list( "Sniper" = 2, "Scout" = 2, "Demo" = 2, + "ST" = 2 ) /proc/init_global_referenced_datums() diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index ff271b889e6c..fec62c35317f 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -72,9 +72,11 @@ var/severity = 0 var/fs_view = 7 var/show_when_dead = FALSE + /// If this should try and resize if the user's view is bigger than the default + var/should_resize = TRUE /atom/movable/screen/fullscreen/proc/update_for_view(client_view) - if (screen_loc == "CENTER-7,CENTER-7" && fs_view != client_view) + if (screen_loc == "CENTER-7,CENTER-7" && fs_view != client_view && should_resize) var/list/actualview = getviewsize(client_view) fs_view = client_view transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0) @@ -169,6 +171,14 @@ /atom/movable/screen/fullscreen/laser_blind icon_state = "impairedoverlay1" +/atom/movable/screen/fullscreen/vulture + icon_state = "vulture_scope_overlay_sniper" + layer = FULLSCREEN_VULTURE_SCOPE_LAYER + +/atom/movable/screen/fullscreen/vulture/spotter + icon_state = "vulture_scope_overlay_spotter" + should_resize = FALSE + //Weather overlays// /atom/movable/screen/fullscreen/weather diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 9643d0f652ae..206b1dbf9979 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -639,3 +639,7 @@ /atom/movable/screen/rotate/alt dir = WEST rotate_amount = -90 + +/atom/movable/screen/vulture_scope // The part of the vulture's scope that drifts over time + icon_state = "vulture_unsteady" + screen_loc = "CENTER,CENTER" diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0e23b99a9cc2..c6b2f38e9143 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -255,7 +255,7 @@ SUBSYSTEM_DEF(ticker) save_mode(CONFIG_GET(string/gamemode_default)) if(round_statistics) - to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("Welcome to [round_statistics.round_name]"))) + to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("Добро пожаловать на [round_statistics.round_name]"))) supply_controller.process() //Start the supply shuttle regenerating points -- TLE @@ -361,10 +361,10 @@ SUBSYSTEM_DEF(ticker) var/skip_delay = check_rights() if(delay_end && !skip_delay) - to_chat(world, SPAN_BOLDNOTICE("An admin has delayed the round end.")) + to_chat(world, SPAN_BOLDNOTICE("Администратор отложил конец раунда.")) return - to_chat(world, SPAN_BOLDNOTICE("Rebooting World in [DisplayTimeText(delay)]. [reason]")) + to_chat(world, SPAN_BOLDNOTICE("Перезагрузка мира через [DisplayTimeText(delay)]. [reason]")) var/start_wait = world.time sleep(delay - (world.time - start_wait)) @@ -373,7 +373,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, SPAN_BOLDNOTICE("Reboot was cancelled by an admin.")) return - log_game("Rebooting World. [reason]") + log_game("АГАСЬ. [reason]") to_chat_forced(world, "

[SPAN_BOLDNOTICE("Rebooting...")]

") world.Reboot(TRUE) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 3b694e8f44bb..7af9c2cb9f03 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -84,7 +84,7 @@ return {" - + [head_content] diff --git a/code/datums/elements/bullet_trait/penetrating/heavy.dm b/code/datums/elements/bullet_trait/penetrating/heavy.dm new file mode 100644 index 000000000000..13086d01b212 --- /dev/null +++ b/code/datums/elements/bullet_trait/penetrating/heavy.dm @@ -0,0 +1,47 @@ +/datum/element/bullet_trait_penetrating/heavy + // Generic bullet trait vars + element_flags = ELEMENT_DETACH|ELEMENT_BESPOKE + id_arg_index = 3 + + /// For every turf this pierces, how much damage should this lose? + var/damage_lost_per_pen = 100 + /// Typecache of things to annihilate if the bullet is on a tile with it + var/static/list/bullet_destroy_structures = typecacheof(list( + /obj/structure/surface, + /obj/structure/barricade, + )) + +/datum/element/bullet_trait_penetrating/heavy/Attach(datum/target, distance_loss_per_hit = 3, damage_lost_per_pen = 75) + . = ..() + if(. == ELEMENT_INCOMPATIBLE) + return + + src.damage_lost_per_pen = damage_lost_per_pen + +/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_movables(obj/item/projectile/bullet, atom/movable/hit_movable, did_hit) + if(did_hit) + var/slow_mult = 1 + if(ismob(hit_movable)) + var/mob/mob = hit_movable + if(mob.mob_size >= MOB_SIZE_BIG) + slow_mult = 2 + + bullet.distance_travelled += (distance_loss_per_hit * slow_mult) + + if(is_type_in_typecache(hit_movable, bullet_destroy_structures)) + var/obj/structure/cade = hit_movable + cade.deconstruct() // This bullet just tears through whatever cades you put it up against from either side + bullet.damage -= damage_lost_per_pen + + return COMPONENT_BULLET_PASS_THROUGH + +/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_turf(obj/item/projectile/bullet, turf/closed/wall/hit_wall) + bullet.distance_travelled += distance_loss_per_hit + bullet.damage -= damage_lost_per_pen + + if(!istype(hit_wall)) + return COMPONENT_BULLET_PASS_THROUGH + + if(!hit_wall.hull) + return COMPONENT_BULLET_PASS_THROUGH + diff --git a/code/datums/elements/bullet_trait/penetrating.dm b/code/datums/elements/bullet_trait/penetrating/penetrating.dm similarity index 100% rename from code/datums/elements/bullet_trait/penetrating.dm rename to code/datums/elements/bullet_trait/penetrating/penetrating.dm diff --git a/code/datums/emergency_calls/big_game_hunter.dm b/code/datums/emergency_calls/big_game_hunter.dm index e749b6654355..d5f88057f2c2 100644 --- a/code/datums/emergency_calls/big_game_hunter.dm +++ b/code/datums/emergency_calls/big_game_hunter.dm @@ -10,7 +10,7 @@ /datum/emergency_call/van_bandolier/New() . = ..() - arrival_message = "'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" + arrival_message = "'Слышу ваш сигнал бедствия, [MAIN_SHIP_NAME]. Лучше там быть чему-то что я смогу повесить себе на стеночку, агась? Талли хо!'" /datum/emergency_call/van_bandolier/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 52da1c967a00..296201551abf 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -16,7 +16,7 @@ /datum/emergency_call/cmb/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. We are receiving your distress signal and are dispatching a nearby team to board with you now. Standby." + arrival_message = "Входящая передача: [MAIN_SHIP_NAME], это станция Anchorpoint с Бюро Колониальных Маршалов. Мы принимаем ваш сигнал бедствия и отправляем ближайшую команду к вам. Ожидайте." objectives = "Investigate the distress signal aboard the [MAIN_SHIP_NAME], and assist the crew with rescue if possible. If necessary, a contingent of our Colonial Marines may be ready to act as a QRF to reinforce you." will_spawn_icc_liaison = prob(50) diff --git a/code/datums/emergency_calls/contractor.dm b/code/datums/emergency_calls/contractor.dm index a5d6c2d7e80f..a750d96510a7 100644 --- a/code/datums/emergency_calls/contractor.dm +++ b/code/datums/emergency_calls/contractor.dm @@ -12,7 +12,7 @@ /datum/emergency_call/contractors/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USCSS Inheritor with Vanguard's Arrow Incorporated, Primary Operations; we are responding to your distress call and boarding in accordance with the Military Aid Act of 2177, authenticication code Lima-18153. " + arrival_message = "[MAIN_SHIP_NAME], это USCSS Inheritor с Vanguard's Arrow Incorporated, Primary Operations на борту; мы принимаем ваш сигнал бедствия и совершим посадку согласно закону о военной помощи от 2177го, код авторизации Lima-18153. " objectives = "Ensure the survival of the [MAIN_SHIP_NAME], eliminate any hostiles, and assist the crew in any way possible." diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index 0bfab8fbf2b7..9b615806989f 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -6,7 +6,7 @@ name = "Weyland Whiteout Operators" mob_max = 8 mob_min = 5 - arrival_message = "'!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" + arrival_message = "'!`2*%еб#*зите и*h$хm в!сl%х. Н& о*vтаeв(oт^е с&*ви%лей.*v$e %#d на^'" objectives = "Whiteout protocol is in effect for the target. Ensure there are no traces of the infestation or any witnesses." probability = 0 shuttle_id = "Distress_PMC" diff --git a/code/datums/emergency_calls/dutch.dm b/code/datums/emergency_calls/dutch.dm index 32620fa43014..b89dd944803f 100644 --- a/code/datums/emergency_calls/dutch.dm +++ b/code/datums/emergency_calls/dutch.dm @@ -9,7 +9,7 @@ max_heavies = 1 max_medics = 1 - arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'Мы здесь надрать задниц и перебить Яутж. В основном наебашить Яутж." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 6d41c2d64d0b..f4ec23409d10 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -12,7 +12,7 @@ /datum/game_mode/proc/ares_online() var/name = "ARES Online" - var/input = "ARES. Online. Good morning, marines." + var/input = "ARES. Онлайн. Доброе утро, солдаты." shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg') /datum/game_mode/proc/request_ert(user, ares = FALSE) @@ -26,7 +26,7 @@ var/name = "name" var/mob_max = 3 var/mob_min = 3 - var/dispatch_message = "An encrypted signal has been received from a nearby vessel. Stand by." //Msg to display when starting + var/dispatch_message = "Зашифрованный сигнал перехвачен с ближайшего судна. Ожидайте." //Msg to display when starting var/arrival_message = "" //Msg to display about when the shuttle arrives var/objectives //Txt of objectives to display to joined. Todo: make this into objective notes var/objective_info //For additional info in the objectives txt @@ -204,7 +204,7 @@ message_admins("Distress beacon: '[name]' activated [src.hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.") if(announce) - marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) + marine_announcement("Активирован сигнал бедствия на борту [MAIN_SHIP_NAME].", "Приоритетное оповещение", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS) @@ -220,7 +220,7 @@ candidates = list() if(announce) - marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon", logging = ARES_LOG_SECURITY) + marine_announcement("Сигнал бедствия не получил ответа, перекалибровка пусковых труб.", "Сигнал бедствия", logging = ARES_LOG_SECURITY) return //We've got enough! @@ -250,7 +250,7 @@ to_chat(I.current, SPAN_WARNING("You didn't get selected to join the distress team. Better luck next time!")) if(announce) - marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT + marine_announcement(dispatch_message, "Сигнал бедствия", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT message_admins("Distress beacon: [src.name] finalized, setting up candidates.") @@ -306,7 +306,7 @@ candidates = list() if(arrival_message && announce) - marine_announcement(arrival_message, "Intercepted Tranmission:") + marine_announcement(arrival_message, "Перехваченная Передача:") /datum/emergency_call/proc/add_candidate(mob/M) if(!M.client || (M.mind && (M.mind in candidates)) || istype(M, /mob/living/carbon/xenomorph)) diff --git a/code/datums/emergency_calls/feral_xenos.dm b/code/datums/emergency_calls/feral_xenos.dm index 5d9f14a4680c..f07c12143308 100644 --- a/code/datums/emergency_calls/feral_xenos.dm +++ b/code/datums/emergency_calls/feral_xenos.dm @@ -12,7 +12,7 @@ /datum/emergency_call/feral_xenos/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USS Vriess respond-- #&...*#&^#.. signal... oh god, they're in the vent---... Priority Warning: Signal lost." + arrival_message = "[MAIN_SHIP_NAME], это USS Vriess на связ-- #&...*#&^#.. сигнал... БЛЯТЬ, они в вентиля---... Приоритетное Предупреждение: Сигнал потерян." objectives = "Destroy everything!" /datum/emergency_call/feral_xenos/spawn_items() diff --git a/code/datums/emergency_calls/goons.dm b/code/datums/emergency_calls/goons.dm index 8a0b00968807..89875a30258a 100644 --- a/code/datums/emergency_calls/goons.dm +++ b/code/datums/emergency_calls/goons.dm @@ -5,7 +5,7 @@ /datum/emergency_call/goon/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is a Weyland-Yutani Corporate Security shuttle inbound to your distress beacon. We are coming to help." + arrival_message = "[MAIN_SHIP_NAME], это шаттл Корпоративной Безопасности Weyland-Yutani направляющийся на ваш сигнал бедствия. Мы летим с помощью." objectives = "Secure the Corporate Liaison and the [MAIN_SHIP_NAME]'s Commanding Officer, and eliminate any hostile threats. Do not damage Wey-Yu property." /datum/emergency_call/goon/create_member(datum/mind/M, turf/override_spawn_loc) diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index 2af2f99f443e..46671834d91c 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -3,7 +3,7 @@ name = "HEFA knights" mob_max = 15 mob_min = 3 - arrival_message = "'Prepaerth to surrender thine HEFAs unto the order!'" + arrival_message = "'Падгатовьтись сдаца HEFAs па приказю!'" objectives = "You are a Brother of the Order of HEFA! You and your fellow brothers must retrieve as many HEFAs as possible!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/mercs.dm b/code/datums/emergency_calls/mercs.dm index 40210c845c6f..80643e7bfef0 100644 --- a/code/datums/emergency_calls/mercs.dm +++ b/code/datums/emergency_calls/mercs.dm @@ -11,7 +11,7 @@ /datum/emergency_call/mercs/New() . = ..() hostility = pick(75;FALSE,25;TRUE) - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." if(hostility) objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." else @@ -25,7 +25,7 @@ /datum/emergency_call/mercs/friendly/New() . = ..() hostility = FALSE - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Help the crew of the [MAIN_SHIP_NAME] in exchange for payment, and choose your payment well. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/mercs/hostile //ditto @@ -36,7 +36,7 @@ /datum/emergency_call/mercs/hostile/New() . = ..() hostility = TRUE - arrival_message = "[MAIN_SHIP_NAME], this is Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/mercs/print_backstory(mob/living/carbon/human/H) @@ -96,7 +96,7 @@ /datum/emergency_call/heavy_mercs/New() . = ..() hostility = pick(75;FALSE,25;TRUE) - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." if(hostility) objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." else @@ -108,7 +108,7 @@ /datum/emergency_call/heavy_mercs/hostile/New() . = ..() hostility = TRUE - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Ransack the [MAIN_SHIP_NAME] and kill anyone who gets in your way. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/heavy_mercs/friendly @@ -117,7 +117,7 @@ /datum/emergency_call/heavy_mercs/friendly/New() . = ..() hostility = FALSE - arrival_message = "[MAIN_SHIP_NAME], this is Elite Freelancer shuttle [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] responding to your distress call. Prepare for boarding." + arrival_message = "[MAIN_SHIP_NAME], это элитный частный шаттл [pick(alphabet_lowercase)][pick(alphabet_lowercase)]-[rand(1, 99)] отвечает на ваш сигнал бедствия. Подготовьтесь к посадке." objectives = "Help the crew of the [MAIN_SHIP_NAME] in exchange for payment, and choose your payment well. Do what your Captain says. Ensure your survival at all costs." /datum/emergency_call/heavy_mercs/print_backstory(mob/living/carbon/human/H) diff --git a/code/datums/emergency_calls/pirates.dm b/code/datums/emergency_calls/pirates.dm index 7a9d333de970..4d51423f4079 100644 --- a/code/datums/emergency_calls/pirates.dm +++ b/code/datums/emergency_calls/pirates.dm @@ -4,7 +4,7 @@ name = "Fun - Pirates" mob_max = 35 mob_min = 10 - arrival_message = "'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" + arrival_message = "'Чтоо-о-о мы делаем с пьяным моряк-о-о-м? Что делаем с пьяным моряк-о-о-о-м? Что мы делаем с пьяным моряком с утра пораньше?'" objectives = "Pirate! Loot! Ransom!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index a35ce584c68d..35348cab8c46 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -4,7 +4,7 @@ name = "Pizza Delivery" mob_max = 1 mob_min = 1 - arrival_message = "'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" + arrival_message = "'Тогда... шестнадцать порций картошки с сыром, восемь больших пицц с двойной начинкой, девять бутылок Four Loko... эм? Есть кто-нибудь на корабле? Ваши пиццы остывают.'" objectives = "Make sure you get a tip!" shuttle_id = "Distress_Small" name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza diff --git a/code/datums/emergency_calls/pmc.dm b/code/datums/emergency_calls/pmc.dm index a06b0cc0c02e..7c524111d08e 100644 --- a/code/datums/emergency_calls/pmc.dm +++ b/code/datums/emergency_calls/pmc.dm @@ -17,7 +17,7 @@ /datum/emergency_call/pmc/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USCSS Royce responding to your distress call. We are boarding. Any hostile actions will be met with lethal force." + arrival_message = "[MAIN_SHIP_NAME], на ваш сигнал бедствия отвечает USCSS Royce. Мы садимся. Любые агрессивные действия будут встречены применением летальной силы." objectives = "Secure the Corporate Liaison and the [MAIN_SHIP_NAME]'s Commanding Officer, and eliminate any hostile threats. Do not damage Wey-Yu property." @@ -99,7 +99,7 @@ /datum/emergency_call/pmc/chem_retrieval/New() ..() - dispatch_message = "[MAIN_SHIP_NAME], this is USCSS Royce. We are sending a second squad aboard to retrieve all samples of a chemical recently scanned from your research department. If you do not cooperate, the team is authorized to use lethal force and terminate the research department." + dispatch_message = "[MAIN_SHIP_NAME], это USCSS Royce. Мы отправляем второй отряд на борт для сбора всех экземпляров химикатов которые были просканированы в вашем научном отделе. Если вы не будете сотрудничать, команде разрешено применить силу и устранить научный персонал." objectives = "Secure all documents, samples and chemicals containing the property DNA_Disintegrating from [MAIN_SHIP_NAME] research department." /datum/emergency_call/pmc/chem_retrieval/proc/check_objective_info() diff --git a/code/datums/emergency_calls/supplies.dm b/code/datums/emergency_calls/supplies.dm index e562680eca4c..b382528352e6 100644 --- a/code/datums/emergency_calls/supplies.dm +++ b/code/datums/emergency_calls/supplies.dm @@ -5,7 +5,7 @@ name = "Supply Drop" mob_max = 0 mob_min = 0 - arrival_message = "Weyland-Yutani Automated Supply Drop 334-Q signal received. Docking procedures have commenced." + arrival_message = "Автоматический Сброс Припасов Weyland-Yutani по сигналу Drop 334-Q. Процедуры стыковки активированы." probability = 0 auto_shuttle_launch = TRUE diff --git a/code/datums/emergency_calls/upp.dm b/code/datums/emergency_calls/upp.dm index 04bcfecf9128..1f21a6ded866 100644 --- a/code/datums/emergency_calls/upp.dm +++ b/code/datums/emergency_calls/upp.dm @@ -20,7 +20,7 @@ /datum/emergency_call/upp/New() ..() - arrival_message = "T*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns )0r c|*$e @u*r*r$ c0m&*t." + arrival_message = "Э*т* УП* в^sа^*ка`. КоМ*&а зачистки, #*u вы г*%вы к п*ос*%^е. По*тE в*е оР*ж^е )0r и|*$e @а*й*с$ c0н&*о." objectives = "Eliminate the UA Forces to ensure the UPP prescence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs." diff --git a/code/datums/emergency_calls/xenos.dm b/code/datums/emergency_calls/xenos.dm index 5245954e1b0e..8c8245b8b368 100644 --- a/code/datums/emergency_calls/xenos.dm +++ b/code/datums/emergency_calls/xenos.dm @@ -9,7 +9,7 @@ /datum/emergency_call/xenos/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USS Vriess respond-- #&...*#&^#.. signal... oh god, they're in the vent---... Priority Warning: Signal lost." + arrival_message = "[MAIN_SHIP_NAME], это USS Vriess отвечает-- #&...*#&^#.. сигнал... Боже, они в вентиляции---... Приоритетное Оповещение: Сигнал потерян." objectives = "For the Empress!" diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index b691d87a2169..6c0c4a100e44 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -94,7 +94,7 @@ var/tmp_sound = get_sound(user) if(TIMER_COOLDOWN_CHECK(user, type)) - to_chat(user, SPAN_NOTICE("You just did an emote. Wait awhile.")) + to_chat(user, SPAN_NOTICE("По-моему я слишком эмоционален.")) return else if(tmp_sound && should_play_sound(user, intentional)) if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_MOB_AUDIO)) diff --git a/code/datums/entities/player_note.dm b/code/datums/entities/player_note.dm index 420bb5f0a470..216e20b40701 100644 --- a/code/datums/entities/player_note.dm +++ b/code/datums/entities/player_note.dm @@ -94,4 +94,4 @@ BSQL_PROTECT_DATUM(/datum/entity/player_note) /// Returns all notes associated with a CKEY, structured as a list of strings. /proc/get_all_notes(player_ckey) for(var/datum/view_record/note_view/note in DB_VIEW(/datum/view_record/note_view, DB_COMP("player_ckey", DB_EQUALS, player_ckey))) - LAZYADDASSOC(., "[note.note_category]", "\"[note.text]\", by [note.admin_ckey] ([note.admin_rank]) on [note.date] ([note.round_id])") + LAZYADDASSOCLIST(., "[note.note_category]", "\"[note.text]\", by [note.admin_ckey] ([note.admin_rank]) on [note.date] ([note.round_id])") diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index cf77142ce5d6..0683f06672b7 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -26,6 +26,7 @@ if(JOB_INTEL) marine_rk = "io" if(JOB_DROPSHIP_CREW_CHIEF) marine_rk = "dcc" if(JOB_CREWMAN) marine_rk = "tc" + if(JOB_WALKER) marine_rk = "tc" if(JOB_MARINE_RAIDER) marine_rk = "soc" if(JOB_MARINE_RAIDER_SL) marine_rk = "soctl" if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd" @@ -89,6 +90,10 @@ marine_rk = "po" if(JOB_DROPSHIP_CREW_CHIEF) marine_rk = "dcc" + if(JOB_CREWMAN) + marine_rk = "tc" + if(JOB_WALKER) + marine_rk = "tc" if(JOB_CHIEF_POLICE) marine_rk = "cmp" border_rk = "command" diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index d1a6adafa2f3..73400e4095cd 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -11,6 +11,8 @@ /mob/living/carbon/xenomorph/defender/langchat_height = 48 /mob/living/carbon/xenomorph/warrior/langchat_height = 48 +/obj/vehicle/multitile/langchat_height = 80 + #define LANGCHAT_LONGEST_TEXT 64 #define LANGCHAT_WIDTH 96 #define LANGCHAT_X_OFFSET -32 diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index 4a01e4e9d72b..0af788cb60ef 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -69,15 +69,15 @@ stack_trace("track_mob_death called with string cause ([cause_data]) instead of datum") cause_data = create_cause_data(cause_data) - var/log_message = "\[[time_stamp()]\] [key_name(src)] died to " + var/log_message = "\[[time_stamp()]\] [key_name(src)] умер(ла) от " if(cause_data) log_message += "[cause_data.cause_name]" else - log_message += "unknown causes" + log_message += "неизвестных причин" var/mob/cause_mob = cause_data?.resolve_mob() if(cause_mob) - log_message += " from [key_name(cause_data.resolve_mob())]" - cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] killed [key_name(src)] with [cause_data.cause_name]." + log_message += " от [key_name(cause_data.resolve_mob())]" + cause_mob.attack_log += "\[[time_stamp()]\] [key_name(cause_mob)] убил [key_name(src)] с помощью [cause_data.cause_name]." attack_log += "[log_message]." @@ -163,11 +163,11 @@ /mob/proc/handle_observer_message(datum/cause_data/cause_data, mob/cause_mob, turf/death_loc, area/death_area) var/observer_message = "[real_name] has died" if(cause_data && cause_data.cause_name) - observer_message += " to [cause_data.cause_name]" + observer_message += " от [cause_data.cause_name]" if(death_area.name) - observer_message += " at \the [death_area.name]" + observer_message += " в \the [death_area.name]" if(cause_data && cause_mob) - observer_message += " from [cause_mob]" + observer_message += " из [cause_mob]" msg_admin_attack(observer_message, death_loc.x, death_loc.y, death_loc.z) diff --git a/code/datums/statistics/entities/round_stats.dm b/code/datums/statistics/entities/round_stats.dm index 0e1fb6e387db..cabfeb23e69a 100644 --- a/code/datums/statistics/entities/round_stats.dm +++ b/code/datums/statistics/entities/round_stats.dm @@ -341,28 +341,28 @@ var/stats = "" stats += "[SSticker.mode.round_finished]\n" - stats += "Game mode: [game_mode]\n" - stats += "Map name: [current_map.name]\n" - stats += "Round time: [duration2text(round_length)]\n" - stats += "End round player population: [end_round_player_population]\n" + stats += "Режим: [game_mode]\n" + stats += "Карта: [current_map.name]\n" + stats += "Время раунда: [duration2text(round_length)]\n" + stats += "Игроков под конец игры: [end_round_player_population]\n" - stats += "Total xenos spawned: [total_xenos_created]\n" - stats += "Total Preds spawned: [total_predators_spawned]\n" - stats += "Total Predaliens spawned: [total_predaliens]\n" - stats += "Total humans spawned: [total_humans_created]\n" + stats += "Присутствовало ксеноморфов: [total_xenos_created]\n" + stats += "Присутствовало хищников: [total_predators_spawned]\n" + stats += "Присутствовало предалиенов: [total_predaliens]\n" + stats += "Присутствовало людей: [total_humans_created]\n" - stats += "Xeno count during hijack: [xeno_count_during_hijack]\n" - stats += "Human count during hijack: [human_count_during_hijack]\n" + stats += "Ксеноморфов во время угона: [xeno_count_during_hijack]\n" + stats += "Людей во время угона: [human_count_during_hijack]\n" - stats += "Total huggers applied: [total_huggers_applied]\n" - stats += "Total chestbursts: [total_larva_burst]\n" + stats += "Лицехватов: [total_huggers_applied]\n" + stats += "Грудоломов выскочило: [total_larva_burst]\n" - stats += "Total shots fired: [total_projectiles_fired]\n" - stats += "Total friendly fire instances: [total_friendly_fire_instances]\n" + stats += "Всего выстрелов: [total_projectiles_fired]\n" + stats += "Всего дружественных попаданий: [total_friendly_fire_instances]\n" - stats += "Marines remaining: [end_of_round_marines]\n" - stats += "Xenos remaining: [end_of_round_xenos]\n" - stats += "Hijack time: [duration2text(round_hijack_time)]\n" + stats += "Солдат осталось: [end_of_round_marines]\n" + stats += "Ксеноморфов осталось: [end_of_round_xenos]\n" + stats += "Время для угона: [duration2text(round_hijack_time)]\n" stats += "[log_end]" diff --git a/code/datums/statistics/random_facts/damage_fact.dm b/code/datums/statistics/random_facts/damage_fact.dm index 2fa8a5d06491..4f36c306e468 100644 --- a/code/datums/statistics/random_facts/damage_fact.dm +++ b/code/datums/statistics/random_facts/damage_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/damage - statistic_name = "damage" - statistic_verb = "took" + statistic_name = "урона" + statistic_verb = "получил(а)" /datum/random_fact/damage/life_grab_stat(mob/fact_mob) return fact_mob.life_damage_taken_total diff --git a/code/datums/statistics/random_facts/kills_fact.dm b/code/datums/statistics/random_facts/kills_fact.dm index 7ef1c2b238de..190f8b1b21a3 100644 --- a/code/datums/statistics/random_facts/kills_fact.dm +++ b/code/datums/statistics/random_facts/kills_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/kills - statistic_name = "kills" - statistic_verb = "earned" + statistic_name = "убийств" + statistic_verb = "совершил(а)" /datum/random_fact/kills/life_grab_stat(mob/fact_mob) return fact_mob.life_kills_total diff --git a/code/datums/statistics/random_facts/random_fact.dm b/code/datums/statistics/random_facts/random_fact.dm index 76c6e82f776d..bab7dfd388a8 100644 --- a/code/datums/statistics/random_facts/random_fact.dm +++ b/code/datums/statistics/random_facts/random_fact.dm @@ -57,25 +57,25 @@ if(living_stat_gotten > death_stat_gotten) name = mob_to_report.real_name stat_gotten = living_stat_gotten - additional_message = "and survived! Great work!" + additional_message = "не погибнув! Отличная работа!" else name = death_to_report.mob_name stat_gotten = death_stat_gotten - additional_message = "before dying" + additional_message = "перед смертью от" if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" + additional_message += " [death_to_report.cause_name]" + additional_message += ". Хорошая работа!" else if(death_to_report) name = death_to_report.mob_name stat_gotten = death_stat_gotten - additional_message = "before dying" + additional_message = "перед смертью от" if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" + additional_message += " [death_to_report.cause_name]" + additional_message += ". Отличная работа!" else name = mob_to_report.real_name stat_gotten = living_stat_gotten - additional_message = "and survived! Great work!" + additional_message = "не погибнув! Отличная работа!" message = "[name] [statistic_verb] [stat_gotten] [statistic_name] [additional_message]" diff --git a/code/datums/statistics/random_facts/revives_fact.dm b/code/datums/statistics/random_facts/revives_fact.dm index 60b6daa896d2..ca0668a0961b 100644 --- a/code/datums/statistics/random_facts/revives_fact.dm +++ b/code/datums/statistics/random_facts/revives_fact.dm @@ -1,6 +1,6 @@ /datum/random_fact/revives - statistic_name = "people" - statistic_verb = "revived" + statistic_name = "людей" + statistic_verb = "спасено" /datum/random_fact/revives/life_grab_stat(mob/fact_mob) return fact_mob.life_revives_total diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index a28e0c7191ce..927db853e9fd 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -42,7 +42,7 @@ group = "Weapons" /datum/supply_packs/grenade_launchers - name = "M79 Grenade Launcher Crate (x2 Guncasess)" + name = "M79 Grenade Launcher Crate (x2 Guncases)" contains = list( /obj/item/storage/box/guncase/m79, /obj/item/storage/box/guncase/m79, @@ -120,6 +120,16 @@ containername = "\improper XM88 Heavy Rifle crate" group = "Weapons" +/* Uncomment me if it's decided to let the m707 be purchasable through req +/datum/supply_packs/gun/m707 + name = "M707 Anti-Materiel Rifle crate (M707 x1)" + contains = list() + cost = 120 + containertype = /obj/structure/closet/crate/secure/vulture + containername = "M707 crate" + group = "Weapons" +*/ + /datum/supply_packs/gun/merc contains = list() name = "black market firearms (x1)" diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index 33377f7dc6fd..bcffa2d781e8 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -42,8 +42,8 @@ of predators), but can be added to include variant game modes (like humans vs. h fallen_list += fallen_list_cross if(fallen_list.len) var/dat = "
" - dat += SPAN_ROUNDBODY("In Flanders fields...
") - dat += SPAN_CENTERBOLD("In memoriam of our fallen soldiers:
") + dat += SPAN_ROUNDBODY("На полях Фландрии...
") + dat += SPAN_CENTERBOLD("В память нашим падшим солдатам:
") for(var/i = 1 to fallen_list.len) if(i != fallen_list.len) dat += "[fallen_list[i]], " @@ -57,7 +57,7 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(LAZYLEN(xenomorphs) || LAZYLEN(dead_queens)) var/dat = "
" - dat += SPAN_ROUNDBODY("
The xenomorph Queen(s) were:") + dat += SPAN_ROUNDBODY("
В роли Королевы Ксеноморфов:") var/mob/living/carbon/xenomorph/xeno_mob for (var/msg in dead_queens) dat += msg @@ -69,7 +69,7 @@ of predators), but can be added to include variant game modes (like humans vs. h if(!xeno_mob || !xeno_mob.loc) xeno_mob = xeno_mind.original if(xeno_mob && xeno_mob.loc && isqueen(xeno_mob) && xeno_mob.stat != DEAD) // Dead queens handled separately - dat += "
[xeno_mob.full_designation] was [xeno_mob] [SPAN_BOLDNOTICE("(SURVIVED)")]" + dat += "
[xeno_mob.full_designation] был [xeno_mob] [SPAN_BOLDNOTICE("(ВЫЖИЛ)")]" to_world("[dat]") @@ -78,9 +78,9 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(length(predators)) var/dat = "
" - dat += SPAN_ROUNDBODY("
The Predators were:") + dat += SPAN_ROUNDBODY("
В роли Хищников:") for(var/entry in predators) - dat += "
[entry] was [predators[entry]["Name"]] [SPAN_BOLDNOTICE("([predators[entry]["Status"]])")]" + dat += "
[entry] был [predators[entry]["Name"]] [SPAN_BOLDNOTICE("([predators[entry]["Status"]])")]" to_world("[dat]") @@ -89,26 +89,26 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(GLOB.medal_awards.len) var/dat = "
" - dat += SPAN_ROUNDBODY("
Medal Awards:") + dat += SPAN_ROUNDBODY("
Медали получили:") for(var/recipient in GLOB.medal_awards) var/datum/recipient_awards/recipient_award = GLOB.medal_awards[recipient] for(var/i in 1 to recipient_award.medal_names.len) - dat += "
[recipient_award.recipient_rank] [recipient] is awarded [recipient_award.posthumous[i] ? "posthumously " : ""]the [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'." + dat += "
[recipient_award.recipient_rank] [recipient] наградили [recipient_award.posthumous[i] ? "посмертно " : ""]the [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'." to_world(dat) if(GLOB.jelly_awards.len) var/dat = "
" - dat += SPAN_ROUNDBODY("
Royal Jelly Awards:") + dat += SPAN_ROUNDBODY("
Награды Королевского Желе:") for(var/recipient in GLOB.jelly_awards) var/datum/recipient_awards/recipient_award = GLOB.jelly_awards[recipient] for(var/i in 1 to recipient_award.medal_names.len) - dat += "
[recipient] is awarded [recipient_award.posthumous[i] ? "posthumously " : ""]a [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'[recipient_award.giver_rank[i] ? " by [recipient_award.giver_rank[i]]" : ""][recipient_award.giver_name[i] ? " ([recipient_award.giver_name[i]])" : ""]." + dat += "
[recipient] наградили [recipient_award.posthumous[i] ? "посмертно " : ""]a [recipient_award.medal_names[i]]: \'[recipient_award.medal_citations[i]]\'[recipient_award.giver_rank[i] ? " by [recipient_award.giver_rank[i]]" : ""][recipient_award.giver_name[i] ? " ([recipient_award.giver_name[i]])" : ""]." to_world(dat) /datum/game_mode/proc/declare_fun_facts() set waitfor = 0 sleep(2 SECONDS) to_chat_spaced(world, margin_bottom = 0, html = SPAN_ROLE_BODY("|______________________|")) - to_world(SPAN_ROLE_HEADER("FUN FACTS")) + to_world(SPAN_ROLE_HEADER("ИНТЕРЕСНЫЕ ФАКТЫ")) var/list/fact_types = subtypesof(/datum/random_fact) for(var/fact_type as anything in fact_types) var/datum/random_fact/fact_human = new fact_type(set_check_human = TRUE, set_check_xeno = FALSE) diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm index 8c022fd0d916..a29d23a41f7a 100644 --- a/code/game/gamemodes/cm_self_destruct.dm +++ b/code/game/gamemodes/cm_self_destruct.dm @@ -97,13 +97,13 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi if(force || (evac_status == EVACUATION_STATUS_STANDING_BY && !(flags_scuttle & FLAGS_EVACUATION_DENY))) evac_time = world.time evac_status = EVACUATION_STATUS_INITIATING - ai_announcement("Attention. Emergency. All personnel must evacuate immediately. You have [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] minute\s until departure.", 'sound/AI/evacuate.ogg') - xeno_message_all("A wave of adrenaline ripples through the hive. The fleshy creatures are trying to escape!") + ai_announcement("Внимание. Тревога. Всему персоналу немедленно эвакуироваться. У вас есть [round(EVACUATION_ESTIMATE_DEPARTURE/60,1)] минут перед отправлением.", 'sound/AI/evacuate.ogg') + xeno_message_all("Волна адреналина прокатывается по обитателям улья. Эти мясные существа пытаются сбежать!") for(var/obj/structure/machinery/status_display/SD in machines) if(is_mainship_level(SD.z)) SD.set_picture("evac") - for(var/obj/docking_port/mobile/escape_shuttle/shuttle in SSshuttle.mobile) + for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) shuttle.prepare_evac() activate_lifeboats() process_evacuation() @@ -114,14 +114,14 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi evac_time = null evac_status = EVACUATION_STATUS_STANDING_BY deactivate_lifeboats() - ai_announcement("Evacuation has been cancelled.", 'sound/AI/evacuate_cancelled.ogg') + ai_announcement("Эвакуация была отменена.", 'sound/AI/evacuate_cancelled.ogg') if(get_security_level() == "red") for(var/obj/structure/machinery/status_display/SD in machines) if(is_mainship_level(SD.z)) SD.set_picture("redalert") - for(var/obj/docking_port/mobile/escape_shuttle/shuttle in SSshuttle.mobile) + for(var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle in SSshuttle.mobile) shuttle.cancel_evac() return TRUE @@ -129,23 +129,23 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi if(evac_status == EVACUATION_STATUS_INITIATING) evac_status = EVACUATION_STATUS_IN_PROGRESS //Cannot cancel at this point. All shuttles are off. spawn() //One of the few times spawn() is appropriate. No need for a new proc. - ai_announcement("WARNING: Evacuation order confirmed. Launching escape pods.", 'sound/AI/evacuation_confirmed.ogg') + ai_announcement("ПРЕДУПРЕЖДЕНИЕ: Приказ об эвакуации подтвержден. Запуск спасательных шлюпок.", 'sound/AI/evacuation_confirmed.ogg') addtimer(CALLBACK(src, PROC_REF(launch_lifeboats)), 10 SECONDS) // giving some time to board lifeboats - for(var/obj/docking_port/mobile/escape_shuttle/shuttle in SSshuttle.mobile) + 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/lifeboat/lifeboat1 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_PORT) + 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/lifeboat/lifeboat2 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_STARBOARD) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat2 = SSshuttle.getShuttle(MOBILE_SHUTTLE_LIFEBOAT_STARBOARD) lifeboat2.check_for_survivors() lifesigns += lifeboat2.survivors - ai_announcement("ATTENTION: Evacuation complete. Outbound lifesigns detected: [lifesigns ? lifesigns : "none"].", 'sound/AI/evacuation_complete.ogg') + ai_announcement("ВНИМАНИЕ: Процедуры эвакуации завершены. Внешних признаков жизни зафиксировано: [lifesigns ? lifesigns : "0"].", 'sound/AI/evacuation_complete.ogg') evac_status = EVACUATION_STATUS_COMPLETE return TRUE @@ -166,7 +166,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi // 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/lifeboat/lifeboat = lifeboat_dock.get_docked() + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() if(lifeboat && lifeboat.available) lifeboat.status = LIFEBOAT_ACTIVE lifeboat_dock.open_dock() @@ -174,15 +174,15 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi /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/lifeboat/lifeboat = lifeboat_dock.get_docked() + 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/lifeboat/lifeboat = lifeboat_dock.get_docked() + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = lifeboat_dock.get_docked() if(lifeboat && lifeboat.available) - lifeboat.send_to_infinite_transit() + lifeboat.evac_launch() //========================================================================================= //========================================================================================= diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index cf2b7819a596..4a7868503224 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -26,7 +26,7 @@ return TRUE /datum/game_mode/colonialmarines/announce() - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("Игровая карта - [SSmapping.configs[GROUND_MAP].map_name]!")) /datum/game_mode/colonialmarines/get_roles_list() return ROLES_DISTRESS_SIGNAL diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index a0d555acd2fb..25fb8bffbf6e 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -35,7 +35,7 @@ return TRUE /datum/game_mode/xenovs/announce() - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("Игровая карта - [SSmapping.configs[GROUND_MAP].map_name]!")) /datum/game_mode/xenovs/get_roles_list() return ROLES_XENO @@ -284,7 +284,7 @@ if(round_statistics) round_statistics.track_round_end() log_game("Round end result: [round_finished]") - to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|")) + to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Раунд Завершен|")) to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the battling hives on [SSmapping.configs[GROUND_MAP].map_name]. [round_finished]\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #3 for more details.")) // for the toolbox diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 5b007d275c32..f06d5703a4a9 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -128,8 +128,8 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki if(round_statistics) round_statistics.track_round_end() log_game("Round end result: [round_finished]") - to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|")) - to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the brave men and women of the [MAIN_SHIP_NAME] and their struggle on [SSmapping.configs[GROUND_MAP].map_name].\nThe game-mode was: [master_mode]!\nEnd of Round Grief (EORG) is an IMMEDIATE 3 hour ban with no warnings, see rule #3 for more details.")) + to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Раунд завершен|")) + to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Так заканчивается история экипажа [MAIN_SHIP_NAME] и их борьбы на объекте [SSmapping.configs[GROUND_MAP].map_name].\nРежим игры: [master_mode]!\nГриф в конце раунда (EORG) влечет немедленный бан на 3 часа, смотрите правило #3 для деталей.")) /datum/game_mode/proc/declare_completion() if(round_statistics) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 0d10b06d5fef..8399e2884ee2 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -389,6 +389,8 @@ return "[MAIN_SHIP_NAME] Command" if(ACCESS_MARINE_CREWMAN) return "Vehicle Crewman" + if(ACCESS_MARINE_WALKER) + return "Walker Crewman" if(ACCESS_MARINE_PREP) return "Marine Prep" if(ACCESS_MARINE_ENGPREP) diff --git a/code/game/jobs/job/antag/xeno/queen.dm b/code/game/jobs/job/antag/xeno/queen.dm index 5702f9b1a671..253f1427d74c 100644 --- a/code/game/jobs/job/antag/xeno/queen.dm +++ b/code/game/jobs/job/antag/xeno/queen.dm @@ -19,7 +19,7 @@ to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") AddTimelock(/datum/job/antag/xenos/queen, list( - JOB_XENO_ROLES = 10 HOURS, - JOB_DRONE_ROLES = 5 HOURS, - JOB_T3_ROLES = 3 HOURS, + JOB_XENO_ROLES = 3 HOURS, + JOB_DRONE_ROLES = 1 HOURS, + JOB_T3_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index ba65720b8251..3e868b1efbf7 100644 --- a/code/game/jobs/job/civilians/other/liaison.dm +++ b/code/game/jobs/job/civilians/other/liaison.dm @@ -24,5 +24,5 @@ job = /datum/job/civilian/liaison AddTimelock(/datum/job/civilian/liaison, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm index c681768f93bc..eabc1b51b505 100644 --- a/code/game/jobs/job/civilians/other/reporter.dm +++ b/code/game/jobs/job/civilians/other/reporter.dm @@ -35,5 +35,5 @@ This could be the story of the sector! 'Brave Marines responding to dangerous di job = /datum/job/civilian/reporter AddTimelock(/datum/job/civilian/reporter, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 1 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index ff2d7d229fba..15e7b13091ae 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -119,9 +119,9 @@ SSticker.mode.survivors_by_type_amounts[preferred_variant] += 1 AddTimelock(/datum/job/civilian/survivor, list( - JOB_SQUAD_ROLES = 5 HOURS, - JOB_ENGINEER_ROLES = 5 HOURS, - JOB_MEDIC_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_MEDIC_ROLES = 1 HOURS )) /datum/job/civilian/survivor/synth diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 9f3ff20cffb3..91fe434e1bb7 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/code/game/jobs/job/civilians/support/cmo.dm @@ -9,7 +9,7 @@ entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." AddTimelock(/datum/job/civilian/professor, list( - JOB_MEDIC_ROLES = 10 HOURS + JOB_MEDIC_ROLES = 1 HOURS )) /obj/effect/landmark/start/professor diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index fd33d1f03f0a..6ef965885d11 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/code/game/jobs/job/civilians/support/researcher.dm @@ -28,7 +28,7 @@ return positions AddTimelock(/datum/job/civilian/researcher, list( - JOB_MEDIC_ROLES = 5 HOURS + JOB_MEDIC_ROLES = 1 HOURS )) /obj/effect/landmark/start/researcher diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm index 262ba271edbf..af8e21a27f12 100644 --- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm +++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm @@ -8,10 +8,10 @@ entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency." AddTimelock(/datum/job/command/auxiliary_officer, list( - JOB_SQUAD_ROLES = 5 HOURS, - JOB_REQUISITION_ROLES = 5 HOURS, - JOB_ENGINEER_ROLES = 5 HOURS, - JOB_AUXILIARY_ROLES = 5 HOURS, + JOB_SQUAD_ROLES = 1 HOURS, + JOB_REQUISITION_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_AUXILIARY_ROLES = 1 HOURS, )) /obj/effect/landmark/start/auxiliary_officer diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index 5f846bf6581e..3289fec0f82d 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." AddTimelock(/datum/job/command/crew_chief, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/crew_chief diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 10b8381c417e..597f3289c610 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -24,7 +24,7 @@ return positions AddTimelock(/datum/job/command/intel, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/intel diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index 57495fe8be28..57901f3bec91 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason." AddTimelock(/datum/job/command/pilot, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/pilot diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm index 68b9a99e4c4f..c64f27842b1a 100644 --- a/code/game/jobs/job/command/auxiliary/senior.dm +++ b/code/game/jobs/job/command/auxiliary/senior.dm @@ -25,13 +25,13 @@ return filtered_job_options AddTimelock(/datum/job/command/senior, list( - JOB_SQUAD_ROLES = 15 HOURS, + JOB_SQUAD_ROLES = 3 HOURS, - JOB_ENGINEER_ROLES = 10 HOURS, - JOB_POLICE_ROLES = 10 HOURS, - JOB_MEDIC_ROLES = 10 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS, + JOB_POLICE_ROLES = 1 HOURS, + JOB_MEDIC_ROLES = 1 HOURS, - JOB_COMMAND_ROLES = 5 HOURS, + JOB_COMMAND_ROLES = 3 HOURS, )) /obj/effect/landmark/start/senior diff --git a/code/game/jobs/job/command/auxiliary/tankcrew.dm b/code/game/jobs/job/command/auxiliary/tankcrew.dm new file mode 100644 index 000000000000..5e8d7b145c4c --- /dev/null +++ b/code/game/jobs/job/command/auxiliary/tankcrew.dm @@ -0,0 +1,18 @@ +/datum/job/command/tank_crew + title = JOB_CREWMAN + total_positions = 2 + spawn_positions = 2 + allow_additional = 1 + scaled = 0 + flags_startup_parameters = ROLE_ADD_TO_DEFAULT + gear_preset = /datum/equipment_preset/uscm/tank + entry_message_body = "Your job is to operate and maintain the ship's armored vehicles. You are in charge of representing the armored presence amongst the marines during the operation, as well as maintaining and repairing your own vehicles." + +AddTimelock(/datum/job/command/tank_crew, list( + JOB_SQUAD_ROLES = 1 HOURS, + JOB_ENGINEER_ROLES = 1 HOURS +)) + +/obj/effect/landmark/start/tank_crew + name = JOB_CREWMAN + job = /datum/job/command/tank_crew diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index cc9b4f65e624..85fa5fc1bb61 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -18,7 +18,7 @@ GLOB.marine_leaders -= JOB_XO AddTimelock(/datum/job/command/executive, list( - JOB_COMMAND_ROLES = 5 HOURS, + JOB_COMMAND_ROLES = 8 HOURS, )) /obj/effect/landmark/start/executive diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 82a537dc83f6..50cb3a9dda51 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -27,8 +27,8 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 1 HOURS, - JOB_HUMAN_ROLES = 15 HOURS + JOB_SQUAD_LEADER = 3 HOURS, + JOB_HUMAN_ROLES = 3 HOURS )) /obj/effect/landmark/start/bridge diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm index 60bc564af3b1..20452db9ee8e 100644 --- a/code/game/jobs/job/command/police/chief_police.dm +++ b/code/game/jobs/job/command/police/chief_police.dm @@ -7,7 +7,7 @@ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!" AddTimelock(/datum/job/command/warrant, list( - JOB_POLICE_ROLES = 15 HOURS, + JOB_POLICE_ROLES = 5 HOURS, JOB_COMMAND_ROLES = 5 HOURS )) diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm index 48cd9b33e99c..a153b84b2c6f 100644 --- a/code/game/jobs/job/command/police/police.dm +++ b/code/game/jobs/job/command/police/police.dm @@ -26,7 +26,7 @@ return positions AddTimelock(/datum/job/command/police, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/police diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm index 851b43debd3c..31e9b7064799 100644 --- a/code/game/jobs/job/command/police/warden.dm +++ b/code/game/jobs/job/command/police/warden.dm @@ -8,7 +8,7 @@ entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig." AddTimelock(/datum/job/command/warden, list( - JOB_POLICE_ROLES = 10 HOURS + JOB_POLICE_ROLES = 3 HOURS )) /obj/effect/landmark/start/warden diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm index 3b6fb7262a80..79e92f5e5795 100644 --- a/code/game/jobs/job/logistics/cargo/chief_req.dm +++ b/code/game/jobs/job/logistics/cargo/chief_req.dm @@ -6,7 +6,7 @@ entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship." AddTimelock(/datum/job/logistics/requisition, list( - JOB_REQUISITION_ROLES = 10 HOURS, + JOB_REQUISITION_ROLES = 1 HOURS, )) /obj/effect/landmark/start/requisition diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm index 9db14540e74a..9159dc1d8084 100644 --- a/code/game/jobs/job/logistics/engi/chief_engineer.dm +++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm @@ -6,7 +6,7 @@ entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command." AddTimelock(/datum/job/logistics/engineering, list( - JOB_ENGINEER_ROLES = 10 HOURS, + JOB_ENGINEER_ROLES = 5 HOURS, )) /obj/effect/landmark/start/engineering diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index aa2173d173d0..5956bb111505 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -1,7 +1,7 @@ /datum/job/marine/leader title = JOB_SQUAD_LEADER - total_positions = 4 - spawn_positions = 4 + total_positions = 2 + spawn_positions = 2 supervisors = "the acting commanding officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/leader @@ -13,7 +13,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sl AddTimelock(/datum/job/marine/leader, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_ROLES = 5 HOURS )) /obj/effect/landmark/start/marine/leader diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 637567d47d4d..1d85cdf14fc7 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -33,7 +33,6 @@ gear_preset = /datum/equipment_preset/wo/marine/medic AddTimelock(/datum/job/marine/medic, list( - JOB_MEDIC_ROLES = 1 HOURS, JOB_SQUAD_ROLES = 1 HOURS )) diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 5753434e62ee..e6255ec23e59 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -28,10 +28,6 @@ flags_startup_parameters = ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/wo/marine/sg -AddTimelock(/datum/job/marine/smartgunner, list( - JOB_SQUAD_ROLES = 5 HOURS -)) - /obj/effect/landmark/start/marine/smartgunner name = JOB_SQUAD_SMARTGUN icon_state = "smartgunner_spawn" diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 539d3a158690..7afe592eeec2 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -30,7 +30,7 @@ gear_preset = /datum/equipment_preset/wo/marine/spec AddTimelock(/datum/job/marine/specialist, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 1 HOURS )) /obj/effect/landmark/start/marine/spec diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index f6c58cce3e0d..be408be0747b 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -1,7 +1,7 @@ /datum/job/marine/tl title = JOB_SQUAD_TEAM_LEADER - total_positions = 8 - spawn_positions = 8 + total_positions = 4 + spawn_positions = 4 allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl @@ -12,7 +12,7 @@ spawning_human.important_radio_channels += JTAC_FREQ AddTimelock(/datum/job/marine/tl, list( - JOB_SQUAD_ROLES = 8 HOURS + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/marine/tl diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index fb85be012d30..3665c693b815 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -42,15 +42,15 @@ /// Can use any squad vendor regardless of squad connection var/omni_squad_vendor = FALSE /// maximum # of engineers allowed in the squad - var/max_engineers = 3 + var/max_engineers = 6 /// maximum # of squad medics allowed in the squad - var/max_medics = 4 + var/max_medics = 8 /// maximum # of specs allowed in the squad - var/max_specialists = 1 + var/max_specialists = 2 /// maximum # of fireteam leaders allowed in the suqad var/max_tl = 2 /// maximum # of smartgunners allowed in the squad - var/max_smartgun = 1 + var/max_smartgun = 2 /// maximum # of squad leaders allowed in the squad var/max_leaders = 1 /// Squad headsets default radio frequency @@ -123,7 +123,7 @@ access = list(ACCESS_MARINE_ALPHA) radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA - +/* /datum/squad/marine/bravo name = SQUAD_MARINE_2 equipment_color = "#ffc32d" @@ -132,6 +132,10 @@ radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO + active = FALSE + roundstart = FALSE + locked = TRUE + /datum/squad/marine/charlie name = SQUAD_MARINE_3 equipment_color = "#c864c8" @@ -140,6 +144,11 @@ radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE + active = FALSE + roundstart = FALSE + locked = TRUE +*/ + /datum/squad/marine/delta name = SQUAD_MARINE_4 equipment_color = "#4148c8" @@ -148,6 +157,7 @@ radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA + /datum/squad/marine/echo name = SQUAD_MARINE_5 equipment_color = "#67d692" diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index d1934c597da7..10b30d95e487 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -63,7 +63,6 @@ var/global/players_preassigned = 0 /datum/job/special/uaac, /datum/job/special/uaac/tis, /datum/job/special/uscm, - /datum/job/command/tank_crew //Rip VC ) var/squads_all[] = typesof(/datum/squad) - /datum/squad var/castes_all[] = subtypesof(/datum/caste_datum) diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index 7230f57eb745..a11029be746c 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -13,40 +13,40 @@ return round(Clamp((marine_count/factor)+c, min, max)) /proc/medic_slot_formula(playercount) - return job_slot_formula(playercount,40,1,3,5) + return job_slot_formula(playercount,20,1,3,5) /proc/engi_slot_formula(playercount) - return job_slot_formula(playercount,50,1,2,4) + return job_slot_formula(playercount,25,1,2,4) /proc/mp_slot_formula(playercount) return job_slot_formula(playercount,25,2,4,8) /proc/so_slot_formula(playercount) - return job_slot_formula(playercount,40,1,2,5) + return job_slot_formula(playercount,20,1,2,5) /proc/doc_slot_formula(playercount) - return job_slot_formula(playercount,25,1,4,6) + return job_slot_formula(playercount,15,1,4,6) /proc/rsc_slot_formula(playercount) - return job_slot_formula(playercount,40,1,2,3) + return job_slot_formula(playercount,20,1,2,3) /proc/ot_slot_formula(playercount) - return job_slot_formula(playercount,60,1,2,3) + return job_slot_formula(playercount,30,1,2,3) /proc/ct_slot_formula(playercount) - return job_slot_formula(playercount,30,0,2,3) + return job_slot_formula(playercount,15,0,2,3) /proc/int_slot_formula(playercount) - return job_slot_formula(playercount,30,1,1,3) + return job_slot_formula(playercount,15,1,1,3) /proc/spec_slot_formula(playercount) - return job_slot_formula(playercount,20,1,2,4) + return job_slot_formula(playercount,15,1,2,4) /proc/sg_slot_formula(playercount) - return job_slot_formula(playercount,20,1,2,4) + return job_slot_formula(playercount,15,1,2,4) /proc/synth_slot_formula(playercount) - return job_slot_formula(playercount,120,1,1,2) + return job_slot_formula(playercount,60,1,1,2) /proc/working_joe_slot_formula(playercount) - return job_slot_formula(playercount,30,1,3,6) + return job_slot_formula(playercount,15,1,3,6) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index eb9aed4f71e4..463bb6b02d49 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -342,6 +342,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li set_name = "Scout Set" if(SKILL_SPEC_SNIPER) set_name = "Sniper Set" + if(SKILL_SPEC_ST) + set_name = "Stormtrooper Set" if(set_name && !available_specialist_sets.Find(set_name)) available_specialist_sets += set_name diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index da4ad01c086b..e6dccbdedbac 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -353,8 +353,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) . = ..() - if(istype(port, /obj/docking_port/mobile/lifeboat)) - var/obj/docking_port/mobile/lifeboat/lifeboat = port + if(istype(port, /obj/docking_port/mobile/crashable/lifeboat)) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = port lifeboat.doors += src /// External airlock that is part of the lifeboat dock diff --git a/code/game/machinery/medical_pod/autodoc.dm b/code/game/machinery/medical_pod/autodoc.dm index 7049df4c661c..a9c07c1be972 100644 --- a/code/game/machinery/medical_pod/autodoc.dm +++ b/code/game/machinery/medical_pod/autodoc.dm @@ -243,6 +243,10 @@ if(H.disfigured) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"facial") + if(istype(L,/obj/limb/chest)) + if(locate(/obj/item/alien_embryo) in M.contents) + surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") + if(L.status & LIMB_BROKEN) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"broken") if(L.status & LIMB_DESTROYED) @@ -253,7 +257,8 @@ if(!is_type_in_list(I,known_implants)) surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") if(M.incision_depths[L.name] != SURGERY_DEPTH_SURFACE) - surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"open") + surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"open") + var/datum/internal_organ/I = M.internal_organs_by_name["eyes"] if(I && (M.disabilities & NEARSIGHTED || M.sdisabilities & DISABILITY_BLIND || I.damage > 0)) surgery_list += create_autodoc_surgery(null,ORGAN_SURGERY,"eyes",0,I) @@ -477,13 +482,13 @@ H.UpdateDamageIcon() if("shrapnel") - if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Beginning shrapnel removal."); + if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Beginning foreign bodies removal."); if(S.unneeded) sleep(UNNEEDED_DELAY) visible_message("[icon2html(src, viewers(src))] \The [src] speaks: Procedure has been deemed unnecessary."); surgery_todo_list -= S continue - + open_incision(H,S.limb_ref) if(S.limb_ref.name == "chest" || S.limb_ref.name == "head") open_encased(H,S.limb_ref) @@ -495,6 +500,11 @@ S.limb_ref.implants -= I H.embedded_items -= I qdel(I) + var/obj/item/larva_ref = locate(/obj/item/alien_embryo) in H.contents + if(S.limb_ref.name == "chest" && larva_ref) + sleep(REMOVE_OBJECT_MAX_DURATION*surgery_mod) + H.contents -= larva_ref + qdel(larva_ref) if(S.limb_ref.name == "chest" || S.limb_ref.name == "head") close_encased(H,S.limb_ref) if(!surgery) break @@ -713,7 +723,7 @@ dat += "Limb Replacement Surgery" if("shrapnel") surgeryqueue["shrapnel"] = 1 - dat += "Shrapnel Removal Surgery" + dat += "Foreign Bodies Removal Surgery" if("facial") surgeryqueue["facial"] = 1 dat += "Facial Reconstruction Surgery" @@ -733,7 +743,9 @@ if(isnull(surgeryqueue["open"])) dat += "Close Open Incisions
" if(isnull(surgeryqueue["shrapnel"])) - dat += "Shrapnel Removal Surgery
" + dat += "Foreign Bodies Removal Surgery
" + if(isnull(surgeryqueue["facial"])) + dat += "Facial Reconstruction Surgery
" dat += "Hematology Treatments" dat += "
" if(isnull(surgeryqueue["blood"])) @@ -742,9 +754,18 @@ dat += "Dialysis
" if(isnull(surgeryqueue["toxin"])) dat += "Bloodstream Toxin Removal
" + dat += "Internal Surgery" dat += "
" + if(isnull((surgeryqueue["organdamage"]))) + dat += "Organ Treatment Procedure
" + if(isnull((surgeryqueue["internal"]))) + dat += "Internal Bleeding Surgery
" + if(isnull((surgeryqueue["broken"]))) + dat += "Bone Repair Treatment
" + if(isnull((surgeryqueue["missing"]))) + dat += "Limb Replacement Surgery
" else - dat += "The autodoc is empty." + dat += "
The autodoc is empty." dat += text("Close", user) show_browser(user, dat, "Auto-Doc Medical System", "sleeper", "size=300x400") onclose(user, "sleeper") @@ -840,6 +861,9 @@ if(!is_type_in_list(I,known_implants)) N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") needed++ + if(istype(L,/obj/limb/chest) && locate(/obj/item/alien_embryo) in connected.occupant.contents) + N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel") + needed++ if(!needed) N.fields["autodoc_manual"] += create_autodoc_surgery(null,LIMB_SURGERY,"shrapnel",1) updateUsrDialog() diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index f8250fad271c..0a5b639d864a 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -82,7 +82,7 @@ /proc/Broadcast_Message(datum/radio_frequency/connection, mob/M, vmask, vmessage, obj/item/device/radio/radio, message, name, job, realname, vname, - data, compression, list/level, freq, verbage = "says", + data, compression, list/level, freq, verbage = "говорит", datum/language/speaking = null, volume = RADIO_VOLUME_QUIET) /* ###### Prepare the radio connection ###### */ @@ -222,7 +222,7 @@ // --- Some more pre-message formatting --- var/part_b_extra = "" if(data == 3) // intercepted radio message - part_b_extra = " (Intercepted)" + part_b_extra = " (ПЕРЕХВАЧЕНО)" var/part_b = " [icon2html(radio, (heard_masked + heard_normal + heard_voice + heard_garbled + heard_gibberish))]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE if(display_freq in M.important_radio_channels) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index bf7c4fffee65..fa1892729663 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -502,6 +502,9 @@ GLOBAL_LIST_EMPTY(vending_products) if("Pyro Set") user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_PYRO) specialist_assignment = "Pyro" + if("Stormtrooper Set") + user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ST) + specialist_assignment = "ST" else to_chat(user, SPAN_WARNING("Something bad occured with [src], tell a Dev.")) vend_fail() diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a61934324491..d7334a26e9aa 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -395,15 +395,9 @@ products = list( /obj/item/device/cassette_tape/pop1 = 10, - /obj/item/device/cassette_tape/hiphop = 10, - /obj/item/device/cassette_tape/nam = 10, - /obj/item/device/cassette_tape/ocean = 10, - /obj/item/device/cassette_tape/pop3 = 10, - /obj/item/device/cassette_tape/pop4 = 10, /obj/item/device/cassette_tape/pop2 = 10, - /obj/item/device/cassette_tape/heavymetal = 10, - /obj/item/device/cassette_tape/hairmetal = 10, - /obj/item/device/cassette_tape/indie = 10, + /obj/item/device/cassette_tape/pop3 = 10, + /obj/item/device/cassette_tape/heavymetal = 5, /obj/item/device/walkman = 50, /obj/item/storage/pouch/cassette = 15, /obj/item/toy/deck = 5, @@ -417,15 +411,9 @@ prices = list( /obj/item/device/cassette_tape/pop1 = 5, - /obj/item/device/cassette_tape/hiphop = 5, - /obj/item/device/cassette_tape/nam = 5, - /obj/item/device/cassette_tape/ocean = 6, - /obj/item/device/cassette_tape/pop3 = 5, - /obj/item/device/cassette_tape/pop4 = 5, /obj/item/device/cassette_tape/pop2 = 5, + /obj/item/device/cassette_tape/pop3 = 5, /obj/item/device/cassette_tape/heavymetal = 5, - /obj/item/device/cassette_tape/hairmetal = 5, - /obj/item/device/cassette_tape/indie = 5, /obj/item/device/walkman = 15, /obj/item/storage/pouch/cassette = 10, /obj/item/toy/deck = 20, diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 891a2a907b39..7f657a058db1 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -16,7 +16,6 @@ vend_sound = 'sound/machines/medevac_extend.ogg' var/selected_vehicle - var/budget_points = 0 var/available_categories = VEHICLE_ALL_AVAILABLE available_points_to_display = 0 @@ -51,12 +50,17 @@ malfunction() return -/obj/structure/machinery/cm_vending/gear/vehicle_crew/proc/populate_products(datum/source, obj/vehicle/multitile/V) +/obj/structure/machinery/cm_vending/gear/vehicle_crew/proc/populate_products(datum/source, datum/vehicle_order/VO) SIGNAL_HANDLER UnregisterSignal(SSdcs, COMSIG_GLOB_VEHICLE_ORDERED) - selected_vehicle = "APC" - available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section + available_categories = VEHICLE_ALL_AVAILABLE + + if(istype(VO, /datum/vehicle_order/tank)) + selected_vehicle = "TANK" + else if(istype(VO, /datum/vehicle_order/apc)) + selected_vehicle = "APC" + available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_listed_products(mob/user) var/list/display_list = list() @@ -86,7 +90,7 @@ . += ui_static_data(user) if(supply_controller.tank_points) //we steal points from supply_controller, meh-he-he. Solely to be able to modify amount of points in vendor if needed by just changing one var. - available_points_to_display = supply_controller.tank_points + available_points_to_display += supply_controller.tank_points supply_controller.tank_points = 0 .["current_m_points"] = available_points_to_display @@ -97,7 +101,7 @@ var/prod_available = FALSE var/p_cost = myprod[2] var/avail_flag = myprod[4] - if(budget_points >= p_cost && (!avail_flag || available_categories & avail_flag)) + if(available_points_to_display >= p_cost && (!avail_flag || available_categories & avail_flag)) prod_available = TRUE stock_values += list(prod_available) @@ -116,7 +120,7 @@ to_chat(H, SPAN_WARNING("Not enough points.")) vend_fail() return FALSE - budget_points -= L[2] + available_points_to_display -= L[2] /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_appropriate_vend_turf(mob/living/carbon/human/H) var/turf/T = get_turf(src) diff --git a/code/game/machinery/vending/vendor_types/general.dm b/code/game/machinery/vending/vendor_types/general.dm index f4f6aa42aaf1..d4cf6876f53f 100644 --- a/code/game/machinery/vending/vendor_types/general.dm +++ b/code/game/machinery/vending/vendor_types/general.dm @@ -13,15 +13,9 @@ GLOBAL_LIST_INIT(cm_vending_walkman, list( list("WALKMAN", -1, null, null), list("Blue Cassette", 10, /obj/item/device/cassette_tape/pop1, VENDOR_ITEM_REGULAR), - list("Blue Stripe Cassette", 10, /obj/item/device/cassette_tape/hiphop, VENDOR_ITEM_REGULAR), - list("Green Cassette", 10, /obj/item/device/cassette_tape/nam, VENDOR_ITEM_REGULAR), - list("Ocean Cassette", 10, /obj/item/device/cassette_tape/ocean, VENDOR_ITEM_REGULAR), list("Orange Cassette", 10, /obj/item/device/cassette_tape/pop3, VENDOR_ITEM_REGULAR), - list("Pink Cassette", 10, /obj/item/device/cassette_tape/pop4, VENDOR_ITEM_REGULAR), list("Rainbow Cassette", 10, /obj/item/device/cassette_tape/pop2, VENDOR_ITEM_REGULAR), list("Red-Black Cassette", 10, /obj/item/device/cassette_tape/heavymetal, VENDOR_ITEM_REGULAR), - list("Red Striped Cassette", 10, /obj/item/device/cassette_tape/hairmetal, VENDOR_ITEM_REGULAR), - list("Rising Sun Cassette", 10, /obj/item/device/cassette_tape/indie, VENDOR_ITEM_REGULAR), list("Walkman", 50, /obj/item/device/walkman, VENDOR_ITEM_REGULAR), list("Cassette Pouch", 15, /obj/item/storage/pouch/cassette, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index b09ae4aa15c5..e95d9c9dc697 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -6,6 +6,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list( list("Heavy Grenadier Set", 0, /obj/item/storage/box/spec/heavy_grenadier, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Pyro Set", 0, /obj/item/storage/box/spec/pyro, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Scout Set", 0, /obj/item/storage/box/spec/scout, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), + list("Stormtrooper Set", 0, /obj/item/storage/box/spec/st, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), list("Sniper Set", 0, /obj/item/storage/box/spec/sniper, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), list("EXTRA SCOUT AMMUNITION", 0, null, null, null), 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 4f64ca7e81fa..43502952732a 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 @@ -80,6 +80,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("Essential Fireteam Leader Utilities", 0, /obj/effect/essentials_set/tl, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("USCM Radio Telephone Pack", 0, /obj/item/storage/backpack/marine/satchel/rto, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/supplies.dm b/code/game/machinery/vending/vendor_types/supplies.dm index 2a2f35de8c19..376edf7ffc5d 100644 --- a/code/game/machinery/vending/vendor_types/supplies.dm +++ b/code/game/machinery/vending/vendor_types/supplies.dm @@ -23,8 +23,6 @@ list("FOOD AND BEVERAGE", -1, null, null), list("MRE", 25, /obj/item/storage/box/MRE, VENDOR_ITEM_REGULAR), list("Water Bottle", 25, /obj/item/reagent_container/food/drinks/cans/waterbottle, VENDOR_ITEM_REGULAR), - list("Aspen Beer", 10, /obj/item/storage/beer_pack, VENDOR_ITEM_REGULAR),//NOTE TO SELF, LOCK THIS ALCOHOL BEHIND SHIP ESCAPE - list("Wey-Yu Sake", 5, /obj/item/reagent_container/food/drinks/bottle/sake, VENDOR_ITEM_REGULAR), list("UTILITY", -1, null, null), list("M94 Marking Flare Pack", 5, /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 80254be4a6d9..f497bc20ba83 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -368,6 +368,7 @@ cases. Override_icon_state should be a list.*/ /obj/item/proc/pickup(mob/user, silent) SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user) + SEND_SIGNAL(user, COMSIG_MOB_PICKUP_ITEM, src) setDir(SOUTH)//Always rotate it south. This resets it to default position, so you wouldn't be putting things on backwards if(pickup_sound && !silent && src.loc?.z) playsound(src, pickup_sound, pickupvol, pickup_vary) @@ -635,6 +636,8 @@ cases. Override_icon_state should be a list.*/ 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(!disable_warning) to_chat(H, SPAN_WARNING("You need a suit before you can attach this [name].")) diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index d754ada57ca1..84c9eaae63ad 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -189,17 +189,14 @@ name = "Circuit board (vehicle ASRS console)" build_path = /obj/structure/machinery/computer/supplycomp/vehicle var/spent = FALSE //so that they can't just reconstruct the console to get another APC - var/tank_unlocked = FALSE /obj/item/circuitboard/computer/supplycomp/vehicle/construct(obj/structure/machinery/computer/supplycomp/vehicle/SCV) if (..(SCV)) SCV.spent = spent - SCV.tank_unlocked = tank_unlocked /obj/item/circuitboard/computer/supplycomp/vehicle/disassemble(obj/structure/machinery/computer/supplycomp/vehicle/SCV) if (..(SCV)) spent = SCV.spent - tank_unlocked = SCV.tank_unlocked /obj/item/circuitboard/computer/operating name = "Circuit board (Operating Computer)" diff --git a/code/game/objects/items/devices/device.dm b/code/game/objects/items/devices/device.dm index 148d47249201..d3058960233c 100644 --- a/code/game/objects/items/devices/device.dm +++ b/code/game/objects/items/devices/device.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/items/devices.dmi' var/serial_number -/obj/item/device/Initialize() +/obj/item/device/Initialize(mapload, ...) . = ..() serial_number = "[rand(0,9)][pick(alphabet_uppercase)][rand(0,9)][rand(0,9)][rand(0,9)][rand(0,9)][pick(alphabet_uppercase)]" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 2092ffa108c6..75e414690113 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -206,7 +206,7 @@ // If we were to send to a channel we don't have, drop it. return null -/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, verb = "says", datum/language/speaking = null) +/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, verb = "говорит", datum/language/speaking = null) if(!on) return // the device has to be on // Fix for permacell radios, but kinda eh about actually fixing them. if(!M || !message) return @@ -328,7 +328,7 @@ return null return target_zs -/obj/item/device/radio/hear_talk(mob/M as mob, msg, verb = "says", datum/language/speaking = null) +/obj/item/device/radio/hear_talk(mob/M as mob, msg, verb = "говорит", datum/language/speaking = null) if (broadcasting) if(get_dist(src, M) <= canhear_range) talk_into(M, msg,null,verb,speaking) diff --git a/code/game/objects/items/devices/vulture_spotter.dm b/code/game/objects/items/devices/vulture_spotter.dm new file mode 100644 index 000000000000..b89009efde7e --- /dev/null +++ b/code/game/objects/items/devices/vulture_spotter.dm @@ -0,0 +1,41 @@ +/obj/item/device/vulture_spotter_scope + name = "\improper M707 spotter scope" + desc = "A scope that, when mounted on a tripod, allows a user to assist the M707's firer in target acquisition." + icon_state = "vulture_scope" + item_state = "electronic" + flags_atom = FPRINT|CONDUCT + unacidable = TRUE + indestructible = TRUE + /// A weakref to the corresponding rifle + var/datum/weakref/bound_rifle + +/obj/item/device/vulture_spotter_scope/Initialize(mapload, datum/weakref/rifle) + . = ..() + if(rifle) + bound_rifle = rifle + +/obj/item/device/vulture_spotter_scope/attack_self(mob/user) + . = ..() + to_chat(user, SPAN_WARNING("[src] needs to be mounted on a tripod to use!")) + +/obj/item/device/vulture_spotter_tripod + name = "\improper M707 spotter tripod" + desc = "A tripod, meant for stabilizing a spotting scope for the M707 anti-materiel rifle." + icon_state = "vulture_tripod" + item_state = "electronic" + flags_atom = FPRINT|CONDUCT + unacidable = TRUE + indestructible = TRUE + +/obj/item/device/vulture_spotter_tripod/get_examine_text(mob/user) + . = ..() + . += SPAN_NOTICE("[src] can be set down by using in-hand.") + +/obj/item/device/vulture_spotter_tripod/attack_self(mob/user) + . = ..() + user.balloon_alert(user, "setting up tripod...") + if(!do_after(user, 1.5 SECONDS, target = user)) + return + + new /obj/structure/vulture_spotter_tripod(get_turf(user)) + qdel(src) diff --git a/code/game/objects/items/devices/walkman.dm b/code/game/objects/items/devices/walkman.dm index 2bbcb802d426..ab376f14588a 100644 --- a/code/game/objects/items/devices/walkman.dm +++ b/code/game/objects/items/devices/walkman.dm @@ -335,7 +335,7 @@ /obj/item/device/cassette_tape/pop1 name = "blue cassette" id = 2 - desc = "A plastic cassette tape with a blue sticker." + desc = "A plastic cassette tape with a blue sticker.\nFrom 13th with love." icon_state = "cassette_blue" side1_icon = "cassette_blue" songs = list("side1" = list("sound/music/walkman/pop1/1-1-1.ogg",\ @@ -348,7 +348,7 @@ /obj/item/device/cassette_tape/pop2 name = "rainbow cassette" id = 3 - desc = "A plastic cassette tape with a rainbow-colored sticker." + desc = "A plastic cassette tape with a rainbow-colored sticker.\nFrom 13th with love." icon_state = "cassette_rainbow" side1_icon = "cassette_rainbow" songs = list("side1" = list("sound/music/walkman/pop2/2-1-1.ogg",\ @@ -361,7 +361,7 @@ /obj/item/device/cassette_tape/pop3 name = "orange cassette" id = 4 - desc = "A plastic cassette tape with an orange sticker." + desc = "A plastic cassette tape with an orange sticker.\nFrom shizoidov with love." icon_state = "cassette_orange" side1_icon = "cassette_orange" songs = list("side1" = list("sound/music/walkman/pop3/3-1-1.ogg",\ @@ -374,7 +374,7 @@ /obj/item/device/cassette_tape/pop4 name = "pink cassette" id = 5 - desc = "A plastic cassette tape with a pink striped sticker." + desc = "A plastic cassette tape with a pink striped sticker.\nSeems empty." icon_state = "cassette_pink_stripe" side1_icon = "cassette_pink_stripe" songs = list("side1" = list("sound/music/walkman/pop4/4-1-1.ogg",\ @@ -400,7 +400,7 @@ /obj/item/device/cassette_tape/hairmetal name = "red striped cassette" id = 7 - desc = "A plastic cassette tape with a gray sticker with red stripes." + desc = "A plastic cassette tape with a gray sticker with red stripes.\nSeems empty." icon_state = "cassette_red_stripe" side1_icon = "cassette_red_stripe" songs = list("side1" = list("sound/music/walkman/hairmetal/6-1-1.ogg",\ @@ -413,7 +413,7 @@ /obj/item/device/cassette_tape/indie name = "rising sun cassette" id = 8 - desc = "A plastic cassette tape with the Japanese Rising Sun." + desc = "A plastic cassette tape with the Japanese Rising Sun.\nSeems empty." icon_state = "cassette_rising_sun" side1_icon = "cassette_rising_sun" songs = list("side1" = list("sound/music/walkman/indie/7-1-1.ogg",\ @@ -426,7 +426,7 @@ /obj/item/device/cassette_tape/hiphop name = "blue stripe cassette" id = 9 - desc = "An orange plastic cassette tape with a blue stripe." + desc = "An orange plastic cassette tape with a blue stripe.\nSeems empty." icon_state = "cassette_orange_blue" side1_icon = "cassette_orange_blue" songs = list("side1" = list("sound/music/walkman/hiphop/8-1-1.ogg",\ @@ -439,7 +439,7 @@ /obj/item/device/cassette_tape/nam name = "green cassette" id = 10 - desc = "A green plastic cassette tape." + desc = "A green plastic cassette tape.\nSeems empty." icon_state = "cassette_green" side1_icon = "cassette_green" songs = list("side1" = list("sound/music/walkman/nam/9-1-1.ogg",\ @@ -452,7 +452,7 @@ /obj/item/device/cassette_tape/ocean name = "ocean cassette" id = 11 - desc = "A blue and white plastic cassette tape." + desc = "A blue and white plastic cassette tape.\nSeems empty." icon_state = "cassette_ocean" side1_icon = "cassette_ocean" songs = list("side1" = list("sound/music/walkman/surf/10-1-1.ogg",\ @@ -468,7 +468,7 @@ /obj/item/device/cassette_tape/aesthetic name = "aesthetic cassette" id = 12 - desc = "An aesthetic looking cassette tape. 'Jacket' is written on the front." + desc = "An aesthetic looking cassette tape. 'Jacket' is written on the front.\nSeems empty." icon_state = "cassette_aesthetic" side1_icon = "cassette_aesthetic" @@ -476,7 +476,7 @@ /obj/item/device/cassette_tape/cargocrate name = "weyland yutani cassette" id = 13 - desc = "A blue metallic cassette with a weyland yutani logo." + desc = "A blue metallic cassette with a weyland yutani logo.\nSeems empty." icon_state = "cassette_wy" side1_icon = "cassette_wy" @@ -484,7 +484,7 @@ /obj/item/device/cassette_tape/solaris name = "red UCP cassette" id = 14 - desc = "A cassette with a red UCP camo design." + desc = "A cassette with a red UCP camo design.\nSeems empty." icon_state = "cassette_solaris" side1_icon = "cassette_solaris" @@ -492,27 +492,27 @@ /obj/item/device/cassette_tape/icecolony name = "frozen cassette" id = 15 - desc = "A cassette. It's covered in ice and snow." + desc = "A cassette. It's covered in ice and snow.\nSeems empty." icon_state = "cassette_ice" side1_icon = "cassette_ice" /obj/item/device/cassette_tape/lz name = "nostalgic cassette" id = 16 - desc = "There's a cut up postcard taped to this cassette. You know this place." + desc = "There's a cut up postcard taped to this cassette. You know this place.\nSeems empty." icon_state = "cassette_lz" side1_icon = "cassette_lz" /obj/item/device/cassette_tape/desertdam name = "dam cassette" id = 17 - desc = "Attached to this cassette is a picture of a dam." + desc = "Attached to this cassette is a picture of a dam.\nSeems empty." icon_state = "cassette_dam" side1_icon = "cassette_dam" /obj/item/device/cassette_tape/prison name = "broken cassette" id = 18 - desc = "The shell on this cassette is broken, it still looks like it'll work, though!" + desc = "The shell on this cassette is broken, it still looks like it'll work, though!\nSeems empty." icon_state = "cassette_worstmap" side1_icon = "cassette_worstmap" diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index dd96f275ef17..682215be67bb 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -186,3 +186,38 @@ desc = "A piece of paper covered in crude depictions of bananas and various types of primates. Probably drawn by a three-year-old child - or an unusually intelligent marine." trait = /datum/character_trait/language/primitive + +/obj/item/pamphlet/trait + bypass_pamphlet_limit = TRUE + /// What trait to give the user + var/trait_to_give + +/obj/item/pamphlet/trait/can_use(mob/living/carbon/human/user) + if(!istype(user)) + return FALSE + + if(HAS_TRAIT(user, trait_to_give)) + to_chat(user, SPAN_WARNING("You know this already!")) + return FALSE + + if(user.job != JOB_SQUAD_MARINE) + to_chat(user, SPAN_WARNING("Only squad riflemen can use this.")) + return FALSE + + if(user.has_used_pamphlet && !bypass_pamphlet_limit) + to_chat(user, SPAN_WARNING("You've already used a pamphlet!")) + return FALSE + + return TRUE + +/obj/item/pamphlet/trait/on_use(mob/living/carbon/human/user) + to_chat(user, SPAN_NOTICE(flavour_text)) + ADD_TRAIT(user, trait_to_give, "pamphlet") + if(!bypass_pamphlet_limit) + user.has_used_pamphlet = TRUE + +/obj/item/pamphlet/trait/vulture + name = "\improper M707 instructional pamphlet" + desc = "A pamphlet used to quickly impart vital knowledge of how to shoot big guns and spot for them." + icon_state = "pamphlet_vulture" + trait_to_give = TRAIT_VULTURE_USER diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 661c8d422316..00f2c9a0978e 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -396,7 +396,7 @@ to_chat(user, SPAN_WARNING("You cannot use \the [src] when they are hidden.")) return - if(user.client.view > 7 && shape != NVG_SHAPE_COSMETIC) + if(user.client.view > 7 && shape != NVG_SHAPE_COSMETIC && !istype(user.buckled, /obj/structure/bed/chair/comfy/vehicle)) to_chat(user, SPAN_WARNING("You cannot use \the [src] while using optics.")) return diff --git a/code/game/objects/items/reagent_containers/syringes.dm b/code/game/objects/items/reagent_containers/syringes.dm index 06cbb559360c..1166a18d4faa 100644 --- a/code/game/objects/items/reagent_containers/syringes.dm +++ b/code/game/objects/items/reagent_containers/syringes.dm @@ -254,7 +254,7 @@ return var/hit_area = affecting.display_name - if((user != target) && H.check_shields(7, "the [src.name]")) + if((user != target) && H.check_shields(7, "the [src.name]", attacker_dir = get_dir(user,target))) return if (target != user && target.getarmor(target_zone, ARMOR_MELEE) > 5 && prob(50)) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index cdab7db87ed7..cb390fb89fec 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -94,7 +94,7 @@ return /obj/item/weapon/telebaton/proc/stun(mob/living/carbon/human/target, mob/living/user) - if(target.check_shields(src, 0, "[user]'s [name]")) + if(target.check_shields(src, 0, "[user]'s [name]", get_dir(user,target))) return FALSE // Visuals and sound playsound(target, 'sound/weapons/baton.ogg', 50, TRUE, 7) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9ef2f6f716b1..9b0b8cf30aae 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -15,7 +15,7 @@ projectile_coverage = PROJECTILE_COVERAGE_MEDIUM can_block_movement = TRUE -/obj/structure/Initialize() +/obj/structure/Initialize(mapload, ...) . = ..() if(climbable) verbs += /obj/structure/proc/climb_on diff --git a/code/game/objects/structures/crates_lockers/secure_crates.dm b/code/game/objects/structures/crates_lockers/secure_crates.dm index 0bd77d877ee6..a308c4c0a21c 100644 --- a/code/game/objects/structures/crates_lockers/secure_crates.dm +++ b/code/game/objects/structures/crates_lockers/secure_crates.dm @@ -176,6 +176,18 @@ icon_locked = "secure_locked_weyland" icon_unlocked = "secure_unlocked_weyland" +/obj/structure/closet/crate/secure/vulture + name = "secure M707 crate" + desc = "A secure crate, containing an M707 anti-materiel rifle." + icon_state = "secure_locked_vulture" + icon_opened = "secure_open_vulture" + icon_locked = "secure_locked_vulture" + icon_unlocked = "secure_unlocked_vulture" + +/obj/structure/closet/crate/secure/vulture/Initialize() + . = ..() + new /obj/item/storage/box/guncase/vulture(src) + //special version, able to store OB fuel and warheads only /obj/structure/closet/crate/secure/ob name = "secure orbital bombardment ammunition crate" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 4e2413a50f40..d47537743111 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -526,24 +526,6 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. /// For things that might affect someone/everyone's round if hidden. var/static/blocked_atoms = list(/obj/item/device/cotablet, /obj/item/card/id) var/static/blacklist_typecache - //layer shouldn't be put on dmm unless aestetic reason.... - layer = ABOVE_XENO_LAYER - -//made for fiorina. -/obj/structure/flora/pottedplant/pottedplant_27 - icon_state = "pottedplant_27" -/obj/structure/flora/pottedplant/pottedplant_29 - icon_state = "pottedplant_29" -/obj/structure/flora/pottedplant/pottedplant_22 - icon_state = "pottedplant_22" -/obj/structure/flora/pottedplant/pottedplant_21 - icon_state = "pottedplant_21" -/obj/structure/flora/pottedplant/pottedplant_7 - icon_state = "pottedplant_7" -/obj/structure/flora/pottedplant/pottedplant_17 - icon_state = "pottedplant_17"; -/obj/structure/flora/pottedplant/pottedplant_18 - icon_state = "pottedplant_18"; /obj/structure/flora/pottedplant/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index e7a3699a87d2..9323bca2877e 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -73,9 +73,6 @@ anchored = TRUE layer = ATMOS_PIPE_LAYER + 0.01 -//used on fiorina -/obj/structure/monorail/launchtrack - name = "launch track" //ICE COLONY RESEARCH DECORATION-----------------------// //Most of icons made by ~Morrinn @@ -154,18 +151,7 @@ /obj/structure/stairs/perspective //instance these for the required icons icon = 'icons/obj/structures/stairs/perspective_stairs.dmi' icon_state = "np_stair" -//for fiorina -/obj/structure/stairs/perspective/p_stair_sn_full_cap - icon_state = "p_stair_sn_full_cap" -/obj/structure/stairs/perspective/p_stair_full - icon_state = "p_stair_full" - -/obj/structure/stairs/perspective/p_stair_ew_full_cap - icon_state = "p_stair_ew_full_cap" - -/obj/structure/stairs/perspective/p_stair_ew_half_cap - icon_state = "p_stair_ew_half_cap" /obj/structure/stairs/perspective/kutjevo icon = 'icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi' diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm new file mode 100644 index 000000000000..a668cb562028 --- /dev/null +++ b/code/game/objects/structures/vulture_spotter.dm @@ -0,0 +1,305 @@ +/obj/structure/vulture_spotter_tripod + name = "\improper M707 spotting tripod" + desc = "A tripod for an M707 anti-materiel rifle's spotting scope." + icon_state = "vulture_tripod" + density = TRUE + anchored = TRUE + unacidable = TRUE + /// Weakref to the associated rifle + var/datum/weakref/bound_rifle + /// Weakref to the scope user, if any + var/datum/weakref/scope_user + /// If the tripod has an attached spotting scope + var/scope_attached = FALSE + /// If the scope is currently being used + var/scope_using = FALSE + /// Ref to the action to give the user of the scope + var/datum/action/vulture_tripod_unscope/unscope_action + /// How far out the scope zooms + var/scope_zoom = 10 + /// How much to increase the user's dark vision by + var/darkness_view = 12 + /// The maximum distance this can be from the sniper scope + var/max_sniper_distance = 7 + +/obj/structure/vulture_spotter_tripod/Initialize(mapload) + . = ..() + desc = initial(desc) + " Though, it doesn't seem to have one attached yet." + +/obj/structure/vulture_spotter_tripod/Destroy() + if(scope_user) + var/mob/user = scope_user.resolve() + user.unset_interaction() + QDEL_NULL(unscope_action) + return ..() + +/obj/structure/vulture_spotter_tripod/deconstruct(disassembled) + . = ..() + if(scope_attached && bound_rifle) + new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle) + new /obj/item/device/vulture_spotter_tripod(get_turf(src)) + +/obj/structure/vulture_spotter_tripod/get_examine_text(mob/user) + . = ..() + if(scope_attached) + . += SPAN_NOTICE("You can remove the scope from [src] with a screwdriver.") + else + . += SPAN_NOTICE("You can pick up [src] by dragging it to your sprite.") + . += SPAN_NOTICE("You can rotate [src] with Alt-click.") + +/obj/structure/vulture_spotter_tripod/attackby(obj/item/thing, mob/user) + if(istype(thing, /obj/item/device/vulture_spotter_scope)) + on_scope_attach(user, thing) + return + + if(HAS_TRAIT(thing, TRAIT_TOOL_SCREWDRIVER)) + on_screwdriver(user) + return + + return ..() + +/obj/structure/vulture_spotter_tripod/MouseDrop(over_object, src_location, over_location) + if(!ishuman(usr)) + return + var/mob/living/carbon/human/user = usr //this is us + + if(!HAS_TRAIT(user, TRAIT_VULTURE_USER)) + to_chat(user, SPAN_WARNING("You don't know how to use this!")) + return + + if(!scope_attached) + fold_up(user) + return + + try_scope(user) + +/obj/structure/vulture_spotter_tripod/on_set_interaction(mob/user) + var/obj/item/attachable/vulture_scope/scope = get_vulture_scope() + scope.spotter_spotting = TRUE + to_chat(scope.scope_user, SPAN_NOTICE("You notice that [scope] drifts less.")) + RegisterSignal(scope, COMSIG_VULTURE_SCOPE_MOVED, PROC_REF(on_vulture_move)) + RegisterSignal(scope, COMSIG_VULTURE_SCOPE_UNSCOPED, PROC_REF(on_vulture_unscope)) + if(user.client) + RegisterSignal(user.client, COMSIG_PARENT_QDELETING, PROC_REF(do_unscope)) + user.client.change_view(scope_zoom, src) + RegisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED), PROC_REF(do_unscope)) + user.see_in_dark += darkness_view + user.lighting_alpha = 127 + user.sync_lighting_plane_alpha() + user.overlay_fullscreen("vulture_spotter", /atom/movable/screen/fullscreen/vulture/spotter) + user.freeze() + user.status_flags |= IMMOBILE_ACTION + user.visible_message(SPAN_NOTICE("[user] looks through [src]."),SPAN_NOTICE("You look through [src], ready to go!")) + user.forceMove(loc) + user.setDir(dir) + scope_user = WEAKREF(user) + update_pixels(TRUE) + give_action(user, /datum/action/vulture_tripod_unscope, null, null, src) + set_scope_loc(user, scope) + +/obj/structure/vulture_spotter_tripod/on_unset_interaction(mob/user) + user.status_flags &= ~IMMOBILE_ACTION + user.visible_message(SPAN_NOTICE("[user] looks up from [src]."),SPAN_NOTICE("You look up from [src].")) + user.unfreeze() + user.reset_view(null) + user.Move(get_step(src, reverse_direction(src.dir))) + user.client?.change_view(world_view_size, src) + user.setDir(dir) //set the direction of the player to the direction the gun is facing + update_pixels(FALSE) + remove_action(user, /datum/action/vulture_tripod_unscope) + unscope() + +/obj/structure/vulture_spotter_tripod/clicked(mob/user, list/mods) + if(mods["alt"]) + if(in_range(src, user) && !user.is_mob_incapacitated()) + rotate(user) + return TRUE + return ..() + +/// Rotates the tripod 90* counter-clockwise +/obj/structure/vulture_spotter_tripod/proc/rotate(mob/user) + if(scope_using) + to_chat(user, SPAN_WARNING("You can't rotate [src] while someone is using it!")) + return FALSE + + playsound(src, 'sound/items/Ratchet.ogg', 25, 1) + user.visible_message("[user] rotates [src].","You rotate [src].") + setDir(turn(dir, -90)) + update_pixels(TRUE) + +/// Updates the direction the operator should be facing, and their pixel offset +/obj/structure/vulture_spotter_tripod/proc/update_pixels(mounting = TRUE) + if(!scope_user) + return + + var/mob/user = scope_user.resolve() + if(mounting) + var/diff_x = 0 + var/diff_y = 0 + switch(dir) + if(NORTH) + diff_y = -16 + if(SOUTH) + diff_y = 16 + if(EAST) + diff_x = -16 + if(WEST) + diff_x = 16 + + user.pixel_x = diff_x + user.pixel_y = diff_y + else + user.pixel_x = 0 + user.pixel_y = 0 + +/// Handler for when the scope is being attached to the tripod +/obj/structure/vulture_spotter_tripod/proc/on_scope_attach(mob/user, obj/structure/vulture_spotter_tripod/scope) + if(scope_attached) + return + + user.visible_message(SPAN_NOTICE("[user] attaches [scope] to [src]."), SPAN_NOTICE("You attach [scope] to [src].")) + icon_state = "vulture_scope" + setDir(user.dir) + bound_rifle = scope.bound_rifle + scope_attached = TRUE + desc = initial(desc) + qdel(scope) + +/// Handler for when the scope is being detached from the tripod by screwdriver +/obj/structure/vulture_spotter_tripod/proc/on_screwdriver(mob/user) + if(!scope_attached) + to_chat(user, SPAN_NOTICE("You don't need a screwdriver to pick this up!")) + return + user.visible_message(SPAN_NOTICE("[user] unscrews the scope from [src] before detaching it."), SPAN_NOTICE("You unscrew the scope from [src], detaching it.")) + icon_state = initial(icon_state) + unscope() + scope_attached = FALSE + desc = initial(desc) + " Though, it doesn't seem to have one attached yet." + new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle) + +/// Handler for user folding up the tripod, picking it up +/obj/structure/vulture_spotter_tripod/proc/fold_up(mob/user) + user.visible_message(SPAN_NOTICE("[user] folds up [src]."), SPAN_NOTICE("You fold up [src].")) + var/obj/item/device/vulture_spotter_tripod/tripod = new(get_turf(src)) + user.put_in_hands(tripod, TRUE) + qdel(src) + +/// Checks if the user is able to use the scope, uses it if so +/obj/structure/vulture_spotter_tripod/proc/try_scope(mob/living/carbon/human/user) + if(!user.client) + return + + if(user.l_hand || user.r_hand) + to_chat(user, SPAN_WARNING("Your hands need to be free to use [src]!")) + return + + var/obj/item/attachable/vulture_scope/scope = get_vulture_scope() + if(!scope) + return + + if(get_dist(get_turf(scope), get_turf(src)) > max_sniper_distance) + to_chat(user, SPAN_WARNING("[src] needs to be closer to the M707 to be used!")) + return + + if(!scope.scoping) + to_chat(user, SPAN_WARNING("The M707's sight needs to be in use to be able to look through [src]!")) + return + + user.set_interaction(src) + +/// Handler for when the user should be unscoping +/obj/structure/vulture_spotter_tripod/proc/do_unscope() + SIGNAL_HANDLER + + if(!scope_user) + return + + var/mob/user = scope_user.resolve() + user.unset_interaction() + +/// Unscopes the user, cleaning up everything related +/obj/structure/vulture_spotter_tripod/proc/unscope() + SIGNAL_HANDLER + if(scope_user) + var/mob/living/carbon/human/user = scope_user.resolve() + user.see_in_dark -= darkness_view + user.lighting_alpha = user.default_lighting_alpha + user.sync_lighting_plane_alpha() + user.clear_fullscreen("vulture_spotter") + UnregisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED)) + user.pixel_x = 0 + user.pixel_y = 0 + if(user.client) + user.client.change_view(world_view_size, src) + user.client.pixel_x = 0 + user.client.pixel_y = 0 + UnregisterSignal(user.client, COMSIG_PARENT_QDELETING) + + var/obj/item/attachable/vulture_scope/scope = get_vulture_scope() + if(scope) + scope.spotter_spotting = FALSE + to_chat(scope.scope_user, SPAN_NOTICE("You notice that [scope] starts drifting more.")) + UnregisterSignal(scope, list(COMSIG_VULTURE_SCOPE_MOVED, COMSIG_VULTURE_SCOPE_UNSCOPED)) + + QDEL_NULL(unscope_action) + +/// Sets the scope's sight location to the same as the sniper's +/obj/structure/vulture_spotter_tripod/proc/set_scope_loc(mob/living/carbon/human/user, obj/item/attachable/vulture_scope/scope) + if(!user.client || !scope) + return + + var/turf/user_turf = get_turf(user) + var/x_off = scope.scope_x - user_turf.x + var/y_off = scope.scope_y - user_turf.y + var/pixels_per_tile = 32 + + user.client.pixel_x = x_off * pixels_per_tile + user.client.pixel_y = y_off * pixels_per_tile + +/// Handler for when the vulture spotter scope moves +/obj/structure/vulture_spotter_tripod/proc/on_vulture_move(datum/source) + SIGNAL_HANDLER + if(!scope_user) + return + + set_scope_loc(scope_user.resolve(), get_vulture_scope()) + +/// Handler for when the sniper unscopes +/obj/structure/vulture_spotter_tripod/proc/on_vulture_unscope(datum/source) + SIGNAL_HANDLER + if(!scope_user) + return + + var/mob/user = scope_user.resolve() + + to_chat(user, SPAN_WARNING("[src]'s sight disengages as the linked rifle unscopes.")) + unscope() + +/// Getter for the vulture scope on the sniper +/obj/structure/vulture_spotter_tripod/proc/get_vulture_scope() + RETURN_TYPE(/obj/item/attachable/vulture_scope) + if(!bound_rifle) + return + + var/obj/item/weapon/gun/boltaction/vulture/rifle = bound_rifle.resolve() + if(!("rail" in rifle.attachments) || !istype(rifle.attachments["rail"], /obj/item/attachable/vulture_scope)) + return + + return rifle.attachments["rail"] + +/datum/action/vulture_tripod_unscope + name = "Stop Using Scope" + action_icon_state = "vulture_tripod_close" + /// Weakref to the tripod that this is linked to + var/datum/weakref/tripod + +/datum/action/vulture_tripod_unscope/New(Target, override_icon_state, obj/structure/vulture_spotter_tripod/spotting_tripod) + . = ..() + tripod = WEAKREF(spotting_tripod) + +/datum/action/vulture_tripod_unscope/action_activate() + if(!tripod) + return + + var/obj/structure/vulture_spotter_tripod/spotting_tripod = tripod.resolve() + spotting_tripod.do_unscope() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 4d60c6c263cf..3a2272b2c320 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -425,6 +425,7 @@ var/datum/controller/supply/supply_controller = new() //dropship part fabricator's points, so we can reference them globally (mostly for DEFCON) var/dropship_points = 10000 //gains roughly 18 points per minute | Original points of 5k doubled due to removal of prespawned ammo. var/tank_points = 0 + var/mech_points = 5 /datum/controller/supply/New() ordernum = rand(1,9000) @@ -516,6 +517,64 @@ var/datum/controller/supply/supply_controller = new() points += points_per_crate qdel(C) + //Зачем им трупы + var/points_per_xeno_t1 = 20 + var/points_per_xeno_t2 = 40 + var/points_per_xeno_t3 = 70 + var/points_per_xeno_q = 150 + for(var/mob/living/carbon/xenomorph/larva in area_shuttle) + points += 6 + qdel(larva) + for(var/mob/living/carbon/xenomorph/carrier in area_shuttle) + points += points_per_xeno_t2 + qdel(carrier) + for(var/mob/living/carbon/xenomorph/ravager in area_shuttle) + points += points_per_xeno_t3 + qdel(ravager) + for(var/mob/living/carbon/xenomorph/praetorian in area_shuttle) + points += points_per_xeno_t3 + qdel(praetorian) + for(var/mob/living/carbon/xenomorph/hivelord in area_shuttle) + points += points_per_xeno_t2 + qdel(hivelord) + for(var/mob/living/carbon/xenomorph/defender in area_shuttle) + points += points_per_xeno_t1 + qdel(defender) + for(var/mob/living/carbon/xenomorph/warrior in area_shuttle) + points += points_per_xeno_t2 + qdel(warrior) + for(var/mob/living/carbon/xenomorph/facehugger in area_shuttle) + points += 5 + qdel(facehugger) + for(var/mob/living/carbon/xenomorph/runner in area_shuttle) + points += points_per_xeno_t1 + qdel(runner) + for(var/mob/living/carbon/xenomorph/boiler in area_shuttle) + points += points_per_xeno_t3 + qdel(boiler) + for(var/mob/living/carbon/xenomorph/crusher in area_shuttle) + points += points_per_xeno_t3 + qdel(crusher) + for(var/mob/living/carbon/xenomorph/burrower in area_shuttle) + points += points_per_xeno_t2 + qdel(burrower) + for(var/mob/living/carbon/xenomorph/drone in area_shuttle) + points += points_per_xeno_t1 + qdel(drone) + for(var/mob/living/carbon/xenomorph/spitter in area_shuttle) + points += points_per_xeno_t2 + qdel(spitter) + for(var/mob/living/carbon/xenomorph/sentinel in area_shuttle) + points += points_per_xeno_t1 + qdel(sentinel) + for(var/mob/living/carbon/xenomorph/lurker in area_shuttle) + points += points_per_xeno_t2 + qdel(lurker) + for(var/mob/living/carbon/xenomorph/queen in area_shuttle) + points += points_per_xeno_q + qdel(queen) //Квина иди нахуй + + // Sell manifests. var/screams = FALSE for(var/atom/movable/movable_atom in area_shuttle) @@ -1268,8 +1327,7 @@ var/datum/controller/supply/supply_controller = new() req_access = list(ACCESS_MARINE_CREWMAN) circuit = /obj/item/circuitboard/computer/supplycomp/vehicle // Can only retrieve one vehicle per round - var/spent = TRUE - var/tank_unlocked = FALSE + var/spent = FALSE var/list/allowed_roles = list(JOB_CREWMAN) var/list/vehicles @@ -1278,7 +1336,6 @@ var/datum/controller/supply/supply_controller = new() var/name = "vehicle order" var/obj/vehicle/ordered_vehicle - var/unlocked = TRUE var/failure_message = "Not enough resources were allocated to repair this vehicle during this operation.
" /datum/vehicle_order/proc/has_vehicle_lock() @@ -1291,20 +1348,17 @@ var/datum/controller/supply/supply_controller = new() name = "M34A2 Longstreet Light Tank" ordered_vehicle = /obj/effect/vehicle_spawner/tank/decrepit -/datum/vehicle_order/tank/has_vehicle_lock() - return - /datum/vehicle_order/apc name = "M577 Armored Personnel Carrier" ordered_vehicle = /obj/effect/vehicle_spawner/apc/decrepit /datum/vehicle_order/apc/med name = "M577-MED Armored Personnel Carrier" - ordered_vehicle = /obj/effect/vehicle_spawner/apc_med/decrepit + ordered_vehicle = /obj/effect/vehicle_spawner/apc/med/decrepit /datum/vehicle_order/apc/cmd name = "M577-CMD Armored Personnel Carrier" - ordered_vehicle = /obj/effect/vehicle_spawner/apc_cmd/decrepit + ordered_vehicle = /obj/effect/vehicle_spawner/apc/cmd/decrepit /obj/structure/machinery/computer/supplycomp/vehicle/Initialize() . = ..() @@ -1313,10 +1367,11 @@ var/datum/controller/supply/supply_controller = new() /datum/vehicle_order/apc, /datum/vehicle_order/apc/med, /datum/vehicle_order/apc/cmd, + /datum/vehicle_order/tank, ) for(var/order as anything in vehicles) - new order + vehicles[order] = new order if(!VehicleElevatorConsole) VehicleElevatorConsole = src @@ -1361,12 +1416,12 @@ var/datum/controller/supply/supply_controller = new() dat += "Available vehicles:
" for(var/d in vehicles) - var/datum/vehicle_order/VO = d + var/datum/vehicle_order/VO = vehicles[d] if(VO.has_vehicle_lock()) dat += VO.failure_message else - dat += "[VO.name]
" + dat += "[VO.name]
" show_browser(H, dat, "Automated Storage and Retrieval System", "computer", "size=575x450") @@ -1403,7 +1458,7 @@ var/datum/controller/supply/supply_controller = new() var/obj/vehicle/multitile/ordered_vehicle - var/datum/vehicle_order/VO = locate(href_list["get_vehicle"]) + var/datum/vehicle_order/VO = vehicles[text2path(href_list["get_vehicle"])] if(!VO) return if(VO.has_vehicle_lock()) return @@ -1414,7 +1469,7 @@ var/datum/controller/supply/supply_controller = new() VO.on_created(ordered_vehicle) - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VEHICLE_ORDERED, ordered_vehicle) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VEHICLE_ORDERED, VO) add_fingerprint(usr) updateUsrDialog() diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 1ad7ab3223eb..4e47fd004f74 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -554,173 +554,6 @@ icon_state = "floor" plating_type = /turf/open/floor/plating/prison - -//so that the floor turf it's not on default. for Fiorina_SciAnnex.dmm -/turf/open/floor/prison/floor - -//darkred2 -/turf/open/floor/prison/darkred2 - icon_state = "darkred2" -/turf/open/floor/prison/darkred2corner - icon_state = "darkred2corner" -/turf/open/floor/prison/darkred2angle - icon_state = "darkred2angle" -/turf/open/floor/prison/darkred2full - icon_state = "darkred2full" -//darkbrown2 -/turf/open/floor/prison/darkbrown2 - icon_state = "darkbrown2" -/turf/open/floor/prison/darkbrown2corner - icon_state = "darkbrown2corner" -/turf/open/floor/prison/darkbrown2angle - icon_state = "darkbrown2angle" -/turf/open/floor/prison/darkbrown2full - icon_state = "darkbrown2full" -//darkyellow2 -/turf/open/floor/prison/darkyellow2 - icon_state = "darkyellow2" -/turf/open/floor/prison/darkyellow2corner - icon_state = "darkyellow2corner" -/turf/open/floor/prison/darkyellow2angle - icon_state = "darkyellow2angle" -/turf/open/floor/prison/darkyellow2full - icon_state = "darkyellow2full" -//darkpurple2 -/turf/open/floor/prison/darkpurple2 - icon_state = "darkpurple2" -/turf/open/floor/prison/darkpurple2corner - icon_state = "darkpurple2corner" -/turf/open/floor/prison/darkpurple2angle - icon_state = "darkpurple2angle" -/turf/open/floor/prison/darkpurple2full - icon_state = "darkpurple2full" - - -//green -/turf/open/floor/prison/green - icon_state = "green" -/turf/open/floor/prison/greencorner - icon_state = "greencorner" -/turf/open/floor/prison/greenangle - icon_state = "greenangle" -/turf/open/floor/prison/greenfull - icon_state = "greenfull" -/turf/open/floor/prison/greenfull_2 - icon_state = "greenfull_2" -//random alone tiles. -/turf/open/floor/prison/sterile_white - icon_state = "sterile_white" -/turf/open/floor/prison/kitchen - icon_state = "kitchen" - -/turf/open/floor/prison/cell_stripe - icon_state = "cell_stripe" - -/turf/open/floor/prison/floor_plate - icon_state = "floor_plate" - -/turf/open/floor/prison/floor_marked - icon_state = "floor_marked" - -/turf/open/floor/prison/bright_clean_marked - icon_state = "bright_clean_marked" -/turf/open/floor/prison/bright_clean2 - icon_state = "bright_clean2" -//whitegreen -/turf/open/floor/prison/whitegreen - icon_state = "whitegreen" - -/turf/open/floor/prison/whitegreencorner - icon_state = "whitegreencorner" - -/turf/open/floor/prison/whitegreenangle - icon_state = "whitegreenangle" -/turf/open/floor/prison/whitegreenfull - icon_state = "whitegreenfull" -//there is a sprite called sterile that isn't use and look exactly the same. -/turf/open/floor/prison/sterile - icon_state = "sterile" - -//blue -/turf/open/floor/prison/blue - icon_state = "blue" -/turf/open/floor/prison/bluecorner - icon_state = "bluecorner" -/turf/open/floor/prison/blueangle - icon_state = "blueangle" -/turf/open/floor/prison/bluefull - icon_state = "bluefull" -/turf/open/floor/prison/bluefull_2 - icon_state = "bluefull_2" - -//whitepurple -/turf/open/floor/prison/whitepurple - icon_state = "whitepurple" -/turf/open/floor/prison/whitepurplecorner - icon_state = "whitepurplecorner" -/turf/open/floor/prison/whitepurpleangle - icon_state = "whitepurpleangle" -/turf/open/floor/prison/whitepurplefull - icon_state = "whitepurplefull" -/turf/open/floor/prison/whitepurplefull - icon_state = "whitepurplefull" -//red -/turf/open/floor/prison/red - icon_state = "red" -/turf/open/floor/prison/redcorner - icon_state = "redcorner" -/turf/open/floor/prison/redangle - icon_state = "redangle" -/turf/open/floor/prison/redfull - icon_state = "redfull" -//yellow -/turf/open/floor/prison/yellow - icon_state = "yellow" - -/turf/open/floor/prison/yellowcorner - icon_state = "yellowcorner" -/turf/open/floor/prison/yellowangle - icon_state = "yellowangle" -/turf/open/floor/prison/yellowfull - icon_state = "yellowfull" -//greenblue -/turf/open/floor/prison/greenblue - icon_state = "greenblue" -/turf/open/floor/prison/greenbluecorner - icon_state = "greenbluecorner" -/turf/open/floor/prison/greenblueangle - icon_state = "greenblueangle" -//blue plate -/turf/open/floor/prison/blue_plate - icon_state = "blue_plate" -/turf/open/floor/prison/blue_plate_2 - icon_state = "blue_plate_2" -/turf/open/floor/prison/blue_plate_3 - icon_state = "blue_plate_3" -//damage plate -/turf/open/floor/prison/platingdmg1 - icon_state = "platingdmg1" -/turf/open/floor/prison/platingdmg2 - icon_state = "platingdmg2" -/turf/open/floor/prison/platingdmg3 - icon_state = "platingdmg3" -/turf/open/floor/prison/damaged1 - icon_state = "damaged1" -/turf/open/floor/prison/damaged2 - icon_state = "damaged2" -/turf/open/floor/prison/damaged3 - icon_state = "damaged3" -/turf/open/floor/prison/damaged4 - icon_state = "damaged4" -/turf/open/floor/prison/damaged5 - icon_state = "damaged5" -/turf/open/floor/prison/floorscorched1 - icon_state = "floorscorched1" -/turf/open/floor/prison/floorscorched2 - icon_state = "floorscorched2" -/turf/open/floor/prison/panelscorched - icon_state = "panelscorched" - /turf/open/floor/prison/trim/red icon_state = "darkred2" diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 8262caef4258..0b30570bfbfe 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1217,7 +1217,12 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /turf/closed/wall/resin/attackby(obj/item/W, mob/living/user) if(SEND_SIGNAL(src, COMSIG_WALL_RESIN_ATTACKBY, W, user) & COMPONENT_CANCEL_ATTACKBY) return - + + if(istype(W, /obj/item/weapon/twohanded/st_hammer)) + if(!skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && (user.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_ST)) + to_chat(user, SPAN_HIGHDANGER("[W.name] is too heavy for you...")) + return + if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index bf6d8e261ab3..d49a7cf91c63 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -13,9 +13,9 @@ //Guest Checking if(!real_bans_only && CONFIG_GET(flag/guest_ban) && IsGuestKey(key)) - log_access("Failed Login: [key] - Guests not allowed") - message_admins("Failed Login: [key] - Guests not allowed") - return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.") + log_access("Ой ой, [key] не смог зайти - Гости не нужны") + message_admins("Ой ой, [key] не смог зайти - Гости не нужны") + return list("reason"="guest", "desc"="\nПричина: Guests not allowed. Please sign in with a byond account.") WAIT_DB_READY if(admin_datums[ckey] && (admin_datums[ckey].rights & R_MOD)) @@ -28,8 +28,8 @@ //check if the IP address is a known TOR node if(CONFIG_GET(flag/ToRban) && ToRban_isbanned(address)) - log_access("Failed Login: [src] - Banned: ToR") - message_admins("Failed Login: [src] - Banned: ToR") + log_access("Агаааа, [src] не смог зайти - бан: ТоР") + message_admins("Агаааа, [src] не смог зайти - бан: ТоР") return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]") // wait for database to be ready diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index b64b1e4682fd..477fa504dded 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -20,10 +20,10 @@ var/savefile/Banlist ClearTempbans() return 0 else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: [GetExp(Banlist["minutes"])]\nВыдан: [Banlist["bannedby"]][appeal]" else Banlist.cd = "/base/[ckey][id]" - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: ПЕРМА\nВыдан: [Banlist["bannedby"]][appeal]" .["reason"] = "ckey/id" return . else @@ -46,9 +46,9 @@ var/savefile/Banlist ClearTempbans() return 0 else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]" else - .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]" + .["desc"] = "\nПричина: [Banlist["reason"]]\nСрок: ПЕРМА\nВыдан: [Banlist["bannedby"]][appeal]" .["reason"] = matches return . return 0 @@ -62,10 +62,10 @@ var/savefile/Banlist Banlist = new("data/banlist.bdb") log_admin("Loading Banlist") - if (!length(Banlist.dir)) log_admin("Banlist is empty.") + if (!length(Banlist.dir)) log_admin("Банлист пуст. Ой.") if (!Banlist.dir.Find("base")) - log_admin("Banlist missing base dir.") + log_admin("Банлист не имеет базовой директории.") Banlist.dir.Add("base") Banlist.cd = "/base" else if (Banlist.dir.Find("base")) @@ -82,8 +82,8 @@ var/savefile/Banlist Banlist.cd = "/base/[A]" if (!Banlist["key"] || !Banlist["id"]) RemoveBan(A) - log_admin("Invalid Ban.") - message_admins("Invalid Ban.") + log_admin("Некорректный бан.") + message_admins("Некорректный бан.") continue if (!Banlist["temp"]) continue @@ -137,12 +137,12 @@ var/savefile/Banlist if (!Banlist.dir.Remove(foldername)) return 0 if(!usr) - log_admin("Ban Expired: [key]") - message_admins("Ban Expired: [key]") + log_admin("Срок бана истек: [key]") + message_admins("Срок бана истек: [key]") else - ban_unban_log_save("[key_name_admin(usr)] unbanned [key]") - log_admin("[key_name_admin(usr)] unbanned [key]") - message_admins("[key_name_admin(usr)] unbanned: [key]") + ban_unban_log_save("[key_name_admin(usr)] разбанил [key]") + log_admin("[key_name_admin(usr)] разбанил [key]") + message_admins("[key_name_admin(usr)] разбанил: [key]") for (var/A in Banlist.dir) Banlist.cd = "/base/[A]" if (key == Banlist["key"] /*|| id == Banlist["id"]*/) @@ -160,11 +160,11 @@ var/savefile/Banlist else var/timeleftstring if (exp >= 1440) //1440 = 1 day in minutes - timeleftstring = "[round(exp / 1440, 0.1)] Days" + timeleftstring = "[round(exp / 1440, 0.1)] Дней" else if (exp >= 60) //60 = 1 hour in minutes - timeleftstring = "[round(exp / 60, 0.1)] Hours" + timeleftstring = "[round(exp / 60, 0.1)] Часов" else - timeleftstring = "[exp] Minutes" + timeleftstring = "[exp] Минут" return timeleftstring /datum/admins/proc/unbanpanel() @@ -182,12 +182,12 @@ var/savefile/Banlist expiry = "Permaban" var/unban_link = "(U)" - dat += "[unban_link] Key: [ban.ckey]ComputerID: [ban.last_known_cid]IP: [ban.last_known_ip] [expiry](By: [ban.admin])(Reason: [ban.reason])" + dat += "[unban_link] Ключ: [ban.ckey]ComputerID: [ban.last_known_cid]IP: [ban.last_known_ip] [expiry](By: [ban.admin])(Причина: [ban.reason])" dat += "" - var/dat_header = "
Bans: (U) = Unban" - dat_header += " - Ban Listing
[dat]" - show_browser(usr, dat_header, "Unban Panel", "unbanp", "size=875x400") + var/dat_header = "
Баны:(U) = Разбанить" + dat_header += " - Список банов
[dat]" + show_browser(usr, dat_header, "Панель Разбанов", "unbanp", "size=875x400") //////////////////////////////////// DEBUG //////////////////////////////////// @@ -237,17 +237,17 @@ var/savefile/Banlist return //mods+ cannot be banned. Even if they could, the ban doesn't affect them anyway if(!M.ckey) - to_chat(usr, SPAN_DANGER("Warning: Mob ckey for [M.name] not found.")) + to_chat(usr, SPAN_DANGER("Внимание: Сикей для моба [M.name] не найден.")) return var/mob_key = M.ckey - var/mins = tgui_input_number(usr,"How long (in minutes)? \n 180 = 3 hours \n 1440 = 1 day \n 4320 = 3 days \n 10080 = 7 days \n 43800 = 1 Month","Ban time", 1440, 262800, 1) + var/mins = tgui_input_number(usr,"На сколько (в минутах)? \n 180 = 3 часа \n 1440 = 1 день \n 4320 = 3 дня \n 10080 = Неделя \n 43800 = Месяц","Срок бана", 1440, 262800, 1) if(!mins) return if(mins >= 525600) mins = 525599 - var/reason = input(usr,"Reason? \n\nPress 'OK' to finalize the ban.","reason","Griefer") as message|null + var/reason = input(usr,"Причина? \n\nНажмите 'ОК' чтобы закончить.","причина","Гриферок") as message|null if(!reason) return var/datum/entity/player/P = get_player_from_key(mob_key) // you may not be logged in, but I will find you and I will ban you - if(P.is_time_banned && alert(usr, "Ban already exists. Proceed?", "Confirmation", "Yes", "No") != "Yes") + if(P.is_time_banned && alert(usr, "Бан уже существует. Продолжим?", "Подтверждение", "Да", "Нет") != "Да") return P.add_timed_ban(reason, mins) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2c749df71bb7..cd4760c51f0e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -2,7 +2,7 @@ /proc/message_admins(msg, jmp_x=0, jmp_y=0, jmp_z=0) // +MOD and above, not mentors log_admin(msg) - msg = "ADMIN LOG:[msg]" + msg = "АДМИН ЛОГ: [msg]" if(jmp_x && jmp_y && jmp_z) msg += " (JMP)" msg += "" @@ -15,7 +15,7 @@ if(GLOB.perf_flags & PERF_TOGGLE_ATTACKLOGS) return log_attack(text) - var/rendered = SPAN_COMBAT("ATTACK: [text] (JMP)") + var/rendered = SPAN_COMBAT("АТАКА: [text] (JMP)") for(var/client/C as anything in GLOB.admins) if(C && C.admin_holder && (R_MOD & C.admin_holder.rights)) if(C.prefs.toggles_chat & CHAT_ATTACKLOGS) @@ -24,14 +24,14 @@ /proc/msg_admin_niche(msg) //Toggleable Niche Messages log_admin(msg) - msg = SPAN_ADMIN("ADMIN NICHE LOG: [msg]") + msg = SPAN_ADMIN("ЛОГ АДМИНСКОЙ НИШИ: [msg]") for(var/client/C as anything in GLOB.admins) if(C && C.admin_holder && (R_MOD & C.admin_holder.rights)) if(C.prefs.toggles_chat & CHAT_NICHELOGS) to_chat(C, msg) /proc/msg_sea(msg, nosound = FALSE) //Only used for newplayer ticker message, hence no logging - msg = FONT_SIZE_LARGE("MENTOR ALERT: [msg]") + msg = FONT_SIZE_LARGE("ТРЕВОГА ДЛЯ МЕНТОРОВ: [msg]") for(var/mob/possible_sea as anything in GLOB.player_list) if(!isSEA(possible_sea)) continue @@ -44,9 +44,9 @@ /proc/msg_admin_ff(text, alive = TRUE) var/rendered if(alive) - rendered = SPAN_COMBAT("ATTACK: [text]") //I used because I never learned html correctly, fix this if you want + rendered = SPAN_COMBAT("АТАКА: [text]") //I used because I never learned html correctly, fix this if you want else - rendered = SPAN_COMBAT("ATTACK: [text]") + rendered = SPAN_COMBAT("АТАКА: [text]") text = "///DEAD/// - " + text log_attack(text) //Do everything normally BUT IN GREEN SO THEY KNOW for(var/client/C as anything in GLOB.admins) @@ -76,7 +76,7 @@ if (!istype(src,/datum/admins)) src = usr.client.admin_holder if (!istype(src,/datum/admins) || !(src.rights & R_MOD)) - to_chat(usr, "Error: you are not an admin!") + to_chat(usr, "Ошибочка - вы не админ!") return var/dat = "" @@ -84,12 +84,12 @@ var/list/datum/view_record/note_view/NL = DB_VIEW(/datum/view_record/note_view, DB_COMP("player_ckey", DB_EQUALS, key)) for(var/datum/view_record/note_view/N in NL) var/admin_ckey = N.admin_ckey - var/confidential_text = N.is_confidential ? " \[CONFIDENTIALLY\]" : "" + var/confidential_text = N.is_confidential ? " \[КОНФИДЕНЦИАЛЬНО\]" : "" var/color = "#008800" if(N.is_ban) - var/time_d = N.ban_time ? "Banned for [N.ban_time] minutes | " : "" + var/time_d = N.ban_time ? "Забанен на [N.ban_time] минут | " : "" color = "#880000" //Removed confidential check because we can't make confidential bans - dat += "[time_d][N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " + dat += "[time_d][N.text] [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " else if(N.is_confidential) color = "#AA0055" @@ -104,12 +104,12 @@ dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] " if(admin_ckey == usr.ckey || admin_ckey == "Adminbot" || ishost(usr)) - dat += "Remove" + dat += "Удалить" dat += "

" dat += "" - show_browser(usr, dat, "Info on [key]", "allplayerinfo", "size=480x480") + show_browser(usr, dat, "Информаци о [key]", "allplayerinfo", "size=480x480") /datum/admins/proc/Jobbans() @@ -127,9 +127,9 @@ i = jobban_keylist[r][c] //These are already strings, as you're iterating through them. Anyway, establish jobban. t = "[c] - [r] ## [i]" u = "[c] - [r]" - dat += "" + dat += "" dat += "
[t] (unban)
[t] (разбанить)
" - show_browser(usr, dat, "Job Bans", "ban", "size=400x400") + show_browser(usr, dat, "Джоб баны", "бан", "size=400x400") /datum/admins/proc/Game() @@ -202,7 +202,7 @@ else new chosen(usr.loc) - log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])") + log_admin("[key_name(usr)] спаунит [chosen] по координатам ([usr.x],[usr.y],[usr.z])") /client/proc/update_mob_sprite(mob/living/carbon/human/H as mob) @@ -211,7 +211,7 @@ set desc = "Should fix any mob sprite update errors." if (!admin_holder || !(admin_holder.rights & R_MOD)) - to_chat(src, "Only administrators may use this command.") + to_chat(src, "Ай яй яй, эта команда только для администраторов.") return if(istype(H)) @@ -241,7 +241,7 @@ if(SSticker) var/success = SSticker.send_tip_of_the_round() if(!success) - to_chat(usr, SPAN_ADMINNOTICE("Sending tip failed!")) + to_chat(usr, SPAN_ADMINNOTICE("Подсказочка не отправилась!")) /// Allow admin to add or remove traits of datum /datum/admins/proc/modify_traits(datum/D) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7d9127313094..051623f67e3f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -391,7 +391,7 @@ var/list/roundstart_mod_verbs = list( set category = "OOC.OOC" set name = "OOC Text Color - Self" if(!admin_holder && !donator) return - var/new_ooccolor = input(src, "Please select your OOC color.", "OOC color") as color|null + var/new_ooccolor = input(src, "Настало время выбрать цвет.", "Цвет OOC") as color|null if(new_ooccolor) prefs.ooccolor = new_ooccolor prefs.save_preferences() @@ -406,30 +406,30 @@ var/list/roundstart_mod_verbs = list( if(!warned_ckey || !istext(warned_ckey)) return if(warned_ckey in admin_datums) - to_chat(usr, "Error: warn(): You can't warn admins.") + to_chat(usr, "Ошибочка: warn(): Зачем варнить админов?") return var/datum/entity/player/P = get_player_from_key(warned_ckey) // you may not be logged in, but I will find you and I will ban you if(!P) - to_chat(src, "Error: warn(): No such ckey found.") + to_chat(src, "Ошибочка: warn(): Такого сикея нет.") return if(++P.warning_count >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) - ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") + ban_unban_log_save("[ckey] варнит [warned_ckey], что влечет за собой [AUTOBANTIME] минутный автобан.") if(P.owning_client) - message_admins("[key_name_admin(src)] has warned [ckey] resulting in a [AUTOBANTIME] minute ban.") + message_admins("[key_name_admin(src)] варнит [ckey], что влечет за собой [AUTOBANTIME] минутный бан.") to_chat_forced(P.owning_client, "You have been autobanned due to a warning by [key_name_admin(P.owning_client)].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") else - message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.") + message_admins("[key_name_admin(src)] варнит [warned_ckey], что влечет за собой [AUTOBANTIME] минутный бан.") P.add_timed_ban("Autobanning due to too many formal warnings", AUTOBANTIME) else if(P.owning_client) to_chat(P.owning_client, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") - message_admins("[key_name_admin(src)] has warned [key_name_admin(P.owning_client)]. They have [MAX_WARNS-P.warning_count] strikes remaining.") + message_admins("[key_name_admin(src)] предупреждает [key_name_admin(P.owning_client)]. У них осталось [MAX_WARNS-P.warning_count] страйков.") else - message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-P.warning_count] strikes remaining.") + message_admins("[key_name_admin(src)] предувпреждает [warned_ckey] (DC). У них осталось [MAX_WARNS-P.warning_count] страйков.") /client/proc/give_disease(mob/T as mob in GLOB.mob_list) // -- Giacom set category = "Admin.Fun" @@ -438,12 +438,12 @@ var/list/roundstart_mod_verbs = list( var/list/disease_names = list() for(var/v in diseases) disease_names.Add(copytext("[v]", 16, 0)) - var/datum/disease/D = tgui_input_list(usr, "Choose the disease to give to that guy", "ACHOO", disease_names) + var/datum/disease/D = tgui_input_list(usr, "Чем заразим паренька?", "Хихи", disease_names) if(!D) return var/path = text2path("/datum/disease/[D]") T.contract_disease(new path, 1) - message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") + message_admins("[key_name_admin(usr)] заражает [key_name(T)] болезнью [D].") /client/proc/object_talk(msg as text) // -- TLE @@ -454,7 +454,7 @@ var/list/roundstart_mod_verbs = list( if(!msg) return for (var/mob/V in hearers(mob.control_object)) - V.show_message("[mob.control_object.name] says: \"" + msg + "\"", SHOW_MESSAGE_AUDIBLE) + V.show_message("[mob.control_object.name] говорит: \"" + msg + "\"", SHOW_MESSAGE_AUDIBLE) /client/proc/toggle_log_hrefs() diff --git a/code/modules/admin/autoreply.dm b/code/modules/admin/autoreply.dm index a90e21b7f311..8d8632c9e7e5 100644 --- a/code/modules/admin/autoreply.dm +++ b/code/modules/admin/autoreply.dm @@ -9,6 +9,10 @@ GLOBAL_REFERENCE_LIST_INDEXED(adminreplies, /datum/autoreply/admin, title) var/closer = TRUE /// Admin Replies +/datum/autoreply/admin/regurgitate + title = "Проглатывание За Ксеноморфа" + message = "Проглатывание живых существ способствует их быстрой транспортировке к яйцам. Для того, чтобы проглотить жертву, схватите ее (CTRL+Click) и затем нажмите на себя. Для того, чтобы срыгнуть жертву, нажмите кнопку 'Regurgitate' на интерфейсе слева вверху. Держать людей в себе можно в течении минуты, после которой вы их срыгнете, а жертве расплавит случайную конечность." + /datum/autoreply/admin/handled title = "Being Handled" message = "Staff are aware of this issue and it is being handled" diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 18f06e79a66a..0720dca268b8 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -23,39 +23,39 @@ var/jobban_keylist[0] //to store the keys & ranks /proc/jobban_client_fullban(ckey, rank) if (!ckey || !rank) return rank = check_jobban_path(rank) - jobban_keylist[rank][ckey] = "Reason Unspecified" + jobban_keylist[rank][ckey] = "Причина не указана" //returns a reason if M is banned from rank, returns 0 otherwise /proc/jobban_isbanned(mob/M, rank, datum/entity/player/P = null) if(!rank) - return "Non-existant job" + return "Несуществующая профессия" rank = ckey(rank) if(P) // asking for a friend if(!P.jobbans_loaded) - return "Not yet loaded" + return "Еще не загрузились" var/datum/entity/player_job_ban/PJB = P.job_bans[rank] return PJB ? PJB.text : null if(M) if(!M.client || !M.client.player_data || !M.client.player_data.jobbans_loaded) - return "Not yet loaded" + return "Еще не загрузились" if(guest_jobbans(rank)) if(CONFIG_GET(flag/guest_jobban) && IsGuestKey(M.key)) - return "Guest Job-ban" + return "Гостевой джоб-банчик" if(CONFIG_GET(flag/usewhitelist) && !check_whitelist(M)) - return "Whitelisted Job" + return "Профессия по вайтлисту" var/datum/entity/player_job_ban/PJB = M.client.player_data.job_bans[rank] return PJB ? PJB.text : null /proc/jobban_loadbanfile() var/savefile/S=new("data/job_new.ban") S["new_bans"] >> jobban_keylist - log_admin("Loading jobban_rank") + log_admin("Загружаю jobban_rank") S["runonce"] >> jobban_runonce if (!length(jobban_keylist)) jobban_keylist=list() - log_admin("jobban_keylist was empty") + log_admin("jobban_keylist был пуст") /proc/jobban_savebanfile() var/savefile/S=new("data/job_new.ban") @@ -87,7 +87,7 @@ var/jobban_keylist[0] //to store the keys & ranks return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "У моба нет сикея") return if(!RoleAuthority) to_chat(usr, "The Role Authority is not set up!") diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm index 1af1f5aa9fa3..93d719275bca 100644 --- a/code/modules/admin/callproc.dm +++ b/code/modules/admin/callproc.dm @@ -18,7 +18,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) /// So usr is set to this for any proccalls that don't have any usr mob/client to refer to. /mob/proccall_handler name = "ProcCall Handler" - desc = "If you are seeing this, tell a coder." + desc = "Если вы это видите - напишите кодеру." var/list/callers = list() @@ -57,7 +57,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) if(GLOB.AdminProcCallHandler != src) return ..() if(!force) - stack_trace("Attempted deletion on [type] - [name], aborting.") + stack_trace("попытался удалить [type] - [name], отмена.") return QDEL_HINT_LETMELIVE return ..() diff --git a/code/modules/admin/fax_templates.dm b/code/modules/admin/fax_templates.dm index 91b23abb2422..99c26726f326 100644 --- a/code/modules/admin/fax_templates.dm +++ b/code/modules/admin/fax_templates.dm @@ -63,7 +63,7 @@ if(show_wy_logo) dat += "" dat += "
" diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index e7559f3aa4fd..1b86a6781580 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -87,13 +87,13 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your return TRUE else if(show_msg && C.prefs.show_permission_errors) - to_chat(C, SPAN_DANGER("Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required,"")].")) + to_chat(C, SPAN_DANGER("Ошибочка: У вас недостаточно прав. Требуемые флажки:[rights2text(rights_required,"")].")) else if(C.admin_holder) return TRUE else if(show_msg && C.prefs.show_permission_errors) - to_chat(C, SPAN_DANGER("Error: You are not an admin.")) + to_chat(C, SPAN_DANGER("Ошибочка: Ты не админ, дружище.")) return FALSE /proc/check_rights(rights_required, show_msg=TRUE) @@ -108,12 +108,12 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(check_client_rights(usr.client, rights_required, show_msg)) return TRUE else if(show_msg) - to_chat(usr, SPAN_WARNING("You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].")) + to_chat(usr, SPAN_WARNING("У вас недостаточно прав для такого. Требуемые флажки:[rights2text(rights_required," ")].")) else if(other.admin_holder) return TRUE else if(show_msg) - to_chat(usr, SPAN_WARNING("You are not a holder.")) + to_chat(usr, SPAN_WARNING("Вы не владелец.")) return FALSE //probably a bit iffy - will hopefully figure out a better solution @@ -125,7 +125,7 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(usr.client.admin_holder.rights != other.admin_holder.rights) if( (usr.client.admin_holder.rights & other.admin_holder.rights) == other.admin_holder.rights ) return 1 //we have all the rights they have and more - to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") + to_chat(usr, "Ошибочка: Никак не продолжить. У них больше или равные права.") return 0 /client/proc/deadmin() @@ -177,7 +177,7 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your if(!forceGlobal && usr) var/client/C = usr.client if(!C) - CRASH("No client for HrefToken()!") + CRASH("Нет клиента для HrefToken()!") var/datum/admins/holder = C.admin_holder if(holder) tok = holder.href_token diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index d8caa58f1e97..0ea6f3ff3ac6 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -29,7 +29,7 @@ if(usr.client && usr.client.admin_holder && (usr.client.admin_holder.rights & R_MOD)) P.rank = usr.client.admin_holder.rank else - to_chat(usr, "NA01: Something went wrong, tell a coder.") + to_chat(usr, "NA01: Что-то не так, зовите кодера.") return else P.author = "Adminbot" @@ -40,7 +40,7 @@ infos += P info << infos - message_admins("[key_name_admin(usr)] has edited [key]'s notes: [sanitize(note)]") + message_admins("[key_name_admin(usr)] поменял заметки [key]: [sanitize(note)]") qdel(info) //Updating list of keys with notes on them @@ -63,7 +63,7 @@ infos.Remove(item) info << infos - message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.") + message_admins("[key_name_admin(usr)] удалил одну из заметок [key].") qdel(info) @@ -73,7 +73,7 @@ var/list/infos info >> infos if(!infos) - dat = "No information found on the given key." + dat = "Нет информации для этого сикея." else for(var/datum/player_info/I in infos) dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A" diff --git a/code/modules/admin/player_panel/actions/physical.dm b/code/modules/admin/player_panel/actions/physical.dm index a48f39e81a5e..404f3cddc03a 100644 --- a/code/modules/admin/player_panel/actions/physical.dm +++ b/code/modules/admin/player_panel/actions/physical.dm @@ -89,6 +89,8 @@ set_name = "Scout Set" if(SKILL_SPEC_SNIPER) set_name = "Sniper Set" + if(SKILL_SPEC_ST) + set_name = "Stormtrooper Set" if(set_name && !available_specialist_sets.Find(set_name)) available_specialist_sets += set_name diff --git a/code/modules/admin/server_verbs.dm b/code/modules/admin/server_verbs.dm index 47a60c043741..96ac775327ca 100644 --- a/code/modules/admin/server_verbs.dm +++ b/code/modules/admin/server_verbs.dm @@ -27,17 +27,17 @@ maprotatechoices[mapname] = VM - var/chosenmap = tgui_input_list(usr, "Choose a ground map to change to", "Change Ground Map", maprotatechoices) + var/chosenmap = tgui_input_list(usr, "Выберите карту", "Смена карты", maprotatechoices) if(!chosenmap) return var/datum/map_config/VM = maprotatechoices[chosenmap] if(!SSmapping.changemap(VM, GROUND_MAP)) - to_chat(usr, SPAN_WARNING("Failed to change the ground map.")) + to_chat(usr, SPAN_WARNING("Не удалось поменять карту.")) return - log_admin("[key_name(usr)] changed the map to [VM.map_name].") - message_admins("[key_name_admin(usr)] changed the map to [VM.map_name].") + log_admin("[key_name(usr)] меняет карту на [VM.map_name].") + message_admins("[key_name_admin(usr)] меняет карту на [VM.map_name].") /datum/admins/proc/vote_ground_map() set category = "Server" @@ -47,8 +47,8 @@ return SSvote.initiate_vote("groundmap", usr.ckey) - log_admin("[key_name(usr)] started a groundmap vote.") - message_admins("[key_name_admin(usr)] started a groundmap vote.") + log_admin("[key_name(usr)] начал голосование за карту.") + message_admins("[key_name_admin(usr)] начал голосование за карту.") /datum/admins/proc/override_ground_map() set category = "Server" @@ -57,15 +57,15 @@ if(!check_rights(R_SERVER)) return - var/map_type = tgui_alert(usr, "Override Ship or Ground Map?", "Map selection", list(GROUND_MAP, SHIP_MAP, "Cancel")) - if(map_type == "Cancel") + var/map_type = tgui_alert(usr, "Сменить карту корабля или планеты?", "Выбор карты", list(GROUND_MAP, SHIP_MAP, "ОТМЕНИТЬ")) + if(map_type == "ОТМЕНИТЬ") return - var/map = input(usr, "Choose a custom map to run for next round","Upload Map") as null|file + var/map = input(usr, "Выберите кастомную карту для следующего раунда","Загрузить карту") as null|file if(!map) return if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm") - to_chat(usr, SPAN_WARNING("Filename must end in '.dmm': [map]"), confidential = TRUE) + to_chat(usr, SPAN_WARNING("Имя файлы должно заканчиваться на '.dmm': [map]"), confidential = TRUE) return message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] is overriding the next '[map_type]' map with a custom one.")) diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 69793a599596..eca059f7606f 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -8,7 +8,7 @@ var/datum/entity/player/P = get_player_from_key(ckey) if(!P) - message_admins("Tried stickybanning ckey \"[ckey]\", player entity was unable to be found. Please try again later.") + message_admins("Попробовал застикибанить сикей \"[ckey]\", player entity не найдено. Попробуйте позже.") return var/datum/entity/player_sticky_ban/PSB = DB_ENTITY(/datum/entity/player_sticky_ban) @@ -29,9 +29,9 @@ if(banning_admin) PSB.admin_id = banning_admin.id if(banning_admin.owning_client) - message_admins("[banning_admin.owning_client.ckey] has stickybanned [ckey].") + message_admins("[banning_admin.owning_client.ckey] застикибанил [ckey].") - message_admins("[ckey] (IP: [address], CID: [cid]) has been stickybanned for: \"[reason]\".") + message_admins("[ckey] (IP: [address], CID: [cid]) бы застикибанен за: \"[reason]\".") if(P.owning_client) to_chat_forced(P.owning_client, SPAN_WARNING("You have been sticky banned by [banning_admin? banning_admin.ckey : "Host"].\nReason: [sanitize(reason)].")) @@ -43,7 +43,7 @@ /datum/entity/player/proc/process_stickyban(address, computer_id, source_id, reason, datum/entity/player/banning_admin, list/PSB) if(length(PSB) > 0) // sticky ban with identical data already exists, no need for another copy if(banning_admin) - to_chat(banning_admin, SPAN_WARNING("Failed to add stickyban to [ckey]. Reason: Stickyban already exists.")) + to_chat(banning_admin, SPAN_WARNING("Не получилось дать стикибан [ckey]. Причина: стикибан уже выдан.")) return stickyban_internal(ckey, address, computer_id, reason, source_id, banning_admin) diff --git a/code/modules/admin/tabs/server_tab.dm b/code/modules/admin/tabs/server_tab.dm index 6e5ded23206a..86176674dce7 100644 --- a/code/modules/admin/tabs/server_tab.dm +++ b/code/modules/admin/tabs/server_tab.dm @@ -14,7 +14,7 @@ if(confirm == "Cancel") return if(confirm == "Yes") - to_world(SPAN_DANGER("Restarting world! [SPAN_NOTICE("Initiated by [usr.client.admin_holder.fakekey ? "Admin" : usr.key]!")]")) + to_world(SPAN_DANGER("ПАМ-ПАРАМ! [SPAN_NOTICE("[usr.client.admin_holder.fakekey ? "Admin" : usr.key]!")]")) log_admin("[key_name(usr)] initiated a reboot.") sleep(50) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 3d50b50e414c..665e739bf4d8 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -697,7 +697,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) defer_to_mentors() /datum/admin_help/proc/player_ticket_panel() - var/list/dat = list("Player Ticket") + var/list/dat = list("Player Ticket") dat += "State: " switch(state) if(AHELP_ACTIVE) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 700d42808a07..31bf3036a06b 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -23,12 +23,12 @@ stafftype = "[admin_holder.rank]" msg = strip_html(msg) - log_admin("DEAD: [key_name(src)] : [msg]") + log_admin("МЕРТВЕЦ: [key_name(src)] : [msg]") if (!msg) return - var/rendered = "DEAD: [stafftype]([src.key]) says, \"[msg]\"" + var/rendered = "МЕРТВЕЦ: [stafftype]([src.key]) рассказывает, \"[msg]\"" for (var/mob/M in GLOB.player_list) if (istype(M, /mob/new_player)) diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 4809d9b2e6ee..bc43f917bf73 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -225,7 +225,7 @@ switch(type) if(NARRATION_METHOD_SAY) selected.langchat_speech(message, heard, GLOB.all_languages, skip_language_check = TRUE) - selected.visible_message("[selected] says, \"[message]\"") + selected.visible_message("[selected] говорит, \"[message]\"") if(NARRATION_METHOD_ME) selected.langchat_speech(message, heard, GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_small", "emote")) selected.visible_message("[selected] [message]") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d9eb01511344..1b7f57283c7f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -646,7 +646,7 @@ var/const/MAX_SAVE_SLOTS = 10 //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. //width - Screen' width. Defaults to 550 to make it look nice. //height - Screen's height. Defaults to 500 to make it look nice. -/datum/preferences/proc/SetChoices(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) +/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) if(!RoleAuthority) return diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 0916ecfb34e9..d722c9aa9d58 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -537,7 +537,7 @@ //==========================//PROTECTIVE\\===============================\\ //=======================================================================\\ -D + /obj/item/clothing/head/ushanka name = "ushanka" desc = "Perfect for winter in Siberia, da?" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index aa1d21c4902e..aaa6eaa07500 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -831,6 +831,17 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( specialty = "M35 pyrotechnician" flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE +/obj/item/clothing/head/helmet/marine/M40 + name = "\improper M40 helmet" + icon_state = "st_helmet" + desc = "A helmet designed for USCM storm trooper. Contains heavy insulation, covered in nomex weave." + armor_melee = CLOTHING_ARMOR_HIGH + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT + specialty = "M40 stormtrooper" + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + unacidable = TRUE + /obj/item/clothing/head/helmet/marine/M3T name = "\improper M3-T bombardier helmet" icon_state = "sadar_helmet" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 9976181588d8..8b82d6dffb88 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -665,6 +665,16 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE +/obj/item/clothing/suit/storage/marine/M40 + name = "M40 armor" + desc = "A custom set of M40 armor designed for use by USCM stormtrooper. Contains thick kevlar shielding." + icon_state = "st_armor" + armor_melee = CLOTHING_ARMOR_HIGH + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + #define FIRE_SHIELD_CD 150 /obj/item/clothing/suit/storage/marine/M35 diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index aa01535ff888..33684aa29d0a 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -296,6 +296,35 @@ new /obj/item/ammo_magazine/handful/revolver/marksman/six_rounds(src) new /obj/item/ammo_magazine/handful/revolver/marksman/six_rounds(src) +/obj/item/storage/box/guncase/vulture + name = "\improper M707 anti-materiel rifle case" + desc = "A gun case containing the M707 \"Vulture\" anti-materiel rifle and its requisite spotting tools." + icon_state = "guncase_blue" + storage_slots = 7 + can_hold = list( + /obj/item/weapon/gun/boltaction/vulture, + /obj/item/ammo_magazine/rifle/boltaction/vulture, + /obj/item/device/vulture_spotter_tripod, + /obj/item/device/vulture_spotter_scope, + /obj/item/tool/screwdriver, + /obj/item/pamphlet/trait/vulture, + ) + +/obj/item/storage/box/guncase/vulture/update_icon() + if(LAZYLEN(contents)) + icon_state = "guncase_blue" + else + icon_state = "guncase_blue_e" + +/obj/item/storage/box/guncase/vulture/fill_preset_inventory() + var/obj/item/weapon/gun/boltaction/vulture/rifle = new(src) + new /obj/item/ammo_magazine/rifle/boltaction/vulture(src) + new /obj/item/device/vulture_spotter_tripod(src) + new /obj/item/device/vulture_spotter_scope(src, WEAKREF(rifle)) + new /obj/item/tool/screwdriver(src) // Spotter scope needs a screwdriver to disassemble + new /obj/item/pamphlet/trait/vulture(src) //both pamphlets give use of the scope and the rifle + new /obj/item/pamphlet/trait/vulture(src) + //Handgun case for Military police vendor three mag , a railflashligh and the handgun. //88 Mod 4 Combat Pistol diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 43cf733adb75..ebc93b430a6b 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -120,6 +120,22 @@ new /obj/item/ammo_magazine/pistol/vp78(src) new /obj/item/device/binoculars(src) +/obj/item/storage/box/spec/st + name = "\improper Stormtrooper equipment case" + desc = "M40 helmet, M40 armor, Montage, 88 mod vp78 and ammo.\nDrag this sprite onto yourself to open it up! NOTE: You cannot put items back inside this case." + kit_overlay = "st" + +/obj/item/storage/box/spec/st/fill_preset_inventory() + new /obj/item/clothing/suit/storage/marine/M40(src) + new /obj/item/clothing/head/helmet/marine/M40(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/attachable/stock/tactical(src) + new /obj/item/clothing/accessory/storage/holster(src) + new /obj/item/weapon/gun/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/weapon/twohanded/st_hammer(src) + new /obj/item/weapon/shield/montage(src) /obj/item/storage/box/spec/heavy_grenadier name = "\improper Heavy Grenadier equipment case" @@ -256,6 +272,10 @@ //this is to be able to use C4s that are coming with the kit if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) + if("ST") + spec_box = new /obj/item/storage/box/spec/st(T) + specialist_assignment = "ST" + user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ST) if(specialist_assignment) user.put_in_hands(spec_box) ID.set_assignment((user.assigned_squad && squad_assignment_update ? (user.assigned_squad.name + " ") : "") + ID.assignment + " ([specialist_assignment])") diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index a3bea392c201..71bf8213c4d5 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -915,7 +915,8 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_SYNTH = 21, JOB_PILOT = 22, JOB_DROPSHIP_CREW_CHIEF = 23, - JOB_INTEL = 24, + JOB_CREWMAN = 24, + JOB_INTEL = 25, // 30-39: Security JOB_CHIEF_POLICE = 30, JOB_PROVOST_TML = 30, @@ -1017,6 +1018,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) "[squad_name][JOB_SQUAD_SPECIALIST] (Demo)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SPECIALIST] (Grenadier)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SPECIALIST] (Pyro)" = (squad_number + 2), + "[squad_name][JOB_SQUAD_SPECIALIST] (ST)" = (squad_number + 2), "[squad_name][JOB_SQUAD_SMARTGUN]" = (squad_number + 3), "[squad_name][JOB_SQUAD_ENGI]" = (squad_number + 4), "[squad_name][JOB_SQUAD_MEDIC]" = (squad_number + 5), diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm index a99bb5603dcb..a73759d09e18 100644 --- a/code/modules/cm_phone/phone.dm +++ b/code/modules/cm_phone/phone.dm @@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) T.caller = src T.update_icon() - to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Dialing [calling_phone_id]..")) + to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Звоню [calling_phone_id]..")) playsound(get_turf(user), "rtb_handset") timeout_timer_id = addtimer(CALLBACK(src, PROC_REF(reset_call), TRUE), timeout_duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) @@ -192,12 +192,12 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(T.attached_to && ismob(T.attached_to.loc)) var/mob/M = T.attached_to.loc - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] has picked up.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] отвечает.")) if(T.timeout_timer_id) deltimer(T.timeout_timer_id) T.timeout_timer_id = null - to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Picked up a call from [T.phone_id].")) + to_chat(user, SPAN_PURPLE("[icon2html(src, user)] ответил [T.phone_id].")) playsound(get_turf(user), "rtb_handset") user.put_in_active_hand(attached_to) @@ -223,14 +223,14 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(T) if(T.attached_to && ismob(T.attached_to.loc)) var/mob/M = T.attached_to.loc - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] has hung up on you.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] бросает трубку.")) if(attached_to && ismob(attached_to.loc)) var/mob/M = attached_to.loc if(timeout) - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Your call to [T.phone_id] has reached voicemail, you immediately disconnect the line.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Вместо [T.phone_id] я слышу автоответчик и кладу трубку.")) else - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] You have hung up on [T.phone_id].")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] Я заканчиваю разговор с [T.phone_id].")) if(calling) calling.caller = null @@ -263,7 +263,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(attached_to.loc == src) if(next_ring < world.time) playsound(loc, 'sound/machines/telephone/telephone_ring.ogg', 75) - visible_message(SPAN_WARNING("[src] rings vigorously!")) + visible_message(SPAN_WARNING("[src] настойчиво звонит!")) next_ring = world.time + 3 SECONDS else if(calling) @@ -276,7 +276,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(P && attached_to.loc == src && P.loc == T && next_ring < world.time) playsound(get_turf(attached_to), 'sound/machines/telephone/telephone_ring.ogg', 20, FALSE, 14) - visible_message(SPAN_WARNING("[src] rings vigorously!")) + visible_message(SPAN_WARNING("[src] настойчиво звонит!")) next_ring = world.time + 3 SECONDS else @@ -396,7 +396,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) vname = attached_to.phone_id M.hear_radio( - message, "says", L, part_a = "", + message, "говорит", L, part_a = "", part_b = " ", vname = vname, speaker = speaking, command = loudness, no_paygrade = TRUE) @@ -463,10 +463,10 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) ..() if(raised) set_raised(FALSE, user) - to_chat(user, SPAN_NOTICE("You lower [src].")) + to_chat(user, SPAN_NOTICE("Я откладываю [src].")) else set_raised(TRUE, user) - to_chat(user, SPAN_NOTICE("You raise [src] to your ear.")) + to_chat(user, SPAN_NOTICE("Я подношу [src] к уху.")) /obj/item/phone/proc/set_raised(to_raise, mob/living/carbon/human/H) diff --git a/code/modules/cm_tech/implements/tank.dm b/code/modules/cm_tech/implements/tank.dm index 1ce83c37eae3..55b6fc780cd6 100644 --- a/code/modules/cm_tech/implements/tank.dm +++ b/code/modules/cm_tech/implements/tank.dm @@ -43,30 +43,10 @@ return . = TRUE - comp.spent = FALSE - QDEL_NULL_LIST(comp.vehicles) + + QDEL_LIST_ASSOC_VAL(comp.vehicles) comp.vehicles = list( - new /datum/vehicle_order/tank() + /datum/vehicle_order/tank = new /datum/vehicle_order/tank() ) - comp.allowed_roles = null - comp.req_access = list() - comp.req_one_access = list() - comp.spent = FALSE - - gearcomp.req_access = list() - gearcomp.req_one_access = list() - gearcomp.vendor_role = list() - gearcomp.selected_vehicle = "TANK" - gearcomp.available_categories = VEHICLE_ALL_AVAILABLE - - var/datum/supply_packs/VK = /datum/supply_packs/vc_kit - var/pack = initial(VK.name) - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_controller.ordernum - supply_controller.ordernum++ - O.object = supply_controller.supply_packs[pack] - O.orderedby = MAIN_AI_SYSTEM - O.approvedby = MAIN_AI_SYSTEM - supply_controller.shoppinglist += O return TRUE diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 33af36991e17..5f3ee897863b 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -17,7 +17,7 @@ -/mob/dead/observer/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) +/mob/dead/observer/hear_say(message, verb = "говорит", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) if(!client) return diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 19f461be757c..bc2583d0e32e 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -2,7 +2,7 @@ /mob/proc/hear_apollo() return FALSE -/mob/proc/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) +/mob/proc/hear_say(message, verb = "говорит", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol) if(!client && !(mind && mind.current != src)) return @@ -46,9 +46,9 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(speaker == src) - to_chat(src, SPAN_WARNING("You cannot hear yourself speak!")) + to_chat(src, SPAN_WARNING("Я не слышу себя!")) else - to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] talks but you cannot hear them.")) + to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] говорит, но я ни черта не слышу.")) else to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] [verb], \"[message]\"")) if (speech_sound && (get_dist(speaker, src) <= world_view_size && src.z == speaker.z)) @@ -57,7 +57,7 @@ /mob/proc/hear_radio( - message, verb="says", + message, verb="говорит", datum/language/language=null, part_a, part_b, mob/speaker = null, @@ -110,7 +110,7 @@ if(hard_to_hear) - speaker_name = "unknown" + speaker_name = "неизвестный" comm_paygrade = "" var/changed_voice @@ -132,23 +132,23 @@ jobname = impersonating.get_assignment() comm_paygrade = impersonating.get_paygrade() else - jobname = "Unknown" + jobname = "Неизвестный" comm_paygrade = "" else jobname = H.get_assignment() comm_paygrade = H.get_paygrade() else if (iscarbon(speaker)) // Nonhuman carbon mob - jobname = "No id" + jobname = "Нет ID" comm_paygrade = "" else if (isAI(speaker)) - jobname = "AI" + jobname = "ИИ" comm_paygrade = "" else if (isrobot(speaker)) - jobname = "Cyborg" + jobname = "Киборг" comm_paygrade = "" else - jobname = "Unknown" + jobname = "Неизвестно" comm_paygrade = "" if(changed_voice) @@ -175,7 +175,7 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(prob(20)) - to_chat(src, SPAN_WARNING("You feel your headset vibrate but can hear nothing from it!"), type = MESSAGE_TYPE_RADIO) + to_chat(src, SPAN_WARNING("Мой наушник вибрирует, но я ничего не слышу..."), type = MESSAGE_TYPE_RADIO) else if(track) if(!command) to_chat(src, "[part_a][comm_paygrade][track][part_b][verb], \"[message]\"", type = MESSAGE_TYPE_RADIO) @@ -187,7 +187,7 @@ else to_chat(src, "[part_a][comm_paygrade][speaker_name][part_b][verb], \"[message]\"", type = MESSAGE_TYPE_RADIO) -/mob/proc/hear_signlang(message, verb = "gestures", datum/language/language, mob/speaker = null) +/mob/proc/hear_signlang(message, verb = "жестикулирует", datum/language/language, mob/speaker = null) var/comm_paygrade = "" if(!client) return @@ -212,16 +212,16 @@ if(sdisabilities & DISABILITY_DEAF || ear_deaf) if(speaker == src) - to_chat(src, SPAN_WARNING("You cannot hear yourself speak!")) + to_chat(src, SPAN_WARNING("Я не слышу своих слов!")) else - to_chat(src, SPAN_LOCALSAY("Someone near talks but you cannot hear them.")) + to_chat(src, SPAN_LOCALSAY("Кто-то рядом разговаривает, но я ничего не слышу.")) return if(hearing_self) - heard = SPAN_LOCALSAY("You mutter something about... [stars(message, clear_char_probability = 99)]") + heard = SPAN_LOCALSAY("Бубню что-то про... [stars(message, clear_char_probability = 99)]") else if(!sleeping && proximity_flag) - heard = SPAN_LOCALSAY("You hear someone near you say something... [stars(message, clear_char_probability = 90)]") + heard = SPAN_LOCALSAY("Кто-то рядом говорит о... [stars(message, clear_char_probability = 90)]") else if(prob(15)) @@ -233,9 +233,9 @@ heardword = copytext(heardword,2) if(copytext(heardword,-1) in punctuation) heardword = copytext(heardword,1,length(heardword)) - heard = SPAN_LOCALSAY("...You hear something about...[heardword]") + heard = SPAN_LOCALSAY("...Что? Кто-то говорит про...[heardword]") else - heard = SPAN_LOCALSAY("...You almost hear someone talking...") + heard = SPAN_LOCALSAY("...Кажется я слышу разговоры...") to_chat(src, heard) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index f00618fe54be..0f19ea9ec0bd 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -7,9 +7,9 @@ /datum/language var/name = "an unknown language" // Fluff name of language if any. var/desc = "A language." // Short description for 'Check Languages'. - var/speech_verb = "says" // 'says', 'hisses', 'farts'. - var/ask_verb = "asks" // Used when sentence ends in a ? - var/exclaim_verb = "exclaims" // Used when sentence ends in a ! + var/speech_verb = "говорит" // 'says', 'hisses', 'farts'. + var/ask_verb = "спрашивает" // Used when sentence ends in a ? + var/exclaim_verb = "восклицает" // Used when sentence ends in a ! var/signlang_verb = list() // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags var/color = "body" // CSS style to use for strings in this language. var/key = "x" // Character used to speak in language eg. :o for Unathi. diff --git a/code/modules/mob/language/languages.dm b/code/modules/mob/language/languages.dm index 2844b5841781..96388c7bfcdf 100644 --- a/code/modules/mob/language/languages.dm +++ b/code/modules/mob/language/languages.dm @@ -1,7 +1,7 @@ /datum/language/common name = LANGUAGE_ENGLISH desc = "Common Earth English. The standard language of the United Americas." - speech_verb = "says" + speech_verb = "говорит" key = "1" flags = RESTRICTED @@ -10,7 +10,7 @@ /datum/language/common/get_spoken_verb(msg_end) switch(msg_end) if("!") - return pick("exclaims","shouts","yells") //TODO: make the basic proc handle lists of verbs. + return pick("объясняет","кричит","восклицает") //TODO: make the basic proc handle lists of verbs. if("?") return ask_verb return speech_verb @@ -23,7 +23,7 @@ /datum/language/generated/japanese name = LANGUAGE_JAPANESE desc = "A notoriously complex language boasting an extensive grammatical system, three writing systems, and a new smattering of English loanwords. It has gained popularity due to high cultural contact in the 3WE, and finds use outside due to emigration." - speech_verb = "vocalizes" + speech_verb = "выражается" color = "japanese" key = "2" @@ -31,9 +31,9 @@ /datum/language/generated/chinese name = LANGUAGE_CHINESE desc = "The secondary language of the UPP, widespread around Asia and with a notable immigrant population in other parts of the world. The most spoken language in charted space." - speech_verb = "shuo" - ask_verb = "wen" - exclaim_verb = "han" + speech_verb = "шуо" + ask_verb = "вен" + exclaim_verb = "хан" color = "chinese" key = "8" @@ -71,9 +71,9 @@ /datum/language/commando name = LANGUAGE_TSL desc = "TSL is a modern technique with a combination of modified American sign language, tactical hand signals and discreet and esoteric code names for radios only known by elite commando groups." - speech_verb = "discreetly communicates" - ask_verb = "interrogates" - exclaim_verb = "orders" + speech_verb = "намекает" + ask_verb = "допрашивает" + exclaim_verb = "приказывает" color = "commando" key = "l" @@ -84,34 +84,34 @@ /datum/language/sainja //Yautja tongue name = LANGUAGE_YAUTJA desc = "The deep, rumbling, guttural sounds of the Yautja predators. It is difficult to speak for those without facial mandibles." - speech_verb = "rumbles" - ask_verb = "rumbles" - exclaim_verb = "roars" + speech_verb = "грохочет" + ask_verb = "ропочет" + exclaim_verb = "рычит" color = "tajaran" key = "s" flags = WHITELISTED - syllables = list("!", "?", ".", "@", "$", "%", "^", "&", "*", "-", "=", "+", "e", "b", "y", "p", "|", "z", "~", ">") + syllables = list("!", "?", ".", "@", "$", "%", "^", "&", "*", "-", "=", "+", "е", "б", "у", "р", "|", "з", "~", ">") space_chance = 20 /datum/language/hellhound name = LANGUAGE_HELLHOUND desc = "A growling, guttural method of communication, only Hellhounds seem to be capable of producing these sounds." - speech_verb = "growls" - ask_verb = "grumbles" - exclaim_verb = "snarls" + speech_verb = "рычит" + ask_verb = "ворчит" + exclaim_verb = "огрызается" color = "monkey" key = "h" /datum/language/hellhound/scramble(input) - return pick("Grrr...", "Grah!", "Gurrr...") + return pick("Гррр...", "Гра!", "Гуррр...") /datum/language/primitive name = LANGUAGE_MONKEY desc = "Ook ook ook." - speech_verb = "chimpers" - ask_verb = "chimpers" - exclaim_verb = "screeches" + speech_verb = "верещит" + ask_verb = "верещит" + exclaim_verb = "визжит" color = "monkey" key = "9" @@ -119,18 +119,18 @@ name = LANGUAGE_XENOMORPH color = "xenotalk" desc = "The common tongue of the xenomorphs." - speech_verb = "hisses" - ask_verb = "hisses" - exclaim_verb = "hisses" + speech_verb = "шипит" + ask_verb = "шипит" + exclaim_verb = "шипит" key = "x" flags = RESTRICTED /datum/language/xenos name = LANGUAGE_HIVEMIND desc = "Xenomorphs have the strange ability to commune over a psychic hivemind." - speech_verb = "hiveminds" - ask_verb = "hiveminds" - exclaim_verb = "hiveminds" + speech_verb = "сообщает" + ask_verb = "сообщает" + exclaim_verb = "сообщает" color = "xeno" key = "q" flags = RESTRICTED|HIVEMIND @@ -205,9 +205,9 @@ /datum/language/event_hivemind name = LANGUAGE_TELEPATH desc = "An event only language that provides a hivemind for its users." - speech_verb = "resonates" - ask_verb = "resonates" - exclaim_verb = "resonates" + speech_verb = "резонирует" + ask_verb = "резонирует" + exclaim_verb = "резонирует" color = "tajaran" key = "7" flags = RESTRICTED|HIVEMIND diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c9092ed479b9..89855c67a39e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1308,8 +1308,8 @@ var/static/list/squad_leader_trackers = list( TRACKER_ASL = /datum/squad/marine/alpha, - TRACKER_BSL = /datum/squad/marine/bravo, - TRACKER_CSL = /datum/squad/marine/charlie, +// TRACKER_BSL = /datum/squad/marine/bravo, +// TRACKER_CSL = /datum/squad/marine/charlie, TRACKER_DSL = /datum/squad/marine/delta, TRACKER_ESL = /datum/squad/marine/echo, TRACKER_FSL = /datum/squad/marine/cryo diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 805b3d7e1744..188f54bdd6ef 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -4,7 +4,7 @@ if(..()) return TRUE - if((attacking_mob != src) && check_shields(0, attacking_mob.name)) + if((attacking_mob != src) && check_shields(0, attacking_mob.name, attacker_dir = get_dir(attacking_mob,src))) visible_message(SPAN_DANGER("[attacking_mob] attempted to touch [src]!"), null, null, 5) return 0 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index a8734afd7301..b742f18ff4d7 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -93,14 +93,14 @@ Contains most of the procs that are called when a mob is attacked by something return TRUE return FALSE -/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", combistick=0) +/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", combistick=0, attacker_dir = NORTH) if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3) if(combistick && istype(l_hand,/obj/item/weapon/yautja/combistick) && prob(66)) var/obj/item/weapon/yautja/combistick/C = l_hand if(C.on) return TRUE - if(l_hand.IsShield() && istype(l_hand,/obj/item/weapon/shield)) // Activable shields + if(l_hand.IsShield() && istype(l_hand,/obj/item/weapon/shield) && (dir in reverse_nearby_direction(attacker_dir))) // Activable shields var/obj/item/weapon/shield/S = l_hand var/shield_blocked_l = FALSE if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. @@ -125,7 +125,7 @@ Contains most of the procs that are called when a mob is attacked by something if(C.on) return TRUE - if(r_hand.IsShield() && istype(r_hand,/obj/item/weapon/shield)) // Activable shields + if(r_hand.IsShield() && istype(r_hand,/obj/item/weapon/shield) && (dir in reverse_nearby_direction(attacker_dir))) // Activable shields var/obj/item/weapon/shield/S = r_hand var/shield_blocked_r = FALSE if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. @@ -143,12 +143,20 @@ Contains most of the procs that are called when a mob is attacked by something visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [r_hand.name]!"), null, null, 5) return TRUE - if(back && istype(back, /obj/item/weapon/shield/riot) && prob(20)) + if(back && istype(back, /obj/item/weapon/shield/riot) && (reverse_direction(dir) in reverse_nearby_direction(attacker_dir))) var/obj/item/weapon/shield/riot/shield = back - if(shield.blocks_on_back) + if(shield.blocks_on_back && prob(shield.passive_block)) visible_message(SPAN_DANGER("The [back] on [src]'s back blocks [attack_text]!"), null, null, 5) return TRUE + if(back && istype(back, /obj/item/weapon/shield/montage) && (reverse_direction(dir) in reverse_nearby_direction(attacker_dir))) + var/obj/item/weapon/shield/montage/shield = back + if(shield.blocks_on_back && prob(shield.passive_block)) + visible_message(SPAN_DANGER("The [back] on [src]'s back blocks [attack_text]!"), null, null, 5) + if(attack_text == "the pounce") + apply_effect(1, WEAKEN) + return TRUE + if(attack_text == "the pounce" && wear_suit && wear_suit.flags_inventory & BLOCK_KNOCKDOWN) visible_message(SPAN_DANGER("[src] withstands [attack_text] with their [wear_suit.name]!"), null, null, 5) return TRUE @@ -191,7 +199,7 @@ Contains most of the procs that are called when a mob is attacked by something return FALSE var/hit_area = affecting.display_name - if((user != src) && check_shields(I.force, "the [I.name]")) + if((user != src) && check_shields(I.force, "the [I.name]", attacker_dir = get_dir(user,src))) return FALSE if(I.attack_verb && I.attack_verb.len) @@ -299,7 +307,7 @@ Contains most of the procs that are called when a mob is attacked by something return O.throwing = FALSE //it hit, so stop moving - if ((LM.thrower != src) && check_shields(impact_damage, "[O]")) + if ((LM.thrower != src) && check_shields(impact_damage, "[O]", attacker_dir = get_dir(LM.thrower,src))) return var/obj/limb/affecting = get_limb(zone) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 4b86c827a069..76a4163a5823 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -16,7 +16,7 @@ i-- break .["modes"] += department_radio_keys[":[current_channel]"] - .["message_and_language"] = copytext(message, i+1) + .["message_and_language"] = copytext_char(message, i+1) var/multibroadcast_cooldown = 0 for(var/obj/item/device/radio/headset/headset in list(wear_l_ear, wear_r_ear)) if(world.time - headset.last_multi_broadcast < headset.multibroadcast_cooldown) @@ -30,9 +30,9 @@ return if(length(message) >= 2 && (message[1] == "." || message[1] == ":" || message[1] == "#")) - var/channel_prefix = copytext(message, 1, 3) + var/channel_prefix = copytext_char(message, 1, 3) if(channel_prefix in department_radio_keys) - .["message_and_language"] = copytext(message, 3) + .["message_and_language"] = copytext_char(message, 3) .["modes"] += department_radio_keys[channel_prefix] return @@ -49,19 +49,19 @@ var/parsed_language = parse_language(message_and_language) if(parsed_language) .["language"] = parsed_language - .["message"] = copytext(message_and_language, 3) + .["message"] = copytext_char(message_and_language, 3) else .["message"] = message_and_language /mob/living/carbon/human/say(message) - var/verb = "says" + var/verb = "говорит" var/alt_name = "" var/message_range = world_view_size var/italics = 0 if(!able_to_speak) - to_chat(src, SPAN_DANGER("You try to speak, but nothing comes out!")) + to_chat(src, SPAN_DANGER("Пытаюсь говорить, но ничего не выходит")) return if(client) @@ -74,9 +74,9 @@ if(stat == DEAD) return say_dead(message) - if(copytext(message,1,2) == "*") + if(copytext_char(message,1,2) == "*") if(!findtext(message, "*", 2)) //Second asterisk means it is markup for *bold*, not an *emote. - return emote(lowertext(copytext(message,2)), intentional = TRUE) //TRUE arg means emote was caused by player (e.g. no an auto scream when hurt). + return emote(lowertext(copytext_char(message,2)), intentional = TRUE) //TRUE arg means emote was caused by player (e.g. no an auto scream when hurt). if(name != GetVoice()) alt_name = "(as [get_id_name("Unknown")])" @@ -91,7 +91,7 @@ if(!speaking) speaking = get_default_language() - var/ending = copytext(message, length(message)) + var/ending = copytext_char(message, length(message)) if (speaking) // This is broadcast to all mobs with the language, // irrespective of distance or anything else. @@ -105,9 +105,9 @@ verb = speaking.get_spoken_verb(ending) else if(ending=="!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") if(ending=="?") - verb="asks" + verb="спрашивает" if (istype(wear_mask, /obj/item/clothing/mask/muzzle)) return @@ -161,7 +161,7 @@ for(var/mob/living/M in hearers(message_range, src)) if(M != src) - M.show_message(SPAN_NOTICE("[src] talks into [used_radios.len ? used_radios[1] : "the radio."]"), SHOW_MESSAGE_VISIBLE) + M.show_message(SPAN_NOTICE("[src] говорит в [used_radios.len ? used_radios[1] : "the radio."]"), SHOW_MESSAGE_VISIBLE) if(ishumansynth_strict(src)) playsound(src.loc, 'sound/effects/radiostatic.ogg', 15, 1) @@ -193,9 +193,9 @@ if (GRADUAL) say_text += "..." if (PAINFUL) - say_text += pick("-OW!", "-UGH!", "-ACK!") + say_text += pick("-ОУ!", "-УХ!", "-АААЙ!") if (EXTREMELY_PAINFUL) - say_text += pick("-AAAGH!", "-AAARGH!", "-AAAHH!") + say_text += pick("-ААААААААА!", "-АЫАЫАА!", "-ЫЫАААА!") say(say_text) winset(client, "input", "text=[null]") @@ -246,22 +246,22 @@ for it but just ignore it. */ /mob/living/carbon/human/say_quote(message, datum/language/speaking = null) - var/verb = "says" + var/verb = "говорит" var/ending = copytext(message, length(message)) if(speaking) verb = speaking.get_spoken_verb(ending) else if(ending == "!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") else if(ending == "?") - verb="asks" + verb="спрашивает" return verb /mob/living/carbon/human/proc/handle_speech_problems(message) var/list/returns[3] - var/verb = "says" + var/verb = "говорит" var/handled = FALSE if(silent) message = "" @@ -273,8 +273,8 @@ for it but just ignore it. if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) var/obj/item/clothing/mask/horsehead/hoers = wear_mask if(hoers.voicechange) - message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - verb = pick("whinnies","neighs", "says") + message = pick("ЫЫЫЫЫЫЫ!", "ЫААААААЫЫЫЫ!", "ЫЫЫЫХЫЫЫЫЫ!", "ХЫЫЫАААЫ!", "ЫААААА!") + verb = pick("ржет","выжимает", "говорит") handled = TRUE var/braindam = getBrainLoss() @@ -282,30 +282,30 @@ for it but just ignore it. msg_admin_niche("[key_name(src)] stuttered while saying: \"[message]\"") //Messages that get modified by the 4 reasons below have their original message logged too if(slurring) message = slur(message) - verb = pick("stammers","stutters") + verb = pick("заплетаясь говорит","заикается") handled = TRUE if(stuttering) message = NewStutter(message) - verb = pick("stammers", "stutters") + verb = pick("заплетаясь говорит", "заикается") handled = TRUE if(dazed) message = DazedText(message) - verb = pick("mumbles", "babbles") + verb = pick("бормочет", "болтает") handled = TRUE if(braindam >= 60) handled = TRUE if(prob(braindam/4)) message = stutter(message, stuttering) - verb = pick("stammers", "stutters") + verb = pick("заплетаясь говорит", "заикается") if(prob(braindam)) message = uppertext(message) - verb = pick("yells like an idiot","says rather loudly") + verb = pick("вопит как идиот","довольно громко говорит") if(HAS_TRAIT(src, TRAIT_LISPING)) handled = TRUE var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" returns[1] = message returns[2] = verb diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 3fba527fb0d7..87ddc2da8aa6 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -21,7 +21,7 @@ message = trim(strip_html(message)) //made consistent with say if(name != GetVoice()) - alt_name = "(as [get_id_name("Unknown")])" + alt_name = "(за [get_id_name("Неизвестный")])" //parse the language code and consume it var/datum/language/speaking = parse_language(message) @@ -34,14 +34,14 @@ //This is used by both the whisper verb and human/say() to handle whispering -/mob/living/carbon/human/proc/whisper_say(message, datum/language/speaking = null, alt_name="", verb="whispers") +/mob/living/carbon/human/proc/whisper_say(message, datum/language/speaking = null, alt_name="", verb="шепчет") var/message_range = 1 var/eavesdropping_range = 2 var/watching_range = 5 var/italics = 1 if (speaking) - verb = speaking.speech_verb + pick(" quietly", " softly") + verb = speaking.speech_verb + pick(" тихо", " медленно") message = capitalize(trim(message)) @@ -121,6 +121,6 @@ if(M.client) M.client.images -= speech_bubble if (watching.len) - var/rendered = "[src.name] whispers something." + var/rendered = "[src.name] что-то шепчет." for (var/mob/M in watching) M.show_message(rendered, SHOW_MESSAGE_AUDIBLE) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index 37b0aa037cd1..9f7f90175b39 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -278,18 +278,19 @@ return if (pounceAction.can_be_shield_blocked) - if(ishuman(M) && (M.dir in reverse_nearby_direction(dir))) + if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.check_shields(15, "the pounce")) //Human shield block. + if(H.check_shields(15, "the pounce", attacker_dir = get_dir(src,H))) //Human shield block. visible_message(SPAN_DANGER("[src] slams into [H]!"), SPAN_XENODANGER("You slam into [H]!"), null, 5) apply_effect(1, WEAKEN) throwing = FALSE //Reset throwing manually. playsound(H, "bonk", 75, FALSE) //bonk + step_away(src, H, 1, 2) return if(isyautja(H)) - if(H.check_shields(0, "the pounce", 1)) + if(H.check_shields(0, "the pounce", 1, get_dir(src,H))) visible_message(SPAN_DANGER("[H] blocks the pounce of [src] with the combistick!"), SPAN_XENODANGER("[H] blocks your pouncing form with the combistick!"), null, 5) apply_effect(3, WEAKEN) throwing = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 25f6108c14f6..b4ccedc3f7ce 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -31,7 +31,7 @@ if(M == src || anchored || buckled) return XENO_NO_DELAY_ACTION - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s grab is blocked by [src]'s shield!"), \ SPAN_DANGER("Your grab was blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback @@ -61,7 +61,7 @@ to_chat(M, SPAN_WARNING("You should not harm this host! It has a sister inside.")) return XENO_NO_DELAY_ACTION - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s slash is blocked by [src]'s shield!"), \ SPAN_DANGER("Your slash is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback @@ -187,7 +187,7 @@ return XENO_NO_DELAY_ACTION M.animation_attack_on(src) - if(check_shields(0, M.name)) // Blocking check + if(check_shields(0, M.name, attacker_dir = get_dir(M,src))) // Blocking check M.visible_message(SPAN_DANGER("[M]'s tackle is blocked by [src]'s shield!"), \ SPAN_DANGER("Your tackle is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) playsound(loc, 'sound/weapons/alien_claw_block.ogg', 25, 1) //Feedback diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index ead254344e0a..7ae9355b7c11 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -67,6 +67,7 @@ /datum/action/xeno_action/activable/burrow, //third macro /datum/action/xeno_action/onclick/tremor, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm index dbdb03bb94ca..6b6aa45f4cbb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm @@ -64,6 +64,7 @@ /datum/action/xeno_action/activable/secrete_resin, //third macro /datum/action/xeno_action/activable/transfer_plasma, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index b0a44b0e3835..9fab361c2a6d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -69,6 +69,7 @@ /datum/action/xeno_action/activable/transfer_plasma/hivelord, // to be consistent with drone placement /datum/action/xeno_action/active_toggle/toggle_speed, //fourth macro /datum/action/xeno_action/onclick/tacmap, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index b83b33e2eee5..f4cdf89ac2f7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -303,6 +303,7 @@ /datum/action/xeno_action/onclick/readmit, /datum/action/xeno_action/onclick/queen_award, /datum/action/xeno_action/activable/info_marker/queen, + /datum/action/xeno_action/onclick/build_lessers_burrow, ) inherent_verbs = list( @@ -339,6 +340,7 @@ /datum/action/xeno_action/onclick/screech, //custom macro, Screech /datum/action/xeno_action/activable/xeno_spit/queen_macro, //third macro /datum/action/xeno_action/onclick/shift_spits, //second macro + /datum/action/xeno_action/onclick/build_lessers_burrow, ) // Abilities they get when they've successfully aged. diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index d1832d10b6fe..2485d8fe8a96 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -1,5 +1,5 @@ /mob/living/carbon/xenomorph/say(message) - var/verb = "says" + var/verb = "говорит" var/forced = 0 var/message_range = world_view_size @@ -17,7 +17,7 @@ return //Unconscious? Nope. if(dazed > 0) - to_chat(src, SPAN_WARNING("You are too dazed to talk.")) + to_chat(src, SPAN_WARNING("Мне не до разговоров.")) return if(copytext(message, 1, 2) == "*") @@ -61,11 +61,11 @@ var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" if(copytext(message,1,2) == ";") message = trim(copytext(message,2)) - else if (copytext(message,1,3) == ":q" || copytext(message,1,3) == ":Q") + else if (copytext(message,1,3) == ":q" || copytext(message,1,3) == ":Q" || copytext_char(message,1,3) == ":й" || copytext_char(message,1,3) == ":Й") message = trim(copytext(message,3)) message = capitalize(trim_left(message)) @@ -105,7 +105,7 @@ return if(!hive.living_xeno_queen && !SSticker?.mode?.hardcore && !hive.allow_no_queen_actions && ROUND_TIME > SSticker.mode.round_time_evolution_ovipositor) - to_chat(src, SPAN_WARNING("There is no Queen. You are alone.")) + to_chat(src, SPAN_WARNING("Королевы нет... Так одиноко...")) return log_hivemind("[key_name(src)] : [message]") @@ -133,13 +133,13 @@ var/mob/hologram/queen/queen_eye = client?.eye if(istype(queen_eye)) track += " (E)" - ghostrend = SPAN_XENOQUEEN("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOQUEEN("Коллективный разум, [src.name][track] шипит, '[message]'") else if(hive.leading_cult_sl == src) - ghostrend = SPAN_XENOQUEEN("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOQUEEN("Коллективный разум, [src.name][track] шипит, '[message]'") else if(istype(X) && IS_XENO_LEADER(X)) - ghostrend = SPAN_XENOLEADER("Hivemind, Leader [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENOLEADER("Коллективный разум, Лидер [src.name][track] шипит, '[message]'") else - ghostrend = SPAN_XENO("Hivemind, [src.name][track] hisses, '[message]'") + ghostrend = SPAN_XENO("Коллективный разум, [src.name][track] шипит, '[message]'") S.show_message(ghostrend, SHOW_MESSAGE_AUDIBLE) else if(hive.hivenumber == xeno_hivenumber(S) || hive.hivenumber == hear_hivemind) @@ -147,11 +147,11 @@ overwatch_insert = " (watch)" if(isqueen(src) || hive.leading_cult_sl == src) - rendered = SPAN_XENOQUEEN("Hivemind, [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENOQUEEN("Коллективный разум, [src.name][overwatch_insert] шипит, '[message]'") else if(istype(X) && IS_XENO_LEADER(X)) - rendered = SPAN_XENOLEADER("Hivemind, Leader [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENOLEADER("Коллективный разум, Лидер [src.name][overwatch_insert] шипит, '[message]'") else - rendered = SPAN_XENO("Hivemind, [src.name][overwatch_insert] hisses, '[message]'") + rendered = SPAN_XENO("Коллективный разум, [src.name][overwatch_insert] шипит, '[message]'") S.show_message(rendered, SHOW_MESSAGE_AUDIBLE) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index eddb22b4b416..78ff6b77903f 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -47,6 +47,54 @@ var/list/department_radio_keys = list( ":Z" = RADIO_CHANNEL_HIGHCOM, ".Z" = RADIO_CHANNEL_HIGHCOM, "#Z" = RADIO_CHANNEL_PMC_CMD, ":K" = SQUAD_SOF, ".K" = SQUAD_SOF, "#K" = RADIO_CHANNEL_WY_WO, ":R" = RADIO_CHANNEL_PROVOST, ".R" = RADIO_CHANNEL_PROVOST, "#R" = RADIO_CHANNEL_PROVOST, + +//Russkie ne sdayutsa + ":ш" = RADIO_CHANNEL_INTERCOM, ".ш" = RADIO_CHANNEL_INTERCOM, "#ш" = RADIO_CHANNEL_INTERCOM, + ":р" = RADIO_CHANNEL_DEPARTMENT, ".р" = RADIO_CHANNEL_DEPARTMENT, "#р" = RADIO_CHANNEL_DEPARTMENT, + ":ц" = RADIO_MODE_WHISPER, ".ц" = RADIO_MODE_WHISPER, "#ц" = RADIO_MODE_WHISPER, + ":=" = RADIO_CHANNEL_SPECIAL, ".=" = RADIO_CHANNEL_SPECIAL, "#=" = RADIO_CHANNEL_SPECIAL, //activate radio-specific special functions + + ":ь" = RADIO_CHANNEL_MEDSCI, ".ь" = RADIO_CHANNEL_MEDSCI, "#ь" = RADIO_CHANNEL_UPP_MED, + ":т" = RADIO_CHANNEL_ENGI, ".т" = RADIO_CHANNEL_ENGI, "#т" = RADIO_CHANNEL_UPP_ENGI, + ":п" = RADIO_CHANNEL_ALMAYER, ".п" = RADIO_CHANNEL_ALMAYER, "#п" = RADIO_CHANNEL_CLF_GEN, + ":м" = RADIO_CHANNEL_COMMAND , ".м" = RADIO_CHANNEL_COMMAND , "#м" = RADIO_CHANNEL_UPP_CMD, + ":ф" = SQUAD_MARINE_1, ".ф" = SQUAD_MARINE_1, "#ф" = RADIO_CHANNEL_CLF_MED, + ":и" = SQUAD_MARINE_2, ".и" = SQUAD_MARINE_2, "#и" = RADIO_CHANNEL_CLF_ENGI, + ":с" = SQUAD_MARINE_3, ".с" = SQUAD_MARINE_3, "#с" = RADIO_CHANNEL_CLF_CMD, + ":в" = SQUAD_MARINE_4, ".в" = SQUAD_MARINE_4, "#в" = RADIO_CHANNEL_CLF_CCT, + ":у" = SQUAD_MARINE_5, ".у" = SQUAD_MARINE_5, "#у" = RADIO_CHANNEL_PMC_ENGI, + ":а" = SQUAD_MARINE_CRYO, ".а" = SQUAD_MARINE_CRYO, "#а" = RADIO_CHANNEL_PMC_MED, + ":з" = RADIO_CHANNEL_MP , ".з" = RADIO_CHANNEL_MP , "#з" = RADIO_CHANNEL_PMC_GEN, + ":г" = RADIO_CHANNEL_REQ, ".г" = RADIO_CHANNEL_REQ, "#г" = RADIO_CHANNEL_UPP_GEN, + ":о" = RADIO_CHANNEL_JTAC, ".о" = RADIO_CHANNEL_JTAC, "#о" = RADIO_CHANNEL_UPP_CCT, + ":е" = RADIO_CHANNEL_INTEL, ".е" = RADIO_CHANNEL_INTEL, "#е" = RADIO_CHANNEL_UPP_KDO, + ":н" = RADIO_CHANNEL_WY, ".н" = RADIO_CHANNEL_WY, "#н" = RADIO_CHANNEL_WY, + ":щ" = RADIO_CHANNEL_COLONY, ".щ" = RADIO_CHANNEL_COLONY, "#щ" = RADIO_CHANNEL_PMC_CCT, + ":я" = RADIO_CHANNEL_HIGHCOM, ".я" = RADIO_CHANNEL_HIGHCOM, "#я" = RADIO_CHANNEL_PMC_CMD, + ":л" = SQUAD_SOF, ".л" = SQUAD_SOF, "#л" = RADIO_CHANNEL_WY_WO, + + ":Ш" = RADIO_CHANNEL_INTERCOM, ".Ш" = RADIO_CHANNEL_INTERCOM, "#Ш" = RADIO_CHANNEL_INTERCOM, + ":Р" = RADIO_CHANNEL_DEPARTMENT, ".Р" = RADIO_CHANNEL_DEPARTMENT, "#Р" = RADIO_CHANNEL_DEPARTMENT, + ":Ц" = RADIO_MODE_WHISPER, ".Ц" = RADIO_MODE_WHISPER, "#Ц" = RADIO_MODE_WHISPER, + + ":Ь" = RADIO_CHANNEL_MEDSCI, ".Ь" = RADIO_CHANNEL_MEDSCI, "#Ь" = RADIO_CHANNEL_UPP_MED, + ":Т" = RADIO_CHANNEL_ENGI, ".Т" = RADIO_CHANNEL_ENGI, "#Т" = RADIO_CHANNEL_UPP_ENGI, + ":П" = RADIO_CHANNEL_ALMAYER, ".П" = RADIO_CHANNEL_ALMAYER, "#П" = RADIO_CHANNEL_CLF_GEN, + ":М" = RADIO_CHANNEL_COMMAND, ".М" = RADIO_CHANNEL_COMMAND, "#М" = RADIO_CHANNEL_UPP_CMD, + ":Ф" = SQUAD_MARINE_1, ".Ф" = SQUAD_MARINE_1, "#Ф" = RADIO_CHANNEL_CLF_MED, + ":И" = SQUAD_MARINE_2, ".И" = SQUAD_MARINE_2, "#И" = RADIO_CHANNEL_CLF_ENGI, + ":С" = SQUAD_MARINE_3, ".С" = SQUAD_MARINE_3, "#С" = RADIO_CHANNEL_CLF_CMD, + ":В" = SQUAD_MARINE_4, ".В" = SQUAD_MARINE_4, "#В" = RADIO_CHANNEL_CLF_CCT, + ":У" = SQUAD_MARINE_5, ".У" = SQUAD_MARINE_5, "#У" = RADIO_CHANNEL_PMC_ENGI, + ":А" = SQUAD_MARINE_CRYO, ".А" = SQUAD_MARINE_CRYO, "#А" = RADIO_CHANNEL_PMC_MED, + ":З" = RADIO_CHANNEL_MP, ".З" = RADIO_CHANNEL_MP, "#З" = RADIO_CHANNEL_PMC_GEN, + ":Г" = RADIO_CHANNEL_REQ, ".Г" = RADIO_CHANNEL_REQ, "#Г" = RADIO_CHANNEL_UPP_GEN, + ":О" = RADIO_CHANNEL_JTAC, ".О" = RADIO_CHANNEL_JTAC, "#О" = RADIO_CHANNEL_UPP_CCT, + ":Е" = RADIO_CHANNEL_INTEL, ".Е" = RADIO_CHANNEL_INTEL, "#Е" = RADIO_CHANNEL_UPP_KDO, + ":Н" = RADIO_CHANNEL_WY, ".Н" = RADIO_CHANNEL_WY, "#Н" = RADIO_CHANNEL_WY, + ":Щ" = RADIO_CHANNEL_COLONY, ".Щ" = RADIO_CHANNEL_COLONY, "#Щ" = RADIO_CHANNEL_PMC_CCT, + ":Я" = RADIO_CHANNEL_HIGHCOM, ".Я" = RADIO_CHANNEL_HIGHCOM, "#Я" = RADIO_CHANNEL_PMC_CMD, + ":Л" = SQUAD_SOF, ".Л" = SQUAD_SOF, "#Л" = RADIO_CHANNEL_WY_WO, ) /proc/channel_to_prefix(channel) @@ -74,7 +122,7 @@ var/list/department_radio_keys = list( /mob/living/proc/remove_speech_bubble(mutable_appearance/speech_bubble, list_of_mobs) overlays -= speech_bubble -/mob/living/say(message, datum/language/speaking = null, verb="says", alt_name="", italics=0, message_range = world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon) +/mob/living/say(message, datum/language/speaking = null, verb="говорит", alt_name="", italics=0, message_range = world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon) var/turf/T if(SEND_SIGNAL(src, COMSIG_LIVING_SPEAK, message, speaking, verb, alt_name, italics, message_range, speech_sound, sound_vol, nolog, message_mode) & COMPONENT_OVERRIDE_SPEAK) return @@ -105,7 +153,7 @@ var/list/department_radio_keys = list( var/old_message = message message = lisp_replace(message) if(old_message != message) - verb = "lisps" + verb = "шепелявит" if(T) var/list/hearturfs = list() @@ -164,7 +212,7 @@ var/list/department_radio_keys = list( return 1 -/mob/living/proc/say_signlang(message, verb="gestures", datum/language/language) +/mob/living/proc/say_signlang(message, verb="жестикулирует", datum/language/language) for (var/mob/O in viewers(src, null)) O.hear_signlang(message, verb, language, src) diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index 1e1cef2b7a8e..a7109f491740 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -34,7 +34,7 @@ cameranet.updateVisibility(src) . = ..() -/obj/structure/Initialize() +/obj/structure/Initialize(mapload, ...) . = ..() if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS) cameranet.updateVisibility(src) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 3ee58585b524..6f32f7573425 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -38,9 +38,9 @@ if (stat == 2) return say_dead(message) - if(copytext(message,1,2) == "*") + if(copytext_char(message,1,2) == "*") if(!findtext(message, "*", 2)) //Second asterisk means it is markup for *bold*, not an *emote. - return emote(lowertext(copytext(message,2))) + return emote(lowertext(copytext_char(message,2))) var/bot_type = 0 //Let's not do a fuck ton of type checks, thanks. if(isAI(src)) @@ -61,15 +61,15 @@ var/message_mode = parse_message_mode(message, "general") if (message_mode) if (message_mode == "general") - message = trim(copytext(message,2)) + message = trim(copytext_char(message,2)) else - message = trim(copytext(message,3)) + message = trim(copytext_char(message,3)) //parse language key and consume it var/datum/language/speaking = parse_language(message) if (speaking) verb = speaking.speech_verb - message = copytext(message,3) + message = copytext_char(message,3) if(speaking.flags & HIVEMIND) speaking.broadcast(src,trim(message)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8b1cc1e26be2..9ad2c4ff0080 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -352,7 +352,7 @@ if(stat) return - var/verb = "says" + var/verb = "говорит" if(speak_emote.len) verb = pick(speak_emote) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 3e765e167ec1..0b661a43ed21 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -103,7 +103,7 @@ var/mob_size = MOB_SIZE_HUMAN var/list/embedded = list() // Embedded items, since simple mobs don't have organs. var/list/datum/language/languages = list() // For speaking/listening. - var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null. + var/list/speak_emote = list("говорит") // Verbs used when speaking. Defaults to 'say' if speak_emote is null. var/emote_type = 1 // Define emote default type, 1 for seen emotes, 2 for heard emotes var/name_archive //For admin things like possession diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 1839fe191627..7c6a69c7d759 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -270,6 +270,8 @@ return /datum/equipment_preset/uscm_ship/uscm_police/cmp if(JOB_WARDEN) return /datum/equipment_preset/uscm_ship/uscm_police/warden + if(JOB_CREWMAN) + return /datum/equipment_preset/uscm/tank/full if(JOB_SEA) return /datum/equipment_preset/uscm_ship/sea if(JOB_CHIEF_ENGINEER) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 8cd5b148a161..947fb91f51c4 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -9,7 +9,7 @@ var/cost = max(CHAT_CPM_MINIMUM, length(text)) src.talked_at = world.time if(src.talked_sum + cost > max_budget) - to_chat(src, SPAN_NOTICE("You just said something, take a breath.")) + to_chat(src, SPAN_NOTICE("Вы слишком много болтаете.")) return FALSE src.talked_sum += cost return TRUE @@ -95,10 +95,10 @@ langchat_listeners += observer if(M.stat == DEAD) - to_chat(M, "DEAD: [name] (F) says, \"[message]\"") + to_chat(M, "МЕРТВЕЦ: [name] (F) сообщает, \"[message]\"") else if(M.client && M.client.admin_holder && (M.client.admin_holder.rights & R_MOD) && M.client.prefs && (M.client.prefs.toggles_chat & CHAT_DEAD) ) // Show the message to admins/mods with deadchat toggled on - to_chat(M, "DEAD: [name] says, \"[message]\"") //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. + to_chat(M, "МЕРТВЕЦ: [name] сообщает, \"[message]\"") //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. if(length(langchat_listeners)) langchat_speech(message, langchat_listeners, GLOB.all_languages, skip_language_check = TRUE) @@ -140,12 +140,12 @@ for it but just ignore it. */ /mob/proc/say_quote(message, datum/language/speaking = null) - var/verb = "says" - var/ending = copytext(message, length(message)) + var/verb = "говорит" + var/ending = copytext_char(message, length(message)) if(ending=="!") - verb=pick("exclaims","shouts","yells") + verb=pick("восклицает","кричит","вопит") else if(ending=="?") - verb="asks" + verb="спрашивает" return verb @@ -169,11 +169,11 @@ for it but just ignore it. //returns the message mode string or null for no message mode. //standard mode is the mode returned for the special ';' radio code. /mob/proc/parse_message_mode(message, standard_mode="headset") - if(length(message) >= 1 && copytext(message,1,2) == ";") + if(length(message) >= 1 && copytext_char(message,1,2) == ";") return standard_mode if(length(message) >= 2) - var/channel_prefix = copytext(message, 1 ,3) + var/channel_prefix = copytext_char(message, 1 ,3) return department_radio_keys[channel_prefix] return null diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 3b10c757f2f4..d3db34a70875 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -20,14 +20,14 @@ flags_armor_protection = BODY_FLAG_HEAD attack_verb = list("bapped") - var/info //What's actually written on the paper. - var/info_links //A different version of the paper which includes html links at fields and EOF - var/stamps //The (text for the) stamps on the paper. - var/fields //Amount of user created fields + var/info //What's actually written on the paper. + var/info_links //A different version of the paper which includes html links at fields and EOF + var/stamps //The (text for the) stamps on the paper. + var/fields //Amount of user created fields var/list/stamped - var/ico[0] //Icons and - var/offset_x[0] //offsets stored for later - var/offset_y[0] //usage by the photocopier + var/ico[0] //Icons and + var/offset_x[0] //offsets stored for later + var/offset_y[0] //usage by the photocopier var/rigged = 0 var/spam_flag = 0 @@ -271,13 +271,10 @@ t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") - + t = replacetext(t, "#", "") // Junk converted to nothing! t = "[t]" - -// t = replacetext(t, "#", "") // Junk converted to nothing! - -//Count the fields - var/laststart = 1 + + var/laststart = 1 //Count the fields while(1) var/i = findtext(t, "", laststart) if(i==0) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 9315a1dd0c68..b5e51db88998 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1643,6 +1643,24 @@ // 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/item/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" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 2eddf975c1b9..dd232de259e3 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -229,6 +229,8 @@ VAR_PROTECTED/start_semiauto = TRUE /// If this gun should spawn with automatic fire. Protected due to it never needing to be edited. VAR_PROTECTED/start_automatic = FALSE + /// The type of projectile that this gun should shoot + var/projectile_type = /obj/item/projectile /// The multiplier for how much slower this should fire in automatic mode. 1 is normal, 1.2 is 20% slower, 2 is 100% slower, etc. Protected due to it never needing to be edited. VAR_PROTECTED/autofire_slow_mult = 1 @@ -1019,7 +1021,7 @@ and you're good to go. if(isliving(loc)) var/mob/M = loc weapon_source_mob = M - var/obj/item/projectile/P = new /obj/item/projectile(src, create_cause_data(bullet_source, weapon_source_mob)) + var/obj/item/projectile/P = new projectile_type(src, create_cause_data(bullet_source, weapon_source_mob)) P.generate_bullet(chambered, 0, NO_FLAGS) return P @@ -1923,3 +1925,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) fa_firing = auto + +/// Getter for gun_user +/obj/item/weapon/gun/proc/get_gun_user() + return gun_user diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 19da628c7922..7346c18770c2 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -451,6 +451,11 @@ Defined in conflicts.dm of the #defines folder. accuracy_mod = HIT_ACCURACY_MULT_TIER_3 scatter_mod = -SCATTER_AMOUNT_TIER_8 +/obj/item/attachable/sniperbarrel/vulture + name = "\improper M707 barrel" + icon_state = "vulture_barrel" + hud_offset_mod = -1 + /obj/item/attachable/m60barrel name = "M60 barrel" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' @@ -1125,7 +1130,474 @@ Defined in conflicts.dm of the #defines folder. attach_icon = "slavicscope" desc = "Oppa! How did you get this off glorious Stalin weapon? Blyat, put back on and do job tovarish. Yankee is not shoot self no?" +/obj/item/attachable/vulture_scope // not a subtype of scope because it uses basically none of the scope's features + name = "\improper M707 \"Vulture\" scope" + icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' + icon_state = "vulture_scope" + attach_icon = "vulture_scope" + desc = "A powerful yet obtrusive sight for the M707 anti-materiel rifle." // Can't be seen normally, anyway + slot = "rail" + aim_speed_mod = SLOWDOWN_ADS_SCOPE //Extra slowdown when wielded + wield_delay_mod = WIELD_DELAY_FAST + flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION + attachment_action_type = /datum/action/item_action/toggle + /// Weakref to the user of the scope + var/datum/weakref/scope_user + /// If the scope is currently in use + var/scoping = FALSE + /// How far out the player should see by default + var/start_scope_range = 12 + /// The bare minimum distance the scope can be from the player + var/min_scope_range = 12 + /// The maximum distance the scope can be from the player + var/max_scope_range = 25 + /// How far in the perpendicular axis the scope can move in either direction + var/perpendicular_scope_range = 7 + /// How far in each direction the scope should see. Default human view size is 7 + var/scope_viewsize = 7 + /// The current X position of the scope within the sniper's view box. 0 is center + var/scope_offset_x = 0 + /// The current Y position of the scope within the sniper's view box. 0 is center + var/scope_offset_y = 0 + /// How far in any given direction the scope can drift + var/scope_drift_max = 2 + /// The current X coord position of the scope camera + var/scope_x = 0 + /// The current Y coord position of the scope camera + var/scope_y = 0 + /// Ref to the scope screen element + var/atom/movable/screen/vulture_scope/scope_element + /// If the gun should experience scope drift + var/scope_drift = TRUE + /// % chance for the scope to drift on process with a spotter using their scope + var/spotted_drift_chance = 33 + /// % chance for the scope to drift on process without a spotter using their scope + var/unspotted_drift_chance = 100 + /// If the scope should use do_afters for adjusting and moving the sight + var/slow_use = TRUE + /// Cooldown for interacting with the scope's adjustment or position + COOLDOWN_DECLARE(scope_interact_cd) + /// If the user is currently holding their breath + var/holding_breath = FALSE + /// Cooldown for after holding your breath + COOLDOWN_DECLARE(hold_breath_cd) + /// How long you can hold your breath for + var/breath_time = 4 SECONDS + /// How long the cooldown for holding your breath is, only starts after breath_time finishes + var/breath_cooldown_time = 12 SECONDS + /// The initial dir of the scope user when scoping in + var/scope_user_initial_dir + /// How much to increase darkness view by + var/darkness_view = 12 + /// If there is currently a spotter using the linked spotting scope + var/spotter_spotting = FALSE + +/obj/item/attachable/vulture_scope/Initialize(mapload, ...) + . = ..() + START_PROCESSING(SSobj, src) + select_gamemode_skin(type) + +/obj/item/attachable/vulture_scope/Destroy() + STOP_PROCESSING(SSobj, src) + on_unscope() + QDEL_NULL(scope_element) + return ..() + +/obj/item/attachable/vulture_scope/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "VultureScope", name) + ui.open() + +/obj/item/attachable/vulture_scope/ui_state(mob/user) + return GLOB.not_incapacitated_state + +/obj/item/attachable/vulture_scope/ui_data(mob/user) + var/list/data = list() + data["offset_x"] = scope_offset_x + data["offset_y"] = scope_offset_y + data["valid_offset_dirs"] = get_offset_dirs() + data["scope_cooldown"] = !COOLDOWN_FINISHED(src, scope_interact_cd) + data["valid_adjust_dirs"] = get_adjust_dirs() + data["breath_cooldown"] = !COOLDOWN_FINISHED(src, hold_breath_cd) + data["breath_recharge"] = get_breath_recharge() + data["spotter_spotting"] = spotter_spotting + data["current_scope_drift"] = get_scope_drift_chance() + data["time_to_fire_remaining"] = 1 - (get_time_to_fire() / FIRE_DELAY_TIER_VULTURE) + return data + +/obj/item/attachable/vulture_scope/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("adjust_dir") + var/direction = params["offset_dir"] + if(!(direction in alldirs) || !scoping || !scope_user) + return + + var/mob/scoper = scope_user.resolve() + if(slow_use) + if(!COOLDOWN_FINISHED(src, scope_interact_cd)) + return + to_chat(scoper, SPAN_NOTICE("You begin adjusting [src]...")) + COOLDOWN_START(src, scope_interact_cd, 0.5 SECONDS) + if(!do_after(scoper, 0.5 SECONDS)) + return + + adjust_offset(direction) + . = TRUE + + if("adjust_position") + var/direction = params["position_dir"] + if(!(direction in alldirs) || !scoping || !scope_user) + return + + var/mob/scoper = scope_user.resolve() + if(slow_use) + if(!COOLDOWN_FINISHED(src, scope_interact_cd)) + return + + to_chat(scoper, SPAN_NOTICE("You begin moving [src]...")) + COOLDOWN_START(src, scope_interact_cd, 1 SECONDS) + if(!do_after(scoper, 1 SECONDS)) + return + + adjust_position(direction) + . = TRUE + + if("hold_breath") + if(!COOLDOWN_FINISHED(src, hold_breath_cd) || holding_breath) + return + + hold_breath() + . = TRUE + +/obj/item/attachable/vulture_scope/process() + if(scope_element && prob(get_scope_drift_chance())) //every 6 seconds when unspotted, on average + scope_drift() + +/// Returns a number between 0 and 100 for the chance of the scope drifting on process() +/obj/item/attachable/vulture_scope/proc/get_scope_drift_chance() + if(!scope_drift || holding_breath) + return 0 + + if(spotter_spotting) + return spotted_drift_chance + + else + return unspotted_drift_chance + +/// Returns how many deciseconds until the gun is able to fire again +/obj/item/attachable/vulture_scope/proc/get_time_to_fire() + if(!istype(loc, /obj/item/weapon/gun/boltaction/vulture)) + return 0 + + var/obj/item/weapon/gun/boltaction/vulture/rifle = loc + if(!rifle.last_fired) + return 0 + + return (rifle.last_fired + rifle.get_fire_delay()) - world.time + +/obj/item/attachable/vulture_scope/activate_attachment(obj/item/weapon/gun/gun, mob/living/carbon/user, turn_off) + if(turn_off || scoping) + on_unscope() + return TRUE + + if(!scoping) + if(!(gun.flags_item & WIELDED)) + to_chat(user, SPAN_WARNING("You must hold [gun] with two hands to use [src].")) + return FALSE + + if(!HAS_TRAIT(gun, TRAIT_GUN_BIPODDED)) + to_chat(user, SPAN_WARNING("You must have a deployed bipod to use [src].")) + return FALSE + + on_scope() + return TRUE + +/obj/item/attachable/vulture_scope/proc/get_offset_dirs() + var/list/possible_dirs = alldirs.Copy() + if(scope_offset_x >= scope_drift_max) + possible_dirs -= list(NORTHEAST, EAST, SOUTHEAST) + else if(scope_offset_x <= -scope_drift_max) + possible_dirs -= list(NORTHWEST, WEST, SOUTHWEST) + + if(scope_offset_y >= scope_drift_max) + possible_dirs -= list(NORTHWEST, NORTH, NORTHEAST) + else if(scope_offset_y <= -scope_drift_max) + possible_dirs -= list(SOUTHWEST, SOUTH, SOUTHEAST) + + return possible_dirs + +/// Gets a list of valid directions to be able to adjust the reticle in +/obj/item/attachable/vulture_scope/proc/get_adjust_dirs() + if(!scoping) + return list() + var/list/possible_dirs = alldirs.Copy() + var/turf/current_turf = get_turf(src) + var/turf/scope_tile = locate(scope_x, scope_y, current_turf.z) + var/mob/scoper = scope_user.resolve() + if(!scoper) + return list() + + var/user_dir = scoper.dir + var/distance = get_dist(current_turf, scope_tile) + if(distance >= max_scope_range) + possible_dirs -= get_related_directions(user_dir) + + else if(distance <= min_scope_range) + possible_dirs -= get_related_directions(REVERSE_DIR(user_dir)) + + if((user_dir == EAST) || (user_dir == WEST)) + if(scope_y - current_turf.y >= perpendicular_scope_range) + possible_dirs -= get_related_directions(NORTH) + + else if(current_turf.y - scope_y >= perpendicular_scope_range) + possible_dirs -= get_related_directions(SOUTH) + + else + if(scope_x - current_turf.x >= perpendicular_scope_range) + possible_dirs -= get_related_directions(EAST) + + else if(current_turf.x - scope_x >= perpendicular_scope_range) + possible_dirs -= get_related_directions(WEST) + + return possible_dirs + +/// Adjusts the position of the reticle by a tile in a given direction +/obj/item/attachable/vulture_scope/proc/adjust_offset(direction = NORTH) + var/old_x = scope_offset_x + var/old_y = scope_offset_y + if((direction == NORTHEAST) || (direction == EAST) || (direction == SOUTHEAST)) + scope_offset_x = min(scope_offset_x + 1, scope_drift_max) + else if((direction == NORTHWEST) || (direction == WEST) || (direction == SOUTHWEST)) + scope_offset_x = max(scope_offset_x - 1, -scope_drift_max) + + if((direction == NORTHWEST) || (direction == NORTH) || (direction == NORTHEAST)) + scope_offset_y = min(scope_offset_y + 1, scope_drift_max) + else if((direction == SOUTHWEST) || (direction == SOUTH) || (direction == SOUTHEAST)) + scope_offset_y = max(scope_offset_y - 1, -scope_drift_max) + + recalculate_scope_offset(old_x, old_y) + +/// Adjusts the position of the scope by a tile in a given direction +/obj/item/attachable/vulture_scope/proc/adjust_position(direction = NORTH) + var/perpendicular_axis = "x" + var/mob/user = scope_user.resolve() + var/turf/user_turf = get_turf(user) + if((user.dir == EAST) || (user.dir == WEST)) + perpendicular_axis = "y" + + if((direction == NORTHEAST) || (direction == EAST) || (direction == SOUTHEAST)) + scope_x++ + scope_x = user_turf.x + axis_math(user, perpendicular_axis, "x", direction) + else if((direction == NORTHWEST) || (direction == WEST) || (direction == SOUTHWEST)) + scope_x-- + scope_x = user_turf.x + axis_math(user, perpendicular_axis, "x", direction) + if((direction == NORTHWEST) || (direction == NORTH) || (direction == NORTHEAST)) + scope_y++ + scope_y = user_turf.y + axis_math(user, perpendicular_axis, "y", direction) + else if((direction == SOUTHWEST) || (direction == SOUTH) || (direction == SOUTHEAST)) + scope_y-- + scope_y = user_turf.y + axis_math(user, perpendicular_axis, "y", direction) + + SEND_SIGNAL(src, COMSIG_VULTURE_SCOPE_MOVED) + + recalculate_scope_pos() + +/// Figures out which direction the scope should move based on user direction and their input +/obj/item/attachable/vulture_scope/proc/axis_math(mob/user, perpendicular_axis = "x", modifying_axis = "x", direction = NORTH) + var/turf/user_turf = get_turf(user) + var/inverse = FALSE + if((user.dir == SOUTH) || (user.dir == WEST)) + inverse = TRUE + var/user_offset + if(modifying_axis == "x") + user_offset = scope_x - user_turf.x + + else + user_offset = scope_y - user_turf.y + + if(perpendicular_axis == modifying_axis) + return clamp(user_offset, -perpendicular_scope_range, perpendicular_scope_range) + + else + return clamp(abs(user_offset), min_scope_range, max_scope_range) * (inverse ? -1 : 1) + +/// Recalculates where the reticle should be inside the scope +/obj/item/attachable/vulture_scope/proc/recalculate_scope_offset(old_x = 0, old_y = 0) + var/mob/scoper = scope_user.resolve() + if(!scoper.client) + return + + var/x_to_set = (scope_offset_x >= 0 ? "+" : "") + "[scope_offset_x]" + var/y_to_set = (scope_offset_y >= 0 ? "+" : "") + "[scope_offset_y]" + scope_element.screen_loc = "CENTER[x_to_set],CENTER[y_to_set]" + +/// Recalculates where the scope should be in relation to the user +/obj/item/attachable/vulture_scope/proc/recalculate_scope_pos() + if(!scope_user) + return + var/turf/current_turf = get_turf(src) + var/x_off = scope_x - current_turf.x + var/y_off = scope_y - current_turf.y + var/pixels_per_tile = 32 + var/mob/scoper = scope_user.resolve() + if(!scoper.client) + return + + if(scoping) + scoper.client.pixel_x = x_off * pixels_per_tile + scoper.client.pixel_y = y_off * pixels_per_tile + else + scoper.client.pixel_x = 0 + scoper.client.pixel_y = 0 + +/// Handler for when the user begins scoping +/obj/item/attachable/vulture_scope/proc/on_scope() + var/turf/gun_turf = get_turf(src) + scope_x = gun_turf.x + scope_y = gun_turf.y + scope_offset_x = 0 + scope_offset_y = 0 + holding_breath = FALSE + + if(!isgun(loc)) + return + + var/obj/item/weapon/gun/gun = loc + var/mob/living/gun_user = gun.get_gun_user() + if(!gun_user) + return + + switch(gun_user.dir) + if(NORTH) + scope_y += start_scope_range + if(EAST) + scope_x += start_scope_range + if(SOUTH) + scope_y -= start_scope_range + if(WEST) + scope_x -= start_scope_range + + scope_user = WEAKREF(gun_user) + scope_user_initial_dir = gun_user.dir + scoping = TRUE + recalculate_scope_pos() + gun_user.overlay_fullscreen("vulture", /atom/movable/screen/fullscreen/vulture) + scope_element = new(src) + gun_user.client.screen += scope_element + gun_user.see_in_dark += darkness_view + gun_user.lighting_alpha = 127 + gun_user.sync_lighting_plane_alpha() + RegisterSignal(gun, list( + COMSIG_ITEM_DROPPED, + COMSIG_ITEM_UNWIELD, + ), PROC_REF(on_unscope)) + RegisterSignal(gun_user, COMSIG_MOB_UNDEPLOYED_BIPOD, PROC_REF(on_unscope)) + RegisterSignal(gun_user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(on_mob_move_look)) + RegisterSignal(gun_user.client, COMSIG_PARENT_QDELETING, PROC_REF(on_unscope)) + +/// Handler for when the scope is deleted, dropped, etc. +/obj/item/attachable/vulture_scope/proc/on_unscope() + SIGNAL_HANDLER + if(!scope_user) + return + + var/mob/scoper = scope_user.resolve() + if(isgun(loc)) + UnregisterSignal(loc, list( + COMSIG_ITEM_DROPPED, + COMSIG_ITEM_UNWIELD, + )) + UnregisterSignal(scoper, list(COMSIG_MOB_UNDEPLOYED_BIPOD, COMSIG_MOB_MOVE_OR_LOOK)) + UnregisterSignal(scoper.client, COMSIG_PARENT_QDELETING) + stop_holding_breath() + scope_user_initial_dir = null + scoper.clear_fullscreen("vulture") + scoper.client.screen -= scope_element + scoper.see_in_dark -= darkness_view + scoper.lighting_alpha = 127 + scoper.sync_lighting_plane_alpha() + QDEL_NULL(scope_element) + recalculate_scope_pos() + scope_user = null + scoping = FALSE + if(scoper.client) + scoper.client.pixel_x = 0 + scoper.client.pixel_y = 0 + +/// Handler for if the mob moves or changes look direction +/obj/item/attachable/vulture_scope/proc/on_mob_move_look(mob/living/mover, actually_moving, direction, specific_direction) + SIGNAL_HANDLER + + if(actually_moving || (mover.dir != scope_user_initial_dir)) + on_unscope() + +/// Causes the scope to drift in a random direction by 1 tile +/obj/item/attachable/vulture_scope/proc/scope_drift(forced_dir) + var/dir_picked + if(!forced_dir) + dir_picked = pick(get_offset_dirs()) + else + dir_picked = forced_dir + + adjust_offset(dir_picked) + +/// Returns the turf that the sniper scope + reticle is currently focused on +/obj/item/attachable/vulture_scope/proc/get_viewed_turf() + RETURN_TYPE(/turf) + if(!scoping) + return null + var/turf/gun_turf = get_turf(src) + return locate(scope_x + scope_offset_x, scope_y + scope_offset_y, gun_turf.z) + +/// Lets the user start holding their breath, stopping gun sway for a short time +/obj/item/attachable/vulture_scope/proc/hold_breath() + if(!scope_user) + return + + var/mob/scoper = scope_user.resolve() + to_chat(scoper, SPAN_NOTICE("You hold your breath, steadying your scope...")) + holding_breath = TRUE + INVOKE_ASYNC(src, PROC_REF(tick_down_breath_scope)) + addtimer(CALLBACK(src, PROC_REF(stop_holding_breath)), breath_time) + +/// Slowly empties out the crosshair as the user's breath runs out +/obj/item/attachable/vulture_scope/proc/tick_down_breath_scope() + scope_element.icon_state = "vulture_steady_4" + sleep(breath_time * 0.25) + scope_element.icon_state = "vulture_steady_3" + sleep(breath_time * 0.25) + scope_element.icon_state = "vulture_steady_2" + sleep(breath_time * 0.25) + scope_element.icon_state = "vulture_steady_1" + +/// Stops the user from holding their breath, starting the cooldown +/obj/item/attachable/vulture_scope/proc/stop_holding_breath() + if(!scope_user || !holding_breath) + return + var/mob/scoper = scope_user.resolve() + to_chat(scoper, SPAN_NOTICE("You breathe out, letting your scope sway.")) + holding_breath = FALSE + scope_element.icon_state = "vulture_unsteady" + COOLDOWN_START(src, hold_breath_cd, breath_cooldown_time) + +/// Returns a % of how much time until the user can still their breath again +/obj/item/attachable/vulture_scope/proc/get_breath_recharge() + return 1 - (COOLDOWN_TIMELEFT(src, hold_breath_cd) / breath_cooldown_time) + +/datum/action/item_action/vulture + +/datum/action/item_action/vulture/action_activate() + var/obj/item/weapon/gun/gun_holder = holder_item + var/obj/item/attachable/vulture_scope/scope = gun_holder.attachments["rail"] + if(!istype(scope)) + return + scope.tgui_interact(owner) // ======== Stock attachments ======== // @@ -1271,6 +1743,16 @@ Defined in conflicts.dm of the #defines folder. recoil_unwielded_mod = RECOIL_AMOUNT_TIER_5 scatter_unwielded_mod = SCATTER_AMOUNT_TIER_4 +/obj/item/attachable/stock/vulture + name = "\improper M707 heavy stock" + icon_state = "vulture_stock" + hud_offset_mod = 3 + +/obj/item/attachable/stock/vulture/Initialize(mapload, ...) + . = ..() + select_gamemode_skin(type) + // Doesn't give any stat additions due to the gun already having really good ones, and this is unremovable from the gun itself + /obj/item/attachable/stock/tactical name = "\improper MK221 tactical stock" desc = "A metal stock made for the MK221 tactical shotgun." @@ -2762,6 +3244,7 @@ Defined in conflicts.dm of the #defines folder. user.apply_effect(2, SLOW) /obj/item/attachable/bipod/proc/undeploy_bipod(obj/item/weapon/gun/G) + REMOVE_TRAIT(G, TRAIT_GUN_BIPODDED, "attached_bipod") bipod_deployed = FALSE accuracy_mod = -HIT_ACCURACY_MULT_TIER_5 scatter_mod = SCATTER_AMOUNT_TIER_9 @@ -2773,6 +3256,7 @@ Defined in conflicts.dm of the #defines folder. var/mob/living/user if(isliving(G.loc)) user = G.loc + SEND_SIGNAL(user, COMSIG_MOB_UNDEPLOYED_BIPOD) UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK) if(G.flags_gun_features & GUN_SUPPORT_PLATFORM) @@ -2796,7 +3280,9 @@ Defined in conflicts.dm of the #defines folder. bipod_deployed = !bipod_deployed if(user) if(bipod_deployed) + ADD_TRAIT(G, TRAIT_GUN_BIPODDED, "attached_bipod") to_chat(user, SPAN_NOTICE("You deploy [src] [support ? "on [support]" : "on the ground"].")) + SEND_SIGNAL(user, COMSIG_MOB_DEPLOYED_BIPOD) playsound(user,'sound/items/m56dauto_rotate.ogg', 55, 1) accuracy_mod = HIT_ACCURACY_MULT_TIER_5 scatter_mod = -SCATTER_AMOUNT_TIER_10 @@ -2858,6 +3344,11 @@ Defined in conflicts.dm of the #defines folder. flags_attach_features = ATTACH_ACTIVATION +/obj/item/attachable/bipod/vulture + name = "heavy bipod" + desc = "A set of rugged telescopic poles to keep a weapon stabilized during firing." + icon_state = "bipod_m60" + attach_icon = "vulture_bipod" /obj/item/attachable/burstfire_assembly name = "burst fire assembly" diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 6c94973997f5..1417772b4e00 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -184,18 +184,20 @@ DEFINES in setup.dm, referenced here. to_chat(user, SPAN_WARNING("[src] flashes a warning sign indicating unauthorized use!")) // Checks whether there is anything to put your harness -/obj/item/weapon/gun/proc/retrieval_check(mob/living/carbon/human/user, retrieval_slot) +/obj/item/weapon/proc/retrieval_check(mob/living/carbon/human/user, retrieval_slot) if(retrieval_slot == WEAR_J_STORE) var/obj/item/suit = user.wear_suit if(!istype(suit, /obj/item/clothing/suit/storage/marine)) return FALSE return TRUE -/obj/item/weapon/gun/proc/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) +/obj/item/weapon/proc/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot) if (!loc || !user) return FALSE if (!isturf(loc)) return FALSE + if (get_dist(src,user) > 1) + return FALSE if(!retrieval_check(user, retrieval_slot)) return FALSE if(!user.equip_to_slot_if_possible(src, retrieval_slot, disable_warning = TRUE)) diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index a558d3dd7969..9639e0c75a20 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -33,9 +33,13 @@ aim_slowdown = SLOWDOWN_ADS_RIFLE wield_delay = WIELD_DELAY_NORMAL civilian_usable_override = TRUE + unacidable = TRUE // Like other 1-of-a-kind weapons, it can't be gotten rid of that fast + indestructible = TRUE var/bolted = TRUE // FALSE IS OPEN, TRUE IS CLOSE var/bolt_delay var/recent_cycle //world.time to see when they last bolted it. + /// If this gun should change icon states when the bolt is open + var/has_openbolt_icon = TRUE /obj/item/weapon/gun/boltaction/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 5, "rail_y" = 18, "under_x" = 25, "under_y" = 14, "stock_x" = 18, "stock_y" = 10) @@ -49,7 +53,7 @@ ..() var/new_icon_state = icon_state - if(!bolted) + if(!bolted && has_openbolt_icon) new_icon_state += "_o" icon_state = new_icon_state @@ -111,3 +115,163 @@ SPAN_NOTICE("You load [magazine] into [src]!"), null, 3, CHAT_TYPE_COMBAT_ACTION) if(reload_sound) playsound(user, reload_sound, 25, 1, 5) + + +/obj/item/weapon/gun/boltaction/vulture + name = "\improper M707 \"Vulture\" anti-materiel rifle" + desc = "The M707 is a crude but highly powerful rifle, designed for disabling lightly armored vehicles and hitting targets inside buildings. Its unwieldy scope and caliber necessitates a spotter to be fully effective, suffering severe scope drift without one." + desc_lore = {" + Put into production in 2175 as an economical answer to rising militancy in the Outer Rim, the M707 was derived from jury-rigged anti-materiel rifles that were captured during the Linna 349 campaign. + + The rebels (colloquially known among the USCMC as bug-boys and beebops) had achieved extensive success at Neusheune using the aforementioned rifles to pick off incinerator-wielding marines by detonating their napthal fuel tank in the midst of squad formations, subsequently leading to the USCMC designating users of those rifles as high-priority targets, as well as changes in USCMC patrol tactics. + + Some of the failings and quirks of the beebops' jury-rigged rifle were quickly noticed by vehicle crews early on in the campaign, as in multiple memoirs the crews mention that: "Once the rain starts, that's when you know you've got an ambush." + + The 'pitter-patter' of 'rain' that the crews heard was in fact multiple rifles failing to penetrate through the vehicle's external armor. Once a number of the anti-materiel rifles were examined, it was deemed a high priority to produce a Corps version. In the process, the rifles were designed for a higher calibre then that of the rebel versions, so the M707 would be capable of penetrating the light vehicle armor of their UPP peers in the event of another Dog War or Tientsin."} + + icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' // overriden with camos + icon_state = "vulture" + item_state = "vulture" + cocked_sound = 'sound/weapons/gun_cocked2.ogg' + fire_sound = 'sound/weapons/gun_vulture_fire.ogg' + open_bolt_sound ='sound/weapons/handling/gun_vulture_bolt_eject.ogg' + close_bolt_sound ='sound/weapons/handling/gun_vulture_bolt_close.ogg' + flags_equip_slot = SLOT_BACK|SLOT_BLOCK_SUIT_STORE + w_class = SIZE_LARGE + force = 5 + flags_gun_features = NONE + gun_category = GUN_CATEGORY_HEAVY + aim_slowdown = SLOWDOWN_ADS_SPECIALIST // Consider SUPERWEAPON, but it's not like you can fire this without being bipodded + wield_delay = WIELD_DELAY_VERY_SLOW + map_specific_decoration = TRUE + current_mag = /obj/item/ammo_magazine/rifle/boltaction/vulture + attachable_allowed = list( + /obj/item/attachable/sniperbarrel/vulture, + /obj/item/attachable/vulture_scope, + /obj/item/attachable/bipod/vulture, + /obj/item/attachable/stock/vulture, + ) + starting_attachment_types = list( + /obj/item/attachable/sniperbarrel/vulture, + /obj/item/attachable/vulture_scope, + /obj/item/attachable/bipod/vulture, + /obj/item/attachable/stock/vulture, + ) + civilian_usable_override = FALSE + projectile_type = /obj/item/projectile/vulture + actions_types = list( + /datum/action/item_action/vulture, + ) + has_openbolt_icon = FALSE + bolt_delay = 1 SECONDS + /// How far out people can tell the direction of the shot + var/fire_message_range = 25 + /// If the gun should bypass the trait requirement + var/bypass_trait = FALSE + +/obj/item/weapon/gun/boltaction/vulture/update_icon() + ..() + if(!bolted) + overlays += "vulture_bolt_open" + + +/obj/item/weapon/gun/boltaction/vulture/set_gun_config_values() //check that these work + ..() + set_fire_delay(FIRE_DELAY_TIER_VULTURE) + accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_7 + accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_10 + scatter = SCATTER_AMOUNT_TIER_10 + burst_scatter_mult = SCATTER_AMOUNT_TIER_6 + scatter_unwielded = SCATTER_AMOUNT_TIER_2 + damage_mult = BASE_BULLET_DAMAGE_MULT + recoil = RECOIL_AMOUNT_TIER_4 + recoil_unwielded = RECOIL_AMOUNT_TIER_2 + damage_falloff_mult = 0 + +/obj/item/weapon/gun/boltaction/vulture/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 24, "under_x" = 25, "under_y" = 14, "stock_x" = 11, "stock_y" = 15) + +/obj/item/weapon/gun/boltaction/vulture/able_to_fire(mob/user) + . = ..() + if(!.) + return + + if(!bypass_trait && !HAS_TRAIT(user, TRAIT_VULTURE_USER)) + to_chat(user, SPAN_WARNING("You don't know how to use this!")) + return + +/obj/item/weapon/gun/boltaction/vulture/Fire(atom/target, mob/living/user, params, reflex, dual_wield) + var/obj/item/attachable/vulture_scope/scope = attachments["rail"] + if(istype(scope) && scope.scoping) + var/turf/viewed_turf = scope.get_viewed_turf() + target = viewed_turf + var/mob/living/living_mob = locate(/mob/living) in viewed_turf + if(living_mob) + target = living_mob + + . = ..() + if(!.) + return . + + for(var/mob/current_mob as anything in get_mobs_in_z_level_range(get_turf(user), fire_message_range) - user) + var/relative_dir = get_dir(current_mob, user) + var/final_dir = dir2text(relative_dir) + to_chat(current_mob, SPAN_HIGHDANGER("You hear a massive boom coming from [final_dir ? "the [final_dir]" : "nearby"]!")) + if(current_mob.client) + playsound_client(current_mob.client, 'sound/weapons/gun_vulture_report.ogg', src, 25) + + if(!HAS_TRAIT(src, TRAIT_GUN_BIPODDED)) + fired_without_bipod(user) + else + shake_camera(user, 3, 4) // equivalent to getting hit with a heavy round + + return . + +/// Someone tried to fire this without using a bipod, so we break their arm along with sending them flying backwards +/obj/item/weapon/gun/boltaction/vulture/proc/fired_without_bipod(mob/living/user) + SEND_SIGNAL(src, COMSIG_GUN_VULTURE_FIRED_ONEHAND) + to_chat(user, SPAN_HIGHDANGER("You get flung backwards as you fire [src], breaking your firing arm in the process!")) + user.apply_effect(0.7, WEAKEN) + user.apply_effect(1, SUPERSLOW) + user.apply_effect(2, SLOW) + + if(ishuman(user)) + if(user.hand) + break_arm(user, RIGHT) + else + break_arm(user, LEFT) + + //Either knockback or slam them into an obstacle. + var/direction = REVERSE_DIR(user.dir) + if(direction && !step(user, direction)) + user.animation_attack_on(get_step(user, direction)) + user.visible_message(SPAN_DANGER("[user] slams into an obstacle!"), SPAN_HIGHDANGER("You slam into an obstacle!"), null, 4, CHAT_TYPE_TAKING_HIT) + user.apply_damage(MELEE_FORCE_TIER_2) + + shake_camera(user, 7, 6) // Around 2x worse than getting hit with a heavy round + +/// The code that takes care of breaking a person's firing arm +/obj/item/weapon/gun/boltaction/vulture/proc/break_arm(mob/living/carbon/human/user, arm = LEFT) + var/obj/limb/arm/found_limb + var/obj/limb/hand/found_hand + if(arm == LEFT) + found_limb = locate(/obj/limb/arm/l_arm) in user.limbs + found_hand = locate(/obj/limb/hand/l_hand) in user.limbs + else + found_limb = locate(/obj/limb/arm/r_arm) in user.limbs + found_hand = locate(/obj/limb/hand/r_hand) in user.limbs + + if(!found_limb || !found_hand) + return + found_limb.take_damage((found_limb.status & LIMB_BROKEN) ? rand(25, 30) : rand(10, 15)) + found_hand.take_damage((found_hand.status & LIMB_BROKEN) ? rand(25, 30) : rand(10, 15)) + found_limb.fracture(100) + found_hand.fracture(100) + + for(var/obj/limb/limb as anything in list(found_limb, found_hand)) + if(!(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE) && (limb.status & LIMB_SPLINTED)) //If they have it splinted, the splint won't hold. + limb.status &= ~LIMB_SPLINTED + playsound(user, 'sound/items/splintbreaks.ogg', 20) + to_chat(user, SPAN_DANGER("The splint on your [limb.display_name] comes apart under the recoil!")) + user.pain.apply_pain(PAIN_BONE_BREAK_SPLINTED) + user.update_med_icon() diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index f960cc82535b..c12d2bd1bf43 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -445,3 +445,15 @@ max_rounds = 10 gun_type = /obj/item/weapon/gun/boltaction w_class = SIZE_SMALL + +/obj/item/ammo_magazine/rifle/boltaction/vulture + name = "\improper M707 \"Vulture\" magazine (20x102mm)" + desc = "A magazine for the M707 \"Vulture\" anti-matieriel rifle. Contains up to 4 massively oversized rounds." + caliber = "20x102mm" + icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' + icon_state = "vulture" + handful_state = "vulture_bullet" + default_ammo = /datum/ammo/bullet/sniper/anti_materiel/vulture + max_rounds = 4 + gun_type = /obj/item/weapon/gun/boltaction/vulture + w_class = SIZE_MEDIUM // maybe small? This shit's >4 inches long mind you diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index eccba14a442a..84428d520126 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -69,6 +69,8 @@ /// 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" + /// How much to make the bullet fall off by accuracy-wise when closer than the ideal range + var/accuracy_range_falloff = 10 /obj/item/projectile/Initialize(mapload, datum/cause_data/cause_data) . = ..() @@ -534,7 +536,7 @@ var/ammo_flags = ammo.flags_ammo_behavior | projectile_override_flags if(distance_travelled <= ammo.accurate_range) if(distance_travelled <= ammo.accurate_range_min) // If bullet stays within max accurate range + random variance - effective_accuracy -= (ammo.accurate_range_min - distance_travelled) * 10 // Snipers have accuracy falloff at closer range before point blank + effective_accuracy -= (ammo.accurate_range_min - distance_travelled) * accuracy_range_falloff // Snipers have accuracy falloff at closer range before point blank else effective_accuracy -= (distance_travelled - ammo.accurate_range) * ((ammo_flags & AMMO_SNIPER) ? 1.5 : 10) // Snipers have a smaller falloff constant due to longer max range @@ -876,7 +878,7 @@ //Shields if( !(ammo_flags & AMMO_ROCKET) ) //No, you can't block rockets. - if(prob(75) && check_shields(damage * 0.65, "[P]") ) // Lower chance to block bullets + if(prob(75) && check_shields(damage * 0.65, "[P]", attacker_dir = get_dir(P.firer,src)) ) // Lower chance to block bullets P.ammo.on_shield_block(src) bullet_ping(P) return @@ -1192,6 +1194,31 @@ if(dx == -1 || dx == 1) return TRUE +/obj/item/projectile/vulture + accuracy_range_falloff = 10 + /// The odds of hitting a xeno in less than your gun's range. Doesn't apply to humans. + var/xeno_shortrange_chance = 10 + +/obj/item/projectile/vulture/Initialize(mapload, datum/cause_data/cause_data) + . = ..() + RegisterSignal(src, COMSIG_GUN_VULTURE_FIRED_ONEHAND, PROC_REF(on_onehand)) + +/obj/item/projectile/vulture/handle_mob(mob/living/hit_mob) + if((ammo.accurate_range_min > distance_travelled) && isxeno(hit_mob)) + if(prob(xeno_shortrange_chance)) + return ..() + + permutated |= hit_mob + return + + return ..() + +/// Handler for when the user one-hands the firing gun +/obj/item/projectile/vulture/proc/on_onehand(datum/source) + SIGNAL_HANDLER + + accuracy = HIT_ACCURACY_TIER_2 // flat 10% chance if you're desperate and try to fire this thing without a bipod + #undef DEBUG_HIT_CHANCE #undef DEBUG_HUMAN_DEFENSE #undef DEBUG_XENO_DEFENSE diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index be087444c99e..705f062f14fe 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -16,25 +16,25 @@ switch(level) if(SEC_LEVEL_GREEN) if(announce) - ai_announcement("Attention: Security level lowered to GREEN - all clear.", no_sound ? null : 'sound/AI/code_green.ogg', ARES_LOG_SECURITY) + ai_announcement("Внимание: Уровень безопасности понижен до ЗЕЛЕНОГО - все чисто.", no_sound ? null : 'sound/AI/code_green.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_GREEN if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) if(announce) - ai_announcement("Attention: Security level elevated to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', ARES_LOG_SECURITY) + ai_announcement("Внимание: Уровень безопасности повышен до СИНЕГО - возможна враждебная активность на борту.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', ARES_LOG_SECURITY) else if(announce) - ai_announcement("Attention: Security level lowered to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', ARES_LOG_SECURITY) + ai_announcement("Внимание: Уровень безопасности понижен до СИНЕГО - возможна враждебная активность на борту.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) if(announce) - ai_announcement("Attention: Security level elevated to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', ARES_LOG_SECURITY) + ai_announcement("Внимание: Уровень безопасности повышен до КРАСНОГО - прямая угроза кораблю.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', ARES_LOG_SECURITY) else if(announce) - ai_announcement("Attention: Security level lowered to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', ARES_LOG_SECURITY) + ai_announcement("Внимание: Уровень безопасности понижен до КРАСНОГО - прямая угроза кораблю.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_RED if(SEC_LEVEL_DELTA) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index a7d988e460e1..26869cfcf448 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -284,23 +284,36 @@ /obj/structure/machinery/computer/shuttle/lifeboat/attack_hand(mob/user) . = ..() - var/obj/docking_port/mobile/lifeboat/lifeboat = SSshuttle.getShuttle(shuttleId) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = SSshuttle.getShuttle(shuttleId) if(lifeboat.status == LIFEBOAT_LOCKED) - to_chat(user, SPAN_WARNING("\The [src] flickers with error messages.")) + to_chat(user, SPAN_WARNING("[src] flickers with error messages.")) else if(lifeboat.status == LIFEBOAT_INACTIVE) - to_chat(user, SPAN_NOTICE("\The [src]'s screen says \"Awaiting evacuation order\".")) + to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting evacuation order\".")) else if(lifeboat.status == LIFEBOAT_ACTIVE) switch(lifeboat.mode) if(SHUTTLE_IDLE) - to_chat(user, SPAN_NOTICE("\The [src]'s screen says \"Awaiting confirmation of the evacuation order\".")) + if(!istype(user, /mob/living/carbon/human)) + to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting confirmation of the evacuation order\".")) + return + + var/mob/living/carbon/human/human_user = user + if(!(ACCESS_MARINE_SENIOR in human_user.wear_id?.access)) + to_chat(user, SPAN_NOTICE("[src]'s screen says \"Awaiting confirmation of the evacuation order\".")) + 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() + return + if(SHUTTLE_IGNITING) - to_chat(user, SPAN_NOTICE("\The [src]'s screen says \"Engines firing\".")) + to_chat(user, SPAN_NOTICE("[src]'s screen says \"Engines firing\".")) if(SHUTTLE_CALL) - to_chat(user, SPAN_NOTICE("\The [src] has flight information scrolling across the screen. The autopilot is working correctly.")) + to_chat(user, SPAN_NOTICE("[src] has flight information scrolling across the screen. The autopilot is working correctly.")) /obj/structure/machinery/computer/shuttle/lifeboat/attack_alien(mob/living/carbon/xenomorph/xeno) if(xeno.caste && xeno.caste.is_intelligent) - var/obj/docking_port/mobile/lifeboat/lifeboat = SSshuttle.getShuttle(shuttleId) + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = SSshuttle.getShuttle(shuttleId) if(lifeboat.status == LIFEBOAT_LOCKED) to_chat(xeno, SPAN_WARNING("We already wrested away control of this metal bird.")) return XENO_NO_DELAY_ACTION diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index 99a989ab2e9f..1054bf5e90d7 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -39,7 +39,7 @@ /obj/structure/machinery/computer/shuttle/escape_pod_panel/ui_data(mob/user) . = list() - var/obj/docking_port/mobile/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId) + var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId) if(pod_state == STATE_IDLE && shuttle.evac_set) pod_state = STATE_READY @@ -63,7 +63,7 @@ if(.) return - var/obj/docking_port/mobile/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId) + var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId) switch(action) if("force_launch") shuttle.evac_launch() @@ -204,7 +204,7 @@ heat_proof = 1 unslashable = TRUE unacidable = TRUE - var/obj/docking_port/mobile/escape_shuttle/linked_shuttle + var/obj/docking_port/mobile/crashable/escape_shuttle/linked_shuttle /obj/structure/machinery/door/airlock/evacuation/Initialize() . = ..() @@ -229,16 +229,16 @@ /obj/structure/machinery/door/airlock/evacuation/attack_alien(mob/living/carbon/xenomorph/xeno) if(!density || unslashable) //doors become slashable after evac is called return FALSE - + if(xeno.claw_type < CLAW_TYPE_SHARP) to_chat(xeno, SPAN_WARNING("[src] is bolted down tight.")) return XENO_NO_DELAY_ACTION - + xeno.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) take_damage(HEALTH_DOOR / XENO_HITS_TO_DESTROY_BOLTED_DOOR) return XENO_ATTACK_ACTION - + /obj/structure/machinery/door/airlock/evacuation/attack_remote() return FALSE diff --git a/code/modules/shuttle/shuttles/crashable/crashable.dm b/code/modules/shuttle/shuttles/crashable/crashable.dm new file mode 100644 index 000000000000..de1c5cc8e4fb --- /dev/null +++ b/code/modules/shuttle/shuttles/crashable/crashable.dm @@ -0,0 +1,179 @@ +/obj/docking_port/mobile/crashable + name = "crashable shuttle" + + /// Whether or not this shuttle is crash landing + var/crash_land = FALSE + /// Whether fires occur aboard the shuttle when crashing + var/fires_on_crash = FALSE + +/obj/docking_port/mobile/crashable/enterTransit() + . = ..() + + if(!crash_land) + return + + notify_ghosts(header = "Crashing shuttle!", message = "[name] has catastrophically failed and is crashing at [get_area(destination)].", source = src) + + for(var/area/shuttle_area as anything in shuttle_areas) + shuttle_area.flags_alarm_state |= ALARM_WARNING_FIRE + shuttle_area.updateicon() + for(var/mob/evac_mob in shuttle_area) + if(evac_mob.client) + playsound_client(evac_mob.client, 'sound/effects/bomb_fall.ogg', vol = 50) + + for(var/turf/found_turf as anything in destination.return_turfs()) + if(istype(found_turf, /turf/closed)) + found_turf.ChangeTurf(/turf/open/floor) + + for(var/mob/current_mob as anything in get_mobs_in_z_level_range(destination.return_center_turf(), 18)) + var/relative_dir = get_dir(current_mob, destination.return_center_turf()) + var/final_dir = dir2text(relative_dir) + to_chat(current_mob, SPAN_HIGHDANGER("You hear something crashing down from above [final_dir ? "to the [final_dir]" : "nearby"]!")) + + if(fires_on_crash) + handle_fires() + + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cell_explosion), destination.return_center_turf(), length(destination.return_turfs()) * 2, 25, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("crashing shuttle")), 1.5 SECONDS) + +/obj/docking_port/mobile/crashable/on_prearrival() + . = ..() + + if(!crash_land) + return + + movement_force = list("KNOCKDOWN" = 0, "THROW" = 5) + + for(var/area/shuttle_area in shuttle_areas) + for(var/mob/evac_mob in shuttle_area) + shake_camera(evac_mob, 20, 2) + if(evac_mob.client) + playsound_client(evac_mob.client, get_sfx("bigboom"), vol = 50) + +/// Called when the shuttle is launched and checks for crash and creates a crash point +/obj/docking_port/mobile/crashable/proc/evac_launch() + if(!crash_check()) + return + + create_crash_point() + +/// Returns whether or not the shuttle will crash after being sent +/obj/docking_port/mobile/crashable/proc/crash_check() + return FALSE + +/// Sets up a valid crash point, fails after 10 tries +/obj/docking_port/mobile/crashable/proc/create_crash_point() + for(var/i = 1 to 10) + var/list/all_ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) + var/ground_z_level = all_ground_levels[1] + + var/list/area/potential_areas = SSmapping.areas_in_z["[ground_z_level]"] + + var/area/area_picked = pick(potential_areas) + + var/list/potential_turfs = list() + + for(var/turf/turf_in_area in area_picked) + potential_turfs += turf_in_area + + if(!length(potential_turfs)) + continue + + var/turf/turf_picked = pick(potential_turfs) + + var/obj/docking_port/stationary/crashable/temp_crashable_port = new(turf_picked) + temp_crashable_port.width = width + temp_crashable_port.height = height + temp_crashable_port.id = id + + if(!check_crash_point(temp_crashable_port)) + qdel(temp_crashable_port) + continue + + destination = temp_crashable_port + break + + if(destination) + crash_land = TRUE + +/// Checks for anything that may get in the way of a crash, returns FALSE if there is something in the way or is out of bounds +/obj/docking_port/mobile/crashable/proc/check_crash_point(obj/docking_port/stationary/crashable/checked_crashable_port) + for(var/turf/found_turf as anything in checked_crashable_port.return_turfs()) + var/area/found_area = get_area(found_turf) + if(found_area.flags_area & AREA_NOTUNNEL) + return FALSE + + if(!found_area.can_build_special) + return FALSE + + if(istype(found_turf, /turf/closed/wall)) + var/turf/closed/wall/found_closed_turf = found_turf + if(found_closed_turf.hull) + return FALSE + + if(istype(found_turf, /turf/closed/shuttle)) + return FALSE + + for(var/obj/docking_port/stationary/stationary_dock in get_turf(checked_crashable_port)) + if(stationary_dock != checked_crashable_port) + return FALSE + + for(var/obj/docking_port/mobile/cycled_mobile_port as anything in SSshuttle.mobile) + if(cycled_mobile_port == src) + continue + + if(!cycled_mobile_port.destination) + continue + + if(length(checked_crashable_port.return_turfs() & cycled_mobile_port.destination.return_turfs())) + return FALSE + + return TRUE + +/// Forces the shuttle to crash, admin called +/obj/docking_port/mobile/crashable/proc/force_crash() + create_crash_point() + set_mode(SHUTTLE_IGNITING) + on_ignition() + setTimer(ignitionTime) + +/// Sets up and handles fires/explosions on crashing shuttles +/obj/docking_port/mobile/crashable/proc/handle_fires() + var/list/turf/total_turfs = list() + for(var/area/shuttle_area as anything in shuttle_areas) + for(var/turf/cycled_turf in shuttle_area) + total_turfs += cycled_turf + + for(var/i = 1 to (length(total_turfs) / 40)) + var/turf/position = pick(total_turfs) + new /obj/effect/warning/explosive(position, 3 SECONDS) + playsound(position, 'sound/effects/pipe_hissing.ogg', vol = 40) + addtimer(CALLBACK(src, PROC_REF(kablooie), position), 3 SECONDS) + +/// Actually blows up the fire/explosion on crashing shuttles, used for effect delay +/obj/docking_port/mobile/crashable/proc/kablooie(turf/position) + var/new_cause_data = create_cause_data("crashing shuttle fire") + var/list/exploding_types = list(/obj/item/explosive/grenade/high_explosive/bursting_pipe, /obj/item/explosive/grenade/incendiary/bursting_pipe) + for(var/path in exploding_types) + var/obj/item/explosive/grenade/exploder = new path(position) + exploder.cause_data = new_cause_data + exploder.prime() + +/// Handles opening the doors for the specific shuttle type upon arriving at the crash point +/obj/docking_port/mobile/crashable/proc/open_doors() + return + +/obj/docking_port/stationary/crashable + name = "Crashable Dock" + +/obj/docking_port/stationary/crashable/on_arrival(obj/docking_port/mobile/arriving_shuttle) + . = ..() + + if(istype(arriving_shuttle, /obj/docking_port/mobile/crashable)) + var/obj/docking_port/mobile/crashable/crashing_shuttle = arriving_shuttle + crashing_shuttle.open_doors() + + for(var/area/shuttle_area in arriving_shuttle.shuttle_areas) + shuttle_area.remove_base_lighting() + + shuttle_area.flags_alarm_state &= ~ALARM_WARNING_FIRE + shuttle_area.updateicon() diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm similarity index 56% rename from code/modules/shuttle/shuttles/escape_shuttle.dm rename to code/modules/shuttle/shuttles/crashable/escape_shuttle.dm index 941785e60d9d..6029d345b6d7 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/crashable/escape_shuttle.dm @@ -1,4 +1,4 @@ -/obj/docking_port/mobile/escape_shuttle +/obj/docking_port/mobile/crashable/escape_shuttle name = "Escape Pod" id = ESCAPE_SHUTTLE area_type = /area/shuttle/escape_pod @@ -17,10 +17,9 @@ var/datum/door_controller/single/door_handler = new() var/launched = FALSE - var/crash_land = FALSE var/evac_set = FALSE -/obj/docking_port/mobile/escape_shuttle/Initialize(mapload) +/obj/docking_port/mobile/crashable/escape_shuttle/Initialize(mapload) . = ..(mapload) for(var/place in shuttle_areas) for(var/obj/structure/machinery/door/airlock/evacuation/air in place) @@ -30,7 +29,7 @@ air.unacidable = TRUE air.linked_shuttle = src -/obj/docking_port/mobile/escape_shuttle/proc/cancel_evac() +/obj/docking_port/mobile/crashable/escape_shuttle/proc/cancel_evac() door_handler.control_doors("force-unlock") evac_set = FALSE @@ -42,7 +41,7 @@ for(var/obj/structure/machinery/cryopod/evacuation/cryotube in interior_area) cryotube.dock_state = STATE_IDLE -/obj/docking_port/mobile/escape_shuttle/proc/prepare_evac() +/obj/docking_port/mobile/crashable/escape_shuttle/proc/prepare_evac() door_handler.control_doors("force-unlock") evac_set = TRUE for(var/area/interior_area in shuttle_areas) @@ -54,8 +53,9 @@ air.unslashable = FALSE air.unacidable = FALSE +/obj/docking_port/mobile/crashable/escape_shuttle/evac_launch() + . = ..() -/obj/docking_port/mobile/escape_shuttle/proc/evac_launch() if(mode == SHUTTLE_CRASHED) return @@ -86,10 +86,6 @@ door_handler.control_doors("force-unlock") return - destination = null - if(prob((EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS ? crash_land_chance : early_crash_land_chance))) - create_crash_point() - set_mode(SHUTTLE_IGNITING) on_ignition() setTimer(ignitionTime) @@ -104,128 +100,44 @@ air.indestructible = TRUE air.unacidable = TRUE - -/obj/docking_port/mobile/escape_shuttle/proc/create_crash_point() - for(var/i = 1 to 10) - var/list/all_ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) - var/ground_z_level = all_ground_levels[1] - - var/list/area/potential_areas = SSmapping.areas_in_z["[ground_z_level]"] - - var/area/area_picked = pick(potential_areas) - - var/list/potential_turfs = list() - - for(var/turf/turf_in_area in area_picked) - potential_turfs += turf_in_area - - if(!length(potential_turfs)) - continue - - var/turf/turf_picked = pick(potential_turfs) - - var/obj/docking_port/stationary/escape_pod/crash_land/temp_escape_pod_port = new(turf_picked) - temp_escape_pod_port.width = width - temp_escape_pod_port.height = height - temp_escape_pod_port.id = id - - if(!check_crash_point(temp_escape_pod_port)) - qdel(temp_escape_pod_port) - continue - - destination = temp_escape_pod_port - break - - if(destination) - crash_land = TRUE - -/obj/docking_port/mobile/escape_shuttle/proc/check_crash_point(obj/docking_port/stationary/escape_pod/crash_land/checked_escape_pod_port) - for(var/turf/found_turf as anything in checked_escape_pod_port.return_turfs()) - var/area/found_area = get_area(found_turf) - if(found_area.flags_area & AREA_NOTUNNEL) - return FALSE - - if(!found_area.can_build_special) - return FALSE - - if(istype(found_turf, /turf/closed/wall)) - var/turf/closed/wall/found_closed_turf = found_turf - if(found_closed_turf.hull) - return FALSE - - if(istype(found_turf, /turf/closed/shuttle)) - return FALSE - - return TRUE - -/obj/docking_port/mobile/escape_shuttle/enterTransit() +/obj/docking_port/mobile/crashable/escape_shuttle/crash_check() . = ..() - if(!crash_land) - return - - for(var/area/shuttle_area in shuttle_areas) - shuttle_area.flags_alarm_state |= ALARM_WARNING_FIRE - shuttle_area.updateicon() - for(var/mob/evac_mob in shuttle_area) - if(evac_mob.client) - playsound_client(evac_mob.client, 'sound/effects/bomb_fall.ogg', vol = 50) - - for(var/turf/found_turf as anything in destination.return_turfs()) - if(istype(found_turf, /turf/closed)) - found_turf.ChangeTurf(/turf/open/floor) - - cell_explosion(destination.return_center_turf(), 300, 25, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("evac pod crash")) + if(prob((EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS ? crash_land_chance : early_crash_land_chance))) + return TRUE -/obj/docking_port/mobile/escape_shuttle/on_prearrival() +/obj/docking_port/mobile/crashable/escape_shuttle/open_doors() . = ..() - if(!crash_land) - return - - movement_force = list("KNOCKDOWN" = 0, "THROW" = 5) - - for(var/area/shuttle_area in shuttle_areas) - for(var/mob/evac_mob in shuttle_area) - shake_camera(evac_mob, 20, 2) - if(evac_mob.client) - playsound_client(evac_mob.client, get_sfx("bigboom"), vol = 50) - door_handler.control_doors("force-unlock") -/obj/docking_port/mobile/escape_shuttle/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) +/obj/docking_port/mobile/crashable/escape_shuttle/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() playsound(src,'sound/effects/escape_pod_launch.ogg', 50, 1) -/obj/docking_port/mobile/escape_shuttle/proc/force_crash() - create_crash_point() - set_mode(SHUTTLE_IGNITING) - on_ignition() - setTimer(ignitionTime) - -/obj/docking_port/mobile/escape_shuttle/e +/obj/docking_port/mobile/crashable/escape_shuttle/e id = ESCAPE_SHUTTLE_EAST width = 4 height = 5 -/obj/docking_port/mobile/escape_shuttle/cl +/obj/docking_port/mobile/crashable/escape_shuttle/cl id = ESCAPE_SHUTTLE_EAST_CL width = 4 height = 5 early_crash_land_chance = 25 crash_land_chance = 5 -/obj/docking_port/mobile/escape_shuttle/w +/obj/docking_port/mobile/crashable/escape_shuttle/w id = ESCAPE_SHUTTLE_WEST width = 4 height = 5 -/obj/docking_port/mobile/escape_shuttle/n +/obj/docking_port/mobile/crashable/escape_shuttle/n id = ESCAPE_SHUTTLE_NORTH width = 5 height = 4 -/obj/docking_port/mobile/escape_shuttle/s +/obj/docking_port/mobile/crashable/escape_shuttle/s id = ESCAPE_SHUTTLE_SOUTH width = 5 height = 4 @@ -263,22 +175,6 @@ width = 4 height = 5 -/obj/docking_port/stationary/escape_pod/crash_land - name = "Crash Escape Pod Dock" - -/obj/docking_port/stationary/escape_pod/crash_land/on_arrival(obj/docking_port/mobile/arriving_shuttle) - . = ..() - - if(istype(arriving_shuttle, /obj/docking_port/mobile/escape_shuttle)) - var/obj/docking_port/mobile/escape_shuttle/escape_shuttle = arriving_shuttle - escape_shuttle.door_handler.control_doors("force-unlock") - - for(var/area/shuttle_area in arriving_shuttle.shuttle_areas) - shuttle_area.remove_base_lighting() - - shuttle_area.flags_alarm_state &= ~ALARM_WARNING_FIRE - shuttle_area.updateicon() - /datum/map_template/shuttle/escape_pod_w name = "Escape Pod W" shuttle_id = ESCAPE_SHUTTLE_WEST diff --git a/code/modules/shuttle/lifeboats.dm b/code/modules/shuttle/shuttles/crashable/lifeboats.dm similarity index 82% rename from code/modules/shuttle/lifeboats.dm rename to code/modules/shuttle/shuttles/crashable/lifeboats.dm index 36696441a961..93489ee4a359 100644 --- a/code/modules/shuttle/lifeboats.dm +++ b/code/modules/shuttle/shuttles/crashable/lifeboats.dm @@ -1,7 +1,7 @@ // === MOBILES /// Generic Lifeboat definition -/obj/docking_port/mobile/lifeboat +/obj/docking_port/mobile/crashable/lifeboat name = "lifeboat" area_type = /area/shuttle/lifeboat ignitionTime = 10 SECONDS @@ -12,7 +12,9 @@ var/list/doors = list() var/survivors = 0 -/obj/docking_port/mobile/lifeboat/proc/check_for_survivors() + fires_on_crash = TRUE + +/obj/docking_port/mobile/crashable/lifeboat/proc/check_for_survivors() for(var/mob/living/carbon/human/survived_human as anything in GLOB.alive_human_list) //check for lifeboats survivors var/area/area = get_area(survived_human) if(!survived_human) @@ -25,26 +27,42 @@ to_chat(survived_human, "

[SPAN_CENTERBOLD("You have successfully left the [MAIN_SHIP_NAME]. You may now ghost and observe the rest of the round.")]
") /// Port Aft Lifeboat (bottom-right, doors on its left side) -/obj/docking_port/mobile/lifeboat/port +/obj/docking_port/mobile/crashable/lifeboat/port name = "port-aft lifeboat" id = MOBILE_SHUTTLE_LIFEBOAT_PORT preferred_direction = WEST port_direction = WEST /// Starboard Aft Lifeboat (top-right, doors its right side) -/obj/docking_port/mobile/lifeboat/starboard +/obj/docking_port/mobile/crashable/lifeboat/starboard name = "starboard-aft lifeboat" id = MOBILE_SHUTTLE_LIFEBOAT_STARBOARD preferred_direction = EAST port_direction = EAST -/obj/docking_port/mobile/lifeboat/proc/send_to_infinite_transit() +/obj/docking_port/mobile/crashable/lifeboat/evac_launch() + . = ..() + available = FALSE - destination = null set_mode(SHUTTLE_IGNITING) on_ignition() setTimer(ignitionTime) +/obj/docking_port/mobile/crashable/lifeboat/crash_check() + . = ..() + + if(EvacuationAuthority.evac_status >= EVACUATION_STATUS_IN_PROGRESS) + return FALSE + + if(prob(abs(((world.time - EvacuationAuthority.evac_time) / EVACUATION_AUTOMATIC_DEPARTURE) - 1) * 100)) + return TRUE + +/obj/docking_port/mobile/crashable/lifeboat/open_doors() + . = ..() + + for(var/obj/structure/machinery/door/airlock/multi_tile/door in doors) + INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, unlock_and_open)) + // === STATIONARIES /// Generic lifeboat dock @@ -54,7 +72,7 @@ height = 7 /obj/docking_port/stationary/lifeboat_dock/on_dock_ignition(departing_shuttle) - var/obj/docking_port/mobile/lifeboat/lifeboat = departing_shuttle + var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = departing_shuttle if(istype(lifeboat)) for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/door in lifeboat.doors) INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, close_and_lock)) @@ -71,7 +89,7 @@ blastdoor.vacate_premises() /obj/docking_port/stationary/lifeboat_dock/proc/open_dock() - var/obj/docking_port/mobile/lifeboat/docked_shuttle = get_docked() + var/obj/docking_port/mobile/crashable/lifeboat/docked_shuttle = get_docked() if(docked_shuttle) for(var/obj/structure/machinery/door/airlock/multi_tile/door in docked_shuttle.doors) INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, unlock_and_open)) @@ -81,7 +99,7 @@ addtimer(CALLBACK(blastdoor, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, unlock_and_open)), 10) /obj/docking_port/stationary/lifeboat_dock/proc/close_dock() - var/obj/docking_port/mobile/lifeboat/docked_shuttle = get_docked() + var/obj/docking_port/mobile/crashable/lifeboat/docked_shuttle = get_docked() if(docked_shuttle) for(var/obj/structure/machinery/door/airlock/multi_tile/door in docked_shuttle.doors) INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, close_and_lock)) @@ -125,5 +143,3 @@ /datum/map_template/shuttle/lifeboat_starboard name = "Starboard door lifeboat" shuttle_id = MOBILE_SHUTTLE_LIFEBOAT_STARBOARD - - diff --git a/code/modules/shuttle/vehicle_elevator.dm b/code/modules/shuttle/vehicle_elevator.dm index c9a051a261c5..a537c6520be8 100644 --- a/code/modules/shuttle/vehicle_elevator.dm +++ b/code/modules/shuttle/vehicle_elevator.dm @@ -53,8 +53,8 @@ /obj/docking_port/stationary/vehicle_elevator/almayer name = "Almayer Vehicle Elevator Dock" id = "almayer vehicle" - roundstart_template = /datum/map_template/shuttle/vehicle /obj/docking_port/stationary/vehicle_elevator/adminlevel name = "Adminlevel Vehicle Elevator Dock" id = "adminlevel vehicle" + roundstart_template = /datum/map_template/shuttle/vehicle diff --git a/code/modules/sorokyne/sorokyne_cold_water.dm b/code/modules/sorokyne/sorokyne_cold_water.dm index adf7e3de6228..0650a41826a2 100644 --- a/code/modules/sorokyne/sorokyne_cold_water.dm +++ b/code/modules/sorokyne/sorokyne_cold_water.dm @@ -62,7 +62,7 @@ else M.bodytemperature = MINIMUM_TEMP if(!issynth(M)) - to_chat(M, SPAN_DANGER("You feel your body start to shake as the water chills you to the bone...")) + to_chat(M, SPAN_DANGER("Мое тело начинает трясти, холод этой воды пробирает до самых костей...")) #undef COLD_WATER_DAMAGE #undef COLD_WATER_TEMP_EFFECT diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index d71db37074f1..fddb1c1c3901 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -108,6 +108,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, /obj/vehicle/multitile/proc/name_vehicle )) else if(seat == VEHICLE_GUNNER) @@ -135,6 +136,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, /obj/vehicle/multitile/proc/name_vehicle, )) else if(seat == VEHICLE_GUNNER) @@ -160,128 +162,3 @@ GLOBAL_LIST_EMPTY(command_apc_list) camera.c_tag = "#[rand(1,100)] M777 APC" if(camera_int) camera_int.c_tag = camera.c_tag + " interior" - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc - name = "APC Transport Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base" - pixel_x = -48 - pixel_y = -48 - -//Installation of transport APC Firing Ports Weapons -/obj/effect/vehicle_spawner/apc/proc/load_fpw(obj/vehicle/multitile/apc/V) - var/obj/item/hardpoint/special/firing_port_weapon/FPW = new - FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE - V.add_hardpoint(FPW) - FPW.dir = turn(V.dir, 90) - FPW.name = "Left "+ initial(FPW.name) - FPW.origins = list(2, 0) - FPW.muzzle_flash_pos = list( - "1" = list(-18, 14), - "2" = list(18, -42), - "4" = list(34, 3), - "8" = list(-32, -34) - ) - - FPW = new - FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_TWO - V.add_hardpoint(FPW) - FPW.dir = turn(V.dir, -90) - FPW.name = "Right "+ initial(FPW.name) - FPW.origins = list(-2, 0) - FPW.muzzle_flash_pos = list( - "1" = list(16, 14), - "2" = list(-18, -42), - "4" = list(34, -34), - "8" = list(-32, 2) - ) - -/obj/effect/vehicle_spawner/apc/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: FPWs, no hardpoints -/obj/effect/vehicle_spawner/apc/spawn_vehicle() - var/obj/vehicle/multitile/apc/APC = new (loc) - - load_misc(APC) - load_fpw(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: FPWs, wheels installed -/obj/effect/vehicle_spawner/apc/plain/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed (this one spawns on VASRS elevatorfor VCs) -/obj/effect/vehicle_spawner/apc/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/APC = new (loc) - - load_misc(APC) - load_fpw(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/decrepit/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: FPWs, default hardpoints -/obj/effect/vehicle_spawner/apc/fixed/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//Transport version without FPWs - -/obj/vehicle/multitile/apc/unarmed - interior_map = /datum/map_template/interior/apc_no_fpw - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc/unarmed/spawn_vehicle() - var/obj/vehicle/multitile/apc/unarmed/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/unarmed/load_hardpoints(obj/vehicle/multitile/apc/V) - return - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc/unarmed/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/unarmed/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc/unarmed/decrepit/load_hardpoints(obj/vehicle/multitile/apc/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: no FPWs, wheels installed -/obj/effect/vehicle_spawner/apc/unarmed/plain/load_hardpoints(obj/vehicle/multitile/apc/unarmed/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc/unarmed/fixed/load_hardpoints(obj/vehicle/multitile/apc/unarmed/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index c5bd55928362..8df78ba6a55d 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -98,6 +98,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -119,6 +120,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -200,54 +202,3 @@ return FALSE */ - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc_cmd - name = "APC CMD Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base_com" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/apc_cmd/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc_cmd/spawn_vehicle() - var/obj/vehicle/multitile/apc/command/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: only wheels installed -/obj/effect/vehicle_spawner/apc_cmd/plain/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc_cmd/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/command/APC = new (loc) - - load_misc(APC) - handle_direction(APC) - load_hardpoints(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc_cmd/decrepit/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc_cmd/fixed/load_hardpoints(obj/vehicle/multitile/apc/command/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index f8809bedaa73..f6ede307809d 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -54,6 +54,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -75,6 +76,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -94,54 +96,3 @@ camera.c_tag = "#[rand(1,100)] M777 MED APC" if(camera_int) camera_int.c_tag = camera.c_tag + " interior" - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/apc_med - name = "APC MED Spawner" - icon = 'icons/obj/vehicles/apc.dmi' - icon_state = "apc_base_med" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/apc_med/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/apc_med/spawn_vehicle() - var/obj/vehicle/multitile/apc/medical/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - APC.update_icon() - -//PRESET: only wheels installed -/obj/effect/vehicle_spawner/apc_med/plain/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/apc_med/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/apc/medical/APC = new (loc) - - load_misc(APC) - load_hardpoints(APC) - handle_direction(APC) - load_damage(APC) - APC.update_icon() - -/obj/effect/vehicle_spawner/apc_med/decrepit/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/apc_med/fixed/load_hardpoints(obj/vehicle/multitile/apc/medical/V) - V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) - V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) - V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) diff --git a/code/modules/vehicles/hardpoints/primary/primary.dm b/code/modules/vehicles/hardpoints/primary/primary.dm index d6be1c37a4db..d235009dfc34 100644 --- a/code/modules/vehicles/hardpoints/primary/primary.dm +++ b/code/modules/vehicles/hardpoints/primary/primary.dm @@ -4,6 +4,8 @@ slot = HDPT_PRIMARY + hdpt_layer = HDPT_LAYER_PRIMARY_GUN + damage_multiplier = 0.15 activatable = TRUE diff --git a/code/modules/vehicles/hardpoints/secondary/secondary.dm b/code/modules/vehicles/hardpoints/secondary/secondary.dm index 6c5b7f54aeca..60ea97d5c84e 100644 --- a/code/modules/vehicles/hardpoints/secondary/secondary.dm +++ b/code/modules/vehicles/hardpoints/secondary/secondary.dm @@ -4,6 +4,8 @@ slot = HDPT_SECONDARY + hdpt_layer = HDPT_LAYER_SECONDARY_GUN + damage_multiplier = 0.125 activatable = TRUE diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm index 3e298ba48f1a..b9e99c59e5e5 100644 --- a/code/modules/vehicles/interior/interactable/seats.dm +++ b/code/modules/vehicles/interior/interactable/seats.dm @@ -53,7 +53,10 @@ return vehicle.set_seated_mob(seat, M) if(M && M.client) - M.client.change_view(8, vehicle) + if(istype(vehicle, /obj/vehicle/multitile/tank)) + M.client.change_view(9, vehicle) + else + M.client.change_view(8, vehicle) /obj/structure/bed/chair/comfy/vehicle/clicked(mob/user, list/mods) // If you're buckled, you can shift-click on the seat in order to return to camera-view if(user == buckled_mob && mods["shift"] && !user.is_mob_incapacitated()) @@ -189,6 +192,8 @@ if(istype(vehicle, /obj/vehicle/multitile/apc)) var/obj/vehicle/multitile/apc/APC = vehicle M.client.change_view(APC.gunner_view_buff, vehicle) + else if(istype(vehicle, /obj/vehicle/multitile/tank)) + M.client.change_view(9, vehicle) else M.client.change_view(8, vehicle) diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 9e4d2c9d297b..eb1985e5fd03 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -26,7 +26,7 @@ var/atom/movable/vehicle_light_holder/lighting_holder - var/vehicle_light_range = 5 + var/vehicle_light_range = 7 var/vehicle_light_power = 2 //Yay! Working cameras in the vehicles at last!! @@ -35,6 +35,8 @@ var/nickname //used for single-use verb to name the vehicle. Put anything here to prevent naming + var/next_shout = 0 //to prevent spamming + var/honk_sound = 'sound/vehicles/honk_4_light.ogg' var/next_honk = 0 //to prevent spamming @@ -175,17 +177,6 @@ rotate_entrances(angle_to_turn) rotate_bounds(angle_to_turn) - if(bound_width > world.icon_size || bound_height > world.icon_size) - lighting_holder = new(src) - lighting_holder.set_light_range(vehicle_light_range) - lighting_holder.set_light_power(vehicle_light_power) - lighting_holder.set_light_on(vehicle_light_range || vehicle_light_power) - else if(light_range) - set_light_on(TRUE) - - light_pixel_x = -bound_x - light_pixel_y = -bound_y - healthcheck() update_icon() @@ -200,6 +191,20 @@ interior = new(src) INVOKE_ASYNC(src, PROC_REF(do_create_interior)) +/obj/vehicle/multitile/New() + . = ..() + if(bound_width > world.icon_size || bound_height > world.icon_size) + lighting_holder = new(src) + lighting_holder.set_light_flags(LIGHT_ATTACHED) + lighting_holder.set_light_range(vehicle_light_range) + lighting_holder.set_light_power(vehicle_light_power) + lighting_holder.set_light_on(vehicle_light_range || vehicle_light_power) + else if(light_range) + set_light_on(TRUE) + + light_pixel_x = -bound_x + light_pixel_y = -bound_y + /obj/vehicle/multitile/proc/do_create_interior() interior.create_interior(interior_map) @@ -214,6 +219,8 @@ QDEL_NULL_LIST(hardpoints) + QDEL_NULL(lighting_holder) + GLOB.all_multi_vehicles -= src return ..() @@ -240,25 +247,28 @@ var/amt_hardpoints = LAZYLEN(hardpoints) if(amt_hardpoints) - var/list/hardpoint_images[amt_hardpoints] - var/list/C[HDPT_LAYER_MAX] + var/list/hardpoint_images = list() - // Counting sort the images into a list so we get the hardpoint images sorted by layer for(var/obj/item/hardpoint/H in hardpoints) - C[H.hdpt_layer] += 1 - - for(var/i = 2 to HDPT_LAYER_MAX) - C[i] += C[i-1] - - for(var/obj/item/hardpoint/H in hardpoints) - hardpoint_images[C[H.hdpt_layer]] = H.get_hardpoint_image() - C[H.hdpt_layer] -= 1 - - for(var/i = 1 to amt_hardpoints) - var/image/I = hardpoint_images[i] + hardpoint_images[H.get_hardpoint_image()] = H.hdpt_layer + + for(var/k = hardpoint_images.len, k > 0, k--) + for(var/j = 1, j < k, j++) + if(hardpoint_images[hardpoint_images[j]] > hardpoint_images[hardpoint_images[j+1]]) + hardpoint_images.Swap(j, j+1) + + for(var/i in hardpoint_images) + if(islist(i)) + for(var/l in i) + var/image/P = l + if(istype(P)) + P.layer = layer + (hardpoint_images[i]*0.1) + overlays += P + continue + var/image/I = i // get_hardpoint_image() can return a list of images if(istype(I)) - I.layer = layer + (i*0.1) + I.layer = layer + (hardpoint_images[i]*0.1) overlays += I if(clamped) @@ -382,57 +392,12 @@ toggle_cameras_status() handle_all_modules_broken() - //vehicle is dead, no more lights - if(health <= 0 && lighting_holder.light_range) - lighting_holder.set_light_on(FALSE) + if(lighting_holder) + //vehicle is dead, no more lights + if (health <= 0) lighting_holder.set_light_on(FALSE) + else lighting_holder.set_light_on(TRUE) update_icon() -/* -** PRESETS SPAWNERS -*/ -//These help spawning vehicles that don't end up as subtypes, causing problems later with various checks -//as well as allowing customizations, like properly turning on mapped in direction and so on. - -/obj/effect/vehicle_spawner - name = "Vehicle Spawner" - -//Main proc which handles spawning and adding hardpoints/damaging the vehicle -/obj/effect/vehicle_spawner/proc/spawn_vehicle() - return - -//Installation of modules kit -/obj/effect/vehicle_spawner/proc/load_hardpoints(obj/vehicle/multitile/V) - return - -//Miscellaneous additions -/obj/effect/vehicle_spawner/proc/load_misc(obj/vehicle/multitile/V) - - V.load_role_reserved_slots() - V.initialize_cameras() - //transfer mapped in edits - if(color) - V.color = color - if(name != initial(name)) - V.name = name - if(desc) - V.desc = desc - -//Dealing enough damage to destroy the vehicle -/obj/effect/vehicle_spawner/proc/load_damage(obj/vehicle/multitile/V) - V.take_damage_type(1e8, "abstract") - V.take_damage_type(1e8, "abstract") - V.healthcheck() - -/obj/effect/vehicle_spawner/proc/handle_direction(obj/vehicle/multitile/M) - switch(dir) - if(EAST) - M.try_rotate(90) - if(WEST) - M.try_rotate(-90) - if(NORTH) - M.try_rotate(90) - M.try_rotate(90) - /obj/vehicle/multitile/get_applying_acid_time() return 3 SECONDS diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm index 2c5a343b802a..ab9f017d67ea 100644 --- a/code/modules/vehicles/multitile/multitile_hardpoints.dm +++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm @@ -103,7 +103,10 @@ if(HDPT_SECONDARY) num_delays = 3 if(HDPT_SUPPORT) num_delays = 2 if(HDPT_ARMOR) num_delays = 10 - if(HDPT_TREADS, HDPT_WHEELS) num_delays = 7 + if(HDPT_TREADS, HDPT_WHEELS) + num_delays = 7 + //now reset the movement timer + next_move = world.time if(!do_after(user, 30*num_delays * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL, BUSY_ICON_FRIENDLY, numticks = num_delays)) user.visible_message(SPAN_WARNING("[user] stops installing \the [HP] on \the [src]."), SPAN_WARNING("You stop installing \the [HP] on \the [src].")) diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index f956d64ebf12..31af9f92a726 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -196,6 +196,7 @@ return health = min(health + max_hp/100 * (5 / amount_fixed_adjustment), max_hp) + healthcheck() if(WT) WT.remove_fuel(1, user) @@ -295,7 +296,7 @@ if(P.runtime_iff_group && get_target_lock(P.runtime_iff_group)) return - if(ammo_flags & AMMO_ANTISTRUCT) + if(ammo_flags & AMMO_ANTISTRUCT|AMMO_ANTIVEHICLE) // Multiplier based on tank railgun relationship, so might have to reconsider multiplier for AMMO_SIEGE in general damage = round(damage*ANTISTRUCT_DMG_MULT_TANK) if(ammo_flags & AMMO_ACIDIC) diff --git a/code/modules/vehicles/multitile/multitile_verbs.dm b/code/modules/vehicles/multitile/multitile_verbs.dm index c7dd29bbf0a9..cc785dcd3410 100644 --- a/code/modules/vehicles/multitile/multitile_verbs.dm +++ b/code/modules/vehicles/multitile/multitile_verbs.dm @@ -342,6 +342,63 @@ if(honk_sound) playsound(loc, honk_sound, 75, TRUE, 15) //heard within ~15 tiles +//Megaphone gaming +/obj/vehicle/multitile/proc/use_megaphone() + set name = "Use Megaphone" + set desc = "Let's you shout a message to peoples around the vehicle." + set category = "Vehicle" + + var/mob/living/user = usr + if(user.client) + if(user.client?.prefs?.muted & MUTE_IC) + to_chat(src, SPAN_DANGER("You cannot speak in IC (muted).")) + return + if(!ishumansynth_strict(user)) + to_chat(user, SPAN_DANGER("You don't know how to use this!")) + return + if(user.silent) + return + + var/obj/vehicle/multitile/V = user.interactee + if(!istype(V)) + return + + var/seat + for(var/vehicle_seat in V.seats) + if(V.seats[vehicle_seat] == user) + seat = vehicle_seat + break + if(!seat) + return + + if(world.time < V.next_shout) + to_chat(user, SPAN_WARNING("You need to wait [(V.next_shout - world.time) / 10] seconds.")) + return + + var/message = tgui_input_text(user, "Shout a message?", "Megaphone", multiline = TRUE) + if(!message) + return + // we know user is a human now, so adjust user for this check + var/mob/living/carbon/human/humanoid = user + if(humanoid.speech_problem_flag) + var/list/new_message = humanoid.handle_speech_problems(message) + message = new_message[1] + message = capitalize(message) + log_admin("[key_name(user)] used a vehicle megaphone to say: >[message]<") + + if(!user.is_mob_incapacitated()) + var/list/mob/listeners = get_mobs_in_view(9,V) + var/list/mob/langchat_long_listeners = list() + for(var/mob/listener in listeners) + if(!ishumansynth_strict(listener) && !isobserver(listener)) + listener.show_message("[V] broadcasts something, but you can't understand it.") + continue + listener.show_message("[V] broadcasts, [FONT_SIZE_LARGE("\"[message]\"")]", SHOW_MESSAGE_AUDIBLE) // 2 stands for hearable message + langchat_long_listeners += listener + V.langchat_long_speech(message, langchat_long_listeners, user.get_default_language()) + + V.next_shout = world.time + 10 SECONDS + //Support gunner verbs /obj/vehicle/multitile/proc/reload_firing_port_weapon() diff --git a/code/modules/vehicles/spawners/apc.dm b/code/modules/vehicles/spawners/apc.dm new file mode 100644 index 000000000000..f9c48fd4587c --- /dev/null +++ b/code/modules/vehicles/spawners/apc.dm @@ -0,0 +1,79 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc + name = "APC Transport Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc + +/obj/effect/vehicle_spawner/apc/load_misc(obj/vehicle/multitile/V) + . = ..() + load_fpw(V) + +//PRESET: default hardpoints +/obj/effect/vehicle_spawner/apc/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/primary/dualcannon) + V.add_hardpoint(new /obj/item/hardpoint/secondary/frontalcannon) + V.add_hardpoint(new /obj/item/hardpoint/support/flare_launcher) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/decrepit + spawn_damaged = TRUE + +/obj/vehicle/multitile/apc/nofpw + interior_map = /datum/map_template/interior/apc_no_fpw + +//PRESET: no FPWs, default hardpoints +/obj/effect/vehicle_spawner/apc/nofpw + spawn_type = /obj/vehicle/multitile/apc/nofpw + +/obj/effect/vehicle_spawner/apc/nofpw/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: no FPWs, default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/nofpw/decrepit + spawn_damaged = TRUE + +//PRESET: no FPWs, only wheels +/obj/effect/vehicle_spawner/apc/nofpw/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: no FPWs, no hardpoints +/obj/effect/vehicle_spawner/apc/nofpw/unarmed/load_hardpoints(obj/vehicle/multitile/V) + return + +//Installation of transport APC Firing Ports Weapons +/obj/effect/vehicle_spawner/apc/proc/load_fpw(obj/vehicle/multitile/apc/V) + var/obj/item/hardpoint/special/firing_port_weapon/FPW = new + FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE + V.add_hardpoint(FPW) + FPW.dir = turn(V.dir, 90) + FPW.name = "Left "+ initial(FPW.name) + FPW.origins = list(2, 0) + FPW.muzzle_flash_pos = list( + "1" = list(-18, 14), + "2" = list(18, -42), + "4" = list(34, 3), + "8" = list(-32, -34) + ) + + FPW = new + FPW.allowed_seat = VEHICLE_SUPPORT_GUNNER_TWO + V.add_hardpoint(FPW) + FPW.dir = turn(V.dir, -90) + FPW.name = "Right "+ initial(FPW.name) + FPW.origins = list(-2, 0) + FPW.muzzle_flash_pos = list( + "1" = list(16, 14), + "2" = list(-18, -42), + "4" = list(34, -34), + "8" = list(-32, 2) + ) diff --git a/code/modules/vehicles/spawners/apc_cmd.dm b/code/modules/vehicles/spawners/apc_cmd.dm new file mode 100644 index 000000000000..54189a954d75 --- /dev/null +++ b/code/modules/vehicles/spawners/apc_cmd.dm @@ -0,0 +1,21 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc/cmd + name = "APC CMD Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base_com" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc/command + +/obj/effect/vehicle_spawner/apc/cmd/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/cmd/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/cmd/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/apc_med.dm b/code/modules/vehicles/spawners/apc_med.dm new file mode 100644 index 000000000000..75f3246c4ec7 --- /dev/null +++ b/code/modules/vehicles/spawners/apc_med.dm @@ -0,0 +1,21 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/apc/med + name = "APC MED Spawner" + icon = 'icons/obj/vehicles/apc.dmi' + icon_state = "apc_base_med" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/apc/medical + +/obj/effect/vehicle_spawner/apc/med/load_fpw(obj/vehicle/multitile/apc/V) + return + +//PRESET: only wheels +/obj/effect/vehicle_spawner/apc/med/wheels_only/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/apc_wheels) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/apc/med/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/tank.dm b/code/modules/vehicles/spawners/tank.dm new file mode 100644 index 000000000000..f7c100155578 --- /dev/null +++ b/code/modules/vehicles/spawners/tank.dm @@ -0,0 +1,63 @@ +/* +** PRESETS SPAWNERS +*/ +/obj/effect/vehicle_spawner/tank + name = "Tank Spawner" + icon = 'icons/obj/vehicles/tank.dmi' + icon_state = "tank_base" + pixel_x = -48 + pixel_y = -48 + spawn_type = /obj/vehicle/multitile/tank + +//PRESET: default hardpoints +/obj/effect/vehicle_spawner/tank/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) + V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) + break + +//PRESET: only threads, empty turret +/obj/effect/vehicle_spawner/tank/plain/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + +//PRESET: default hardpoints, destroyed +/obj/effect/vehicle_spawner/tank/decrepit + spawn_damaged = TRUE + +//PRESET: minigun kit +/obj/effect/vehicle_spawner/tank/minigun/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/minigun) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/small_flamer) + break + +//PRESET: dragon flamer kit +/obj/effect/vehicle_spawner/tank/flamer/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/overdrive_enhancer) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/flamer) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/grenade_launcher) + break + +//PRESET: autocannon kit +/obj/effect/vehicle_spawner/tank/autocannon/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) + V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) + V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) + for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) + TT.add_hardpoint(new /obj/item/hardpoint/primary/autocannon) + TT.add_hardpoint(new /obj/item/hardpoint/secondary/towlauncher) + break diff --git a/code/modules/vehicles/spawners/van.dm b/code/modules/vehicles/spawners/van.dm new file mode 100644 index 000000000000..02cff3dfe41a --- /dev/null +++ b/code/modules/vehicles/spawners/van.dm @@ -0,0 +1,19 @@ +/* +** PRESETS SPAWNERS +*/ + +/obj/effect/vehicle_spawner/van + name = "Van Spawner" + icon = 'icons/obj/vehicles/van.dmi' + icon_state = "van_base" + pixel_x = -16 + pixel_y = -16 + spawn_type = /obj/vehicle/multitile/van + +//PRESET: wheels +/obj/effect/vehicle_spawner/van/load_hardpoints(obj/vehicle/multitile/V) + V.add_hardpoint(new /obj/item/hardpoint/locomotion/van_wheels) + +//PRESET: wheels, destroyed +/obj/effect/vehicle_spawner/van/decrepit + spawn_damaged = TRUE diff --git a/code/modules/vehicles/spawners/vehicle.dm b/code/modules/vehicles/spawners/vehicle.dm new file mode 100644 index 000000000000..ac5b016c3a56 --- /dev/null +++ b/code/modules/vehicles/spawners/vehicle.dm @@ -0,0 +1,60 @@ +/* +** PRESETS SPAWNERS +*/ +//These help spawning vehicles that don't end up as subtypes, causing problems later with various checks +//as well as allowing customizations, like properly turning on mapped in direction and so on. + +/obj/effect/vehicle_spawner + name = "Vehicle Spawner" + var/spawn_type = /obj/vehicle/multitile + var/spawn_damaged = FALSE + +/obj/effect/vehicle_spawner/Initialize() + . = ..() + spawn_vehicle() + return INITIALIZE_HINT_QDEL + +//Main proc which handles spawning and adding hardpoints/damaging the vehicle +/obj/effect/vehicle_spawner/proc/spawn_vehicle() + var/obj/vehicle/multitile/V = new spawn_type(loc) + + load_hardpoints(V) + load_misc(V) + if(spawn_damaged) + deal_damage(V) + handle_direction(V) + V.update_icon() + return V + +//Installation of modules kit +/obj/effect/vehicle_spawner/proc/load_hardpoints(obj/vehicle/multitile/V) + return + +//Miscellaneous additions +/obj/effect/vehicle_spawner/proc/load_misc(obj/vehicle/multitile/V) + + V.load_role_reserved_slots() + V.initialize_cameras() + //transfer mapped in edits + if(color) + V.color = color + if(name != initial(name)) + V.name = name + if(desc) + V.desc = desc + +//Dealing enough damage to destroy the vehicle +/obj/effect/vehicle_spawner/proc/deal_damage(obj/vehicle/multitile/V) + V.take_damage_type(1e8, "abstract") + V.take_damage_type(1e8, "abstract") + V.healthcheck() + +/obj/effect/vehicle_spawner/proc/handle_direction(obj/vehicle/multitile/M) + switch(dir) + if(EAST) + M.try_rotate(90) + if(WEST) + M.try_rotate(-90) + if(NORTH) + M.try_rotate(90) + M.try_rotate(90) diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm index ad69f80cdfb6..49e80b6f1bb1 100644 --- a/code/modules/vehicles/tank/tank.dm +++ b/code/modules/vehicles/tank/tank.dm @@ -36,8 +36,6 @@ move_momentum_build_factor = 1.8 move_turn_momentum_loss_factor = 0.6 - vehicle_light_range = 7 - // Rest (all the guns) is handled by the tank turret hardpoint hardpoints_allowed = list( /obj/item/hardpoint/holder/tank_turret, @@ -110,6 +108,7 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -133,6 +132,7 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/use_megaphone, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( @@ -164,103 +164,3 @@ update_icon() return TRUE - -/* -** PRESETS SPAWNERS -*/ -/obj/effect/vehicle_spawner/tank - name = "Tank Spawner" - icon = 'icons/obj/vehicles/tank.dmi' - icon_state = "tank_base" - pixel_x = -48 - pixel_y = -48 - -/obj/effect/vehicle_spawner/tank/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: turret, no hardpoints (not the one without turret for convenience, you still expect to have turret when you spawn "no hardpoints tank") -/obj/effect/vehicle_spawner/tank/spawn_vehicle() - var/obj/vehicle/multitile/tank/TANK = new (loc) - - load_misc(TANK) - load_hardpoints(TANK) - handle_direction(TANK) - TANK.update_icon() - -/obj/effect/vehicle_spawner/tank/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - -//PRESET: turret, treads installed -/obj/effect/vehicle_spawner/tank/plain/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/tank/hull/load_hardpoints(obj/vehicle/multitile/tank/V) - return - -//PRESET: default hardpoints, destroyed -/obj/effect/vehicle_spawner/tank/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/tank/TANK = new (loc) - - load_misc(TANK) - handle_direction(TANK) - load_hardpoints(TANK) - load_damage(TANK) - TANK.update_icon() - -/obj/effect/vehicle_spawner/tank/decrepit/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) - break - -//PRESET: default hardpoints -/obj/effect/vehicle_spawner/tank/fixed/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/paladin) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/cannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/m56cupola) - break - -//PRESET: minigun kit -/obj/effect/vehicle_spawner/tank/fixed/minigun/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/minigun) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/small_flamer) - break - -//PRESET: dragon flamer kit -/obj/effect/vehicle_spawner/tank/fixed/flamer/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/overdrive_enhancer) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/flamer) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/grenade_launcher) - break - -//PRESET: autocannon kit -/obj/effect/vehicle_spawner/tank/fixed/autocannon/load_hardpoints(obj/vehicle/multitile/tank/V) - V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module) - V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads) - V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) - for(var/obj/item/hardpoint/holder/tank_turret/TT in V.hardpoints) - TT.add_hardpoint(new /obj/item/hardpoint/primary/autocannon) - TT.add_hardpoint(new /obj/item/hardpoint/secondary/towlauncher) - break diff --git a/code/modules/vehicles/van/van.dm b/code/modules/vehicles/van/van.dm index 1124f5348140..cf2706be25e4 100644 --- a/code/modules/vehicles/van/van.dm +++ b/code/modules/vehicles/van/van.dm @@ -241,52 +241,3 @@ return FALSE return ..() - -/* -** PRESETS SPAWNERS -*/ - -/obj/effect/vehicle_spawner/van - name = "Van Spawner" - icon = 'icons/obj/vehicles/van.dmi' - icon_state = "van_base" - pixel_x = -16 - pixel_y = -16 - -/obj/effect/vehicle_spawner/van/Initialize() - . = ..() - spawn_vehicle() - qdel(src) - -//PRESET: no hardpoints -/obj/effect/vehicle_spawner/van/spawn_vehicle() - var/obj/vehicle/multitile/van/VAN = new (loc) - - load_misc(VAN) - handle_direction(VAN) - VAN.update_icon() - -//PRESET: wheels installed, destroyed -/obj/effect/vehicle_spawner/van/decrepit/spawn_vehicle() - var/obj/vehicle/multitile/van/VAN = new (loc) - - load_misc(VAN) - load_hardpoints(VAN) - handle_direction(VAN) - load_damage(VAN) - VAN.update_icon() - -/obj/effect/vehicle_spawner/van/decrepit/load_hardpoints(obj/vehicle/multitile/van/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/van_wheels) - -//PRESET: wheels installed -/obj/effect/vehicle_spawner/van/fixed/spawn_vehicle() - var/obj/vehicle/multitile/van/VAN = new (loc) - - load_misc(VAN) - load_hardpoints(VAN) - handle_direction(VAN) - VAN.update_icon() - -/obj/effect/vehicle_spawner/van/fixed/load_hardpoints(obj/vehicle/multitile/van/V) - V.add_hardpoint(new /obj/item/hardpoint/locomotion/van_wheels) diff --git a/colonialmarines.dme b/colonialmarines.dme index 03f1e780e4a1..51ba49ed7243 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -450,7 +450,8 @@ s// DM Environment file for colonialmarines.dme. #include "code\datums\elements\bullet_trait\iff.dm" #include "code\datums\elements\bullet_trait\ignored_range.dm" #include "code\datums\elements\bullet_trait\incendiary.dm" -#include "code\datums\elements\bullet_trait\penetrating.dm" +#include "code\datums\elements\bullet_trait\penetrating\heavy.dm" +#include "code\datums\elements\bullet_trait\penetrating\penetrating.dm" #include "code\datums\elements\traitbound\_traitbound.dm" #include "code\datums\elements\traitbound\crawler.dm" #include "code\datums\elements\traitbound\gun_silenced.dm" @@ -711,6 +712,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\jobs\job\command\auxiliary\intel.dm" #include "code\game\jobs\job\command\auxiliary\pilot.dm" #include "code\game\jobs\job\command\auxiliary\senior.dm" +#include "code\game\jobs\job\command\auxiliary\tankcrew.dm" #include "code\game\jobs\job\command\cic\captain.dm" #include "code\game\jobs\job\command\cic\executive.dm" #include "code\game\jobs\job\command\cic\staffofficer.dm" @@ -1037,6 +1039,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\items\devices\taperecorder.dm" #include "code\game\objects\items\devices\teleportation.dm" #include "code\game\objects\items\devices\transfer_valve.dm" +#include "code\game\objects\items\devices\vulture_spotter.dm" #include "code\game\objects\items\devices\walkman.dm" #include "code\game\objects\items\devices\whistle.dm" #include "code\game\objects\items\devices\radio\beacon.dm" @@ -1208,6 +1211,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\surface.dm" #include "code\game\objects\structures\tables_racks.dm" #include "code\game\objects\structures\tank_dispenser.dm" +#include "code\game\objects\structures\vulture_spotter.dm" #include "code\game\objects\structures\watercloset.dm" #include "code\game\objects\structures\windoor_assembly.dm" #include "code\game\objects\structures\window.dm" @@ -2181,7 +2185,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\shuttle\dropship.dm" #include "code\modules\shuttle\dropship_hijack.dm" #include "code\modules\shuttle\helpers.dm" -#include "code\modules\shuttle\lifeboats.dm" #include "code\modules\shuttle\on_move.dm" #include "code\modules\shuttle\ripple.dm" #include "code\modules\shuttle\shuttle.dm" @@ -2192,8 +2195,10 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\shuttle\computers\trijent_elevator_control.dm" #include "code\modules\shuttle\shuttles\dropship.dm" #include "code\modules\shuttle\shuttles\ert.dm" -#include "code\modules\shuttle\shuttles\escape_shuttle.dm" #include "code\modules\shuttle\shuttles\trijent_elevator.dm" +#include "code\modules\shuttle\shuttles\crashable\crashable.dm" +#include "code\modules\shuttle\shuttles\crashable\escape_shuttle.dm" +#include "code\modules\shuttle\shuttles\crashable\lifeboats.dm" #include "code\modules\shuttles\marine_ferry.dm" #include "code\modules\shuttles\monorail_console.dm" #include "code\modules\shuttles\shuttle.dm" @@ -2347,6 +2352,12 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\vehicles\multitile\multitile_interaction.dm" #include "code\modules\vehicles\multitile\multitile_movement.dm" #include "code\modules\vehicles\multitile\multitile_verbs.dm" +#include "code\modules\vehicles\spawners\apc.dm" +#include "code\modules\vehicles\spawners\apc_cmd.dm" +#include "code\modules\vehicles\spawners\apc_med.dm" +#include "code\modules\vehicles\spawners\tank.dm" +#include "code\modules\vehicles\spawners\van.dm" +#include "code\modules\vehicles\spawners\vehicle.dm" #include "code\modules\vehicles\tank\interior.dm" #include "code\modules\vehicles\tank\tank.dm" #include "code\modules\vehicles\van\interior.dm" @@ -2355,6 +2366,24 @@ s// DM Environment file for colonialmarines.dme. #include "code\modules\vox\vox_tgui.dm" #include "code\modules\vox\vox_sounds\vox.dm" #include "code\modules\vox\vox_sounds\vox_military.dm" +#include "fray-marines\code\__DEFINES\xeno.dm" +#include "fray-marines\code\cm_tech\techs\marine\tier2\tank.dm" +#include "fray-marines\code\datums\skills.dm" +#include "fray-marines\code\datums\supply_packs\gear.dm" +#include "fray-marines\code\game\jobs\command\auxiliary\mech_crew.dm" +#include "fray-marines\code\game\objects\items\weapons\st_equip.dm" +#include "fray-marines\code\game\objects\items\weapons\st_hammer_stacks.dm" +#include "fray-marines\code\modules\vehicles\hardpoints_walker.dm" +#include "fray-marines\code\modules\vehicles\walker.dm" +#include "fray-marines\code\modules\vehicles\walker_vendor.dm" +#include "fray-marines\modules\cm_aliens\structures\lessers_burrow.dm" +#include "fray-marines\modules\cm_aliens\structures\special_structure.dm" +#include "fray-marines\modules\gear_presets\usmc.dm" +#include "fray-marines\modules\mob\living\carbon\xenomorph\Abilities.dm" +#include "fray-marines\modules\mob\living\carbon\xenomorph\resin_constructions.dm" +#include "fray-marines\modules\mob\living\simple_animal\hostile\alien.dm" +#include "fray-marines\modules\mob\living\simple_animal\hostile\alien\tearer.dm" +#include "fray-marines\modules\mob\living\simple_animal\hostile\alien\trooper.dm" #include "interface\fonts.dm" #include "interface\interface.dm" #include "interface\skin.dmf" diff --git a/fray-marines/code/__DEFINES/xeno.dm b/fray-marines/code/__DEFINES/xeno.dm new file mode 100644 index 000000000000..328f7eb0c2b9 --- /dev/null +++ b/fray-marines/code/__DEFINES/xeno.dm @@ -0,0 +1,13 @@ +#define XENO_AI_DAMAGE_TIER_1 10 * XENO_UNIVERSAL_DAMAGEMULT +#define XENO_AI_DAMAGE_TIER_2 15 * XENO_UNIVERSAL_DAMAGEMULT +#define XENO_AI_DAMAGE_TIER_3 20 * XENO_UNIVERSAL_DAMAGEMULT + +#define XENO_AI_SPECIAL_ATTACK_PROBABILITY 20 + +#define XENO_AI_SPEED_TIER_1 2 +#define XENO_AI_SPEED_TIER_2 1 + +#define XENO_LESSER_BURROW_AMOUNT 5 +#define XENO_LESSER_BURROW_SPAWN_QUEUE_TIME 5 SECONDS +#define XENO_LESSER_BURROW_SPAWN_TIME 5 MINUTES +#define XENO_LESSER_BURROW_MIN_DISTANCE 15 diff --git a/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm b/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm new file mode 100644 index 000000000000..40d4ea9f136b --- /dev/null +++ b/fray-marines/code/cm_tech/techs/marine/tier2/tank.dm @@ -0,0 +1,19 @@ +/datum/tech/repeatable/tank_points + name = "Tank Budget Increase" + icon_state = "budget_ds" + desc = "Distributes resources to the tank fabricator." + + announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" + announce_message = "Additional tank part fabricator points have been authorised for this operation." + + required_points = 15 + increase_per_purchase = 1 + + flags = TREE_FLAG_MARINE + tier = /datum/tier/two + + var/points_to_give = 1000 + +/datum/tech/repeatable/tank_points/on_unlock() + . = ..() + supply_controller.tank_points += points_to_give diff --git a/fray-marines/code/datums/skills.dm b/fray-marines/code/datums/skills.dm new file mode 100644 index 000000000000..b5153d722200 --- /dev/null +++ b/fray-marines/code/datums/skills.dm @@ -0,0 +1,11 @@ + +/datum/skills/mech_pilot + name = "Mech Crewman" + skills = list( + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_JTAC = SKILL_JTAC_EXPERT, + ) diff --git a/fray-marines/code/datums/supply_packs/gear.dm b/fray-marines/code/datums/supply_packs/gear.dm new file mode 100644 index 000000000000..1b42b0ad91bf --- /dev/null +++ b/fray-marines/code/datums/supply_packs/gear.dm @@ -0,0 +1,9 @@ +/datum/supply_packs/backpack_rto + contains = list( + /obj/item/storage/backpack/marine/satchel/rto, + ) + name = "USCM Radio Telephone Pack" + cost = 30 + containertype = /obj/structure/closet/crate/supply + containername = "USCM Radio Telephone Pack (x1)" + group = "Gear" diff --git a/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm b/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm new file mode 100644 index 000000000000..dff5da4ff0e5 --- /dev/null +++ b/fray-marines/code/game/jobs/command/auxiliary/mech_crew.dm @@ -0,0 +1,19 @@ + +/datum/job/command/walker + title = JOB_WALKER + total_positions = 1 + spawn_positions = 1 + allow_additional = 1 + scaled = 0 + flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_WHITELISTED + gear_preset = /datum/equipment_preset/uscm/walker + entry_message_body = "Your job is to operate and maintain thee ship's combat walkers. While you are an officer, your authority is limited to your own vehicle." + +AddTimelock(/datum/job/command/walker, list( + JOB_SQUAD_ROLES = 2 HOURS, + JOB_ENGINEER_ROLES = 2 HOURS +)) + +/obj/effect/landmark/start/mech_crew + name = JOB_CREWMAN + job = /datum/job/command/walker diff --git a/fray-marines/code/game/objects/items/weapons/st_equip.dm b/fray-marines/code/game/objects/items/weapons/st_equip.dm new file mode 100644 index 000000000000..4ac3c706dcc0 --- /dev/null +++ b/fray-marines/code/game/objects/items/weapons/st_equip.dm @@ -0,0 +1,113 @@ +/obj/item/weapon/twohanded/st_hammer + name = "N45 battle hammer" + desc = "RIP AND TEAR." + icon = 'icons/obj/items/experimental_tools.dmi' + icon_state = "d2_breacher" + item_state = "d2_breacher" + force = MELEE_FORCE_STRONG + flags_item = TWOHANDED + force_wielded = MELEE_FORCE_TIER_8 + throwforce = MELEE_FORCE_NORMAL + w_class = SIZE_LARGE + sharp = IS_SHARP_ITEM_BIG + flags_equip_slot = SLOT_WAIST|SLOT_BACK + unacidable = TRUE + indestructible = TRUE + + throw_range = 3 + attack_speed = 14 + + var/speed_penalty = 0.7 + var/retrieval_slot = WEAR_WAIST + +/obj/item/weapon/twohanded/st_hammer/attack(mob/M, mob/user) + if(!skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && user.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_ST) + to_chat(user, SPAN_HIGHDANGER("[src] is too heavy for you to use!")) + return + ..(M, user) + + if(!isxeno(M)) + return + + if(flags_item & WIELDED) + var/datum/effects/hammer_stacks/HS = null + for (var/datum/effects/hammer_stacks/hammer_stacks in M.effects_list) + HS = hammer_stacks + break + + if (HS == null) + HS = new /datum/effects/hammer_stacks(M) + HS.increment_stack_count(0, user) + else + HS.increment_stack_count(1, user) + + if(M.stat != CONSCIOUS) // haha xeno-cricket + HS.increment_stack_count(4, user) + +/obj/item/weapon/twohanded/st_hammer/pickup(mob/user) + RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay)) + ..() + +/obj/item/weapon/twohanded/st_hammer/proc/handle_movedelay(mob/living/M, list/movedata) + SIGNAL_HANDLER + movedata["move_delay"] += speed_penalty + +/obj/item/weapon/twohanded/st_hammer/dropped(mob/user, silent) + . = ..() + UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY) + var/mob/living/carbon/human/H = user + if(!istype(H)) + return + if(H.belt == null && istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M40)) + addtimer(CALLBACK(src, PROC_REF(retrieve_to_slot), H, retrieval_slot), 0.3 SECONDS, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + +/obj/item/weapon/shield/montage + name = "N30 montage shield" + desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." + icon_state = "metal_st" + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi', + WEAR_BACK = 'icons/mob/humans/onmob/back.dmi' + ) + flags_equip_slot = SLOT_BACK + passive_block = 70 + readied_block = 100 + force = MELEE_FORCE_TIER_1 + throwforce = MELEE_FORCE_TIER_1 + throw_range = 4 + w_class = SIZE_LARGE + attack_verb = list("shoved", "bashed") + unacidable = TRUE + indestructible = TRUE + var/blocks_on_back = TRUE + var/retrieval_slot = WEAR_BACK + var/cooldown = 0 //shield bash cooldown. based on world.time + +/obj/item/weapon/shield/montage/IsShield() + return TRUE + +/obj/item/weapon/shield/montage/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/bang-bang.ogg', 25, FALSE) + cooldown = world.time + else + ..() + +/obj/item/weapon/shield/montage/dropped(mob/user, silent) + . = ..() + var/mob/living/carbon/human/H = user + if(!istype(H)) + return + if(H.back == null && istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M40)) + addtimer(CALLBACK(src, PROC_REF(retrieve_to_slot), H, retrieval_slot), 0.3 SECONDS, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + + +/obj/item/weapon/shield/montage/marine + name = "N30-2 standard defensive shield" + desc = "A heavy shield adept at blocking blunt or sharp objects from connecting with the shield wielder." + icon_state = "marine_shield" + passive_block = 45 + readied_block = 80 diff --git a/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm b/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm new file mode 100644 index 000000000000..aaedfe53b710 --- /dev/null +++ b/fray-marines/code/game/objects/items/weapons/st_hammer_stacks.dm @@ -0,0 +1,87 @@ +/datum/effects/hammer_stacks + effect_name = "Stormtrooper hammer combo stack" + duration = null + flags = INF_DURATION // We always clean ourselves up + + var/stack_count = 1 + var/max_stacks = 4 + var/last_decrement_time = 0 + var/time_between_decrements = 40 + var/last_increment_time = 0 + var/increment_grace_time = 50 + var/combo_sound = 'sound/effects/alien_tail_swipe2.ogg' + var/combo_hit_sound = 'sound/effects/slam1.ogg' + +/datum/effects/hammer_stacks/New(mob/living/carbon/xenomorph/X, mob/from = null, last_dmg_source = null, zone = "chest") + last_decrement_time = world.time + last_increment_time = world.time + . = ..(X, from, last_dmg_source, zone) + + +/datum/effects/hammer_stacks/validate_atom(mob/living/carbon/xenomorph/X) + if (!isxeno(X)) + return FALSE + + return ..() + +/datum/effects/hammer_stacks/process_mob() + . = ..() + if (!isxeno(affected_atom)) + return + + if (last_decrement_time + time_between_decrements < world.time && !(last_increment_time + increment_grace_time > world.time)) + stack_count-- + last_decrement_time = world.time + + if (stack_count <= 0) + qdel(src) + return + + // TODO: добавить оверлей на ксене + +/datum/effects/hammer_stacks/Destroy() + if (!isxeno(affected_atom)) + return ..() + + // TODO: впилить удаление оверлея + + return ..() + +/datum/effects/hammer_stacks/proc/increment_stack_count(increment_number = 1, mob/living/carbon/human/attacker) + stack_count = min(max_stacks, stack_count + increment_number) + + if (!isxeno(affected_atom)) + return + + var/mob/living/carbon/xenomorph/X = affected_atom + // TODO: добавить оверлей на ксене + + last_increment_time = world.time + var/throw_range = 1 + + if (prob(25)) X.emote("roar") + + if (stack_count > 0) X.apply_effect(3, SLOW) + if (stack_count > 1) X.apply_effect(1, SUPERSLOW) + if (stack_count > 2) X.apply_effect(2, SUPERSLOW) + if (stack_count > 3) + playsound(attacker, combo_sound, 85, 1) + playsound(X, combo_hit_sound, 45, 1) + if (X.stat != DEAD) + attacker.apply_effect(1, STUN) + attacker.spin_circle(1, 1.5) + + shake_camera(X, 1, 4) + if (X.mob_size >= MOB_SIZE_IMMOBILE) + X.apply_effect(2, SUPERSLOW) + qdel(src) + return + + X.apply_effect(2, WEAKEN) + if (!X.anchored) + var/turf/throw_to = get_step_away(X, attacker) + X.throw_atom(throw_to, throw_range) + qdel(src) + + + diff --git a/fray-marines/code/modules/vehicles/hardpoints_walker.dm b/fray-marines/code/modules/vehicles/hardpoints_walker.dm new file mode 100644 index 000000000000..c94cea6fe602 --- /dev/null +++ b/fray-marines/code/modules/vehicles/hardpoints_walker.dm @@ -0,0 +1,288 @@ +//////////////// +// MEGALODON HARDPOINTS // START +//////////////// + +/obj/item/walker_gun + name = "walker gun" + icon = 'fray-marines/icons/obj/vehicles/mecha_guns.dmi' + var/equip_state = "" + w_class = 12.0 + var/obj/vehicle/walker/owner = null + var/magazine_type = /obj/item/ammo_magazine/walker + var/obj/item/ammo_magazine/walker/ammo = null + var/fire_sound = 'sound/weapons/gun_smartgun1.ogg' + var/fire_delay = 0 + var/last_fire = 0 + var/burst = 1 + + w_class = 12.0 + + var/muzzle_flash = "muzzle_flash" + var/muzzle_flash_lum = 3 //muzzle flash brightness + +/obj/item/walker_gun/proc/get_icon_image(hardpoint) + if(!owner) + return + + return image(owner.icon, equip_state + hardpoint) + +/obj/item/walker_gun/proc/active_effect(atom/target) + if(ammo.current_rounds <= 0 || !ammo) + to_chat(owner.pilot, "WARNING! System report: ammunition is depleted!") + if(ammo) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + if(world.time < last_fire + fire_delay) + to_chat(owner.pilot, "WARNING! System report: weapon is not ready to fire again!") + return + last_fire = world.time + var/obj/item/projectile/P + for(var/i = 1 to burst) + if(!owner.firing_arc(target)) + if(i == 1) + return + to_chat(owner.pilot , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] remaining!") + visible_message("[owner.name] fires from [name]!", "You hear [istype(P.ammo, /datum/ammo/bullet) ? "gunshot" : "blast"]!") + return + P = new + P.generate_bullet(new ammo.default_ammo) + playsound(src, fire_sound, 60) + target = simulate_scatter(target, P) + P.fire_at(target, owner, src, P.ammo.max_range, P.ammo.shell_speed) + ammo.current_rounds-- + if(ammo.current_rounds <= 0) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + break + sleep(3) + to_chat(owner.pilot , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] remaining!") + visible_message("[owner.name] fires from [name]!", "You hear [istype(P.ammo, /datum/ammo/bullet) ? "gunshot" : "blast"]!") + + var/angle = round(Get_Angle(owner,target)) + muzzle_flash(angle) + + if(ammo.current_rounds <= 0) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return TRUE + +/obj/item/walker_gun/proc/muzzle_flash(angle, x_offset = 0, y_offset = 5) + if(!muzzle_flash || isnull(angle)) + return //We have to check for null angle here, as 0 can also be an angle. + if(!istype(owner) || !istype(owner.loc,/turf)) + return + + if(owner.luminosity <= muzzle_flash_lum) + owner.set_light(muzzle_flash_lum) + spawn(10) + owner.set_light(-muzzle_flash_lum) + +/obj/item/walker_gun/proc/simulate_scatter(atom/target, obj/item/projectile/projectile_to_fire) + var/total_chance = projectile_to_fire.scatter + if(total_chance <= 0) + return target + var/targdist = get_dist(target, owner) + if(targdist <= (4 + rand(-1, 1))) + return target + if(burst > 1) + total_chance += burst * 2 + + var/turf/targloc = get_turf(target) + if(prob(total_chance)) //Scattered! + var/scatter_x = rand(-1,1) + var/scatter_y = rand(-1,1) + var/turf/new_target = locate(targloc.x + round(scatter_x),targloc.y + round(scatter_y),targloc.z) //Locate an adjacent turf. + if(new_target) + target = new_target//Looks like we found a turf. + return target + + +/obj/item/walker_gun/smartgun + name = "M56 Double-Barrel Mounted Smartgun" + desc = "Modifyed version of standart USCM Smartgun System, mounted on military walkers" + icon_state = "mecha_smartgun" + equip_state = "mech-shot" + magazine_type = /obj/item/ammo_magazine/walker/smartgun + burst = 2 + fire_delay = 6 + +/obj/item/walker_gun/hmg + name = "M30 Machine Gun" + desc = "High-caliber machine gun firing small bursts of AP bullets, tearing into shreds unfortunate fellas on its way." + icon_state = "mecha_machinegun" + equip_state = "mech-gatt" + fire_sound = 'sound/weapons/gun_minigun.ogg' + magazine_type = /obj/item/ammo_magazine/walker/hmg + fire_delay = 20 + burst = 3 + +/obj/item/walker_gun/flamer + name = "F40 \"Hellfire\" Flamethower" + desc = "Powerful flamethower, that can send any unprotected target straight to hell." + icon_state = "mecha_flamer" + equip_state = "mech-flam" + fire_sound = 'sound/weapons/gun_flamethrower2.ogg' + magazine_type = /obj/item/ammo_magazine/walker/flamer + var/burnlevel = 50 + var/burntime = 27 + var/max_range = 6 + fire_delay = 30 + +/obj/item/walker_gun/flamer/active_effect(atom/target) + if(ammo.current_rounds <= 0 || !ammo) + to_chat(owner.pilot, "WARNING! System report: ammunition is depleted!") + if(ammo) + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + if(world.time < last_fire + fire_delay) + to_chat(owner.pilot, "WARNING! System report: weapon is not ready to fire again!") + return + last_fire = world.time + var/list/turf/turfs = getline(owner, target) + playsound(owner, fire_sound, 50, 1) + ammo.current_rounds-- + var/distance = 1 + var/turf/prev_T + + for (var/F in turfs) + var/turf/T = F + + if(T == owner.loc) + prev_T = T + continue + if((T.density && !istype(T, /turf/closed/wall/resin))) + break + if(distance > max_range) + break + + var/blocked = FALSE + for(var/obj/O in T) + if(O.density && !O.throwpass && !(O.flags_atom & ON_BORDER)) + blocked = TRUE + break + + var/turf/TF + if(!prev_T.Adjacent(T) && (T.x != prev_T.x || T.y != prev_T.y)) //diagonally blocked, it will seek for a cardinal turf by the former target. + blocked = TRUE + var/turf/Ty = locate(prev_T.x, T.y, prev_T.z) + var/turf/Tx = locate(T.x, prev_T.y, prev_T.z) + for(var/turf/TB in shuffle(list(Ty, Tx))) + if(prev_T.Adjacent(TB) && (!TB.density) || istype(T, /turf/closed/wall/resin)) + TF = TB + break + if(!TF) + break + else + TF = T + + flame_turf(TF,owner.pilot, burntime, burnlevel) + if(blocked) + break + distance++ + prev_T = T + sleep(1) + + to_chat(owner.pilot , "[name] fired! [ammo.current_rounds]/[ammo.max_rounds] charges remaining!") + + if(ammo.current_rounds <= 0 || !ammo) + to_chat(owner.pilot, "WARNING! System report: ammunition is depleted!") + ammo.loc = owner.loc + ammo = null + visible_message("[owner.name]'s systems deployed used magazine.","") + return + +/obj/item/walker_gun/flamer/proc/flame_turf(turf/T, mob/living/user, heat, burn, f_color = "red") + if(!istype(T)) + return + + new /obj/flamer_fire(T, heat, burn, f_color) + + var/fire_mod + for(var/mob/living/M in T) //Deal bonus damage if someone's caught directly in initial stream + if(M.stat == DEAD) + continue + + fire_mod = 1 + + if(ishuman(M)) + var/mob/living/carbon/human/H = M //fixed :s + + if(istype(H.wear_suit, /obj/item/clothing/suit/fire) || (istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M35) && istype(H.head, /obj/item/clothing/head/helmet/marine/pyro))) + continue + + var/armor_block = M.getarmor(null, "fire") + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(istype(H.wear_suit, /obj/item/clothing/suit/fire) || (istype(H.wear_suit, /obj/item/clothing/suit/storage/marine/M35) && istype(H.head, /obj/item/clothing/head/helmet/marine/pyro))) + H.show_message(text("Your suit protects you from most of the flames."), 1) + armor_block = Clamp(armor_block * 1.5, 0.75, 1) //Min 75% resist, max 100% + M.apply_damage(rand(burn,(burn*2))* fire_mod, BURN, null, armor_block) // Make it so its the amount of heat or twice it for the initial blast. + + M.adjust_fire_stacks(rand(5,burn*2)) + M.IgniteMob() + + to_chat(M, "[isxeno(M)?"":""]Augh! You are roasted by the flames!") + +/////////////// +// AMMO MAGS // START +/////////////// + +/obj/item/ammo_magazine/walker + w_class = 12.0 + +/obj/item/ammo_magazine/walker/smartgun + name = "M56 Double-Barrel Magazine (Standart)" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "ua571c" + default_ammo = /datum/ammo/bullet/smartgun + max_rounds = 700 + gun_type = /obj/item/walker_gun/smartgun + +/* +/obj/item/ammo_magazine/walker/smartgun/ap + name = "M56 Double-Barrel Magazine (AP)" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "big_ammo_box_ap" + default_ammo = /datum/ammo/bullet/smartgun/walker/ap + max_rounds = 500 + gun_type = /obj/item/walker_gun/smartgun +/obj/item/ammo_magazine/walker/smartgun/incendiary + name = "M56 Double-Barrel \"Scorcher\" Magazine" + desc = "A armament MG magazine" + caliber = "10x28mm" //Correlates to smartguns + icon_state = "ammoboxslug" + default_ammo = /datum/ammo/bullet/smartgun/walker/incendiary + max_rounds = 500 + gun_type = /obj/item/walker_gun/smartgun +*/ + +/obj/item/ammo_magazine/walker/hmg + name = "M30 Machine Gun Magazine" + desc = "A armament M30 magazine" + icon_state = "ua571c" + max_rounds = 300 + default_ammo = /datum/ammo/bullet/machinegun + gun_type = /obj/item/walker_gun/hmg + +/obj/item/ammo_magazine/walker/flamer + name = "F40 Canister" + desc = "Canister for mounted flamethower" + icon_state = "flametank_large" + max_rounds = 40 + default_ammo = /datum/ammo/flamethrower + gun_type = /obj/item/walker_gun/flamer + +/////////////// +// AMMO MAGS // END +/////////////// +//////////////// +// MEGALODON HARDPOINTS // END +//////////////// diff --git a/fray-marines/code/modules/vehicles/walker.dm b/fray-marines/code/modules/vehicles/walker.dm new file mode 100644 index 000000000000..89eaa013c755 --- /dev/null +++ b/fray-marines/code/modules/vehicles/walker.dm @@ -0,0 +1,635 @@ +#define GUN_RIGHT 0 +#define GUN_LEFT 1 + +///////////////// +// Walker +///////////////// + +/obj/vehicle/walker + name = "CW13 \"Megalodon\" Assault Walker" + desc = "Relatively new combat walker of \"Megalodon\"-series. Unlike its predecessor, \"Carharodon\"-series, slower, but relays on its tough armor and rapid-firing weapons." + icon = 'fray-marines/icons/obj/vehicles/mech-walker.dmi' + icon_state = "mech" + layer = ABOVE_LYING_MOB_LAYER + opacity = TRUE + can_buckle = FALSE + move_delay = 6 + req_access = list(ACCESS_MARINE_WALKER) + + var/lights = FALSE + var/lights_power = 8 + var/zoom = FALSE + var/zoom_size = 14 + + pixel_x = -18 + + health = 700 + var/maxHealth = 700 + var/repair = FALSE + + var/mob/pilot = null + + var/acid_process_cooldown = null + var/list/dmg_multipliers = list( + "all" = 1.0, //for when you want to make it invincible + "acid" = 0.9, + "slash" = 0.6, + "bullet" = 0.2, + "explosive" = 5.0, + "blunt" = 0.1, + "energy" = 1.0, + "abstract" = 1.0) //abstract for when you just want to hurt it + + var/max_angle = 45 + var/obj/item/walker_gun/left = null + var/obj/item/walker_gun/right = null + var/obj/item/walker_armor/armor_module = null + var/selected = GUN_LEFT + +/obj/vehicle/walker/New() + . = ..() + + unacidable = 0 + +/obj/vehicle/walker/prebuilt/New() + . = ..() + + left = new /obj/item/walker_gun/smartgun() + right = new /obj/item/walker_gun/flamer() + left.ammo = new left.magazine_type() + right.ammo = new right.magazine_type() + left.owner = src + right.owner = src + + update_icon() + +/obj/vehicle/walker/update_icon() + overlays.Cut() + + if(left) + var/image/left_gun = left.get_icon_image("-l") + overlays += left_gun + if(right) + var/image/right_gun = right.get_icon_image("-r") + overlays += right_gun + + if(pilot) + var/image/occupied = image(icon, icon_state = "mech-face") + overlays += occupied + +/obj/vehicle/walker/examine(mob/user) + ..() + var/integrity = round(health/maxHealth*100) + switch(integrity) + if(85 to 100) + to_chat(usr, "It's fully intact.") + if(65 to 85) + to_chat(usr, "It's slightly damaged.") + if(45 to 65) + to_chat(usr, "It's badly damaged.") + if(25 to 45) + to_chat(usr, "It's heavily damaged.") + else + to_chat(usr, "It's falling apart.") + to_chat(usr, "[left ? left.name : "Nothing"] is placed on its left hardpoint.") + to_chat(usr, "[right ? right.name : "Nothing"] is placed on its right hardpoint.") + +/obj/vehicle/walker/ex_act(severity) + switch(severity) + if (1) + if(prob(10)) // "- You have three seconds to run before I stab you in the anus!"@ Walker Pilot to rocket spec. + health = 0 + healthcheck() + return + take_damage(20, "explosive") // 100 damage btw. 2 instance of MT repair. 3-4 minutes standing IDLY near walker. + if (2) + take_damage(15, "explosive") + if (3) + take_damage(10, "explosive") // 10 * 5.0 = 50. Maxhealth is 400. Hellova damage + +/obj/vehicle/walker/relaymove(mob/user, direction) + if(world.time > l_move_time + move_delay) + if(dir != direction) + l_move_time = world.time + dir = direction + pick(playsound(src.loc, 'sound/mecha/powerloader_turn.ogg', 25, 1), playsound(src.loc, 'sound/mecha/powerloader_turn2.ogg', 25, 1)) + . = TRUE + else + . = step(src, direction) + if(.) + pick(playsound(loc, 'sound/mecha/powerloader_step.ogg', 25), playsound(loc, 'sound/mecha/powerloader_step2.ogg', 25)) + +/obj/vehicle/walker/Bump(atom/obstacle) + if(istype(obstacle, /obj/structure/machinery/door)) + var/obj/structure/machinery/door/door = obstacle + if(door.allowed(pilot)) + door.open() + else + flick("door_deny", door) + + else if(ishuman(obstacle)) + step_away(obstacle, src, 0) + return + +//Breaking stuff + else if(istype(obstacle, /obj/structure/fence)) + var/obj/structure/fence/F = obstacle + F.visible_message("[src.name] smashes through [F]!") + take_damage(5, "abstract") + F.health = 0 + F.healthcheck() + else if(istype(obstacle, /obj/structure/surface/table)) + var/obj/structure/surface/table/T = obstacle + T.visible_message("[src.name] crushes [T]!") + take_damage(5, "abstract") + T.deconstruct(TRUE) + else if(istype(obstacle, /obj/structure/showcase)) + var/obj/structure/showcase/S = obstacle + S.visible_message("[src.name] bulldozes over [S]!") + take_damage(15, "abstract") + S.deconstruct(TRUE) + else if(istype(obstacle, /obj/structure/window/framed)) + var/obj/structure/window/framed/W = obstacle + W.visible_message("[src.name] crashes through the [W]!") + take_damage(20, "abstract") + W.shatter_window(1) + else if(istype(obstacle, /obj/structure/window_frame)) + var/obj/structure/window_frame/WF = obstacle + WF.visible_message("[src.name] runs over the [WF]!") + take_damage(20, "abstract") + WF.deconstruct() + else + ..() + +/obj/vehicle/walker/verb/enter_walker() + set category = "Object" + set name = "Enter Into Walker" + set src in oview(1) + + if(usr.skills.get_skill_level(SKILL_POWERLOADER)) + move_in(usr) + else + to_chat(usr, "How to operate it?") + +/obj/vehicle/walker/proc/move_in(mob/living/carbon/user) + set waitfor = FALSE + if(!ishuman(user)) + return + if(pilot) + to_chat(user, "There is someone occupying mecha right now.") + return + var/mob/living/carbon/human/H = user + for(var/ID in list(H.wear_id, H.belt)) + if(operation_allowed(ID)) + pilot = user + add_verb(pilot.client, list( + /obj/vehicle/walker/proc/eject, + /obj/vehicle/walker/proc/lights, + /obj/vehicle/walker/proc/zoom, + /obj/vehicle/walker/proc/select_weapon, + /obj/vehicle/walker/proc/deploy_magazine, + /obj/vehicle/walker/proc/get_stats, + )) + user.loc = src + pilot.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") + pilot.set_interaction(src) + pilot << sound('sound/mecha/powerup.ogg',volume=50) + update_icon() + sleep(50) + pilot << sound('sound/mecha/nominalsyndi.ogg',volume=50) + return + + to_chat(user, "Access denied.") + +/obj/vehicle/walker/proc/operation_allowed(obj/item/I) + if(check_access(I)) + return TRUE + return FALSE + +/obj/vehicle/walker/proc/eject() + set name = "Eject" + set category = "Vehicle" + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + if(!W || !istype(W)) + return + W.move_out() + +/obj/vehicle/walker/proc/move_out() + if(!pilot) + return FALSE + if(health <= 0) + to_chat(pilot, "PRIORITY ALERT! Chassis integrity failing. Systems shutting down.") + if(zoom) + zoom_activate() + if(pilot.client) + pilot.client.mouse_pointer_icon = initial(pilot.client.mouse_pointer_icon) + pilot.unset_interaction() + pilot.loc = src.loc + remove_verb(pilot.client, list( + /obj/vehicle/walker/proc/eject, + /obj/vehicle/walker/proc/lights, + /obj/vehicle/walker/proc/zoom, + /obj/vehicle/walker/proc/select_weapon, + /obj/vehicle/walker/proc/deploy_magazine, + /obj/vehicle/walker/proc/get_stats, + )) + pilot = null + update_icon() + return TRUE + +/obj/vehicle/walker/proc/lights() + set name = "Lights on/off" + set category = "Vehicle" + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + if(!W || !istype(W)) + return + W.handle_lights() + +/obj/vehicle/walker/proc/handle_lights() + if(!lights) + lights = TRUE + set_light(lights_power) + else + lights = FALSE + set_light(-lights_power) + pilot << sound('sound/machines/click.ogg',volume=50) + +/obj/vehicle/walker/proc/deploy_magazine() + set name = "Deploy Magazine" + set category = "Vehicle" + var/mob/M = usr + var/obj/vehicle/walker/W = M.interactee + if(!W || !istype(W)) + return + + if(W.selected) + if(!W.left || !W.left.ammo) + return + else + W.left.ammo.loc = W.loc + W.left.ammo = null + to_chat(M, "WARNING! [W.left.name] ammo magazine deployed.") + visible_message("[W.name]'s systems deployed used magazine.","") + else + if(!W.right || !W.right.ammo) + return + else + W.right.ammo.loc = W.loc + W.right.ammo = null + to_chat(M, "WARNING! [W.right.name] ammo magazine deployed.") + visible_message("[W.name]'s systems deployed used magazine.","") + +/obj/vehicle/walker/proc/get_stats() + set name = "Status Display" + set category = "Vehicle" + + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + if(!W || !istype(W)) + return + + if(M != W.pilot) + return + W.statistics(M) + +/obj/vehicle/walker/proc/statistics(mob/user) + to_chat(user, "

[name] Interface

") + to_chat(user, "Vehicle Status:
") + + var/danger = "'notice'" + + var/curr_health = round(health/maxHealth*100) + danger = "'notice'" + if(curr_health <= 50) + danger = "'warning'" + if(curr_health <= 25) + danger = "'danger'" + to_chat(user, "Overall vehicle integrity: [curr_health] percent. [danger == "'danger'" ? "LEVEL CRITICAL!" : ""]") + + to_chat(user, "=========\n") + + if(left) + var/munition = left.ammo ? "[left.ammo.current_rounds]/[left.ammo.max_rounds]" : "DEPLETED" + to_chat(user, "Left hardpoint: [left.name].\n Current ammo level: [munition]") + else + to_chat(user, "LEFT HARDPOINT IS EMPTY!") + + if(right) + var/munition = right.ammo ? "[right.ammo.current_rounds]/[right.ammo.max_rounds]" : "DEPLETED" + to_chat(user, "Right hardpoint: [left.name].\n Current ammo level: [munition]") + else + to_chat(user, "RIGHT HARDPOINT IS EMPTY!") + +/obj/vehicle/walker/proc/select_weapon() + set name = "Select Weapon" + set category = "Vehicle" + + var/mob/M = usr + if(!M || !istype(M)) + return + + var/obj/vehicle/walker/W = M.interactee + if(!W || !istype(W)) + return + + if(W.selected) + if(!W.right) + return + W.selected = !W.selected + else + if(!W.left) + return + W.selected = !W.selected + to_chat(M, "Selected [W.selected ? "[W.left]" : "[W.right]"]") + +/obj/vehicle/walker/handle_click(mob/living/user, atom/A, list/mods) + if(!firing_arc(A)) + return + if(selected) + if(!left) + to_chat(usr, "WARNING! Hardpoint is empty.") + return + left.active_effect(A) + else + if(!right) + to_chat(usr, "WARNING! Hardpoint is empty.") + return + right.active_effect(A) + +/obj/vehicle/walker/proc/firing_arc(atom/A) + var/turf/T = get_turf(A) + var/dx = T.x - x + var/dy = T.y - y + var/deg = 0 + switch(src.dir) + if(EAST) deg = 0 + if(NORTH) deg = -90 + if(WEST) deg = -180 + if(SOUTH) deg = -270 + + var/nx = dx * cos(deg) - dy * sin(deg) + var/ny = dx * sin(deg) + dy * cos(deg) + if(nx == 0) + return max_angle >= 180 + var/angle = arctan(ny/nx) + if(nx < 0) + angle += 180 + return abs(angle) <= max_angle + +/obj/vehicle/walker/proc/zoom() + set name = "Zoom on/off" + set category = "Vehicle" + + zoom_activate() + +/obj/vehicle/walker/proc/zoom_activate() + if(zoom) + pilot.client.change_view(world.view)//world.view - default mob view size + zoom = FALSE + else + pilot.client.change_view(world.view)//world.view - default mob view size + pilot.client.change_view(zoom_size) + pilot << sound('sound/mecha/imag_enhsyndi.ogg',volume=50) + zoom = TRUE + to_chat(pilot, "Notification. Cameras zooming [zoom ? "activated" : "deactivated"].") + + + + +///////////////// +// Attackby +///////////////// + +/obj/vehicle/walker/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/ammo_magazine/walker)) + var/obj/item/ammo_magazine/walker/mag = W + rearm(mag, user) + + else if(istype(W, /obj/item/walker_gun)) + var/obj/item/walker_gun/WG = W + install_gun(WG, user) + + else if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + var/obj/item/tool/wrench/WR = W + dismount(WR, user) + + else if(iswelder(W)) + var/obj/item/tool/weldingtool/weld = W + repair_walker(weld, user) + + else + . = ..() + +/obj/vehicle/walker/proc/install_gun(obj/item/walker_gun/W, mob/user as mob) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) + to_chat(user, "You don't know how to mount weapon.") + return + var/choice = input("On which hardpoint install gun.") in list("Left", "Right", "Cancel") + switch(choice) + if("Cancel") + return + + if("Left") + if(left) + to_chat(user, "This hardpoint is full") + return + to_chat(user, "You start mounting [W.name] on left hardpoint.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + user.drop_held_item() + W.loc = src + left = W + left.owner = src + to_chat(user, "You mount [W.name] on left hardpoint.") + update_icon() + return + return + + if("Right") + if(right) + to_chat(user, "This hardpoint is full") + return + to_chat(user, "You start mounting [W.name] on right hardpoint.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + user.drop_held_item() + W.loc = src + right = W + right.owner = src + to_chat(user, "You mount [W] on right hardpoint.") + update_icon() + return + return + +/obj/vehicle/walker/proc/rearm(obj/item/ammo_magazine/walker/mag as obj, mob/user as mob) + if(left && !left.ammo && istype(mag, left.magazine_type)) + if(!do_after(user, 20, TRUE, 5, BUSY_ICON_BUILD)) + to_chat(user, "Your action was interrupted.") + return + else + user.drop_held_item() + mag.loc = left + left.ammo = mag + to_chat(user, "You install magazine in [left.name].") + return + + else if(right && !right.ammo && istype(mag, right.magazine_type)) + if(!do_after(user, 20, TRUE, 5, BUSY_ICON_BUILD)) + to_chat(user, "Your action was interrupted.") + return + else + user.drop_held_item() + mag.loc = right + right.ammo = mag + to_chat(user, "You install magazine in [right.name].") + return + + else + to_chat(user, "You cannot fit that magazine in any weapon.") + return + +/obj/vehicle/walker/proc/dismount(obj/item/tool/wrench/WR as obj, mob/user as mob) + if(!left && !right) + return + var/choice = input("Which hardpoint should be dismounted.") in list("Left", "Right", "Cancel") + switch(choice) + if("Cancel") + return + + if("Left") + if(!left) + to_chat(user, "Left hardpoint is empty.") + return + to_chat(user, "You start dismounting [left.name] from walker.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + left.loc = loc + left = null + update_icon() + return + else + to_chat(user, "Dismounting has been interrupted.") + + if("Right") + if(!right) + to_chat(user, "Right hardpoint is empty.") + return + to_chat(user, "You start dismounting [right.name] from walker.") + if(do_after(user, 100, TRUE, 5, BUSY_ICON_BUILD)) + right.loc = loc + right = null + update_icon() + return + else + to_chat(user, "Dismounting has been interrupted.") + +/obj/vehicle/walker/proc/repair_walker(obj/item/tool/weldingtool/weld as obj, mob/user as mob) + if(!weld.isOn()) + return + if(health >= maxHealth) + to_chat(user, "Armor seems fully intact.") + return + if(repair) + to_chat(user, "Someone already reparing this vehicle.") + return + repair = TRUE + var/repair_time = 1000 + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_DEFAULT)) //NO DIVIDING BY ZERO + repair_time = round(repair_time/user.skills.get_skill_level(SKILL_ENGINEER)) + + to_chat(user, "You start repairing broken part of [src.name]'s armor...") + if(do_after(user, repair_time, TRUE, 5, BUSY_ICON_BUILD)) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + to_chat(user, "You haphazardly weld together chunks of broken armor.") + health += 25 + healthcheck() + else + health += 100 + healthcheck() + to_chat(user, "You repair broken part of the armor.") + playsound(src.loc, 'sound/items/weldingtool_weld.ogg', 25) + if(pilot) + to_chat(pilot, "Notification.Armor partly restored.") + return + else + to_chat(user, "Repair has been interrupted.") + repair = FALSE + + +///////// +//Attack_alien +///////// + +/obj/vehicle/walker/attack_alien(mob/living/carbon/xenomorph/M) + if(M.a_intent == "hurt") + M.animation_attack_on(src) + playsound(loc, "alien_claw_metal", 25, 1) + M.flick_attack_overlay(src, "slash") + M.visible_message("[M] slashes [src].","You slash [src].", null, 5) + take_damage(rand(M.melee_damage_lower, M.melee_damage_upper), "slash") + else + attack_hand(M) + +/obj/vehicle/walker/healthcheck() + if(health > maxHealth) + health = maxHealth + return + if(health <= 0) + move_out() + new /obj/structure/walker_wreckage(src.loc) + playsound(loc, 'sound/effects/metal_crash.ogg', 75) + qdel(src) + +/obj/vehicle/walker/bullet_act(obj/item/projectile/Proj) + if(!Proj) + return + + switch(Proj.ammo.damage_type) + if(BRUTE) + if(Proj.ammo.flags_ammo_behavior & AMMO_ROCKET) + take_damage(Proj.damage, "explosive") + else + take_damage(Proj.damage, "bullet") + if(BURN) + if(Proj.ammo.flags_ammo_behavior & AMMO_XENO) + take_damage(Proj.damage, "acid") + else + take_damage(Proj.damage, "energy") + if(TOX, OXY, CLONE) + return + +/obj/vehicle/walker/proc/take_damage(dam, damtype = "blunt") + if(!dam || dam <= 0) + return + if(!(damtype in list("explosive", "acid", "energy", "blunt", "slash", "bullet", "all", "abstract"))) + return + var/damage = dam * dmg_multipliers[damtype] + if(damage <= 10) + to_chat(pilot, "ALERT! Hostile incursion detected. Deflected.") + return + + health -= damage + to_chat(pilot, "ALERT! Hostile incursion detected. Chassis taking damage.") + if(pilot && damage >= 50) + pilot << sound('sound/mecha/critdestrsyndi.ogg',volume=50) + healthcheck() + + + +/obj/structure/walker_wreckage + name = "CW13 wreckage" + desc = "Remains of some unfortunate walker. Completely unrepairable." + icon = 'fray-marines/icons/obj/vehicles/mech-walker.dmi' + icon_state = "mech-damaged" + density = TRUE + anchored = TRUE + opacity = FALSE + pixel_x = -18 diff --git a/fray-marines/code/modules/vehicles/walker_vendor.dm b/fray-marines/code/modules/vehicles/walker_vendor.dm new file mode 100644 index 000000000000..3419120b6c08 --- /dev/null +++ b/fray-marines/code/modules/vehicles/walker_vendor.dm @@ -0,0 +1,77 @@ +GLOBAL_LIST_INIT(cm_vending_mech_crew, list( + list("WEAPONS (choose 2)", 0, null, null, null), + list("M56 Double-Barrel Mounted Smartgun", 0, /obj/item/walker_gun/smartgun, MECH_GUN, VENDOR_ITEM_REGULAR), + list("M30 Machine Gun", 0, /obj/item/walker_gun/hmg, MECH_GUN, VENDOR_ITEM_REGULAR), + list("F40 \"Hellfire\" Flamethower", 0, /obj/item/walker_gun/flamer, MECH_GUN, VENDOR_ITEM_REGULAR), + + list("AMMUNITION", 0, null, null, null), + list("M56 Magazine", 1, /obj/item/ammo_magazine/walker/smartgun, null, VENDOR_ITEM_REGULAR), + list("M30 Magazine", 2, /obj/item/ammo_magazine/walker/hmg, null, VENDOR_ITEM_REGULAR), + list("F40 Canister", 2, /obj/item/ammo_magazine/walker/flamer, null, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/gear/mech_crew + name = "ColMarTech Automated Mech Vendor" + desc = "This vendor is connected to main ship storage, allows to fetch one hardpoint module per category for free." + icon_state = "engi" + + req_access = list(ACCESS_MARINE_WALKER) + vendor_role = list(JOB_WALKER) //everyone else, mind your business + var/available_categories = MECH_ALL_AVAIBALE + + unslashable = TRUE + + vend_delay = 4 SECONDS + vend_sound = 'sound/machines/medevac_extend.ogg' + + vend_flags = VEND_CLUTTER_PROTECTION|VEND_CATEGORY_CHECK|VEND_TO_HAND|VEND_USE_VENDOR_FLAGS + +/obj/structure/machinery/cm_vending/gear/mech_crew/tip_over() //we don't do this here + return + +/obj/structure/machinery/cm_vending/gear/mech_crew/flip_back() + return + +/obj/structure/machinery/cm_vending/gear/mech_crew/get_listed_products(mob/user) + var/list/display_list = list() + + display_list = GLOB.cm_vending_mech_crew + + return display_list + +/obj/structure/machinery/cm_vending/gear/mech_crew/ui_data(mob/user) + . = list() + . += ui_static_data(user) + + .["current_m_points"] = supply_controller.mech_points + + var/list/ui_listed_products = get_listed_products(user) + var/list/stock_values = list() + for (var/i in 1 to length(ui_listed_products)) + var/list/myprod = ui_listed_products[i] //we take one list from listed_products + var/prod_available = FALSE + var/p_cost = myprod[2] + var/avail_flag = myprod[4] + if(supply_controller.mech_points >= p_cost && (!avail_flag || ((avail_flag in available_categories) && (available_categories[avail_flag])))) + prod_available = TRUE + stock_values += list(prod_available) + + .["stock_listing"] = stock_values + +/obj/structure/machinery/cm_vending/gear/mech_crew/handle_points(mob/living/carbon/human/H, list/L) + . = TRUE + if(L[4] != null) + if(!(L[4] in available_categories)) + return FALSE + if(!(available_categories[L[4]])) + return FALSE + if(supply_controller.mech_points < L[2]) + return FALSE + else + available_categories[L[4]] -= 1 + supply_controller.mech_points -= L[2] + else + if(supply_controller.mech_points < L[2]) + return FALSE + else + supply_controller.mech_points -= L[2] diff --git a/fray-marines/icons/mob/xenos/lesser_xeno.dmi b/fray-marines/icons/mob/xenos/lesser_xeno.dmi new file mode 100644 index 000000000000..2cca3fe8d2f1 Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi new file mode 100644 index 000000000000..7274af2982cb Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_big.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi new file mode 100644 index 000000000000..d4320b04dd6b Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_big_old.dmi differ diff --git a/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi b/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi new file mode 100644 index 000000000000..09dbf1f4e613 Binary files /dev/null and b/fray-marines/icons/mob/xenos/lesser_xeno_old.dmi differ diff --git a/fray-marines/icons/obj/structures/alien/Buildings.dmi b/fray-marines/icons/obj/structures/alien/Buildings.dmi new file mode 100644 index 000000000000..84d5a8d7d1b4 Binary files /dev/null and b/fray-marines/icons/obj/structures/alien/Buildings.dmi differ diff --git a/fray-marines/icons/obj/vehicles/mech-walker.dmi b/fray-marines/icons/obj/vehicles/mech-walker.dmi new file mode 100644 index 000000000000..999f50d38993 Binary files /dev/null and b/fray-marines/icons/obj/vehicles/mech-walker.dmi differ diff --git a/fray-marines/icons/obj/vehicles/mecha_guns.dmi b/fray-marines/icons/obj/vehicles/mecha_guns.dmi new file mode 100644 index 000000000000..0e0b1aa15aa6 Binary files /dev/null and b/fray-marines/icons/obj/vehicles/mecha_guns.dmi differ diff --git a/fray-marines/modules/cm_aliens/structures/lessers_burrow.dm b/fray-marines/modules/cm_aliens/structures/lessers_burrow.dm new file mode 100644 index 000000000000..4462ef34d424 --- /dev/null +++ b/fray-marines/modules/cm_aliens/structures/lessers_burrow.dm @@ -0,0 +1,134 @@ +/obj/structure/lessers_burrow + name = "tunnel" + desc = "A tunnel entrance. Looks like it was dug by some kind of clawed beast." + icon = 'icons/mob/xenos/effects.dmi' + icon_state = "hole" + + density = FALSE + opacity = FALSE + anchored = TRUE + unslashable = TRUE + unacidable = TRUE + layer = RESIN_STRUCTURE_LAYER + plane = FLOOR_PLANE + + var/hivenumber = XENO_HIVE_NORMAL + var/datum/hive_status/hive + var/last_spawning = 0 + var/spawn_cooldown = XENO_LESSER_BURROW_SPAWN_TIME + + health = 140 + var/id = null //For mapping + +/obj/structure/lessers_burrow/Initialize(mapload, h_number) + . = ..() + var/turf/L = get_turf(src) + + if(h_number && GLOB.hive_datum[h_number]) + hivenumber = h_number + hive = GLOB.hive_datum[h_number] + + set_hive_data(src, h_number) + + if(!hive) + hive = GLOB.hive_datum[hivenumber] + + var/obj/effect/alien/resin/trap/resin_trap = locate() in L + if(resin_trap) + qdel(resin_trap) + + handle_spawning() + +/obj/structure/lessers_burrow/proc/handle_spawning() + last_spawning = world.time + visible_message(SPAN_WARNING("[src] starts rumbling!")) + for(var/i = 1; i <= XENO_LESSER_BURROW_AMOUNT; i++) + addtimer(CALLBACK(src, PROC_REF(spawn_alien)), XENO_LESSER_BURROW_SPAWN_QUEUE_TIME * i) + +/obj/structure/lessers_burrow/proc/spawn_alien() + if(prob(10)) + new /mob/living/simple_animal/hostile/alien/spawnable/tearer(get_turf(src)) + return + new /mob/living/simple_animal/hostile/alien/spawnable/trooper(get_turf(src)) + +/obj/structure/lessers_burrow/attackby(obj/item/W as obj, mob/user as mob) + if(!isxeno(user)) + if(istype(W, /obj/item/tool/shovel)) + var/obj/item/tool/shovel/destroying_shovel = W + + if(destroying_shovel.folded) + return + + playsound(user.loc, 'sound/effects/thud.ogg', 40, 1, 6) + + user.visible_message(SPAN_NOTICE("[user] starts to collapse [src]!"), SPAN_NOTICE("You start collapsing [src]!")) + + if(user.action_busy || !do_after(user, TUNNEL_COLLAPSING_TIME * ((100 - destroying_shovel.shovelspeed) * 0.01), INTERRUPT_ALL, BUSY_ICON_BUILD)) + return + + playsound(loc, 'sound/effects/tunnel_collapse.ogg', 50) + + visible_message(SPAN_NOTICE("[src] collapses in on itself.")) + + qdel(src) + else if (user.a_intent != INTENT_HARM) + user.visible_message(SPAN_NOTICE("[user] knocks in the [src]"), SPAN_NOTICE("You knock in the [src].")) + + if (last_spawning + spawn_cooldown <= world.time) + handle_spawning() + + return + + return ..() + return attack_alien(user) + +/obj/structure/lessers_burrow/attack_larva(mob/living/carbon/xenomorph/M) + . = attack_alien(M) + +/obj/structure/lessers_burrow/attack_alien(mob/living/carbon/xenomorph/M) + if(!istype(M) || M.stat || M.lying) + return XENO_NO_DELAY_ACTION + + if(!isfriendly(M)) + if(M.mob_size < MOB_SIZE_BIG) + to_chat(M, SPAN_XENOWARNING("You aren't large enough to collapse this tunnel!")) + return XENO_NO_DELAY_ACTION + + M.visible_message(SPAN_XENODANGER("[M] begins to fill [src] with dirt."),\ + SPAN_XENONOTICE("You begin to fill [src] with dirt using your massive claws."), max_distance = 3) + xeno_attack_delay(M) + + if(!do_after(M, 10 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL_OUT_OF_RANGE, max_dist = 1)) + to_chat(M, SPAN_XENOWARNING("You decide not to cave the tunnel in.")) + return XENO_NO_DELAY_ACTION + + src.visible_message(SPAN_XENODANGER("[src] caves in!"), max_distance = 3) + qdel(src) + + return XENO_NO_DELAY_ACTION + + if (last_spawning + spawn_cooldown <= world.time) + M.visible_message(SPAN_WARNING("[M] made few knocks on [src]"), SPAN_XENONOTICE("You call your lesser sisters")) + handle_spawning() + else + to_chat(M, SPAN_XENOWARNING("It's not time yet! New lesser sisters will arrive in [((last_spawning + spawn_cooldown) - world.time) SECONDS]!")) + return XENO_NO_DELAY_ACTION + +/obj/structure/lessers_burrow/proc/isfriendly(mob/target) + var/mob/living/carbon/C = target + if(istype(C) && C.ally_of_hivenumber(hivenumber)) + return TRUE + + return FALSE + +/obj/structure/lessers_burrow/proc/healthcheck() + if(health <= 0) + visible_message(SPAN_DANGER("[src] suddenly collapses!")) + qdel(src) + +/obj/structure/lessers_burrow/bullet_act(obj/item/projectile/Proj) + return FALSE + +/obj/structure/lessers_burrow/ex_act(severity) + health -= severity/2 + healthcheck() diff --git a/fray-marines/modules/cm_aliens/structures/special_structure.dm b/fray-marines/modules/cm_aliens/structures/special_structure.dm new file mode 100644 index 000000000000..712ccb436558 --- /dev/null +++ b/fray-marines/modules/cm_aliens/structures/special_structure.dm @@ -0,0 +1,189 @@ +/obj/structure/alien + name = "alien building" + desc = "Building that's alien" + icon = 'fray-marines/icons/obj/structures/alien/Buildings.dmi' + icon_state = "sunken" + density = TRUE + pixel_x = -16 + + // var/xeno_tag = null //see misc.dm + + health = 500 + var/maxHealth = 500 + + var/dying = 0 + var/last_heal = 0 + var/heal = 40 + var/datum/hive_status/hive + +/obj/structure/alien/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + hive = GLOB.hive_datum[XENO_HIVE_NORMAL] + +/obj/structure/alien/Destroy() + . = ..() + STOP_PROCESSING(SSobj, src) + +/obj/structure/alien/flamer_fire_act() + health -= 50 + healthcheck() + +/obj/structure/alien/process(delta_time) + if(dying) + if(locate(/obj/effect/alien/weeds) in src.loc) + dying = 0 + health = max(0, health-(25 * delta_time)) + if(health <= 0) + die() + return ..() + if(health > maxHealth) + health = maxHealth + if(!(locate(/obj/effect/alien/weeds) in src.loc)) + dying = 1 + + update_icon() + + if(world.time >= last_heal + heal && health < maxHealth && !dying) + health += 5 //slowly regenerate on weed + last_heal = world.time + return 1 + +/obj/structure/alien/ex_act(severity) + switch(severity) + if(1) + die() + if(2,3) + health -= rand(200 * (4-severity)) + healthcheck() + +/obj/structure/alien/bullet_act(obj/item/projectile/P) + health -= max(0, P.damage) + bullet_ping(P) + healthcheck() + +/obj/structure/alien/proc/healthcheck() + if(health <= 0) + die() + return + if(health>=maxHealth) + health = maxHealth + +/obj/structure/alien/proc/die() + visible_message("[src] explodes into bloody gore!") + xgibs(src.loc) + qdel(src) + +/obj/structure/alien/attack_alien(mob/living/carbon/xenomorph/M) + if(islarva(M)) //Larvae can't do shit + return + + if(M.a_intent == INTENT_HELP) + return XENO_NO_DELAY_ACTION + else + M.animation_attack_on(src) + M.visible_message(SPAN_XENONOTICE("\The [M] claws \the [src]!"), \ + SPAN_XENONOTICE("You claw \the [src].")) + if(istype(src, /obj/effect/alien/resin/sticky)) + playsound(loc, "alien_resin_move", 25) + else + playsound(loc, "alien_resin_break", 25) + + health -= (M.melee_damage_upper + 50) //Beef up the damage a bit + healthcheck() + return XENO_ATTACK_ACTION + +//Sunken Colony +/obj/structure/alien/sunken + name = "Sunken Colony" + desc = "A living stationary organism that strikes from below with its powerful claw." + pixel_y = -8 + + var/cooldown = 6 SECONDS + var/can_attack = 1 + + // xeno_tag = SUNKEN_COLONY + +/obj/structure/alien/sunken/update_icon() + if(health <= maxHealth/2) + icon_state = "s_weak" + else + icon_state = "sunken" + +/obj/structure/alien/sunken/process() + . = ..() + if(!.) + return + + if(!can_attack) + return + + var/turf/target = get_target() + + if (!target) + return + + process_cooldown() + strike(target) + +/obj/structure/alien/sunken/proc/get_target() + var/list/targets = list() + + for(var/atom/movable/targ in orange(10, src)) + var/turf/T = get_turf(targ) + if(!T.can_dig_xeno_tunnel() || !is_ground_level(T.z) || get_dist(src, T) <= 3) + continue + if(ishuman(targ)) + var/mob/living/carbon/human/H = targ + if(locate(/obj/item/alien_embryo) in H) + continue + if(!H.stat) + targets += T + + if (targets.len > 0) + return pick(targets) + + return null + +/obj/structure/alien/sunken/proc/strike(turf/target) + if(!istype(target)) + return 0 + if(!target) + return 0 + + visible_message("[src] is about to strike!") + flick("s_hitting",src) + + var/obj/effect/impaler/I = new /obj/effect/impaler(target) + addtimer(CALLBACK(I, PROC_REF(strike)), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), cooldown) + + return 1 + +/obj/structure/alien/sunken/proc/process_cooldown() + can_attack = !can_attack + +/obj/effect/impaler + name = "impaling chitin" + icon = 'fray-marines/icons/obj/structures/alien/Buildings.dmi' + icon_state = "s_incoming" + var/damage = 120 + +/obj/effect/impaler/Initialize(mapload, ...) + . = ..() + visible_message(SPAN_HIGHDANGER("Ground starts to rumble!")) + playsound(loc, "alien_bite", 25, 1) + +/obj/effect/impaler/proc/strike() + icon_state = "strike" + for(var/mob/living/carbon/human/L in src.loc) + to_chat(L, "You've been hit by [src] from below!") + var/obj/limb/affecting = L.get_limb(pick("r_leg", "l_leg")) + var/armor = L.getarmor_organ(affecting, ARMOR_MELEE) + var/damage_result = armor_damage_reduction(GLOB.marine_melee, damage, armor, 0) + L.apply_damage(damage_result, BRUTE, affecting, 0) //This should slicey dicey + L.updatehealth() + + playsound(loc, "alien_bite", 25, 1) + + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), 5) diff --git a/fray-marines/modules/gear_presets/usmc.dm b/fray-marines/modules/gear_presets/usmc.dm new file mode 100644 index 000000000000..b3a8ffc0bcb2 --- /dev/null +++ b/fray-marines/modules/gear_presets/usmc.dm @@ -0,0 +1,35 @@ + +/datum/equipment_preset/uscm/walker + name = "USCM Mech Crewman (MO) (Cryo)" + flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE + + access = list( + ACCESS_MARINE_PREP, + ACCESS_MARINE_WALKER, + ACCESS_MARINE_ALPHA, + ACCESS_MARINE_BRAVO, + ACCESS_MARINE_CHARLIE, + ACCESS_MARINE_DELTA, + ) + assignment = JOB_WALKER + rank = JOB_WALKER + paygrade = "01" + role_comm_title = "MO" + minimum_age = 30 + skills = /datum/skills/mech_pilot + + minimap_icon = "vc" + +/datum/equipment_preset/uscm/walker/load_gear(mob/living/carbon/human/new_human) + var/back_item = /obj/item/storage/backpack/marine/satchel + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) + back_item = /obj/item/storage/backpack/marine + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/tanker, WEAR_JACKET) + +/datum/equipment_preset/uscm/tank/load_status() + return diff --git a/fray-marines/modules/mob/living/carbon/xenomorph/Abilities.dm b/fray-marines/modules/mob/living/carbon/xenomorph/Abilities.dm new file mode 100644 index 000000000000..ed4d7f54c3ab --- /dev/null +++ b/fray-marines/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -0,0 +1,99 @@ +/datum/action/xeno_action/onclick/build_lessers_burrow + name = "Dig Lesser's burrow (200)" + action_icon_state = "build_tunnel" + plasma_cost = 200 + // macro_path = /datum/action/xeno_action/verb/verb_dig_tunnel + action_type = XENO_ACTION_ACTIVATE //doesn't really need a macro + +/datum/action/xeno_action/onclick/build_lessers_burrow/can_use_action() + if(!owner) + return FALSE + var/mob/living/carbon/xenomorph/X = owner + if(!istype(X)) + return FALSE + if(X.tunnel_delay) + return FALSE + return ..() + +/datum/action/xeno_action/onclick/build_lessers_burrow/use_ability(atom/A) + var/mob/living/carbon/xenomorph/X = owner + if(!X.check_state()) + return + + if(X.action_busy) + to_chat(X, SPAN_XENOWARNING("You should finish up what you're doing before digging.")) + return + + var/turf/T = X.loc + if(!istype(T)) //logic + to_chat(X, SPAN_XENOWARNING("You can't do that from there.")) + return + + if(SSticker?.mode?.hardcore) + to_chat(X, SPAN_XENOWARNING("A certain presence is preventing you from digging tunnels here.")) + return + + if(!T.can_dig_xeno_tunnel() || !is_ground_level(T.z)) + to_chat(X, SPAN_XENOWARNING("You scrape around, but you can't seem to dig through that kind of floor.")) + return + + if(locate(/obj/structure/tunnel) in X.loc || locate(/obj/structure/lessers_burrow) in X.loc) + to_chat(X, SPAN_XENOWARNING("There already is a tunnel here.")) + return + + if(X.tunnel_delay) + to_chat(X, SPAN_XENOWARNING("You are not ready to dig a tunnel again.")) + return + + if(X.get_active_hand()) + to_chat(X, SPAN_XENOWARNING("You need an empty claw for this!")) + return + + if(locate(/obj/structure/lessers_burrow) in range(16, X)) + to_chat(X, SPAN_XENOWARNING("There already is a tunnel in range.")) + return + + if(!X.check_plasma(plasma_cost)) + return + + var/area/AR = get_area(T) + + if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return + to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) + return + + X.visible_message(SPAN_XENONOTICE("[X] begins digging out a burrow."), \ + SPAN_XENONOTICE("You begin digging out a burrow."), null, 5) + if(!do_after(X, 100, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + to_chat(X, SPAN_WARNING("Your tunnel caves in as you stop digging it.")) + return + if(!X.check_plasma(plasma_cost)) + return + X.visible_message(SPAN_XENONOTICE("\The [X] digs out a burrow."), \ + SPAN_XENONOTICE("You dig out an entrance to the tunnel network."), null, 5) + + var/obj/structure/lessers_burrow/tunnelobj = new(T, X.hivenumber) + X.tunnel_delay = 1 + addtimer(CALLBACK(src, PROC_REF(cooldown_end)), 30 SECONDS) + log_admin("[key_name(X)] has dug out xenobots burrow.") + msg_admin_niche("[X]/([key_name(X)]) has dug out xenobots burrow.") + + if(X.hive.living_xeno_queen || X.hive.allow_no_queen_actions) + for(var/mob/living/carbon/xenomorph/target_for_message as anything in X.hive.totalXenos) + var/overwatch_target = XENO_OVERWATCH_TARGET_HREF + var/overwatch_src = XENO_OVERWATCH_SRC_HREF + to_chat(target_for_message, SPAN_XENOANNOUNCE("Hive: A new burrow has been created by [X] (watch) at [get_area_name(tunnelobj)].")) + + X.use_plasma(plasma_cost) + to_chat(X, SPAN_NOTICE("You will be ready to dig a new tunnel or burrow in 30 seconds.")) + playsound(X.loc, 'sound/weapons/pierce.ogg', 25, 1) + + return ..() + +/datum/action/xeno_action/onclick/build_lessers_burrow/proc/cooldown_end() + var/mob/living/carbon/xenomorph/X = owner + to_chat(X, SPAN_NOTICE("You are ready to dig a tunnel again.")) + X.tunnel_delay = 0 diff --git a/fray-marines/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/fray-marines/modules/mob/living/carbon/xenomorph/resin_constructions.dm new file mode 100644 index 000000000000..c707299d5651 --- /dev/null +++ b/fray-marines/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -0,0 +1,26 @@ +/datum/resin_construction/resin_obj/sunken_colony + name = "Sunken Colony" + desc = "Big and tanky living structure made to protect the hive. Fiercely territorial." + construction_name = "acid pillar" + cost = XENO_RESIN_ACID_GRENADE_COST + max_per_xeno = 2 + + build_overlay_icon = /obj/effect/warning/alien/weak + + build_path = /obj/structure/alien/sunken + build_time = 24 SECONDS + + range_between_constructions = 14 + +/datum/resin_construction/resin_obj/sunken_colony/can_build_here(turf/T, mob/living/carbon/xenomorph/X) + if (!..()) + return FALSE + + var/obj/effect/alien/weeds/alien_weeds = locate() in T + + if (alien_weeds.weed_strength < WEED_LEVEL_HIVE) + to_chat(X, SPAN_WARNING("You can only shape it on hive weeds. Find some resin before you start building!")) + return FALSE + + return TRUE + diff --git a/fray-marines/modules/mob/living/simple_animal/hostile/alien.dm b/fray-marines/modules/mob/living/simple_animal/hostile/alien.dm new file mode 100644 index 000000000000..5d4a1bc157fe --- /dev/null +++ b/fray-marines/modules/mob/living/simple_animal/hostile/alien.dm @@ -0,0 +1,209 @@ +/mob/living/simple_animal/hostile/alien/spawnable + var/icon_name = "Drone" + caste_name = null + desc = "Bork." + icon = 'fray-marines/icons/mob/xenos/lesser_xeno.dmi' + icon_gib = "gibbed-a" + layer = BIG_XENO_LAYER + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH + move_to_delay = XENO_AI_SPEED_TIER_2 + meat_type = null + health = XENO_HEALTH_LESSER_DRONE + harm_intent_damage = 5 + melee_damage_lower = XENO_AI_DAMAGE_TIER_1 + melee_damage_upper = XENO_AI_DAMAGE_TIER_1 + attacktext = "slashes" + a_intent = INTENT_HARM + unsuitable_atoms_damage = 15 + attack_same = TRUE + faction = FACTION_XENOMORPH + hivenumber = XENO_HIVE_NORMAL + wall_smash = 1 + minbodytemp = 0 + heat_damage_per_tick = 20 + stop_automated_movement_when_pulled = TRUE + break_stuff_probability = 90 + mob_size = MOB_SIZE_XENO_SMALL + + pixel_x = -8 + old_x = -8 + + var/special_attack_probability = XENO_AI_SPECIAL_ATTACK_PROBABILITY + +/mob/living/simple_animal/hostile/alien/spawnable/generate_name() + change_real_name(src, "\improper[caste_name] (WT-[rand(1, 999)])") + +/mob/living/simple_animal/hostile/alien/spawnable/handle_icon() + icon_state = "[icon_name] Running" + icon_living = "[icon_name] Running" + icon_dead = "[icon_name] Dead" + +/mob/living/simple_animal/hostile/alien/spawnable/update_transform() + if(lying != lying_prev) + lying_prev = lying + if(stat == DEAD) + icon_state = "[icon_name] Dead" + else if(lying) + if((resting || sleeping) && (!knocked_down && !knocked_out && health > 0)) + icon_state = "[icon_name] Sleeping" + else + icon_state = "[icon_name] Knocked Down" + else + icon_state = "[icon_name] Running" + update_wounds() + +/mob/living/simple_animal/hostile/alien/spawnable/FindTarget() + var/atom/T = null + stop_automated_movement = 0 + for(var/atom/A in ListTargets(10)) + + if(A == src) + continue + + var/atom/F = Found(A) + if(F) + T = F + break + + if(isliving(A)) + var/mob/living/L = evaluate_target(A) + if(L) + stance = HOSTILE_STANCE_ATTACK + var/atom/Tprev = T + T = L + + if (!ishuman(L)) + continue + if (get_dist(src, L) > get_dist(src, Tprev)) + T = Tprev + continue + + return T + +/mob/living/simple_animal/hostile/alien/spawnable/evaluate_target(mob/living/carbon/target) + . = ..() + + if (!.) + return + + if (evaluate_embryo_existance(target)) + return FALSE + + if (issynth(target)) + return FALSE + + if (target.pulledby && isxeno(target.pulledby)) + return FALSE + + if (target.alpha < 50) + return FALSE + + return target + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_embryo_existance(mob/living/carbon/target) + var/obj/item/alien_embryo/embryo = locate() in target + + if (embryo) + return TRUE + + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/AttackTarget() + + stop_automated_movement = 1 + if(!target_mob || SA_attackable(target_mob) || target_mob.pulledby && isxeno(target_mob.pulledby) || target_mob.alpha < 50) + LoseTarget() + return 0 + if(!(target_mob in ListTargets(10))) + LostTarget() + return 0 + if(get_dist(src, target_mob) <= 1) //Attacking + AttackingTarget() + return 1 + +/mob/living/simple_animal/hostile/alien/spawnable/AttackingTarget() + if(!Adjacent(target_mob)) + return + if(isliving(target_mob)) + var/mob/living/L = target_mob + if (evaluate_special_attack(L)) + return L + L.attack_animal(src) + src.animation_attack_on(L) + src.flick_attack_overlay(L, "slash") + playsound(src.loc, "alien_claw_flesh", 25, 1) + return L + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_special_attack(mob/living/L) + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/proc/evaluate_specific_behavior(mob/living/L) + return FALSE + +/mob/living/simple_animal/hostile/alien/spawnable/bullet_act(obj/item/projectile/P) + if(!P || !istype(P)) + return + + var/damage = P.calculate_damage() + var/damage_result = damage + + var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags + + if(ammo_flags & AMMO_FLAME) + health = 0 + emote("bursts into flames!") + return TRUE + + if(isxeno(P.firer)) + return -1 + + if(P.ammo.debilitate && stat != DEAD && ( damage || (ammo_flags & AMMO_IGNORE_RESIST) ) ) + apply_effects(arglist(P.ammo.debilitate)) + + . = TRUE + if(damage) + bullet_message(P) + apply_damage(damage, P.ammo.damage_type, P.def_zone, 0, 0, P) + handle_blood_splatter(get_dir(P.starting, loc)) + P.play_hit_effect(src) + + bullet_message(P) //Message us about the bullet, since damage was inflicted. + + SEND_SIGNAL(P, COMSIG_BULLET_ACT_XENO, src, damage, damage_result) + + return TRUE + +/mob/living/simple_animal/hostile/alien/spawnable/death(cause, gibbed, deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw. The caustic acid starts melting the body away...") + . = ..() + if(!.) + return //If they were already dead, it will return. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(xgibs), get_turf(src)), 3 SECONDS) + +/mob/living/simple_animal/hostile/alien/spawnable/spawn_gibs() + xgibs(get_turf(src)) + +/mob/living/simple_animal/hostile/alien/spawnable/gib_animation() + var/to_flick = "gibbed-a" + var/icon_path = icon + new /obj/effect/overlay/temp/gib_animation/xeno(loc, src, to_flick, icon_path) + +/mob/living/simple_animal/hostile/alien/spawnable/handle_blood_splatter(splatter_dir, duration) + new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration) + +/mob/living/simple_animal/hostile/alien/spawnable/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) + health = -1 + death() + visible_message("[src] bursts into flames!") + +/mob/living/simple_animal/hostile/alien/spawnable/handle_flamer_fire_crossed(obj/flamer_fire/fire) + health = -1 + death() + visible_message("[src] bursts into flames!") + +/mob/living/simple_animal/hostile/alien/spawnable/TryIgniteMob(fire_stacks, datum/reagent/R) + health = -1 + death() + visible_message("[src] bursts into flames!") diff --git a/fray-marines/modules/mob/living/simple_animal/hostile/alien/tearer.dm b/fray-marines/modules/mob/living/simple_animal/hostile/alien/tearer.dm new file mode 100644 index 000000000000..81c34a0fbf1c --- /dev/null +++ b/fray-marines/modules/mob/living/simple_animal/hostile/alien/tearer.dm @@ -0,0 +1,24 @@ +/mob/living/simple_animal/hostile/alien/spawnable/tearer + icon_name = "Ravager" + caste_name = "tearer" + name = "tearer" + icon = 'fray-marines/icons/mob/xenos/lesser_xeno_big.dmi' + desc = "Weakened version of a Ravager." + health = XENO_HEALTH_RUNNER + melee_damage_lower = XENO_AI_DAMAGE_TIER_2 + melee_damage_upper = XENO_AI_DAMAGE_TIER_3 + move_to_delay = XENO_AI_SPEED_TIER_1 + pixel_x = -12 + old_x = -12 + +/mob/living/simple_animal/hostile/alien/spawnable/tearer/evaluate_special_attack(mob/living/L) + var/probability = prob(special_attack_probability) + + if(probability) + visible_message(SPAN_DANGER("[src] goes savage!")) + for(var/mob/living/ajacent in range(1, L)) + if(ajacent == src) + continue + ajacent.attack_animal(src) + + return probability diff --git a/fray-marines/modules/mob/living/simple_animal/hostile/alien/trooper.dm b/fray-marines/modules/mob/living/simple_animal/hostile/alien/trooper.dm new file mode 100644 index 000000000000..f9bffcfc9631 --- /dev/null +++ b/fray-marines/modules/mob/living/simple_animal/hostile/alien/trooper.dm @@ -0,0 +1,6 @@ +/mob/living/simple_animal/hostile/alien/spawnable/trooper + icon_name = "Hunter" + caste_name = "trooper" + name = "trooper" + desc = "Weak and pathetic excuse of an alpha predator. If alone." + melee_damage_upper = XENO_AI_DAMAGE_TIER_2 diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index e8c44d82dbde..835f1fd9e4b5 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -345,6 +345,8 @@ - rscadd: Added a new lockdown system to research. - rscadd: Added an admin button to interact with above. 2023-08-26: + AnuvKH: + - maptweak: Fixed deep ocean around NV monsoon, removed incend ammo. CapCamIII: - rscadd: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in following lines. @@ -397,13 +399,56 @@ - balance: Masterkey and underbarrel extinguisher now must be wielded in order to be used. - bugfix: Underbarrel extinguisher no longer bypass wielding restrictions on flamers. + - bugfix: Glasses with flash protection can no longer be used for welding. + - refactor: Adds defines for negative welding protection. + Fray2: + - rscadd: Added something Morrow: - balance: You now lose nutrition when gaining blood rather than losing a ton of nutrition when you have low effective blood + - bugfix: fixed a bypass to allow ghost scan health when it should not be allowed Morrow, Frans_Feiffer (beautiful sprites): - rscadd: Added in built HUDs to various helmets - rscadd: Sensormates used by squads without medical skills have been converted to buyable helmet optics + XDinka: + - rscadd: "\u0414\u0435\u043A\u043E\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0439\ + \ \u0438 \u043D\u0435 \u043E\u0447\u0435\u043D\u044C\n\u0445\u043B\u0430\u043C\ + \ \u0432 \u043F\u0440\u0435\u043F\u0430\u0440\u0430\u0446\u0438\u0438." + - bugfix: "\u0423\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0430 \u043F\u0440\u043E\ + \u0431\u043B\u0435\u043C\u0430 \u0441 \u0434\u043E\u0441\u0442\u0443\u043F\u0430\ + \u043C\u0438, \u043B\u0430\u043C\u043F\u044B \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0441\u0442\u043E\u044F\u0442 \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\ + \u043E, \u0430 \u043D\u0435 \u043D\u0430 \u0432\u0435\u043D\u0434\u043E\u0440\ + \u0430\u0445, \u0434\u0435\u043A\u0430\u043B\u0438 \u0431\u043E\u043B\u044C\u0448\ + \u0435 \u043D\u0435 \u0442\u043E\u0440\u0447\u0430\u0442 \u0438\u0437 \u043C\ + \u043E\u043D\u0438\u0442\u043E\u0440\u043E\u0432. \u041D\u0435\u0441\u043A\u043E\ + \u043B\u044C\u043A\u043E \u043D\u0435\u0437\u043D\u0430\u0447\u0438\u0442\u0435\ + \u043B\u044C\u043D\u044B\u0445 \u0431\u0430\u0433\u0444\u0438\u043A\u0441\u043E\ + \u0432." + - mapadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043E\u0444\u0438\u0441\ + \ AO, \u041C\u0435\u0445-\u043E\u0442\u0441\u0435\u043A, \u0442\u0435\u043F\u0435\ + \u0440\u044C \u0430\u043B\u044C\u0444\u0430 \u0438 \u0434\u0435\u043B\u044C\u0442\ + \u0430 \u043F\u0440\u0435\u043F\u044B \u0441\u043F\u0430\u0440\u0435\u043D\u044B\ + , \u043C\u0435\u0436\u0434\u0443 \u043D\u0438\u043C\u0438 \u043D\u0430\u043B\ + \u0430\u0436\u0435\u043D\u044B \u043F\u0443\u0442\u0438 \u0434\u0432\u0438\u0436\ + \u0435\u043D\u0438\u044F, \u0447\u0442\u043E \u0443\u0441\u043A\u043E\u0440\u0438\ + \u0442 \u043E\u0431\u0449\u0438\u0439 \u0441\u0431\u043E\u0440 \u043C\u043E\u0440\ + \u043F\u0435\u0445\u043E\u0432, \u0437\u0430\u0440\u0435\u0437\u0435\u0440\u0432\ + \u0438\u0440\u043E\u0432\u0430\u043D\u044B \u0441\u0442\u0430\u0440\u044B\u0435\ + \ \u043F\u0440\u0435\u043F\u044B \u043F\u043E\u0434 \u0431\u0443\u0434\u0443\ + \u0449\u0438\u0435 \u043D\u0430\u0440\u0430\u0431\u043E\u0442\u043A\u0438, \u043F\ + \u0430\u0440\u0430 \u043F\u0440\u0438\u044F\u0442\u043D\u044B\u0445 \u0431\u043E\ + \u043D\u0443\u0441\u043E\u0432 \u043E\u0436\u0438\u0434\u0430\u0435\u0442 \u0441\ + \u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043C\u0435\ + \u0434\u0438\u043A\u043E\u0432 \u0438 \u0438\u043D\u0436\u0435\u043D\u0435\u0440\ + \u043E\u0432 \u0432 \u043D\u043E\u0432\u044B\u0445 \u043F\u0440\u0435\u043F\u0430\ + \u0445 (\u0414\u043E\u0441\u0442\u0443\u043F\u044B \u043A \u043C\u0435\u0434\ + \u0432\u0435\u043D\u0434\u0443\u0440\u0430\u043C \u043F\u043E\u0444\u0438\u043A\ + \u0448\u0435\u043D\u044B)." + cuberound: + - rscadd: UPP SL gets proper bag with mini fire extinguisher three WP grenades , + two snacks and an AP mag realforest2001: - code_imp: Changed backend for the message of walking into an invisible wall to reduce duplication. diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index e164bd50d41a..4f72e5779b83 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -52,8 +52,30 @@ Ben10083: - admin: New toggleable flag added to bypass restrictions for Working Joe spawns as observer (excluding whitelist requirement) + Fray2: + - rscadd: Added something + - rscdel: Removed old things + - qol: made something easier to use + - balance: rebalanced something + - bugfix: fixed a few things + - spellcheck: fixed a few typos + - ui: changed something relating to user interfaces + - code_imp: changed some code + - refactor: refactored some code + - soundadd: added a new sound thingy + - sounddel: removed an old sound thingy + - imageadd: added some icons and images + - imagedel: deleted some icons and images + - mapadd: added a new map or section to a map + - maptweak: tweaked a map + - config: changed some config setting + - admin: messed with admin stuff + - server: something server ops should know Morrow: - bugfix: Fixed perma helmet HUDs + RenaRenaRe: + - bugfix: Hugger and Lesser Drone ghosts now actually bypass time of death checks + for the larva queue. Steelpoint: - rscadd: Synthetic vendors now have the option to vend several helmets and a riot visor. Including a standard M10 helmet defaulted to non-camo grey. @@ -63,19 +85,177 @@ - bugfix: Working Joes no longer get cryo self defense kits - bugfix: Cryo self defense kits now have the correct amount of slots 2023-09-06: - Birdtalon: - - bugfix: fixed eggsac carrier strain not updating hugger sprites. - Drathek: - - bugfix: Fixed xeno grab intent + Fray2: + - rscadd: Added something + - rscdel: Removed old things + - qol: made something easier to use + - balance: rebalanced something + - bugfix: fixed a few things + - spellcheck: fixed a few typos + - ui: changed something relating to user interfaces + - code_imp: changed some code + - refactor: refactored some code + - soundadd: added a new sound thingy + - sounddel: removed an old sound thingy + - imageadd: added some icons and images + - imagedel: deleted some icons and images + - mapadd: added a new map or section to a map + - maptweak: tweaked a map + - config: changed some config setting + - admin: messed with admin stuff + - server: something server ops should know Morrow: - - rscadd: Added a ghost notification for Acid Runner For the Hive! ability. - RenaRenaRe: - - bugfix: Hugger and Lesser Drone ghosts now actually bypass time of death checks - for the larva queue. + - bugfix: Fixed a null reference when firing full auto and dropping your weapon + Steelpoint: + - bugfix: ERT UPP Soldiers will now correctly spawn with firearms. + Wyderar: + - imageadd: Icon placeholder for mecha gun + - maptweak: Deleted tags + harryob: + - rscadd: guns that have full auto now start on full auto by default + poleno1232: + - balance: "\u0421\u0430\u043D\u043A\u0435\u043D \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0431\u044C\u0451\u0442 \u043D\u0430 \u0440\u0430\u0441\u0441\u0442\u043E\ + \u044F\u043D\u0438\u0435 10 \u0442\u0430\u0439\u043B\u043E\u0432, \u043C\u0438\ + \u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\ + \u0442\u043E\u044F\u043D\u0438\u0435 - 3 \u0442\u0430\u0439\u043B\u0430" + - balance: "\u041C\u043E\u0436\u043D\u043E \u0431\u0435\u0437 \u0441\u0442\u0440\ + \u0430\u0445\u0430 \u043F\u043E\u0434\u0445\u043E\u0434\u0438\u0442\u044C \u043A\ + \ \u0441\u0430\u043D\u043A\u0435\u043D\u0430\u043C \u043D\u0430 \u0440\u0430\ + \u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u0432 3 \u0442\u0430\u0439\ + \u043B\u0430" + - balance: "\u0422\u0435\u043F\u0435\u0440\u044C \u043E\u0434\u0438\u043D \u0445\ + \u0430\u0439\u0432\u043B\u043E\u0440\u0434 \u043C\u043E\u0436\u0435\u0442 \u043F\ + \u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043C\u0430\u043A\u0441\u0438\ + \u043C\u0443\u043C 5 \u0441\u0430\u043D\u043A\u0435\u043D\u043E\u0432" 2023-09-07: Morrow: - bugfix: Fixed a null reference when firing full auto and dropping your weapon Steelpoint: - bugfix: ERT UPP Soldiers will now correctly spawn with firearms. + Wyderar: + - balance: Changed timelocks + carrotman2013: + - admin: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u043D\u0435\u043A\u043E\u0442\ + \u043E\u0440\u044B\u0445 \u0430\u0434\u043C\u0438\u043D \u0444\u0443\u043D\u043A\ + \u0446\u0438\u0439." + - qol: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434\u044B \u0442\u0435\u043A\u0441\ + \u0442\u0430" + - rscadd: "\u041C\u043E\u0436\u043D\u043E \u043F\u0440\u043E\u0434\u0430\u0432\u0430\ + \u0442\u044C \u043C\u0435\u0440\u0442\u0432\u044B\u0445 \u043A\u0441\u0435\u043D\ + \u043E\u043C\u043E\u0440\u0444\u043E\u0432 \u0432 \u043A\u0430\u0440\u0433\u043E\ + \ (\u043F\u0440\u0438 \u0443\u0441\u043B\u043E\u0432\u0438\u0438 \u0447\u0442\ + \u043E \u0432\u043A\u043B\u044E\u0447\u0435\u043D \u0440\u0435\u0436\u0438\u043C\ + \ \u0447\u0435\u0440\u043D\u043E\u0433\u043E \u0440\u044B\u043D\u043A\u0430\ + )." + - rscadd: "\u0427\u0430\u0441\u0442\u0438\u0447\u043D\u044B\u0439 \u043F\u0435\u0440\ + \u0435\u0432\u043E\u0434 \u0447\u0430\u0442\u0430 \u043D\u0430 \u0440\u0443\u0441\ + \u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A." + - rscadd: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0430\u0442\u0438\ + \u0441\u0442\u0438\u043A\u0438 \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\u0438\ + \u0439 \u044F\u0437\u044B\u043A." + - rscadd: "\u0414\u043B\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\ + \u0430\u043D\u0438\u044F \u0440\u0430\u0434\u0438\u043E\u043A\u0430\u043D\u0430\ + \u043B\u043E\u0432 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\ + \u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\ + \ \u0440\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0435\ + \ \u0430\u043D\u0430\u043B\u043E\u0433\u0438 \u043A\u043B\u0430\u0432\u0438\u0448\ + ." harryob: - rscadd: guns that have full auto now start on full auto by default + poleno1232: + - balance: Weaken Sunken Colony + xDanilcusx: + - bugfix: "\u0428\u0430\u043D\u0441 \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\ + \u0438\u044F \u044D\u0444\u0444\u0435\u043A\u0442\u0430 \u043C\u043E\u043B\u043E\ + \u0442\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\ + \u0430\u0435\u0442." + - rscadd: "\u041D\u0430 \u043C\u0435\u0441\u0442\u043E \u0431\u0430\u043D\u0430\u043B\ + \u044C\u043D\u043E\u043C\u0443 70% \u0448\u0430\u043D\u0441\u0443 \u0443\u043B\ + \u043E\u0436\u0438\u0442\u044C \u043A\u0441\u0435\u043D\u043E\u0441\u0430 1-2\ + \ \u0442\u0438\u0440\u0430 \u043C\u043E\u0440\u0434\u043E\u0439 \u0432 \u043F\ + \u043E\u043B - \u043F\u0440\u0438\u0448\u043B\u0438 \u0441\u0442\u0430\u043A\ + \u0438 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044F, \u043F\u043E\u0440\u0442\ + \u044F\u0449\u0438\u0435 \u043A\u0441\u0435\u043D\u043E\u043C\u043E\u0440\u0444\ + \u0443 \u0436\u0438\u0437\u043D\u044C. (\u041F\u043E\u0434\u0440\u043E\u0431\ + \u043D\u0435\u0435 - \u0442\u0443\u0442 https://github.com/Fray2/RU-CMSS13/pull/41)" + - balance: "\u0423\u0440\u043E\u043D \u043C\u043E\u043B\u043E\u0442\u0430 **N45**\ + \ \u043F\u043E \u043A\u0441\u0435\u043D\u043E\u043C\u043E\u0440\u0444\u0430\u043C\ + \ \u0431\u044B\u043B \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0441\ + \ **~85** \u0435\u0434\u0438\u043D\u0438\u0446 \u0434\u043E **~75** \u0432 \u0434\ + \u0432\u0443\u0440\u0443\u0447\u043D\u043E\u043C \u0441\u043E\u0441\u0442\u043E\ + \u044F\u043D\u0438\u0438." + - balance: "\u0414\u0430\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u0438 \u0443\ + \u0440\u043E\u043D \u043E\u0442 \u0431\u0440\u043E\u0441\u043A\u0430 **N45**\ + \ \u0431\u044B\u043B\u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430\ + \ \u0438 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0430 \u0441\u043E\ + \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043D\u043D\u043E." + - balance: "\u041F\u0435\u043D\u0430\u043B\u044C\u0442\u0438 \u043D\u0430 \u0441\ + \u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0434\u0432\u0438\u0436\u0435\u043D\ + \u0438\u044F \u0441 \u043C\u043E\u043B\u043E\u0442\u043E\u043C \u0421\u0422\ + \ \u0431\u044B\u043B\u043E \u0441\u043D\u0438\u0436\u0435\u043D\u043E." + - balance: "\u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u043C\u0435\u0436\u0434\ + \u0443 \u0443\u0434\u0430\u0440\u0430\u043C\u0438 \u043C\u043E\u043B\u043E\u0442\ + \u0430 \u0448\u0442\u0443\u0440\u043C\u043E\u0432\u0438\u043A\u0430 \u0431\u044B\ + \u043B\u0430 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0430." + - balance: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u0445\u043E\u0434\u044F\ + \u0449\u0438\u0439\u0441\u044F \u0432 \u0440\u0443\u043A\u0430\u0445 \u0449\u0438\ + \u0442 \u0437\u0430\u0449\u0438\u0449\u0430\u0435\u0442 \u043E\u0442 \u0443\u0434\ + \u0430\u0440\u043E\u0432 / \u043F\u0443\u043D\u0441\u043E\u0432 / \u0432\u044B\ + \u0441\u0442\u0440\u0435\u043B\u043E\u0432 \u043B\u0438\u0448\u044C \u0441 \u0444\ + \u0440\u043E\u043D\u0442\u0430." + - balance: "\u0428\u0430\u043D\u0441 N30 \u043E\u0442\u0440\u0430\u0437\u0438\u0442\ + \u044C \u0430\u0442\u0430\u043A\u0443 \u0431\u044B\u043B \u0443\u0432\u0435\u043B\ + \u0438\u0447\u0435\u043D \u0441 65% \u0434\u043E 70%." + - rscadd: "\u0412\u0438\u0441\u044F\u0449\u0438\u0439 \u043D\u0430 \u0441\u043F\u0438\ + \u043D\u0435 \u0449\u0438\u0442 \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\ + \u0432\u043B\u044F\u0435\u0442 \u0437\u0430\u0449\u0438\u0442\u0443 \u043E\u0442\ + \ \u043D\u0430\u043F\u0430\u0434\u0435\u043D\u0438\u044F \u0441\u0437\u0430\u0434\ + \u0438, \u043D\u043E \u0438\u0437\u0431\u0435\u0436\u0430\u0442\u044C \u044D\ + \u0444\u0444\u0435\u043A\u0442\u043E\u0432 \u043F\u0430\u0443\u043D\u0441\u0430\ + \ \u0431\u043E\u043B\u0435\u0435 \u043D\u0435 \u043F\u043E\u0437\u0432\u043E\ + \u043B\u044F\u0435\u0442." + - rscadd: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432\u0441\u0442\u0440\ + \u043E\u0435\u043D\u043D\u044B\u0439 \u0432 \u0431\u0440\u043E\u043D\u044E \u0421\ + \u0422 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0441\u0442\u0430 \u043C\ + \u0430\u0433\u043D\u0438\u0442 \u0441 \u043A\u0440\u0435\u043F\u0435\u0436\u043E\ + \u043C \u0434\u043B\u044F \u0449\u0438\u0442\u0430 \u0438 \u043A\u0443\u0432\ + \u0430\u043B\u0434\u044B." + - qol: "\u0423\u0434\u0430\u0440 \u043F\u043E \u0441\u0432\u043E\u0435\u043C\u0443\ + \ \u0449\u0438\u0442\u0443 \u0441 \u0445\u0430\u0440\u0430\u043A\u0442\u0435\ + \u0440\u043D\u044B\u043C \u0437\u0432\u0443\u043A\u043E\u043C \u0442\u0435\u043F\ + \u0435\u0440\u044C \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\ + \u0441\u043F\u043E\u043B\u043D\u0435\u043D \u043B\u044E\u0431\u044B\u043C \u0442\ + \u0438\u043F\u043E\u043C \u043E\u0440\u0443\u0436\u0438\u044F." + - rscdel: "\u0429\u0438\u0442 \u0431\u043E\u043B\u0435\u0435 \u043D\u0435 \u0438\ + \u043C\u0435\u0435\u0442 \u0448\u0430\u043D\u0441\u0430 \u043A\u043D\u043E\u043A\ + \u043D\u0443\u0442\u044C \u04221 \u043A\u0441\u0435\u043D\u043E\u043C\u043E\u0440\ + \u0444\u0430 \u0441 \u0443\u0434\u0430\u0440\u0430." + - balance: "\u041F\u0430\u0440\u0430 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\u043E\ + \u0432 \u0438 \u043F\u043E\u044F\u0441 \u0434\u043B\u044F \u043F\u0438\u0441\ + \u0442\u043E\u043B\u0435\u0442\u0430 \u0432\u0437\u0430\u043C\u0435\u043D \u043D\ + \u0430 \u043F\u0440\u0438\u043A\u043B\u0430\u0434 \u0438 \u043D\u0430\u043F\u043B\ + \u0435\u0447\u043D\u044B\u0439 \u0445\u043E\u043B\u0441\u0442\u0435\u0440" +2023-09-08: + Carrotman2013: + - spellcheck: "\u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0430\u0442\ + \u0438\u0441\u0442\u0438\u043A\u0438 \u0443\u043B\u0443\u0447\u0448\u0435\u043D" + - rscadd: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0415\u0420\u0422 \u0438\ + \ \u044D\u0432\u0430\u043A\u0430" + Morrow: + - rscadd: Added the ability to early launch lifeboats + - rscadd: Added the ability for lifeboats to crash if early launched + - rscdel: Removed alcohol from emergency wall cabinets + - bugfix: Should stop crashing shuttles from landing on each other + Zonepace, Thwomper: + - rscadd: Added the M707 "Vulture" anti-materiel rifle. Not currently player-obtainable. + Credit to Tophat and Kaga for the lore description. + xDanilcusx: + - balance: "\u041F\u0430\u0440\u0430 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\u043E\ + \u0432 \u0438 \u043F\u043E\u044F\u0441 \u0434\u043B\u044F \u043F\u0438\u0441\ + \u0442\u043E\u043B\u0435\u0442\u0430 \u0432\u0437\u0430\u043C\u0435\u043D \u043D\ + \u0430 \u043F\u0440\u0438\u043A\u043B\u0430\u0434 \u0438 \u043D\u0430\u043F\u043B\ + \u0435\u0447\u043D\u044B\u0439 \u0445\u043E\u043B\u0441\u0442\u0435\u0440" + - bugfix: "\u0421\u0432\u0435\u0442 \u0442\u0430\u043D\u043A\u0430 \u043F\u0440\u0438\ + \ \u043F\u043E\u0447\u0438\u043D\u043A\u0435 \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0447\u0438\u043D\u0438\u0442\u0441\u044F." diff --git a/icons/mob/hud/actions.dmi b/icons/mob/hud/actions.dmi index 9f885c44f50f..9021db895eb7 100644 Binary files a/icons/mob/hud/actions.dmi and b/icons/mob/hud/actions.dmi differ diff --git a/icons/mob/hud/screen1.dmi b/icons/mob/hud/screen1.dmi index fd4cf8188579..c79f6321a083 100644 Binary files a/icons/mob/hud/screen1.dmi and b/icons/mob/hud/screen1.dmi differ diff --git a/icons/mob/hud/screen1_full.dmi b/icons/mob/hud/screen1_full.dmi index 10eabc7a1659..c61aeaad55ee 100644 Binary files a/icons/mob/hud/screen1_full.dmi and b/icons/mob/hud/screen1_full.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index e4f228109127..1b31294f9f9c 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 7f78ce119341..5aa1b82b98c8 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 75c578316c83..0746bb84654c 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 4f98571ff715..a1d44f918816 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 19f2a2f6f68b..ac66151a5ab7 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 7f798c2cd0bc..74839bd4e8d2 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 232e74695a1b..4f8d26e5d1b7 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/devices.dmi b/icons/obj/items/devices.dmi index de9e6fb01145..df3a53339dc4 100644 Binary files a/icons/obj/items/devices.dmi and b/icons/obj/items/devices.dmi differ diff --git a/icons/obj/items/pamphlets.dmi b/icons/obj/items/pamphlets.dmi index 021adfcdee52..b178b6389802 100644 Binary files a/icons/obj/items/pamphlets.dmi and b/icons/obj/items/pamphlets.dmi differ diff --git a/icons/obj/items/storage.dmi b/icons/obj/items/storage.dmi index 310bee26b9e9..e44491b62691 100644 Binary files a/icons/obj/items/storage.dmi and b/icons/obj/items/storage.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi index 3d2f1377db6f..51bc441aefaa 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index aaa591f64a88..1ffb40420286 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi index 315005696ba8..68cb2648ebd1 100644 Binary files a/icons/obj/items/weapons/guns/attachments/rail.dmi and b/icons/obj/items/weapons/guns/attachments/rail.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index 330102213689..a15409b808ca 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 1a55ea7e215f..5a9be7542348 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index 8576612c13b2..49e06f5ee547 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi index 9ca0704b6f46..63b197dd36c4 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi index d89a862cb7c3..22eae6bd0ba4 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi index 3f1b8385390e..b9aa8907a806 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi index b5aaba3e9431..dd432a1fa2c1 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi index b06e4bcd63e9..63771f7ff133 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi index b498fba1e8c1..6530e1d6967d 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi index f9e1d720098c..cae152f237ef 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi index 4fe8f9cd3939..9df4a0d86ccc 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi index 7d4f0a5db658..04718caddcd1 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi index 486d5a3d73b0..717a1182824e 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi index 479b0b9d39f2..9ce7e553ba45 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi index c30fb58093bb..9f69b4ac6815 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi index a9a1f0c3b1b7..b72963ff7917 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi index ee677a66bc20..2c8dedb6cf35 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi index 801a03dbcfcd..fbc98874a4f6 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi index 0af69fa8a9d6..6e7b9cb8c9b5 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi index 0a9f43029891..e849b8134004 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi index 2eece9a9ffc4..c844b637ab7e 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi index 2899c72fa9a8..09029fb61f2b 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi index 1950b50114db..78bebfdd4bd9 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/handful.dmi b/icons/obj/items/weapons/guns/handful.dmi index 7d717db608c4..bbea110531ea 100644 Binary files a/icons/obj/items/weapons/guns/handful.dmi and b/icons/obj/items/weapons/guns/handful.dmi differ diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi index 41a1f9981976..5073f8260d3c 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/crates.dmi b/icons/obj/structures/crates.dmi index 5fab82b5185d..a1a494d90da2 100644 Binary files a/icons/obj/structures/crates.dmi and b/icons/obj/structures/crates.dmi differ diff --git a/icons/obj/structures/structures.dmi b/icons/obj/structures/structures.dmi index ef63dee56e13..d96329839a7b 100644 Binary files a/icons/obj/structures/structures.dmi and b/icons/obj/structures/structures.dmi differ diff --git a/icons/turf/floors/prison.dmi b/icons/turf/floors/prison.dmi index 8830ab801823..375666c3ed3f 100644 Binary files a/icons/turf/floors/prison.dmi and b/icons/turf/floors/prison.dmi differ diff --git a/map_config/maps.txt b/map_config/maps.txt index 885b1e76faad..e5ef7ad8206f 100644 --- a/map_config/maps.txt +++ b/map_config/maps.txt @@ -20,7 +20,6 @@ map bigredv2 endmap map prison_station_fop - disabled endmap map fiorina_sciannex @@ -44,6 +43,7 @@ map ice_colony_v2 endmap map shivas_snowball + disabled endmap map kutjevo diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index b94651988cb0..9d8033ae0ae8 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -9,15 +9,23 @@ /area/fiorina/oob) "aac" = ( /obj/structure/machinery/power/apc, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "aad" = ( /obj/structure/machinery/power/apc, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "aae" = ( /obj/structure/machinery/power/apc, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "aaf" = ( /obj/structure/bed/roller, @@ -30,34 +38,39 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "aag" = ( /obj/item/trash/eat, -/turf/open/floor/prison/floor_plate, +/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/yellowcorner{ - dir = 8 +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "aaj" = ( /obj/structure/machinery/power/apc{ dir = 1 }, -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) "aak" = ( @@ -70,26 +83,32 @@ /obj/structure/machinery/power/apc{ dir = 4 }, -/turf/open/floor/prison/green{ - dir = 1 +/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/yellow{ - 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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "aap" = ( -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "aaq" = ( /obj/structure/machinery/power/apc{ @@ -117,29 +136,37 @@ "aat" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/baton, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "aau" = ( /obj/structure/inflatable, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "aav" = ( /obj/structure/closet/secure_closet/security_empty, /obj/item/weapon/baton, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aaK" = ( -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "aaW" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "abe" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "abJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -149,7 +176,10 @@ /area/fiorina/station/lowsec) "adk" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "adl" = ( /obj/structure/machinery/computer/secure_data, @@ -157,18 +187,22 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "adH" = ( /obj/structure/closet/secure_closet/medical3, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "adY" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "aem" = ( @@ -178,7 +212,9 @@ pixel_y = 9 }, /obj/item/storage/box/donkpockets, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "afk" = ( /turf/open/floor{ @@ -244,16 +280,24 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "ahn" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, -/turf/open/floor/prison/blue{ - dir = 8 +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "ahR" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/platform{ dir = 8 }, @@ -267,32 +311,39 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "aiK" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "aiV" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "aja" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "ajh" = ( /obj/item/device/flashlight/on, -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "ajp" = ( /obj/structure/barricade/wooden{ @@ -300,11 +351,15 @@ pixel_y = 4 }, /obj/structure/barricade/wooden, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "ajr" = ( -/turf/open/floor/prison/redangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "redcorner" }, /area/fiorina/station/security) "aju" = ( @@ -319,6 +374,16 @@ /obj/structure/platform/kutjevo/smooth, /turf/open/space/basic, /area/fiorina/oob) +"ajD" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "ajH" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/electrical{ @@ -328,14 +393,21 @@ pixel_y = 6 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "ajK" = ( -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "ajN" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ajX" = ( /obj/structure/mirror{ @@ -346,35 +418,47 @@ pixel_x = -12; pixel_y = 2 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "akc" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "akw" = ( -/turf/open/floor/prison/greencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, /area/fiorina/station/transit_hub) "akE" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "alr" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/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" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/oob) "alJ" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "alX" = ( /obj/item/paper/crumpled/bloody, @@ -396,18 +480,23 @@ /area/fiorina/tumor/civres) "ami" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "amj" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "amx" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "amF" = ( @@ -474,21 +563,28 @@ /area/fiorina/station/security/wardens) "aoa" = ( /obj/structure/largecrate/random/mini/med, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "aoH" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "apw" = ( /turf/open/auto_turf/sand/layer1, @@ -497,20 +593,26 @@ /obj/structure/bed/sofa/vert/grey/bot{ pixel_y = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "aqI" = ( -/turf/open/floor/prison/red, +/turf/open/floor/prison{ + icon_state = "red" + }, /area/fiorina/station/security) "aqJ" = ( -/obj/structure/monorail/launchtrack{ - dir = 6 +/obj/structure/monorail{ + dir = 6; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "aqS" = ( /obj/item/explosive/grenade/high_explosive/frag, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "aqW" = ( /obj/structure/platform{ @@ -522,7 +624,9 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "arl" = ( /obj/effect/landmark/objective_landmark/close, @@ -532,7 +636,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "arn" = ( /obj/effect/landmark/nightmare{ @@ -548,19 +652,24 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "aru" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "arS" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "ask" = ( /obj/structure/machinery/light/double/blue{ @@ -599,7 +708,10 @@ /area/fiorina/lz/near_lzI) "atm" = ( /obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "atp" = ( /obj/item/book/manual/security_space_law{ @@ -613,11 +725,12 @@ health = 250; icon_state = "metal_1" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "atE" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "auH" = ( @@ -628,7 +741,9 @@ /obj/item/bodybag{ pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "auQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -651,24 +766,33 @@ pixel_y = 5 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "avl" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "avs" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "avI" = ( /obj/structure/closet/bodybag, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "avX" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "avY" = ( @@ -681,33 +805,40 @@ }, /obj/item/storage/toolbox, /obj/item/storage/toolbox, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "awo" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/reagent_container/food/snacks/wrapped/barcardine, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "awx" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "awF" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "axb" = ( /obj/item/clothing/suit/storage/marine/specialist, /turf/open/floor/plating/prison, /area/fiorina/oob) "axi" = ( -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/chapel) "axA" = ( @@ -722,21 +853,28 @@ /area/fiorina/station/security) "ayv" = ( /obj/item/trash/pistachios, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "ayA" = ( /obj/structure/platform, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "ayK" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant/pottedplant_27{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; layer = 3.1; pixel_x = -2; pixel_y = 10 }, -/turf/open/floor/prison/redangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "redcorner" }, /area/fiorina/station/power_ring) "ayM" = ( @@ -747,7 +885,10 @@ /obj/item/ammo_magazine/pistol/heavy{ pixel_y = 12 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -758,7 +899,9 @@ /area/fiorina/maintenance) "azg" = ( /obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "azs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -783,19 +926,24 @@ pixel_x = 7; pixel_y = 6 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "azJ" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "azN" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) @@ -805,8 +953,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "azZ" = ( @@ -822,14 +971,18 @@ /area/fiorina/tumor/ship) "aAH" = ( /obj/item/device/multitool, -/turf/open/floor/prison/floor_plate, +/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 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "aBb" = ( /obj/structure/barricade/wooden{ @@ -846,11 +999,13 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "aBm" = ( /obj/item/trash/uscm_mre, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "aBs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -876,13 +1031,16 @@ /area/fiorina/station/park) "aBO" = ( /obj/item/ammo_magazine/rifle/m16, -/turf/open/floor/prison/floor, +/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/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "aCi" = ( /obj/structure/prop/invuln{ @@ -893,12 +1051,15 @@ name = "cell door" }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "aCn" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "aCC" = ( @@ -917,11 +1078,15 @@ pixel_x = 12; pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "aCT" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aCV" = ( /obj/item/explosive/grenade/high_explosive/m15{ @@ -932,14 +1097,19 @@ pixel_x = 6; pixel_y = 3 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "aDh" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/oob) "aDi" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "aDl" = ( /obj/structure/machinery/vending/cola, @@ -947,8 +1117,9 @@ dir = 1; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "aDr" = ( @@ -957,7 +1128,7 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "aDs" = ( /obj/structure/surface/table/reinforced/prison, @@ -966,14 +1137,18 @@ pixel_x = -10; pixel_y = 8 }, -/turf/open/floor/prison/darkpurple2full, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "aDC" = ( /obj/structure/surface/table/reinforced/prison, @@ -989,7 +1164,9 @@ pixel_x = 3; pixel_y = 5 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aEi" = ( /obj/structure/machinery/door/poddoor/shutters/almayer, @@ -997,7 +1174,9 @@ /area/fiorina/tumor/civres) "aFg" = ( /obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "aFh" = ( /obj/structure/toilet{ @@ -1005,13 +1184,14 @@ pixel_y = 8 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "aFn" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "aFp" = ( /obj/structure/machinery/defenses/tesla_coil{ @@ -1021,7 +1201,9 @@ /area/fiorina/tumor/ship) "aFJ" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "aFK" = ( /obj/structure/machinery/light/double/blue{ @@ -1035,12 +1217,16 @@ /area/fiorina/station/telecomm/lz1_cargo) "aFO" = ( /obj/structure/largecrate/supply/floodlights, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "aFV" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "aFZ" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -1050,7 +1236,9 @@ opacity = 1 }, /obj/structure/machinery/door/poddoor/shutters/almayer, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "aGS" = ( /obj/structure/lattice, @@ -1061,7 +1249,7 @@ /area/fiorina/oob) "aGV" = ( /obj/structure/largecrate/random/barrel/red, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "aHg" = ( /obj/structure/prop/resin_prop, @@ -1073,16 +1261,21 @@ /area/fiorina/lz/near_lzI) "aHs" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkred2full, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "aHA" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) @@ -1096,11 +1289,14 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aIf" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, @@ -1110,11 +1306,16 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "aIp" = ( /obj/structure/closet/secure_closet/personal, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/telecomm/lz1_cargo) "aIv" = ( /obj/structure/bed{ @@ -1123,7 +1324,10 @@ /obj/item/storage/box/holobadge{ pixel_y = 3 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "aIE" = ( /obj/structure/surface/table/reinforced/prison, @@ -1139,30 +1343,43 @@ pixel_x = -1; pixel_y = 6 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "aIK" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/weeds, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "aIR" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "aIZ" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "aJf" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/emergency, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "aJg" = ( -/turf/open/floor/prison/platingdmg3, +/turf/open/floor/prison{ + icon_state = "platingdmg3" + }, /area/fiorina/maintenance) "aJK" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -1170,16 +1387,11 @@ /obj/item/reagent_container/food/snacks/meat/human, /obj/structure/machinery/light/double/blue, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/kitchen, -/area/fiorina/station/civres_blue) -"aJR" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" }, -/area/fiorina/station/disco) +/area/fiorina/station/civres_blue) "aJX" = ( /obj/structure/bed/chair{ dir = 8 @@ -1194,8 +1406,9 @@ "aKc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/sake, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "aKA" = ( @@ -1210,16 +1423,22 @@ pixel_y = 15 }, /obj/item/trash/syndi_cakes, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "aKW" = ( -/turf/open/floor/prison/floor_plate, +/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/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "aLp" = ( /obj/structure/prop/invuln{ @@ -1232,7 +1451,7 @@ /area/fiorina/station/medbay) "aLR" = ( /obj/item/stack/medical/bruise_pack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "aLT" = ( /obj/item/trash/uscm_mre, @@ -1242,8 +1461,9 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/ice_lab) "aMq" = ( -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/civres_blue) "aMz" = ( @@ -1252,7 +1472,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "aMM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -1265,13 +1487,15 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/darkbrown2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "aNn" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "aNw" = ( @@ -1288,7 +1512,10 @@ /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "aOc" = ( /turf/closed/shuttle/ert{ @@ -1301,17 +1528,23 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "aOh" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/oob) "aOJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "aPd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -1324,12 +1557,20 @@ 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/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "aPD" = ( @@ -1342,8 +1583,12 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "aPF" = ( -/obj/structure/flora/pottedplant/pottedplant_7, -/turf/open/floor/prison/redfull, +/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, @@ -1352,33 +1597,38 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "aQK" = ( /obj/item/trash/uscm_mre, /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "aQM" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "aQU" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "aQZ" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/red{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" }, /area/fiorina/station/security) "aRb" = ( @@ -1386,8 +1636,9 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "aRk" = ( @@ -1403,16 +1654,22 @@ "aRx" = ( /obj/structure/closet/crate/medical, /obj/item/storage/pill_bottle/tramadol/skillless, -/turf/open/floor/prison/whitegreenfull, +/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/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "aRG" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "aRT" = ( /obj/structure/barricade/handrail/type_b{ @@ -1434,11 +1691,15 @@ name = "Dr. O's fantastic self rolling wheelie chair"; pixel_x = 7 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "aSw" = ( /obj/structure/inflatable/door, -/turf/open/floor/prison/whitegreenangle, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, /area/fiorina/station/medbay) "aSz" = ( /turf/closed/wall/r_wall/prison, @@ -1472,7 +1733,9 @@ /area/fiorina/oob) "aUa" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "aUx" = ( /obj/structure/sign/poster{ @@ -1487,24 +1750,32 @@ pixel_x = 6; pixel_y = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "aVd" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "aVh" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" }, -/turf/open/floor/prison/greenfull, /area/fiorina/station/transit_hub) "aVA" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "aVD" = ( @@ -1515,29 +1786,41 @@ }, /obj/item/card/id/guest, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aVE" = ( /obj/vehicle/train/cargo/engine, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "aVJ" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "aVK" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "aVS" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "aVT" = ( /obj/structure/barricade/wooden{ @@ -1554,7 +1837,9 @@ pixel_x = -6; pixel_y = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "aVU" = ( /turf/open/floor/corsat{ @@ -1568,21 +1853,30 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "aWP" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "aWR" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "aWV" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -1601,7 +1895,9 @@ "aXM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/cable_coil/orange, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/maintenance) "aYA" = ( /obj/structure/machinery/light/double/blue{ @@ -1609,18 +1905,23 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "aYZ" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "aZz" = ( /obj/item/ammo_casing{ icon_state = "casing_5" }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "aZD" = ( @@ -1645,19 +1946,25 @@ /area/fiorina/station/power_ring) "aZQ" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/power_ring) "aZU" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "aZZ" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "bac" = ( /obj/item/stack/sheet/wood{ @@ -1665,7 +1972,10 @@ pixel_y = -3 }, /obj/item/stack/sheet/wood, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "baC" = ( /turf/closed/wall/mineral/bone_resin, @@ -1676,21 +1986,17 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "bby" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/civres) -"bbR" = ( -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowcorner{ - dir = 8 - }, -/area/fiorina/station/disco) "bbT" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "bce" = ( /obj/structure/lattice, @@ -1705,45 +2011,59 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/greenbluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "greenblue" + }, /area/fiorina/station/botany) "bck" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone{ pixel_y = 7 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "bcs" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "bcF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/plate, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bcH" = ( /obj/item/tool/screwdriver, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "bcV" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "bdI" = ( /obj/structure/bed/roller, /obj/item/bedsheet/green, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "bdL" = ( /obj/structure/inflatable/door, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "bdS" = ( @@ -1751,14 +2071,16 @@ pixel_x = 6; pixel_y = -2 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bej" = ( /obj/structure/barricade/handrail/type_b, /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "bel" = ( /obj/structure/prop/structure_lattice{ @@ -1772,8 +2094,9 @@ }, /area/fiorina/station/civres_blue) "beV" = ( -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "beW" = ( @@ -1788,7 +2111,9 @@ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "bfg" = ( /obj/structure/surface/rack, @@ -1796,11 +2121,19 @@ pixel_y = 3 }, /obj/item/storage/bible/hefa, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) +"bfs" = ( +/obj/item/stack/sheet/wood{ + amount = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "bfx" = ( /obj/item/trash/barcardine, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "bfF" = ( /obj/structure/cable/heavyduty{ @@ -1809,13 +2142,15 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "bfZ" = ( -/turf/open/floor/prison/floor, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "bgc" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -1836,17 +2171,22 @@ /obj/structure/reagent_dispensers/watertank{ layer = 2.6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "bgR" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "bha" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "bht" = ( /obj/effect/decal/cleanable/blood{ @@ -1869,11 +2209,15 @@ /area/fiorina/station/lowsec) "bhM" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "bhR" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "bhX" = ( /turf/open/floor/plating/prison, @@ -1886,44 +2230,57 @@ density = 0; dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "biJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/kitchen/utensil/fork, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "bjk" = ( /obj/structure/sink{ dir = 4; pixel_x = 12 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "bjx" = ( -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/tumor/civres) "bjy" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "bjO" = ( /obj/structure/closet/bodybag, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "bka" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "bkS" = ( -/turf/open/floor/prison/red{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, /area/fiorina/lz/near_lzII) "blb" = ( @@ -1932,15 +2289,16 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/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" }, -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/tumor/civres) "blG" = ( @@ -1952,7 +2310,10 @@ /area/fiorina/station/lowsec) "blQ" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "bmE" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -1965,7 +2326,10 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "bmV" = ( /obj/item/device/flashlight/lamp/tripod, @@ -1976,14 +2340,17 @@ /obj/structure/machinery/computer/cameras{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "bnA" = ( /turf/closed/wall/prison, /area/fiorina/station/transit_hub) "bnK" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -1996,8 +2363,9 @@ /obj/structure/prop/souto_land/streamer{ dir = 9 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "boe" = ( @@ -2006,11 +2374,12 @@ /area/fiorina/tumor/aux_engi) "boh" = ( /obj/item/stool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "bop" = ( -/turf/open/floor/prison/yellowangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellowcorner" }, /area/fiorina/station/lowsec) "bou" = ( @@ -2018,26 +2387,34 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "bow" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "bpq" = ( /obj/item/stack/sheet/wood{ amount = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "bpC" = ( /obj/item/tank/jetpack/carbondioxide, /obj/structure/surface/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bpG" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "bee" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bpK" = ( /obj/structure/surface/table/reinforced/prison, @@ -2045,36 +2422,54 @@ dir = 1 }, /obj/item/weapon/gun/energy/taser, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "bqy" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bra" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "brr" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bry" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/tumor/servers) "brS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "bsd" = ( /obj/structure/closet/basketball, /obj/item/storage/pill_bottle/bicaridine/skillless, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "bsm" = ( /obj/item/shard{ @@ -2095,25 +2490,33 @@ /obj/structure/flora/pottedplant{ pixel_y = 9 }, -/turf/open/floor/prison/floor, +/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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "bsJ" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/flight_deck) "btq" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "btz" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "btB" = ( /obj/structure/cargo_container/grant/right{ @@ -2123,19 +2526,24 @@ layer = 4; unacidable = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "btP" = ( /obj/item/tool/kitchen/rollingpin, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "bux" = ( /obj/structure/toilet{ dir = 4; pixel_y = 8 }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "buz" = ( @@ -2145,7 +2553,7 @@ "buO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/mask/surgical, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "bvK" = ( /obj/structure/surface/table/reinforced/prison, @@ -2168,15 +2576,19 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "bxV" = ( @@ -2185,8 +2597,10 @@ /turf/open/floor/wood, /area/fiorina/station/chapel) "bxW" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, /area/fiorina/tumor/fiberbush) "byb" = ( /turf/closed/shuttle/ert{ @@ -2207,30 +2621,40 @@ /area/fiorina/lz/near_lzI) "byn" = ( /obj/structure/closet/emcloset, -/turf/open/floor/prison/bluecorner{ - dir = 1 +/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, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "byt" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "bzC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bzG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/disco) "bzH" = ( /obj/structure/sign/poster{ @@ -2239,11 +2663,13 @@ pixel_y = 6 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "bzL" = ( /obj/structure/bed/sofa/vert/grey/bot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "bzO" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -2251,7 +2677,9 @@ "bAb" = ( /obj/structure/surface/rack, /obj/item/explosive/grenade/high_explosive/frag, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bAc" = ( /turf/closed/shuttle/ert{ @@ -2272,7 +2700,10 @@ /area/fiorina/oob) "bAS" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "bAU" = ( /obj/structure/bed/chair{ @@ -2280,8 +2711,9 @@ }, /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "bBA" = ( @@ -2290,13 +2722,15 @@ }, /area/fiorina/station/power_ring) "bBS" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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/security) "bBX" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "bCu" = ( /obj/item/shard{ @@ -2306,12 +2740,13 @@ /area/fiorina/tumor/aux_engi) "bDd" = ( /obj/structure/machinery/photocopier, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "bDu" = ( /obj/item/trash/barcardine, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "bDx" = ( @@ -2327,15 +2762,21 @@ "bDC" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/fire/empty, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bDD" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bDN" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "bDU" = ( @@ -2343,12 +2784,15 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "bEn" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "bEO" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "bEP" = ( /obj/item/device/flashlight, @@ -2359,7 +2803,10 @@ "bET" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/uscm_mre, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bEX" = ( /obj/structure/window/framed/prison, @@ -2369,10 +2816,12 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "bFj" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; layer = 3 @@ -2383,7 +2832,9 @@ /area/fiorina/station/chapel) "bFt" = ( /obj/item/stool, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "bFA" = ( /turf/closed/shuttle/ert{ @@ -2399,40 +2850,53 @@ pixel_x = -12; pixel_y = 13 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "bFY" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "bGr" = ( /obj/structure/barricade/metal/wired, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "bGs" = ( /obj/structure/inflatable/popped, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "bGt" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "bGy" = ( /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "bGQ" = ( /obj/structure/closet{ @@ -2440,13 +2904,14 @@ pixel_y = 18 }, /obj/item/clothing/gloves/combat, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "bGT" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "bGY" = ( /turf/closed/shuttle/elevator{ @@ -2454,11 +2919,13 @@ }, /area/fiorina/station/civres_blue) "bHl" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "bHv" = ( @@ -2469,7 +2936,9 @@ /area/fiorina/lz/near_lzI) "bHI" = ( /obj/item/frame/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bHY" = ( /obj/item/weapon/gun/flamer, @@ -2477,19 +2946,26 @@ /obj/item/ammo_magazine/flamer_tank, /obj/item/ammo_magazine/flamer_tank, /obj/item/storage/pouch/flamertank, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "bIg" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "bII" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "bIX" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/tumor/servers) "bIZ" = ( @@ -2525,26 +3001,32 @@ }, /area/fiorina/station/park) "bJz" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/tumor/servers) "bJF" = ( -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/chapel) "bKs" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "bKM" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bLd" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "bLg" = ( /obj/structure/platform{ @@ -2555,15 +3037,16 @@ dir = 6 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "bLz" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/park) "bLA" = ( @@ -2574,7 +3057,9 @@ /area/fiorina/station/security/wardens) "bMd" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "bMh" = ( /obj/item/frame/table/wood/fancy, @@ -2587,7 +3072,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/lowsec) "bMr" = ( -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "bMu" = ( /obj/structure/curtain{ @@ -2600,14 +3088,20 @@ desc = "A ticket to Souto Man's raffle!"; name = "\improper Souto Raffle Ticket" }, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/chapel) "bNf" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "bNz" = ( -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "bNA" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, @@ -2615,11 +3109,16 @@ dir = 8; health = 80 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "bNN" = ( /obj/structure/closet/crate/trashcart, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "bNP" = ( /obj/effect/spawner/random/tool, @@ -2633,10 +3132,14 @@ /area/fiorina/station/park) "bOh" = ( /obj/item/stack/folding_barricade, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "bOz" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; layer = 3; @@ -2650,16 +3153,18 @@ }, /area/fiorina/station/civres_blue) "bPf" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/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, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "bPl" = ( @@ -2676,8 +3181,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "bPS" = ( -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/power_ring) "bQh" = ( @@ -2706,7 +3212,10 @@ /area/fiorina/oob) "bQx" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "bQy" = ( /obj/structure/surface/table/woodentable, @@ -2734,12 +3243,16 @@ /obj/item/ammo_casing{ icon_state = "casing_6_1" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "bRU" = ( /obj/item/device/multitool, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "bSM" = ( @@ -2753,18 +3266,20 @@ /area/fiorina/station/botany) "bSP" = ( /obj/item/tool/surgery/scalpel, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "bST" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "bTe" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "bTo" = ( @@ -2774,7 +3289,9 @@ "bTG" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/gun/shotgun/highchance, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "bTI" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -2791,7 +3308,9 @@ /area/fiorina/tumor/servers) "bUy" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "bUB" = ( /obj/structure/platform_decoration/kutjevo{ @@ -2800,8 +3319,9 @@ /turf/open/space, /area/fiorina/oob) "bUH" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "bUJ" = ( @@ -2809,18 +3329,25 @@ /obj/structure/machinery/computer/objective{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "bVk" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "bVO" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; @@ -2830,7 +3357,9 @@ /area/fiorina/oob) "bVY" = ( /obj/structure/coatrack, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "bVZ" = ( /turf/closed/shuttle/ert{ @@ -2845,7 +3374,9 @@ /area/fiorina/station/security/wardens) "bWE" = ( /obj/effect/spawner/random/gun/rifle/midchance, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "bXa" = ( /obj/structure/barricade/handrail/type_b{ @@ -2855,30 +3386,40 @@ dir = 4; layer = 3.5 }, -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "bXk" = ( /obj/effect/decal/cleanable/blood/gibs/robot/limb, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "bYq" = ( /obj/item/ammo_casing{ icon_state = "casing_10_1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "bYv" = ( /obj/structure/filingcabinet, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "bYB" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "bYG" = ( /obj/structure/machinery/shower{ @@ -2886,26 +3427,32 @@ pixel_y = -1 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "bYS" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "bZu" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "bZF" = ( /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "bZY" = ( /obj/structure/machinery/light/double/blue, @@ -2915,15 +3462,18 @@ /turf/open/floor/wood, /area/fiorina/station/lowsec) "cbb" = ( -/obj/structure/monorail/launchtrack{ - dir = 5 +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, /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/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "cbx" = ( /obj/structure/closet/secure_closet/engineering_personal, @@ -2932,15 +3482,21 @@ pixel_y = 21 }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "cbC" = ( /obj/structure/kitchenspike, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "cbH" = ( /obj/structure/largecrate/supply/generator, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "cbK" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -2954,7 +3510,9 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "cbN" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -2964,8 +3522,9 @@ /turf/closed/wall/prison, /area/fiorina/station/civres_blue) "cdD" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "cel" = ( @@ -2974,7 +3533,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "ceC" = ( /turf/closed/wall/r_wall/prison, @@ -2983,7 +3544,9 @@ /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "cfc" = ( /obj/structure/barricade/sandbags{ @@ -2991,11 +3554,13 @@ icon_state = "sandbag_0" }, /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "cfj" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "cft" = ( /obj/item/frame/rack, @@ -3003,24 +3568,37 @@ dir = 4; layer = 3.5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "cfz" = ( /obj/item/stock_parts/manipulator/pico, -/turf/open/floor/prison/darkpurple2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "cfD" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "cfN" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "cgE" = ( /obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "chA" = ( /obj/structure/barricade/handrail{ @@ -3042,11 +3620,16 @@ icon_state = "abed" }, /obj/item/storage/fancy/cigar/tarbacks, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "chS" = ( /obj/structure/window, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "chT" = ( /obj/structure/machinery/light/double/blue{ @@ -3061,8 +3644,9 @@ /obj/structure/prop/souto_land/streamer{ pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "cif" = ( @@ -3073,10 +3657,12 @@ dir = 4; layer = 3.5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "ciX" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; @@ -3086,7 +3672,9 @@ /area/fiorina/oob) "ciZ" = ( /obj/item/explosive/grenade/incendiary/molotov, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "cjl" = ( /obj/structure/bed/roller, @@ -3095,8 +3683,9 @@ }, /obj/item/newspaper, /obj/item/bedsheet/green, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "cjp" = ( @@ -3105,14 +3694,16 @@ icon_state = "poster14"; pixel_y = 32 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cjs" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "cjA" = ( @@ -3131,12 +3722,15 @@ /turf/open/space, /area/fiorina/oob) "cjF" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "cjS" = ( /obj/item/newspaper, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "ckm" = ( @@ -3153,12 +3747,15 @@ "cky" = ( /obj/structure/bed/roller, /obj/item/trash/used_stasis_bag, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "ckD" = ( /obj/item/stool, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "cll" = ( @@ -3171,7 +3768,10 @@ pixel_x = -5; pixel_y = -11 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "cls" = ( /obj/structure/surface/table/woodentable, @@ -3182,7 +3782,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "clG" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/maintenance) "clN" = ( /obj/structure/prop/invuln/minecart_tracks{ @@ -3204,21 +3804,28 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "cmg" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "cmj" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "cmm" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "cmI" = ( /obj/structure/platform{ @@ -3227,7 +3834,7 @@ /obj/item/prop/almayer/comp_open{ pixel_y = 6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "cmP" = ( /obj/structure/pipes/standard/tank{ @@ -3236,45 +3843,55 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "cmV" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "cmW" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/station/chapel) "cnn" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "cnu" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "cnF" = ( /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "cnU" = ( /obj/structure/machinery/computer/atmos_alert, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/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/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "coh" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "coj" = ( /obj/item/stool, @@ -3282,14 +3899,15 @@ /area/fiorina/station/lowsec) "coT" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "cph" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c20, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "cpP" = ( /turf/closed/shuttle/elevator/gears, @@ -3300,8 +3918,9 @@ dir = 4; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "cpW" = ( @@ -3312,13 +3931,16 @@ /area/fiorina/oob) "cqc" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "cqy" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "cqz" = ( /turf/closed/shuttle/ert{ @@ -3328,11 +3950,16 @@ "cqH" = ( /obj/structure/surface/rack, /obj/item/clothing/gloves/latex, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "cqU" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "cri" = ( /obj/structure/machinery/computer/prisoner, @@ -3350,14 +3977,16 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzI) "crH" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" }, /area/fiorina/tumor/aux_engi) "crM" = ( @@ -3367,26 +3996,33 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) "crO" = ( -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/security) "csl" = ( /obj/item/trash/boonie, -/turf/open/floor/prison/whitegreenfull, +/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, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "csp" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "csH" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "ctc" = ( /obj/structure/prop/resin_prop{ @@ -3402,7 +4038,7 @@ /obj/structure/machinery/power/apc{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "ctD" = ( /obj/effect/landmark/monkey_spawn, @@ -3410,11 +4046,16 @@ /area/fiorina/tumor/ice_lab) "ctJ" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "cua" = ( /obj/structure/sign/safety/fire_haz, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "cvf" = ( /obj/structure/prop/structure_lattice{ @@ -3425,7 +4066,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "cvk" = ( /obj/structure/closet{ @@ -3433,8 +4076,9 @@ pixel_y = 18 }, /obj/item/clothing/gloves/boxing/blue, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cvn" = ( @@ -3443,18 +4087,22 @@ /area/fiorina/station/chapel) "cvp" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "cvq" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "cvr" = ( /obj/structure/platform, /obj/structure/reagent_dispensers/oxygentank{ layer = 2.6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "cvL" = ( /obj/effect/landmark/nightmare{ @@ -3472,37 +4120,54 @@ }, /area/fiorina/tumor/fiberbush) "cwO" = ( -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "cwU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/turf/open/floor/prison/sterile_white, +/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 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cxe" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "cxl" = ( /obj/structure/filingcabinet/disk, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cxn" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "cxF" = ( /obj/structure/bed/chair/office/dark, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "cyb" = ( /turf/open/organic/grass{ @@ -3511,8 +4176,12 @@ }, /area/fiorina/tumor/aux_engi) "cyd" = ( -/obj/structure/monorail/launchtrack, -/turf/open/floor/prison/floor_plate, +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "cye" = ( /obj/item/trash/pistachios, @@ -3523,19 +4192,26 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 6 }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "cyL" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/tumor/aux_engi) "cyO" = ( /obj/structure/machinery/vending/hydronutrients, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "cyU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic/small_stack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "cyV" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -3543,31 +4219,39 @@ "czj" = ( /obj/structure/closet/toolcloset, /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "czC" = ( /obj/structure/bedsheetbin, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "cAv" = ( /obj/structure/barricade/handrail/type_b{ dir = 8; layer = 3.5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "cAA" = ( /obj/effect/landmark/static_comms/net_two, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "cAV" = ( /obj/item/ammo_casing{ dir = 2; icon_state = "casing_5" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "cAW" = ( /turf/open/space/basic, @@ -3575,7 +4259,9 @@ "cBB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cBK" = ( /obj/item/shard{ @@ -3591,7 +4277,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "cBT" = ( /obj/structure/surface/table/reinforced/prison, @@ -3601,19 +4290,24 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "cBU" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cBY" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "cCq" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cCt" = ( @@ -3640,11 +4334,18 @@ }, /obj/item/reagent_container/food/snacks/eat_bar, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "cDj" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "cDl" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -3656,21 +4357,27 @@ /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, -/turf/open/floor/prison/whitegreen, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "cEf" = ( /obj/item/tool/extinguisher, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "cEl" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/maintenance) "cEw" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -3681,8 +4388,9 @@ }, /area/fiorina/tumor/ship) "cEB" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "cFf" = ( @@ -3692,11 +4400,11 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "cFn" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "cFq" = ( /obj/item/tool/mop, @@ -3704,18 +4412,23 @@ /area/fiorina/maintenance) "cFy" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cFC" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "cFE" = ( /obj/item/clothing/mask/cigarette, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "cFQ" = ( @@ -3728,7 +4441,9 @@ pixel_x = 6; pixel_y = 3 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "cFX" = ( /obj/structure/largecrate/supply/supplies, @@ -3737,15 +4452,18 @@ /area/fiorina/station/power_ring) "cGg" = ( /obj/structure/machinery/gibber, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "cGm" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/chapel) "cGR" = ( @@ -3756,17 +4474,19 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "cHx" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "cHD" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "cHF" = ( /obj/structure/surface/table/reinforced/prison, @@ -3779,12 +4499,15 @@ /area/fiorina/station/security) "cHJ" = ( /obj/item/trash/hotdog, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "cJa" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "cJo" = ( @@ -3794,7 +4517,7 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "cJv" = ( /obj/item/stack/rods, @@ -3807,7 +4530,10 @@ /obj/item/clipboard, /obj/item/paper, /obj/item/tool/pen, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "cJz" = ( /obj/structure/machinery/light/double/blue{ @@ -3832,12 +4558,17 @@ /obj/item/bodybag/tarp/reactive{ pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "cLu" = ( /obj/structure/machinery/light/double/blue{ @@ -3852,19 +4583,22 @@ pixel_y = 18 }, /obj/item/clothing/gloves/boxing/green, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cLR" = ( -/turf/open/floor/prison/greenblue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greenblue" }, /area/fiorina/station/botany) "cMg" = ( /obj/item/trash/snack_bowl, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "cME" = ( @@ -3872,43 +4606,53 @@ /area/fiorina/maintenance) "cMJ" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "cNn" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "cOb" = ( /obj/item/ammo_casing{ icon_state = "casing_6" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "cOl" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "cOn" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "cOq" = ( /obj/item/disk, -/turf/open/floor/prison/floor, +/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, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "cPq" = ( /obj/structure/machinery/light/double/blue{ @@ -3929,22 +4673,25 @@ }, /obj/item/prop/helmetgarb/flair_initech, /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "cPQ" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "cQn" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "cQu" = ( /obj/item/weapon/gun/energy/taser, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "cQA" = ( /obj/structure/machinery/shower{ @@ -3953,22 +4700,29 @@ /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "cQG" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cQX" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "cRs" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) "cRB" = ( @@ -3988,12 +4742,13 @@ icon_state = "hefasword"; name = "de-activated HEFA Sword" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "cRS" = ( /obj/structure/platform, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/botany) "cTr" = ( @@ -4004,13 +4759,16 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "cUE" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "cVk" = ( /obj/structure/platform_decoration{ @@ -4022,15 +4780,16 @@ /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibup1" }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "cVl" = ( /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "cVQ" = ( /obj/structure/machinery/light/double/blue{ @@ -4050,13 +4809,15 @@ pixel_x = 1; pixel_y = -1 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "cWG" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) @@ -4070,20 +4831,23 @@ pixel_x = 7; pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "cWR" = ( /obj/effect/landmark/objective_landmark/medium, /obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "cWU" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "cXm" = ( /obj/item/inflatable, @@ -4092,7 +4856,7 @@ /obj/item/inflatable, /obj/item/inflatable, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "cXq" = ( /obj/structure/platform{ @@ -4101,17 +4865,20 @@ /obj/structure/surface/rack, /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "cXw" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/oob) "cXY" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, @@ -4126,7 +4893,10 @@ /area/fiorina/oob) "cYg" = ( /obj/item/ammo_magazine/m56d, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "cYP" = ( /obj/structure/closet/crate/trashcart, @@ -4147,8 +4917,9 @@ /obj/structure/machinery/iv_drip{ pixel_y = 19 }, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "cZq" = ( @@ -4191,7 +4962,10 @@ /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "daS" = ( /obj/item/ammo_magazine/pistol/kt42, @@ -4210,27 +4984,34 @@ /area/fiorina/station/chapel) "dbL" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "dbX" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "ddc" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "dds" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "ddz" = ( /obj/item/stack/sheet/cardboard, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "ddA" = ( @@ -4247,11 +5028,14 @@ pixel_x = -5; pixel_y = -11 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "ddF" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) @@ -4274,7 +5058,9 @@ /obj/structure/machinery/computer/cameras{ dir = 1 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "dec" = ( /obj/structure/sign/prop3{ @@ -4296,7 +5082,10 @@ /area/fiorina/station/park) "deE" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "deL" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -4304,13 +5093,16 @@ /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) "deN" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "deR" = ( /obj/item/toy/crayon/red, @@ -4320,11 +5112,15 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "dfa" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "dfu" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -4333,50 +5129,68 @@ pixel_x = 7; pixel_y = 6 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "dfz" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "dfD" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "dfV" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + 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/floor_plate, +/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/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "dgz" = ( /obj/item/trash/cigbutt/ucigbutt, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "dgB" = ( /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "dgF" = ( -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/chapel) "dhe" = ( /obj/structure/barricade/metal/wired{ dir = 4 }, -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/disco) "dhi" = ( /obj/structure/platform_decoration/kutjevo, @@ -4393,11 +5207,11 @@ pixel_x = -6; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "dhs" = ( /obj/item/tool/weldingtool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dhD" = ( /obj/structure/machinery/shower{ @@ -4407,31 +5221,40 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "dhN" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "dhV" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "diP" = ( -/turf/open/floor/prison/greencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "green" }, /area/fiorina/tumor/civres) "diR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger, /obj/item/clothing/accessory/holobadge/cord, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "diS" = ( /obj/structure/largecrate/supply/supplies/water, @@ -4443,15 +5266,18 @@ pixel_x = 1; pixel_y = 12 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "diX" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "djd" = ( -/turf/open/floor/prison/greenblueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greenbluecorner" }, /area/fiorina/station/botany) "dje" = ( @@ -4464,7 +5290,9 @@ /area/fiorina/station/park) "djx" = ( /obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "djA" = ( /obj/structure/surface/table/reinforced/prison, @@ -4473,7 +5301,9 @@ 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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "djB" = ( /obj/vehicle/powerloader{ @@ -4484,8 +5314,12 @@ }, /area/fiorina/station/research_cells) "dka" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/bluefull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "dkb" = ( /obj/item/device/flashlight/lamp/tripod, @@ -4507,24 +5341,31 @@ /turf/open/space, /area/fiorina/oob) "dkj" = ( -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "dkC" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "dkP" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "dla" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dlA" = ( /obj/effect/decal/cleanable/blood, @@ -4532,11 +5373,14 @@ /area/fiorina/tumor/aux_engi) "dlE" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "dlW" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "dlX" = ( @@ -4545,33 +5389,38 @@ 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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "dme" = ( /obj/structure/machinery/deployable/barrier, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dmu" = ( /obj/structure/filingcabinet/disk, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "dmB" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "dmH" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "dnx" = ( /obj/structure/bed/sofa/south/grey/left, @@ -4579,7 +5428,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "dnz" = ( /obj/structure/surface/table/woodentable/fancy, @@ -4588,15 +5440,16 @@ /area/fiorina/station/chapel) "dnB" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dnK" = ( /obj/structure/bed/chair/comfy{ @@ -4628,7 +5481,7 @@ dir = 6; icon_state = "casing_10_1" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "doD" = ( /obj/structure/cable/heavyduty{ @@ -4655,17 +5508,22 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "dpt" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "dpE" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/powercell, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "dpH" = ( /obj/structure/reagent_dispensers/fueltank, @@ -4676,7 +5534,7 @@ dir = 8 }, /obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dqa" = ( /obj/structure/platform{ @@ -4689,7 +5547,10 @@ /area/fiorina/station/park) "dqk" = ( /obj/effect/spawner/random/sentry/midchance, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "dqE" = ( /obj/structure/prop/souto_land/pole, @@ -4719,13 +5580,14 @@ pixel_x = 1; pixel_y = -1 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "dro" = ( /obj/structure/closet/l3closet/general, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "dso" = ( /obj/structure/closet{ @@ -4734,28 +5596,37 @@ }, /obj/effect/spawner/random/tool, /obj/item/clothing/gloves/combat, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "dsv" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "dsQ" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/greenbluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "greenblue" }, /area/fiorina/station/botany) "dsT" = ( -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "dtc" = ( /obj/structure/bed/chair{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) "dtg" = ( @@ -4767,7 +5638,9 @@ /obj/item/ammo_casing{ icon_state = "casing_6_1" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "duw" = ( /obj/structure/reagent_dispensers/fueltank, @@ -4787,7 +5660,10 @@ /obj/structure/window{ dir = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "duF" = ( /obj/structure/window/framed/prison/reinforced, @@ -4806,12 +5682,15 @@ /obj/structure/machinery/computer/emails{ dir = 4 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "dvV" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/power_ring) "dvY" = ( @@ -4823,8 +5702,9 @@ /turf/open/space, /area/fiorina/oob) "dwg" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -4832,14 +5712,17 @@ "dwk" = ( /obj/structure/surface/rack, /obj/item/device/camera, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "dwM" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "dwQ" = ( @@ -4859,16 +5742,22 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "dxg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "dxA" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/medbay) "dxE" = ( /obj/structure/prop/resin_prop{ @@ -4878,21 +5767,25 @@ /area/fiorina/tumor/aux_engi) "dxJ" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "dxO" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "dxS" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/servers) "dyd" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "dyi" = ( /obj/structure/machinery/light/double/blue{ @@ -4903,14 +5796,16 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "dyp" = ( /obj/item/tool/kitchen/utensil/pspoon, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) "dyB" = ( @@ -4921,13 +5816,18 @@ /turf/open/floor/plating/prison, /area/fiorina/station/chapel) "dyM" = ( -/turf/open/floor/prison/whitepurplecorner, +/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/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "dzk" = ( /obj/structure/bed/roller, @@ -4935,8 +5835,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "dzl" = ( @@ -4947,7 +5848,7 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dAe" = ( /obj/structure/machinery/line_nexter{ @@ -4955,21 +5856,22 @@ pixel_x = -2 }, /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "dAk" = ( /obj/structure/largecrate/random/case/small, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "dAA" = ( /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "dAB" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "dAQ" = ( @@ -4978,11 +5880,12 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "dBa" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -5007,36 +5910,49 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "dBI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, /obj/item/trash/cigbutt, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dBR" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "dBY" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "dCb" = ( /obj/structure/platform, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "dCl" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "dCo" = ( /obj/item/clothing/shoes/laceup, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "dCu" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -5048,11 +5964,13 @@ "dCA" = ( /obj/item/organ/lungs, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "dCF" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "dCM" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -5060,25 +5978,31 @@ /area/fiorina/station/security) "dDm" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "dDy" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "dDM" = ( /obj/structure/closet/wardrobe/orange, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "dDS" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "dDU" = ( @@ -5088,8 +6012,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/chapel) "dEo" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, /obj/structure/machinery/light/double/blue{ @@ -5101,17 +6026,24 @@ /area/fiorina/station/flight_deck) "dEy" = ( /obj/item/trash/uscm_mre, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "dEF" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "dEI" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -5121,32 +6053,39 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/chapel) "dFk" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "dFw" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "dFC" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ name = "computer" }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "dFE" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "dFG" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "dFH" = ( @@ -5166,25 +6105,28 @@ "dFO" = ( /obj/item/weapon/gun/rifle/m16, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/security) "dGc" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "dGj" = ( /obj/structure/machinery/power/apc{ start_charge = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "dGw" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "dGx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -5203,21 +6145,25 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/civres) "dHp" = ( -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "dIa" = ( /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "dIi" = ( -/obj/structure/stairs/perspective/p_stair_full, -/turf/open/floor/prison/floor, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, /area/fiorina/station/security) "dIo" = ( /turf/closed/wall/prison, @@ -5225,11 +6171,12 @@ "dIp" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "dIq" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "dID" = ( @@ -5239,7 +6186,10 @@ icon_state = "triagedecaldir" }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dIK" = ( /obj/structure/machinery/light/double/blue{ @@ -5248,12 +6198,16 @@ pixel_y = -3 }, /obj/structure/largecrate/random, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "dJl" = ( /obj/item/device/flashlight/flare, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "dKo" = ( @@ -5262,13 +6216,17 @@ /area/fiorina/station/security/wardens) "dKy" = ( /obj/item/trash/c_tube, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dKI" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "dKX" = ( /obj/effect/landmark/survivor_spawner, @@ -5284,12 +6242,16 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dLF" = ( /obj/structure/barricade/handrail, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "dMa" = ( @@ -5297,18 +6259,23 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "dMc" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/park) "dMm" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "dMv" = ( -/turf/open/floor/prison/greenblueangle, +/turf/open/floor/prison{ + icon_state = "greenbluecorner" + }, /area/fiorina/station/botany) "dMK" = ( /obj/item/tool/pickaxe, @@ -5319,7 +6286,10 @@ pixel_y = 10 }, /obj/structure/surface/rack, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "dMO" = ( /obj/structure/bed/chair{ @@ -5329,7 +6299,10 @@ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/park) "dMU" = ( /obj/structure/barricade/handrail{ @@ -5350,10 +6323,16 @@ /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzI) "dNF" = ( -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "dOs" = ( -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "dOE" = ( /obj/item/storage/bible/hefa, @@ -5369,30 +6348,37 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/oob) "dOX" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzI) "dPC" = ( /obj/structure/machinery/computer3/server/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "dPQ" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "dQp" = ( /obj/effect/decal/hefa_cult_decals/d32, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "dQA" = ( /obj/item/tool/screwdriver, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "dQW" = ( /obj/item/ammo_casing{ @@ -5408,11 +6394,17 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "dRm" = ( /obj/item/storage/bible/hefa, -/turf/open/floor/prison/greencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, /area/fiorina/station/chapel) "dRO" = ( /obj/effect/acid_hole{ @@ -5427,38 +6419,57 @@ /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/whitepurplecorner, +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) +"dSz" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "dTf" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "dTp" = ( /obj/structure/bed/chair/office/dark, -/turf/open/floor/prison/whitegreenfull, +/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/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "dTx" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "dUs" = ( -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "dUZ" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/space/basic, /area/fiorina/oob) "dVe" = ( @@ -5468,24 +6479,30 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "dVm" = ( /obj/item/storage/pill_bottle/spaceacillin/skillless, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + 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/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "dWx" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "dWB" = ( /obj/effect/decal/cleanable/blood/oil, @@ -5493,11 +6510,16 @@ /area/fiorina/station/civres_blue) "dWM" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "dWN" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "dXv" = ( /obj/structure/barricade/wooden{ @@ -5513,7 +6535,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "dXG" = ( /turf/open/floor/plating/prison, @@ -5522,7 +6547,10 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "dYp" = ( /obj/docking_port/stationary/marine_dropship/lz1{ @@ -5533,11 +6561,13 @@ "dYr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/explosive/grenade/incendiary/molotov, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "dYv" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "dYI" = ( /turf/closed/shuttle/ert{ @@ -5546,14 +6576,17 @@ /area/fiorina/tumor/aux_engi) "dYP" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "dZc" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/station/power_ring) "dZt" = ( @@ -5562,19 +6595,25 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "dZA" = ( /obj/structure/closet, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /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, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "eaL" = ( @@ -5586,17 +6625,21 @@ /obj/item/book/manual/engineering_guide{ pixel_x = -4 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "eaQ" = ( /obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "eaZ" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "ebc" = ( /obj/structure/platform{ @@ -5605,19 +6648,25 @@ /obj/effect/decal/medical_decals{ icon_state = "cryomid" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ebm" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenbluecorner{ - dir = 4 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -5625,7 +6674,7 @@ /area/fiorina/station/lowsec) "ecp" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "ecu" = ( /obj/item/stack/sheet/metal/medium_stack, @@ -5635,7 +6684,10 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 32 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "ecL" = ( /obj/structure/surface/rack, @@ -5656,21 +6708,26 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "edv" = ( /obj/item/storage/fancy/cigar, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "eej" = ( /obj/item/reagent_container/food/drinks/coffee{ name = "\improper paper cup" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "eev" = ( /obj/structure/machinery/vending/walkman, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "eew" = ( /obj/structure/platform{ @@ -5680,7 +6737,9 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "eeI" = ( /obj/structure/lattice, @@ -5688,8 +6747,9 @@ /turf/open/floor/almayer_hull, /area/fiorina/oob) "eeL" = ( -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/station/transit_hub) "efk" = ( @@ -5713,11 +6773,15 @@ /turf/open/floor/plating/prison, /area/fiorina/oob) "efz" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "efS" = ( -/obj/structure/monorail/launchtrack{ - dir = 9 +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) @@ -5728,22 +6792,28 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) "ege" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "egv" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/civres_blue) "egx" = ( /obj/item/trash/boonie, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "egL" = ( /obj/item/newspaper, @@ -5755,26 +6825,35 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "ehf" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/whitegreenfull, +/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/bluefull, +/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/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "eir" = ( @@ -5784,11 +6863,16 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "eix" = ( /obj/structure/closet/bombcloset, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "ejk" = ( /obj/structure/disposalpipe/segment{ @@ -5798,19 +6882,26 @@ name = "overhead pipe"; pixel_y = 12 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "ejn" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/random/gun/pistol/midchance, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /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/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "ejq" = ( /obj/structure/machinery/space_heater, @@ -5829,7 +6920,10 @@ icon_state = "sandbag_0"; pixel_y = 2 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "eki" = ( /obj/structure/filingcabinet, @@ -5838,15 +6932,19 @@ /area/fiorina/station/security/wardens) "ekH" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "eli" = ( /obj/structure/closet/emcloset, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "elq" = ( -/turf/open/floor/prison/greenblueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenbluecorner" }, /area/fiorina/station/botany) "elC" = ( @@ -5857,8 +6955,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "elY" = ( @@ -5868,7 +6967,7 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "emm" = ( /obj/structure/machinery/light/double/blue{ @@ -5891,13 +6990,16 @@ /area/fiorina/oob) "emU" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "ena" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "end" = ( /obj/structure/window/framed/prison/cell, @@ -5911,11 +7013,15 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "enG" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "enH" = ( /obj/effect/alien/weeds/node, @@ -5929,7 +7035,10 @@ /turf/open/floor/plating/prison, /area/fiorina/oob) "eok" = ( -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/oob) "eov" = ( /turf/closed/wall/r_wall/prison_unmeltable{ @@ -5939,7 +7048,7 @@ /area/fiorina/station/research_cells) "eoR" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "eoW" = ( /obj/structure/largecrate/random/case, @@ -5949,11 +7058,16 @@ /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) +"eph" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "eps" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "epV" = ( /obj/item/paper/crumpled/bloody, @@ -5961,11 +7075,14 @@ /area/fiorina/station/chapel) "eqq" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "eqC" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "eqQ" = ( /turf/open/floor/corsat{ @@ -5975,11 +7092,15 @@ "eqT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper/janitor, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "ere" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "erl" = ( /obj/structure/machinery/light/double/blue{ @@ -5995,11 +7116,15 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "erB" = ( /obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "erT" = ( /obj/structure/platform_decoration/kutjevo{ @@ -6011,10 +7136,14 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/lz/near_lzI) "esF" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/tumor/servers) "esS" = ( /obj/item/stack/sheet/metal, @@ -6033,12 +7162,14 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "euC" = ( -/obj/structure/monorail/launchtrack, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "euR" = ( /obj/structure/surface/table/reinforced/prison, @@ -6051,7 +7182,9 @@ pixel_y = 2 }, /obj/item/tool/stamp, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "euT" = ( /obj/item/tool/wet_sign, @@ -6059,23 +7192,29 @@ pixel_x = -6; pixel_y = -1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "evc" = ( /obj/structure/machinery/power/terminal{ dir = 1 }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "evf" = ( /obj/item/ammo_casing{ icon_state = "casing_5_1" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "evg" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "evv" = ( /obj/structure/machinery/light/double/blue{ @@ -6085,17 +7224,20 @@ /obj/effect/landmark/nightmare{ insert_tag = "nogear" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "evD" = ( /obj/structure/lz_sign/prison_sign, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "evH" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/pests, /obj/item/tool/plantspray/weeds, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "evQ" = ( /obj/structure/surface/table/reinforced/prison, @@ -6106,7 +7248,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "evU" = ( /obj/item/device/flashlight/lamp/tripod, @@ -6114,7 +7258,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "ewx" = ( /obj/structure/bed/chair/comfy{ @@ -6125,11 +7271,14 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "ewy" = ( -/obj/structure/flora/pottedplant/pottedplant_22{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; layer = 2.8 }, /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "ewE" = ( /obj/item/clothing/accessory/armband/cargo{ @@ -6146,7 +7295,9 @@ "ewY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "exs" = ( /obj/structure/bed/chair{ @@ -6160,7 +7311,10 @@ dir = 4; pixel_y = 8 }, -/turf/open/floor/prison/bright_clean_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean_marked" + }, /area/fiorina/station/medbay) "exO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -6175,7 +7329,10 @@ /area/fiorina/station/park) "eyo" = ( /obj/structure/prop/resin_prop, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "eyz" = ( /obj/structure/machinery/portable_atmospherics/canister/phoron, @@ -6185,11 +7342,23 @@ /area/fiorina/station/telecomm/lz1_cargo) "eyM" = ( /obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) +"eza" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "ezb" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "ezn" = ( /obj/structure/sign/prop3{ @@ -6199,32 +7368,42 @@ /area/fiorina/station/telecomm/lz1_cargo) "ezo" = ( /obj/structure/bed/chair/janicart, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "ezr" = ( /obj/structure/bed{ icon_state = "psychbed" }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "ezx" = ( /obj/structure/platform{ dir = 8 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/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, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "ezJ" = ( -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "ezT" = ( -/turf/open/floor/prison/redangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "redcorner" }, /area/fiorina/station/security) "ezV" = ( @@ -6232,13 +7411,16 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "eAo" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - 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) "eAy" = ( -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/transit_hub) "eAM" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ @@ -6248,31 +7430,49 @@ /area/fiorina/lz/near_lzII) "eAQ" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/whitegreenfull, +/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 + }, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "eCg" = ( /obj/structure/largecrate/supply/explosives/mines, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "eCh" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "eCA" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "eDn" = ( /obj/structure/platform/kutjevo/smooth, @@ -6281,18 +7481,23 @@ /area/fiorina/oob) "eDs" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "eEh" = ( /obj/structure/barricade/wooden, /obj/item/device/flashlight/flare, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "eEk" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "eEo" = ( /obj/structure/prop/structure_lattice{ @@ -6303,7 +7508,7 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "eED" = ( /obj/structure/surface/table/woodentable/fancy, @@ -6331,15 +7536,18 @@ /area/fiorina/station/chapel) "eGg" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "eGz" = ( /obj/structure/machinery/constructable_frame, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "eGV" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "eGY" = ( /obj/structure/toilet{ @@ -6347,8 +7555,9 @@ pixel_y = 8 }, /obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "eHa" = ( @@ -6373,8 +7582,9 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "eIF" = ( @@ -6387,8 +7597,9 @@ /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "eJm" = ( @@ -6405,12 +7616,15 @@ /obj/structure/machinery/autolathe/full{ layer = 2.98 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "eJP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/cigbutt, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "eJQ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -6420,11 +7634,15 @@ /turf/open/space/basic, /area/fiorina/oob) "eKu" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/bright_clean_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean_marked" + }, /area/fiorina/station/power_ring) "eLu" = ( /turf/closed/wall/prison, @@ -6433,7 +7651,10 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "eMG" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/access{ @@ -6442,11 +7663,15 @@ /turf/open/floor/plating/prison, /area/fiorina/station/botany) "eML" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "eMU" = ( /turf/closed/shuttle/ert{ @@ -6460,16 +7685,20 @@ layer = 2.97; pixel_y = -14 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "eNs" = ( -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/power_ring) "eNV" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "eOf" = ( /obj/structure/sink{ @@ -6477,7 +7706,10 @@ pixel_x = 12 }, /obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "eOo" = ( /obj/structure/prop/structure_lattice{ @@ -6488,7 +7720,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "eOF" = ( /obj/structure/platform/kutjevo/smooth{ @@ -6506,18 +7740,23 @@ pixel_y = 21 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "eOS" = ( /obj/item/tool/warning_cone, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "ePf" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "ePq" = ( /obj/item/trash/cigbutt/ucigbutt, @@ -6537,7 +7776,7 @@ /area/fiorina/oob) "ePx" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "ePB" = ( /turf/closed/wall/prison, @@ -6552,22 +7791,27 @@ /area/fiorina/station/civres_blue) "eQv" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "eQD" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "eQR" = ( -/turf/open/floor/prison/greencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "green" }, /area/fiorina/tumor/servers) "eRi" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "eRz" = ( @@ -6580,27 +7824,33 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "eRS" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "eRY" = ( /obj/structure/machinery/constructable_frame, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "eSg" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "eSs" = ( /obj/item/prop/helmetgarb/riot_shield, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "eSF" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -6610,8 +7860,9 @@ /area/fiorina/lz/near_lzII) "eSZ" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "eTb" = ( @@ -6625,8 +7876,9 @@ /area/fiorina/station/chapel) "eTd" = ( /obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "eTh" = ( @@ -6634,24 +7886,29 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "eTn" = ( /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/blue{ - 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/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "eTx" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "eTC" = ( /obj/item/frame/rack, @@ -6666,15 +7923,16 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "eUi" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_cargo) "eUk" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" }, /area/fiorina/tumor/aux_engi) "eUD" = ( @@ -6682,12 +7940,13 @@ current_rounds = 0 }, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "eVb" = ( /obj/item/reagent_container/blood, -/turf/open/floor/prison/greenblueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenbluecorner" }, /area/fiorina/station/botany) "eVf" = ( @@ -6706,8 +7965,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "eVL" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -6717,14 +7977,15 @@ /area/fiorina/tumor/ship) "eVZ" = ( /obj/item/trash/sosjerky, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "eWh" = ( /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "eWu" = ( @@ -6736,12 +7997,15 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "eWO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "eWP" = ( /obj/structure/sign/prop3{ @@ -6766,19 +8030,27 @@ "eXd" = ( /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/prison/whitegreenfull, +/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/launchtrack, -/turf/open/floor/prison/floor_plate, +/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/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "eXP" = ( @@ -6789,13 +8061,18 @@ /turf/open/floor/plating/prison, /area/fiorina/station/botany) "eXU" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "eYC" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -6817,7 +8094,9 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) "eZm" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, @@ -6856,17 +8135,23 @@ }, /obj/item/weapon/gun/launcher/grenade/m81, /obj/item/storage/pill_bottle/kelotane, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "eZL" = ( /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "eZN" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "fbo" = ( /obj/structure/barricade/plasteel, @@ -6883,12 +8168,13 @@ pixel_y = 9 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "fbL" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "fbT" = ( @@ -6900,7 +8186,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "fbW" = ( /obj/effect/decal/medical_decals{ @@ -6909,12 +8197,18 @@ /obj/structure/pipes/standard/simple/visible{ dir = 5 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fcp" = ( /obj/item/trash/burger, /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "fcA" = ( /obj/effect/landmark/yautja_teleport, @@ -6927,7 +8221,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fcX" = ( /obj/structure/closet/crate/trashcart, @@ -6936,7 +8233,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "fcZ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -6954,7 +8253,9 @@ /turf/open/space, /area/fiorina/oob) "fde" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "fdf" = ( @@ -6965,7 +8266,10 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "fdn" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, /area/fiorina/station/research_cells) "fdK" = ( /obj/effect/decal/cleanable/blood/oil, @@ -6976,11 +8280,13 @@ icon_state = "soutomobile"; name = "Disabled Souto Mobile" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "fdS" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "fdV" = ( /obj/structure/platform_decoration/kutjevo{ @@ -6990,21 +8296,27 @@ /area/fiorina/oob) "feO" = ( /obj/structure/largecrate/supply/medicine/iv, -/turf/open/floor/prison/sterile_white, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "ffm" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "ffN" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "ffU" = ( /obj/item/ammo_casing{ @@ -7013,7 +8325,10 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ffZ" = ( /obj/structure/extinguisher_cabinet, @@ -7027,11 +8342,16 @@ pixel_y = -3 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fgB" = ( /obj/item/stack/folding_barricade, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "fgM" = ( /obj/structure/platform, @@ -7049,7 +8369,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "fhc" = ( -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/maintenance) "fhz" = ( /obj/structure/barricade/handrail{ @@ -7067,19 +8389,24 @@ /area/fiorina/oob) "fhC" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor_plate, +/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/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/lz/near_lzI) "fhZ" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "fic" = ( @@ -7091,7 +8418,9 @@ /area/fiorina/station/park) "fin" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "fiq" = ( /turf/open/floor/plating/prison, @@ -7110,26 +8439,35 @@ pixel_y = 21 }, /obj/structure/inflatable, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "fiD" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fiF" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "fiI" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 }, /obj/item/frame/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "fiU" = ( /turf/open/floor/plating/plating_catwalk, @@ -7156,7 +8494,10 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "fkY" = ( /obj/item/tool/wet_sign, @@ -7164,31 +8505,45 @@ pixel_x = -6; pixel_y = -1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "flg" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "flm" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) +"flo" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "flq" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/greenfull, +/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 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "fmg" = ( /obj/item/shard{ @@ -7198,17 +8553,23 @@ /area/fiorina/tumor/aux_engi) "fmL" = ( /obj/item/frame/toolbox_tiles, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "fmM" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "fmU" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, /area/fiorina/tumor/aux_engi) "fmY" = ( /obj/item/device/cassette_tape/ocean, @@ -7216,18 +8577,26 @@ /area/fiorina/tumor/aux_engi) "fnj" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/sterile_white, +/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/pottedplant_22, -/turf/open/floor/prison/yellowcorner, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "fnB" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "fnD" = ( /turf/closed/shuttle/elevator{ @@ -7236,38 +8605,46 @@ /area/fiorina/station/telecomm/lz1_cargo) "fnW" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "fon" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "foL" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "foT" = ( /obj/structure/machinery/power/port_gen/pacman, -/turf/open/floor/prison/floor, +/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, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "foZ" = ( /obj/item/stack/sandbags_empty, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "fpi" = ( /obj/item/clothing/head/soft/yellow, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "fpl" = ( @@ -7276,14 +8653,15 @@ icon_state = "sandbag_0"; pixel_y = 2 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "fpn" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/aux_engi) "fpp" = ( -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/tumor/civres) "fpB" = ( @@ -7294,18 +8672,23 @@ /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "fpY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/briefcase/inflatable, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "fqD" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 5 +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "fqF" = ( /obj/effect/landmark{ @@ -7319,28 +8702,36 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal/medium_stack, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "frt" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "frw" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/storage/fancy/crayons, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "frY" = ( -/turf/open/floor/prison/whitepurpleangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurplecorner" }, /area/fiorina/station/research_cells) "fsf" = ( /obj/structure/bed/roller, /obj/effect/spawner/random/gun/rifle/highchance, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "fsk" = ( /obj/structure/machinery/space_heater, @@ -7356,11 +8747,15 @@ /area/fiorina/oob) "ftq" = ( /obj/item/stack/cable_coil/orange, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "ftv" = ( -/turf/open/floor/prison/red{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "red" }, /area/fiorina/station/security) "ftH" = ( @@ -7372,12 +8767,15 @@ pixel_x = 4; pixel_y = 6 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "ftY" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "fum" = ( @@ -7385,12 +8783,15 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "fuA" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "fuF" = ( @@ -7399,11 +8800,16 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "fvk" = ( /obj/structure/barricade/metal/wired, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "fvL" = ( /obj/item/stack/sheet/metal, @@ -7422,13 +8828,18 @@ /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib2" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "fwZ" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fxt" = ( /obj/structure/largecrate/random/barrel/blue, @@ -7440,14 +8851,19 @@ /obj/structure/pipes/standard/simple/visible{ dir = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fxP" = ( -/turf/open/floor/prison/yellowangle, +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, /area/fiorina/station/lowsec) "fxY" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "fye" = ( /obj/structure/surface/rack, @@ -7455,8 +8871,9 @@ /obj/item/tank/emergency_oxygen/engi, /obj/item/device/flashlight, /obj/item/device/flashlight, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "fyi" = ( @@ -7469,8 +8886,9 @@ /turf/open/floor/carpet, /area/fiorina/station/civres_blue) "fyA" = ( -/turf/open/floor/prison/greencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/tumor/aux_engi) "fyC" = ( @@ -7488,16 +8906,23 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/darkyellow2corner, +/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, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fzb" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -7508,14 +8933,17 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "fzt" = ( /obj/structure/largecrate/random/barrel/white, /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "fzO" = ( /obj/structure/barricade/wooden{ @@ -7533,8 +8961,9 @@ pixel_y = 13 }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "fAs" = ( @@ -7542,7 +8971,10 @@ icon_state = "abed" }, /obj/item/bedsheet/green, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "fAt" = ( /obj/structure/flora/bush/ausbushes/ausbush{ @@ -7581,8 +9013,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "fAZ" = ( @@ -7594,17 +9027,22 @@ /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) "fBc" = ( -/turf/open/floor/prison/damaged1, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, /area/fiorina/station/lowsec) "fBd" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/power_ring) "fBg" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "fBi" = ( @@ -7614,15 +9052,21 @@ /area/fiorina/station/disco) "fBp" = ( /obj/structure/closet/firecloset, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "fBP" = ( -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "fCz" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "fCD" = ( @@ -7638,7 +9082,10 @@ /area/fiorina/station/power_ring) "fDo" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "fDI" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ @@ -7648,7 +9095,9 @@ pixel_x = 2; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "fDQ" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -7666,7 +9115,9 @@ /area/fiorina/station/power_ring) "fFf" = ( /obj/item/stool, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "fFC" = ( /obj/structure/bed/chair{ @@ -7674,7 +9125,9 @@ }, /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "fFE" = ( /obj/item/tool/screwdriver, @@ -7683,56 +9136,73 @@ "fFU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fGb" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "fGe" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "fGp" = ( /obj/structure/surface/rack, /obj/item/handcuffs, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "fGB" = ( /obj/structure/prop/structure_lattice{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "fGL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/tracker, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "fGM" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "fGY" = ( -/turf/open/floor/prison/floorscorched2, +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, /area/fiorina/tumor/civres) "fHh" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4 }, -/turf/open/floor/prison/floor, +/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/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "fHB" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "fHK" = ( @@ -7754,7 +9224,10 @@ /obj/item/coin/uranium{ desc = "You found one of the three uranium coins. It is entirely worthless." }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fHU" = ( /obj/structure/surface/table/reinforced/prison, @@ -7764,23 +9237,29 @@ /obj/structure/machinery/computer/cameras{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "fHV" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "fIj" = ( /obj/item/clothing/suit/storage/hazardvest, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "fIv" = ( /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "fII" = ( /obj/structure/surface/table/reinforced/prison, @@ -7789,7 +9268,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "fIT" = ( /obj/structure/largecrate/random/secure, @@ -7809,11 +9290,16 @@ /area/fiorina/tumor/civres) "fJx" = ( /obj/item/storage/briefcase, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "fJO" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fJW" = ( /obj/structure/surface/table/reinforced/prison, @@ -7832,20 +9318,27 @@ /area/fiorina/station/chapel) "fKq" = ( /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fKr" = ( /obj/structure/platform{ dir = 4 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "fKv" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/power_ring) "fKF" = ( /obj/structure/machinery/light/double/blue{ @@ -7853,17 +9346,21 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "fLa" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "fLq" = ( -/turf/open/floor/prison/greencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, /area/fiorina/tumor/servers) "fLr" = ( @@ -7871,24 +9368,30 @@ /obj/structure/closet/fireaxecabinet{ pixel_y = 32 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "fLs" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "fLR" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "fLS" = ( /obj/structure/bed/chair, @@ -7897,14 +9400,18 @@ "fMk" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "fMY" = ( /obj/structure/reagent_dispensers/watertank{ layer = 2.6 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "fNc" = ( /obj/structure/platform{ @@ -7915,11 +9422,15 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "fNp" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "fOg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -7932,15 +9443,21 @@ "fOo" = ( /obj/structure/closet/crate/medical, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "fOs" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fOt" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -7949,15 +9466,19 @@ /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/power_ring) "fOZ" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "fPu" = ( @@ -7966,20 +9487,31 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fPF" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "fPZ" = ( -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "fQx" = ( /obj/item/reagent_container/food/drinks/bottle/tomatojuice, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "fQB" = ( /obj/item/ammo_casing/shell{ @@ -8003,17 +9535,20 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) "fSe" = ( /obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "fSl" = ( /obj/item/disk/data, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "fSq" = ( /obj/structure/machinery/door/airlock/almayer/marine{ @@ -8046,17 +9581,25 @@ /area/fiorina/tumor/ship) "fSI" = ( /obj/item/broken_device, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fSY" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ship) "fTs" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/power_ring) "fTx" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "fTz" = ( /obj/structure/closet, @@ -8074,7 +9617,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "fUd" = ( /obj/structure/barricade/plasteel{ @@ -8099,10 +9645,15 @@ "fUu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/plate, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "fUF" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "fUX" = ( @@ -8111,12 +9662,15 @@ /area/fiorina/station/medbay) "fUZ" = ( /obj/structure/largecrate/supply, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "fVA" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "fWc" = ( @@ -8124,17 +9678,22 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "fWC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/folder/black_random, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "fWD" = ( /obj/structure/machinery/recharge_station, -/turf/open/floor/prison/darkbrown2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "fWL" = ( @@ -8145,22 +9704,24 @@ /obj/structure/barricade/handrail{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "fWS" = ( /obj/structure/stairs/perspective, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "fXe" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "fXv" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "fXB" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -8180,11 +9741,15 @@ /obj/structure/platform{ dir = 8 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "fXS" = ( -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "fXT" = ( /obj/structure/machinery/light/double/blue{ @@ -8192,23 +9757,29 @@ pixel_y = 21 }, /obj/item/toy/beach_ball, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "fYn" = ( /obj/structure/bed/chair, /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "fYB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/donut_box/empty, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "fYD" = ( /obj/structure/bed/chair/office/dark, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "fYW" = ( /obj/structure/machinery/light/double/blue, @@ -8226,17 +9797,18 @@ /area/fiorina/station/park) "gas" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "gaL" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "gaZ" = ( /obj/structure/closet/secure_closet/engineering_electrical, @@ -8246,27 +9818,35 @@ pixel_y = -3 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "gbi" = ( /obj/structure/inflatable/door, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "gbn" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "gbD" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "gbP" = ( @@ -8278,7 +9858,9 @@ pixel_x = -6; pixel_y = 16 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "gbS" = ( /obj/structure/closet/emcloset, @@ -8289,26 +9871,35 @@ /obj/item/clothing/glasses/mbcg{ pixel_y = -14 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "gbU" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "gcr" = ( /obj/item/tool/wirecutters/clippers, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "gcy" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/lowsec) "gdn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "gdt" = ( /obj/structure/window/framed/prison/reinforced/hull, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/chapel) "gec" = ( /obj/structure/prop/structure_lattice{ @@ -8345,7 +9936,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "gfh" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -8382,7 +9975,9 @@ /obj/item/storage/donut_box{ pixel_y = 9 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "gfL" = ( /obj/structure/prop/souto_land/pole, @@ -8394,7 +9989,7 @@ /area/fiorina/station/park) "gfN" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "ggd" = ( /turf/closed/shuttle/ert{ @@ -8419,8 +10014,9 @@ pixel_y = 18 }, /obj/item/clothing/gloves/boxing/yellow, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "ggu" = ( @@ -8428,18 +10024,24 @@ icon_state = "casing_6_1" }, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "ggB" = ( /obj/item/stool, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "ggG" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/machinery/space_heater, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "ggQ" = ( /obj/structure/platform_decoration/kutjevo{ @@ -8464,8 +10066,9 @@ /area/fiorina/oob) "ghv" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "ghw" = ( @@ -8476,20 +10079,26 @@ }, /area/fiorina/tumor/ship) "ghP" = ( -/turf/open/floor/prison/greencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "green" }, /area/fiorina/station/chapel) "ghU" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "gik" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ pixel_y = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "giX" = ( /obj/structure/barricade/handrail/type_b{ @@ -8502,36 +10111,46 @@ dir = 1; icon_state = "sandbag_0" }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/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 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "gjX" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "gkd" = ( /obj/item/storage/wallet/random, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "gkm" = ( /obj/structure/machinery/line_nexter, -/turf/open/floor/prison/red{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, /area/fiorina/station/security) "gks" = ( -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "gkt" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, /area/fiorina/station/medbay) "gkZ" = ( /obj/effect/decal/medical_decals{ @@ -8541,7 +10160,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "glj" = ( /obj/structure/window/framed/prison, @@ -8552,7 +10174,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "glD" = ( /obj/structure/bed{ @@ -8566,35 +10188,47 @@ /area/fiorina/tumor/aux_engi) "glH" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "glI" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "glW" = ( /obj/structure/holohoop{ pixel_y = 25 }, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "gma" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "gmv" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "gmy" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "gmS" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/spawner/random/gun/shotgun/midchance, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "gmT" = ( /obj/effect/landmark/xeno_spawn, @@ -8611,25 +10245,30 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "gnj" = ( /obj/item/stack/folding_barricade, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "gnm" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/greenfull, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "gnR" = ( /obj/structure/machinery/light/double/blue{ @@ -8637,27 +10276,33 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/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/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "gnV" = ( /obj/effect/decal/medical_decals{ icon_state = "cryomid" }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "goh" = ( /obj/structure/pipes/standard/manifold/visible, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "gol" = ( /obj/structure/filingcabinet{ @@ -8669,20 +10314,28 @@ pixel_y = 4 }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "gom" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "goz" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) "goA" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "goG" = ( /obj/structure/window/framed/prison/reinforced, @@ -8691,14 +10344,17 @@ "goH" = ( /obj/structure/surface/rack, /obj/item/tool/mop, -/turf/open/floor/prison/whitegreenfull, +/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 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "gpq" = ( /obj/structure/machinery/shower{ @@ -8708,12 +10364,15 @@ /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "gpB" = ( /obj/item/storage/bible/hefa, -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) "gpG" = ( @@ -8722,29 +10381,33 @@ /area/fiorina/station/security) "gqd" = ( /obj/item/tool/kitchen/utensil/pknife, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "gqe" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "gqH" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "gqZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio, /obj/item/tool/pen/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "grL" = ( /obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "grO" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "gsL" = ( /obj/structure/platform, @@ -8760,11 +10423,13 @@ /obj/item/shard{ icon_state = "large" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "gto" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "gtH" = ( /obj/structure/safe, @@ -8778,8 +10443,9 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "guf" = ( @@ -8794,29 +10460,43 @@ dir = 8; layer = 3.5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "guG" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "guQ" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/power_ring) "gvT" = ( /obj/structure/closet/secure_closet/engineering_materials, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "gvX" = ( /obj/structure/closet/secure_closet/security_empty, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "gws" = ( /turf/open/floor/plating, /area/fiorina/oob) "gwz" = ( /obj/effect/spawner/random/gun/pistol, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "gwH" = ( /turf/closed/wall/strata_ice/jungle{ @@ -8839,8 +10519,9 @@ pixel_x = 15; pixel_y = 25 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "gxj" = ( @@ -8851,8 +10532,9 @@ "gxx" = ( /obj/item/packageWrap, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "gxL" = ( @@ -8862,14 +10544,19 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "gxN" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "gyi" = ( -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "gyB" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -8882,7 +10569,9 @@ /area/fiorina/station/civres_blue) "gyI" = ( /obj/item/trash/candy, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "gyJ" = ( /obj/structure/machinery/light/double/blue{ @@ -8893,8 +10582,9 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "gyU" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/park) "gyW" = ( @@ -8912,19 +10602,23 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "gzy" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "gzz" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "gzA" = ( /obj/structure/machinery/gibber, @@ -8932,34 +10626,45 @@ pixel_x = 8; pixel_y = 10 }, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "gzF" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "gzQ" = ( /obj/structure/machinery/computer/crew, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "gAa" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "gAA" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "gAS" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "gBo" = ( /obj/structure/closet/emcloset, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "gCb" = ( /obj/structure/barricade/sandbags{ @@ -8967,8 +10672,9 @@ icon_state = "sandbag_0"; pixel_y = 2 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "gCn" = ( @@ -8995,10 +10701,14 @@ /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/civres) "gCX" = ( -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "gCY" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/flight_deck) "gDx" = ( /obj/structure/surface/table/woodentable, @@ -9013,23 +10723,27 @@ /area/fiorina/tumor/ice_lab) "gDz" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/floor_plate, +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "gEe" = ( /obj/item/reagent_container/food/drinks/bottle/patron, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "gEv" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "gEx" = ( @@ -9046,57 +10760,74 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "gEU" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/space, /area/fiorina/oob) "gEW" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "gFc" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "gFe" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/fiberbush) "gFg" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "gFq" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "gFG" = ( -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "gFK" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "gGp" = ( /obj/item/ammo_casing{ icon_state = "casing_1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "gGu" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "gGx" = ( /obj/effect/landmark/queen_spawn, @@ -9106,11 +10837,13 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "gGG" = ( /obj/structure/closet/secure_closet/engineering_materials, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "gHb" = ( /obj/structure/prop/structure_lattice{ @@ -9119,11 +10852,15 @@ /obj/structure/prop/structure_lattice{ pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "gHc" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "gHh" = ( /obj/structure/machinery/light/double/blue{ @@ -9134,7 +10871,7 @@ /area/fiorina/station/research_cells) "gHl" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "gHy" = ( /obj/item/stack/sheet/metal/medium_stack, @@ -9151,7 +10888,10 @@ icon_state = "cryomid" }, /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "gHP" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -9160,13 +10900,15 @@ pixel_x = 7; pixel_y = 6 }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/chapel) "gHW" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "gIB" = ( @@ -9176,7 +10918,7 @@ "gIF" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/technology_scanner, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "gJu" = ( /obj/effect/alien/weeds/node, @@ -9184,8 +10926,9 @@ /area/fiorina/tumor/aux_engi) "gJG" = ( /obj/item/stack/folding_barricade, -/turf/open/floor/prison/red{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, /area/fiorina/station/security) "gKi" = ( @@ -9207,17 +10950,22 @@ /obj/structure/prop/souto_land/streamer{ pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "gKu" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Residential Apartment" }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "gKA" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "gKL" = ( /obj/structure/platform, @@ -9227,7 +10975,10 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "gLu" = ( /turf/closed/shuttle/ert{ @@ -9243,26 +10994,35 @@ /area/fiorina/tumor/servers) "gLG" = ( /obj/item/paper, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "gMw" = ( /obj/structure/pipes/standard/tank/oxygen, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "gMJ" = ( /obj/structure/barricade/deployable{ dir = 4 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "gMV" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "gNF" = ( /obj/structure/machinery/shower{ @@ -9272,24 +11032,22 @@ /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "gNK" = ( /obj/item/stack/rods/plasteel, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) -"gNP" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" }, /area/fiorina/station/disco) "gNW" = ( /obj/item/bodybag, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "gNY" = ( @@ -9305,8 +11063,9 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "gOJ" = ( @@ -9323,7 +11082,9 @@ /obj/item/ammo_casing{ icon_state = "casing_8" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "gPs" = ( /obj/structure/surface/table/woodentable/fancy, @@ -9335,8 +11096,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "gPS" = ( @@ -9353,14 +11115,19 @@ pixel_x = 1; pixel_y = 13 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "gQx" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "gQK" = ( @@ -9380,11 +11147,16 @@ /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "gRy" = ( /obj/item/tool/shovel/etool, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "gRT" = ( /obj/structure/surface/table/woodentable/fancy, @@ -9405,7 +11177,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "gRW" = ( /obj/structure/machinery/light/double/blue{ @@ -9420,11 +11195,14 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "gSG" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 @@ -9434,15 +11212,19 @@ dir = 4; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "gSN" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "handblood" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "gSP" = ( /obj/structure/surface/table/woodentable/fancy, @@ -9467,8 +11249,9 @@ /turf/open/space/basic, /area/fiorina/oob) "gUf" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "gUj" = ( @@ -9483,15 +11266,26 @@ pixel_y = 3 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor, +/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/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "gUO" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "gVs" = ( /obj/structure/largecrate/random/barrel/blue, @@ -9510,14 +11304,19 @@ /area/fiorina/tumor/servers) "gVA" = ( /obj/item/frame/rack, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "gWf" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 }, /obj/item/frame/rack, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "gWg" = ( /obj/structure/powerloader_wreckage, @@ -9538,12 +11337,15 @@ /area/fiorina/station/disco) "gWT" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/tumor/civres) "gXt" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/station/chapel) "gXu" = ( /obj/structure/surface/rack, @@ -9568,7 +11370,9 @@ pixel_x = -16; pixel_y = 12 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "gXL" = ( /obj/structure/bed/chair{ @@ -9579,13 +11383,18 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "gYA" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "gZc" = ( /obj/effect/decal/hefa_cult_decals/d32{ @@ -9606,10 +11415,14 @@ /obj/structure/machinery/computer/cameras{ dir = 1 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "gZT" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/station/transit_hub) "hab" = ( /obj/structure/surface/table/reinforced/prison, @@ -9617,16 +11430,21 @@ pixel_x = 1; pixel_y = 3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "hah" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/darkred2full, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "ham" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "hay" = ( @@ -9640,7 +11458,9 @@ pixel_y = 21 }, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "hbo" = ( /obj/structure/surface/table/reinforced/prison, @@ -9677,15 +11497,20 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "hbC" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/space, /area/fiorina/oob) "hcb" = ( -/turf/open/floor/prison/greenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greencorner" }, /area/fiorina/tumor/civres) "hce" = ( @@ -9706,11 +11531,16 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "hcf" = ( /obj/item/paper/carbon, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "hcv" = ( /obj/item/stack/tile/plasteel{ @@ -9730,11 +11560,15 @@ /area/fiorina/station/civres_blue) "hdv" = ( /obj/item/tool/scythe, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "heb" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, @@ -9744,7 +11578,10 @@ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "heO" = ( /turf/closed/shuttle/elevator, @@ -9769,7 +11606,10 @@ /area/fiorina/station/power_ring) "hfl" = ( /obj/item/device/pinpointer, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "hfT" = ( /turf/closed/wall/r_wall/prison, @@ -9779,26 +11619,34 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/oob) "hgr" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "hgz" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "hgC" = ( -/turf/open/floor/prison/greencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/station/transit_hub) "hgJ" = ( @@ -9817,21 +11665,28 @@ pixel_x = 6; pixel_y = 7 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "hhh" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "hhl" = ( /obj/item/device/flashlight/flare/on, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "hhy" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "hhL" = ( @@ -9851,8 +11706,9 @@ /area/fiorina/lz/near_lzI) "hiu" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/telecomm/lz1_tram) "hix" = ( @@ -9865,17 +11721,22 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "hiG" = ( /obj/item/storage/backpack/souto, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "hiK" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/darkred2full, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/disco) "hiO" = ( /turf/closed/shuttle/elevator{ @@ -9883,7 +11744,9 @@ }, /area/fiorina/tumor/aux_engi) "hja" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, @@ -9891,12 +11754,15 @@ /area/fiorina/station/botany) "hjb" = ( /obj/structure/closet/secure_closet/medical2, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "hjr" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "hjE" = ( @@ -9908,7 +11774,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/security) "hjP" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "hjV" = ( /obj/structure/stairs/perspective, @@ -9927,24 +11793,32 @@ /area/fiorina/oob) "hkW" = ( /obj/item/trash/popcorn, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "hll" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "hln" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "hlq" = ( /obj/structure/janitorialcart, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "hlK" = ( -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "hlT" = ( /obj/structure/machinery/light/double/blue{ @@ -9955,8 +11829,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "hmd" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -9965,14 +11840,18 @@ /area/fiorina/station/park) "hmg" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "hmj" = ( /obj/item/storage/firstaid/toxin, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "hmk" = ( -/turf/open/floor/prison/whitegreenangle, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, /area/fiorina/tumor/ice_lab) "hmr" = ( /obj/structure/bed/sofa/south/grey/right, @@ -9980,21 +11859,29 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/greenfull, +/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/greenfull_2, +/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 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "hob" = ( /obj/item/phone{ @@ -10007,11 +11894,13 @@ dir = 1; layer = 2.7 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "hoy" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "hoH" = ( /obj/effect/decal/cleanable/cobweb{ @@ -10025,15 +11914,18 @@ dir = 8; icon_state = "casing_6" }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "hoZ" = ( /turf/open/floor/plating/prison, @@ -10051,8 +11943,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "hpz" = ( @@ -10080,7 +11973,10 @@ pixel_x = 2; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "hpW" = ( /obj/item/stack/cable_coil/orange, @@ -10104,8 +12000,9 @@ dir = 8; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "hqZ" = ( @@ -10113,7 +12010,10 @@ /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/toxin, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "hro" = ( /obj/structure/girder, @@ -10121,7 +12021,9 @@ /area/fiorina/tumor/servers) "hrX" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "hsc" = ( /obj/structure/cable/heavyduty{ @@ -10131,16 +12033,23 @@ /area/fiorina/tumor/servers) "hsd" = ( /obj/item/device/flashlight/flare, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "hss" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "hsA" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "hsC" = ( /obj/structure/surface/table/reinforced/prison, @@ -10166,12 +12075,15 @@ "htL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "hue" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "hul" = ( @@ -10184,7 +12096,9 @@ /area/fiorina/station/civres_blue) "huI" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "hva" = ( /obj/structure/bed/chair/office/light{ @@ -10209,13 +12123,18 @@ pixel_x = 3; pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "hvi" = ( /obj/effect/decal/medical_decals{ icon_state = "docstripingdir" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "hvE" = ( /obj/structure/machinery/light/double/blue{ @@ -10236,7 +12155,9 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "hvF" = ( /obj/structure/grille, @@ -10245,38 +12166,44 @@ "hvG" = ( /obj/item/weapon/gun/rifle/m16, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "hwn" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "hxg" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "hxi" = ( /obj/item/roller, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "hxk" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "hxq" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) "hxy" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "hxC" = ( -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/tumor/aux_engi) "hxJ" = ( /obj/structure/sign/poster{ @@ -10298,32 +12225,31 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "hyz" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/station/civres_blue) "hyG" = ( /obj/structure/platform_decoration{ dir = 4 }, /obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) -"hyI" = ( -/obj/structure/platform{ - dir = 4 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 - }, -/area/fiorina/station/disco) +/area/fiorina/station/botany) "hyR" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "hyT" = ( @@ -10335,12 +12261,16 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "hzq" = ( /obj/item/storage/fancy/cigarettes/lucky_strikes, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "hzG" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -10360,8 +12290,9 @@ pixel_x = -16; pixel_y = 12 }, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "hAL" = ( @@ -10373,15 +12304,22 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "hAY" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "hBn" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "hBF" = ( /obj/structure/window_frame/prison/reinforced, @@ -10393,7 +12331,10 @@ "hBI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/megaphone, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "hBP" = ( /obj/structure/surface/table/reinforced/prison, @@ -10408,11 +12349,18 @@ pixel_x = -3; pixel_y = 16 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "hBX" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "hCc" = ( /obj/item/reagent_container/food/snacks/meat, @@ -10420,37 +12368,49 @@ /area/fiorina/station/park) "hCd" = ( /obj/structure/barricade/metal/wired, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "hCS" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "hCT" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "hCX" = ( /obj/effect/landmark/wo_supplies/storage/belts/knifebelt, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "hDr" = ( /obj/item/stool, -/turf/open/floor/prison/damaged2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, /area/fiorina/station/lowsec) "hDx" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "hDy" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "hDL" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "hEb" = ( @@ -10469,13 +12429,19 @@ /obj/structure/barricade/handrail/type_b{ dir = 8 }, -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "hFn" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "hFH" = ( @@ -10488,21 +12454,26 @@ /area/fiorina/station/park) "hGz" = ( /obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "hGC" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/greenbluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "greenblue" }, /area/fiorina/station/botany) "hGZ" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "hHc" = ( /obj/structure/surface/table/woodentable/fancy, @@ -10520,7 +12491,10 @@ /area/fiorina/station/chapel) "hHh" = ( /obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "hHq" = ( /obj/structure/closet/cabinet, @@ -10531,42 +12505,61 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "hIe" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "hIo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "hIu" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "hJc" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "hJw" = ( -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/civres_blue) +"hKE" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "hKI" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "hKJ" = ( /obj/structure/closet/emcloset, /obj/item/storage/pill_bottle/kelotane/skillless, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "hKW" = ( /obj/structure/closet/crate/science{ @@ -10580,7 +12573,7 @@ pixel_y = 21 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "hLt" = ( /obj/structure/machinery/photocopier, @@ -10589,11 +12582,15 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "hLy" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "hLz" = ( /turf/closed/wall/prison, @@ -10602,7 +12599,9 @@ /obj/structure/machinery/landinglight/ds2{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "hLM" = ( /obj/structure/sign/safety/bulkhead_door, @@ -10610,14 +12609,15 @@ /area/fiorina/tumor/fiberbush) "hLO" = ( /obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "hLX" = ( /obj/structure/platform{ dir = 4 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - 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) @@ -10630,7 +12630,7 @@ /area/fiorina/station/chapel) "hMg" = ( /obj/item/clothing/head/helmet/marine/specialist/hefa, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "hMK" = ( /obj/effect/landmark/nightmare{ @@ -10640,12 +12640,16 @@ /area/fiorina/station/power_ring) "hMX" = ( /obj/item/weapon/twohanded/spear, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "hNc" = ( /obj/item/newspaper, -/turf/open/floor/prison/red{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" }, /area/fiorina/lz/near_lzII) "hNY" = ( @@ -10654,15 +12658,19 @@ /area/fiorina/station/chapel) "hOg" = ( /obj/structure/largecrate/random/barrel, -/turf/open/floor/prison/whitegreenfull, +/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/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/chapel) "hOA" = ( @@ -10676,16 +12684,22 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "hOW" = ( -/turf/open/floor/prison/floorscorched2, +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, /area/fiorina/station/civres_blue) "hPs" = ( /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "hPF" = ( /obj/structure/reagent_dispensers/water_cooler{ @@ -10693,10 +12707,12 @@ pixel_x = -8; pixel_y = 16 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "hPW" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) "hPY" = ( @@ -10705,7 +12721,9 @@ /area/fiorina/station/chapel) "hQg" = ( /obj/item/bedsheet, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "hQh" = ( /obj/structure/barricade/handrail/type_b{ @@ -10731,7 +12749,10 @@ dir = 8; health = 80 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "hRX" = ( /turf/open/gm/river{ @@ -10741,13 +12762,16 @@ /area/fiorina/station/park) "hSf" = ( /obj/item/dogtag, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "hSF" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "hSH" = ( /obj/item/reagent_container/food/snacks/donkpocket, @@ -10757,11 +12781,11 @@ /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "hSR" = ( /obj/structure/window/reinforced, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "hTf" = ( /obj/structure/prop/structure_lattice{ @@ -10778,7 +12802,9 @@ /obj/structure/machinery/landinglight/ds2{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "hTr" = ( /obj/structure/closet, @@ -10793,8 +12819,9 @@ }, /area/fiorina/station/civres_blue) "hTt" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" }, /area/fiorina/tumor/ice_lab) "hTG" = ( @@ -10802,8 +12829,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "hTM" = ( @@ -10812,11 +12840,12 @@ /area/fiorina/station/transit_hub) "hUf" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "hUh" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" }, /area/fiorina/tumor/ice_lab) "hUi" = ( @@ -10829,7 +12858,9 @@ dir = 8 }, /obj/item/storage/box/flashbangs, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "hUO" = ( /turf/open/floor/prison/chapel_carpet{ @@ -10839,11 +12870,15 @@ /area/fiorina/maintenance) "hUV" = ( /obj/item/clothing/head/helmet/marine/veteran/ua_riot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "hVm" = ( /obj/item/trash/cigbutt/bcigbutt, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "hVu" = ( /obj/item/stack/sheet/metal, @@ -10857,7 +12892,9 @@ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -10876,7 +12913,9 @@ /area/fiorina/oob) "hWB" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/ice_lab) "hWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -10886,24 +12925,32 @@ /area/fiorina/tumor/ship) "hWJ" = ( /obj/item/trash/sosjerky, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "hWU" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "hXc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ pixel_y = 7 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "hXi" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "hXZ" = ( /turf/closed/shuttle/ert{ @@ -10912,11 +12959,14 @@ /area/fiorina/station/medbay) "hYK" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "hYT" = ( /obj/item/disk/botany, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "hYV" = ( /obj/structure/prop/resin_prop{ @@ -10924,14 +12974,19 @@ icon_state = "chair"; pixel_y = 6 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "hZp" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/chapel) "hZR" = ( @@ -10943,30 +12998,40 @@ dir = 8; icon_state = "cartridge_2" }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "iaO" = ( -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /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" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "ibN" = ( -/turf/open/floor/prison/yellowangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellowcorner" }, /area/fiorina/station/lowsec) "icj" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottom" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "ick" = ( /obj/item/tool/candle, @@ -10977,7 +13042,10 @@ /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibmid3" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "icS" = ( /obj/structure/bed/chair{ @@ -10993,12 +13061,13 @@ /obj/item/ammo_casing{ icon_state = "casing_5" }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "idE" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "idT" = ( /obj/structure/barricade/wooden{ @@ -11006,17 +13075,22 @@ pixel_y = 4 }, /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "idV" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "ied" = ( -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/tumor/servers) "ieu" = ( @@ -11041,14 +13115,14 @@ }, /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "ieW" = ( /obj/structure/machinery/computer3/server/rack, /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "ifk" = ( /obj/structure/platform_decoration{ @@ -11070,18 +13144,21 @@ /area/fiorina/station/civres_blue) "ifq" = ( /obj/item/stock_parts/micro_laser/ultra, -/turf/open/floor/prison/darkpurple2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "ifs" = ( /obj/structure/inflatable/popped, -/turf/open/floor/prison/floor, +/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/yellowangle, +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, /area/fiorina/station/lowsec) "ifJ" = ( /obj/structure/bed/chair/dropship/pilot{ @@ -11096,13 +13173,16 @@ /area/fiorina/tumor/ship) "igA" = ( /obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/tumor/civres) "igD" = ( /obj/structure/largecrate/supply/medicine/iv, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "igQ" = ( /obj/structure/closet/cabinet, @@ -11117,7 +13197,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "ihz" = ( /obj/effect/landmark/objective_landmark/medium, @@ -11126,35 +13208,48 @@ "ihA" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "ihC" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "iif" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "iir" = ( /obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "iiE" = ( /obj/item/device/flashlight/lamp/tripod, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "iiP" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "ijs" = ( /obj/structure/surface/rack, @@ -11165,17 +13260,19 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "ijP" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "ikq" = ( -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "ikz" = ( @@ -11183,54 +13280,72 @@ icon_state = "abed" }, /obj/item/toy/beach_ball/holoball, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "ikA" = ( /obj/item/reagent_container/food/drinks/coffee{ name = "\improper paper cup" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "ilb" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /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/floor, +/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/darkyellow2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "ilI" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "ilX" = ( /obj/item/stack/folding_barricade, /obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "imn" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "imt" = ( /turf/open/floor/almayer, /area/fiorina/tumor/ship) "imw" = ( /obj/structure/bed/roller, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "imz" = ( /obj/effect/decal/cleanable/blood, @@ -11240,7 +13355,7 @@ /area/fiorina/station/civres_blue) "imH" = ( /obj/item/tool/shovel/etool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "imL" = ( /obj/structure/surface/table/reinforced/prison, @@ -11248,11 +13363,14 @@ pixel_x = -4; pixel_y = 9 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "inh" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "inA" = ( @@ -11267,7 +13385,10 @@ /area/fiorina/station/medbay) "ioP" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "ipa" = ( /obj/structure/machinery/door/airlock/almayer/command{ @@ -11283,15 +13404,19 @@ /area/fiorina/station/botany) "ipy" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "ipJ" = ( /obj/effect/spawner/random/sentry/midchance, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "iqt" = ( /obj/item/fuelCell, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "iqB" = ( /obj/structure/surface/table/woodentable/fancy, @@ -11306,8 +13431,9 @@ /obj/structure/platform_decoration{ dir = 4 }, -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform{ dir = 1 @@ -11316,11 +13442,16 @@ /area/fiorina/station/power_ring) "iqV" = ( /obj/item/clothing/mask/cigarette/bcigarette, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "iry" = ( /obj/structure/janitorialcart, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "irB" = ( /turf/closed/wall/mineral/bone_resin, @@ -11334,8 +13465,9 @@ /area/fiorina/tumor/ice_lab) "irK" = ( /obj/effect/spawner/random/gun/rifle/lowchance, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "isi" = ( @@ -11347,30 +13479,38 @@ /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "isB" = ( /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/redfull, +/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/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "isK" = ( /obj/structure/inflatable, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "isP" = ( /obj/item/trash/snack_bowl, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "itd" = ( @@ -11381,8 +13521,9 @@ /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib2" }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "itq" = ( @@ -11390,13 +13531,17 @@ pixel_y = 10 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/kitchen, +/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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "itv" = ( /obj/item/toy/handcard/uno_reverse_yellow, @@ -11406,8 +13551,9 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "itN" = ( @@ -11422,7 +13568,9 @@ /area/fiorina/tumor/fiberbush) "iuV" = ( /obj/structure/curtain, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "iuW" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ @@ -11432,7 +13580,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "iuZ" = ( /obj/item/stack/rods, @@ -11464,11 +13614,15 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "ivM" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "ivR" = ( /obj/structure/machinery/optable{ @@ -11483,7 +13637,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "iwf" = ( /obj/structure/machinery/light/double/blue, @@ -11492,7 +13649,9 @@ "iwK" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/mre_pack/meal1, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "iwT" = ( /obj/structure/ice/thin/indestructible{ @@ -11511,8 +13670,9 @@ dir = 8; icon_state = "cartridge_2" }, -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "iyc" = ( @@ -11527,8 +13687,9 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/park) "iyu" = ( @@ -11536,8 +13697,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/botany) "iyS" = ( @@ -11557,8 +13719,9 @@ pixel_x = -1; pixel_y = 9 }, -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/power_ring) "izP" = ( @@ -11566,7 +13729,10 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "izZ" = ( /turf/closed/wall/prison, @@ -11579,17 +13745,24 @@ /area/fiorina/station/medbay) "iAL" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "iAO" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "iBi" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "iBP" = ( /turf/closed/shuttle/ert{ @@ -11601,28 +13774,38 @@ density = 0; dir = 4 }, -/turf/open/floor/prison/floor, +/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/bluefull, +/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/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "iCR" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/bright_clean2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean2" + }, /area/fiorina/station/power_ring) "iCU" = ( /obj/structure/sign/nosmoking_1, @@ -11630,14 +13813,17 @@ /area/fiorina/station/disco) "iDa" = ( /obj/item/inflatable, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "iDo" = ( /obj/structure/platform, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "iDq" = ( /obj/structure/disposalpipe/segment{ @@ -11652,10 +13838,14 @@ /area/fiorina/tumor/servers) "iDE" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "iEi" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, /obj/structure/platform{ dir = 1 }, @@ -11664,13 +13854,15 @@ "iEz" = ( /obj/item/weapon/gun/smg/mp5, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "iFj" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "iFu" = ( @@ -11679,8 +13871,9 @@ pixel_x = -12 }, /obj/item/reagent_container/food/drinks/flask/barflask, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "iFD" = ( @@ -11692,7 +13885,7 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "iGL" = ( /obj/structure/bed/chair/comfy{ @@ -11703,11 +13896,16 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "iGW" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "iGX" = ( /obj/effect/landmark/queen_spawn, @@ -11716,15 +13914,18 @@ "iHn" = ( /obj/item/frame/toolbox_tiles_sensor, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "iHJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ network = list("PRISON") }, -/turf/open/floor/prison/redangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "redcorner" }, /area/fiorina/station/power_ring) "iHU" = ( @@ -11733,7 +13934,9 @@ health = 150; icon_state = "metal_2" }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/ice_lab) "iIS" = ( /obj/structure/machinery/constructable_frame, @@ -11746,11 +13949,14 @@ dir = 4; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "iJf" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "iJj" = ( @@ -11761,17 +13967,22 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "iJC" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/ice_lab) "iJE" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "iJF" = ( /obj/structure/surface/table/reinforced/prison, @@ -11786,15 +13997,20 @@ "iJG" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications/simple, -/turf/open/floor/prison/bluefull, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "iJM" = ( /obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "iKg" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, @@ -11804,7 +14020,9 @@ /obj/structure/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "iKs" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -11812,17 +14030,21 @@ "iKC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /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/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "iLy" = ( /obj/item/stack/rods/plasteel, -/turf/open/floor/prison/floorscorched2, +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, /area/fiorina/station/security) "iLJ" = ( /obj/effect/spawner/random/tool, @@ -11835,14 +14057,15 @@ /obj/item/stack/cable_coil/blue, /obj/item/stack/cable_coil/blue, /obj/item/stack/cable_coil/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "iMm" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 }, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/tumor/servers) "iMo" = ( @@ -11853,27 +14076,39 @@ /area/fiorina/station/security/wardens) "iMF" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "iMM" = ( /obj/structure/machinery/vending/hydronutrients, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "iMS" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "iNw" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "iNO" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "iOa" = ( /obj/structure/machinery/floodlight/landing/floor, @@ -11881,26 +14116,35 @@ /area/fiorina/lz/near_lzI) "iOe" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "iOt" = ( -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "iOE" = ( /obj/structure/platform, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/security) "iOG" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "iOJ" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "iPq" = ( @@ -11909,18 +14153,23 @@ pixel_y = 15 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "iPx" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "iPM" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "iPV" = ( -/turf/open/floor/prison/red{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" }, /area/fiorina/lz/near_lzII) "iPZ" = ( @@ -11930,7 +14179,9 @@ name = "overhead ducting"; pixel_y = 33 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "iQu" = ( /obj/structure/coatrack, @@ -11942,7 +14193,10 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "iQK" = ( /obj/structure/disposalpipe/broken{ @@ -11953,7 +14207,10 @@ /area/fiorina/tumor/aux_engi) "iQP" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "iRa" = ( /obj/structure/window/framed/prison, @@ -11965,20 +14222,28 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreenfull, +/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/kitchen, +/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/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "iRH" = ( /obj/item/frame/firstaid_arm_assembly, @@ -11994,7 +14259,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "iSh" = ( /obj/structure/prop/structure_lattice{ @@ -12005,10 +14270,12 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "iSi" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/oob) "iSn" = ( @@ -12019,8 +14286,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "iSu" = ( @@ -12031,11 +14299,14 @@ /area/fiorina/station/park) "iSG" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "iSQ" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "iTm" = ( @@ -12043,18 +14314,28 @@ /area/fiorina/station/civres_blue) "iTw" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "iTy" = ( /obj/structure/machinery/photocopier, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "iTG" = ( /obj/vehicle/train/cargo/trolley, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "iUy" = ( -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "iUO" = ( /obj/structure/platform{ @@ -12064,11 +14345,14 @@ /area/fiorina/lz/near_lzI) "iVb" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "iVt" = ( /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "iVv" = ( /obj/structure/blocker/invisible_wall, @@ -12078,11 +14362,17 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "iWg" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "iWq" = ( /obj/structure/platform/kutjevo/smooth{ @@ -12096,71 +14386,88 @@ /turf/open/space, /area/fiorina/oob) "iWy" = ( -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/tumor/servers) "iWW" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "iXz" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "iXL" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "iYq" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" }, /area/fiorina/tumor/ice_lab) "iYI" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "iZn" = ( /obj/structure/barricade/metal{ health = 250; icon_state = "metal_1" }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/ice_lab) "iZt" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "iZA" = ( /obj/structure/largecrate/random/barrel, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "iZV" = ( -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "iZZ" = ( /obj/structure/barricade/metal{ health = 250; icon_state = "metal_1" }, -/turf/open/floor/prison/darkpurple2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, /area/fiorina/tumor/ice_lab) "jae" = ( /obj/structure/cargo_container/grant/left, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "jah" = ( /obj/item/tool/crowbar, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "jal" = ( /obj/structure/largecrate/supply/explosives/mortar_flare, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "jao" = ( /obj/structure/filingcabinet{ @@ -12171,7 +14478,9 @@ pixel_x = -8; pixel_y = 4 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "jas" = ( /obj/structure/surface/table/reinforced/prison, @@ -12180,38 +14489,50 @@ pixel_x = -6; pixel_y = 12 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "jax" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "jay" = ( /obj/item/reagent_container/food/snacks/boiledegg, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jbk" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "jbx" = ( /obj/structure/prop/almayer/computers/sensor_computer3, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "jbG" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/console_II) "jbU" = ( /obj/structure/surface/table/reinforced/prison, @@ -12226,7 +14547,9 @@ /area/fiorina/station/research_cells) "jcg" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "jcv" = ( /obj/structure/bed/chair/comfy{ @@ -12244,7 +14567,9 @@ pixel_x = -9; pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "jdc" = ( /obj/structure/closet/secure_closet/engineering_personal, @@ -12255,16 +14580,20 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/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/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 10 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "jdo" = ( /obj/structure/machinery/washing_machine, @@ -12275,10 +14604,14 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "jeh" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, /obj/structure/platform{ dir = 1 }, @@ -12290,7 +14623,9 @@ pixel_x = -6; pixel_y = 4 }, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "jeY" = ( /obj/structure/surface/table/reinforced/prison, @@ -12301,13 +14636,17 @@ /obj/item/tool/surgery/circular_saw{ pixel_y = -2 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "jfa" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ name = "\improper Fiorina Engineering Canteen Vendor" }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "jfc" = ( /obj/item/stack/rods, @@ -12345,7 +14684,10 @@ "jfD" = ( /obj/item/weapon/gun/rifle/m16, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "jfN" = ( /obj/structure/machinery/light/double/blue{ @@ -12353,15 +14695,18 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "jgl" = ( /obj/structure/platform_decoration{ dir = 4 }, /obj/item/trash/used_stasis_bag, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "jgu" = ( @@ -12374,8 +14719,9 @@ /obj/item/bodybag/tarp/reactive, /obj/item/bodybag/tarp/reactive, /obj/structure/surface/rack, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "jhi" = ( @@ -12388,7 +14734,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "jhG" = ( /turf/closed/shuttle/ert{ @@ -12396,7 +14744,9 @@ }, /area/fiorina/tumor/ship) "jit" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/tumor/civres) "jiJ" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ @@ -12405,7 +14755,7 @@ name = "\improper funny telephone booth"; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "jiV" = ( /obj/structure/surface/table/reinforced/prison, @@ -12421,13 +14771,18 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "jiW" = ( -/turf/open/floor/prison/greenfull, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "jjg" = ( /obj/structure/window/framed/prison, @@ -12449,8 +14804,9 @@ /area/fiorina/tumor/fiberbush) "jjS" = ( /obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "jjW" = ( @@ -12468,7 +14824,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "jkg" = ( /obj/structure/largecrate/supply, @@ -12476,17 +14834,24 @@ /area/fiorina/maintenance) "jki" = ( /obj/item/weapon/twohanded/spear, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "jkZ" = ( /obj/structure/barricade/handrail, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "jlg" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jlk" = ( /turf/closed/wall/mineral/bone_resin, @@ -12502,28 +14867,32 @@ /obj/structure/prop/resin_prop{ icon_state = "rack" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "jlO" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant/pottedplant_29{ +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "jlW" = ( /obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "jmm" = ( /obj/effect/spawner/random/gun/rifle/highchance, -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/security) "jmp" = ( /obj/item/ammo_magazine/handful/shotgun/incendiary{ @@ -12549,18 +14918,26 @@ /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "jmy" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "jmO" = ( /obj/structure/platform{ @@ -12573,13 +14950,15 @@ /obj/structure/reagent_dispensers/fueltank{ layer = 2.6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "jmV" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/maintenance) "jnd" = ( /obj/structure/machinery/light/double/blue{ @@ -12593,7 +14972,10 @@ /obj/structure/filingcabinet, /obj/item/card/data/clown, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "jnO" = ( /obj/structure/machinery/light/double/blue{ @@ -12601,7 +14983,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "jor" = ( /obj/effect/spawner/random/attachment, @@ -12628,26 +15012,34 @@ /area/fiorina/station/park) "joy" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "joz" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "joD" = ( /obj/item/trash/used_stasis_bag, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "joE" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/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/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "jpc" = ( /obj/structure/barricade/wooden{ @@ -12657,7 +15049,7 @@ /area/fiorina/station/chapel) "jpl" = ( /obj/item/clothing/under/CM_uniform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "jpt" = ( /obj/structure/machinery/light/small{ @@ -12687,7 +15079,9 @@ pixel_x = 3; pixel_y = 5 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "jpS" = ( /obj/structure/prop/structure_lattice{ @@ -12699,11 +15093,15 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "jqg" = ( /obj/structure/platform, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "jqs" = ( /obj/structure/disposalpipe/segment{ @@ -12729,38 +15127,48 @@ /area/fiorina/station/telecomm/lz1_cargo) "jqH" = ( /obj/structure/curtain, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "jqR" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "jqX" = ( /obj/structure/platform{ dir = 8 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "jre" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ pixel_y = 6 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "jrk" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "jrn" = ( @@ -12768,11 +15176,15 @@ /obj/item/reagent_container/food/snacks/xenoburger, /obj/item/reagent_container/food/snacks/xenoburger, /obj/structure/closet/crate/freezer, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "jru" = ( /obj/structure/machinery/space_heater, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "jrL" = ( /obj/structure/machinery/light/double/blue{ @@ -12780,24 +15192,27 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "jsD" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" }, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "jsE" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "jta" = ( /obj/structure/bed{ @@ -12808,8 +15223,9 @@ "jtv" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "jtF" = ( @@ -12818,24 +15234,33 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "jum" = ( /obj/item/toy/crayon/mime, -/turf/open/floor/prison/floor_plate, +/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/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "juS" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "juW" = ( /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "jvm" = ( /obj/item/storage/surgical_tray, @@ -12850,11 +15275,14 @@ /area/fiorina/station/medbay) "jvp" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "jvu" = ( /obj/item/stool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "jvy" = ( /mob/living/simple_animal/hostile/carp{ @@ -12866,20 +15294,23 @@ "jvB" = ( /obj/structure/closet/firecloset, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "jvE" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "jvG" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "jwc" = ( @@ -12894,33 +15325,46 @@ /area/fiorina/lz/near_lzII) "jxa" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "jxy" = ( /obj/structure/inflatable/door, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "jxN" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "jxY" = ( -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/civres_blue) "jya" = ( -/turf/open/floor/prison/greenblueangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenbluecorner" }, /area/fiorina/station/botany) "jyc" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "jyK" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "jyM" = ( @@ -12933,15 +15377,16 @@ /area/fiorina/station/medbay) "jyR" = ( /obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "jzY" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "jAx" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/security) "jAy" = ( @@ -12949,7 +15394,7 @@ icon_state = "cartridge_1" }, /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "jAW" = ( /obj/structure/largecrate/supply/ammo, @@ -12957,19 +15402,26 @@ /area/fiorina/station/research_cells) "jBj" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "jBK" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreenfull, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "jBQ" = ( /obj/structure/bed/chair/comfy, @@ -12985,14 +15437,22 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/chapel) "jCl" = ( -/turf/open/floor/prison/damaged2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, /area/fiorina/station/security) "jCp" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "jCt" = ( /obj/structure/machinery/light/small{ @@ -13022,7 +15482,10 @@ /area/fiorina/tumor/fiberbush) "jCQ" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jCU" = ( /obj/structure/closet{ @@ -13030,18 +15493,22 @@ pixel_y = 18 }, /obj/item/clothing/gloves/combat, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "jDk" = ( /obj/item/stack/rods, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "jDL" = ( @@ -13049,7 +15516,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jDR" = ( /obj/structure/machinery/light/double/blue{ @@ -13060,24 +15530,35 @@ /area/fiorina/tumor/aux_engi) "jDX" = ( /obj/item/trash/burger, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "jEb" = ( -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "jEf" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "jEl" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "jEG" = ( /obj/structure/prop/resin_prop, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "jEK" = ( /obj/structure/bed/chair/office/light{ @@ -13087,7 +15568,10 @@ /area/fiorina/station/research_cells) "jES" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "jFl" = ( /obj/effect/landmark/xeno_spawn, @@ -13096,7 +15580,9 @@ "jFN" = ( /obj/item/explosive/grenade/high_explosive/m15, /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/tumor/aux_engi) "jFO" = ( /obj/effect/landmark/nightmare{ @@ -13109,14 +15595,14 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "jGj" = ( /obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "jGA" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "jGL" = ( /obj/structure/machinery/light/double/blue{ @@ -13124,8 +15610,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "jGP" = ( @@ -13134,7 +15621,10 @@ pixel_x = 5; pixel_y = 22 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "jGV" = ( /obj/structure/surface/table/reinforced/prison, @@ -13147,16 +15637,22 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "jIm" = ( /obj/item/frame/firstaid_arm_assembly, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "jIZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "jJb" = ( /obj/structure/barricade/wooden{ @@ -13167,7 +15663,9 @@ "jJh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/objective, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "jJF" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ @@ -13183,18 +15681,25 @@ pixel_x = 17; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jJG" = ( /obj/item/stack/sheet/wood/medium_stack, /obj/item/stack/sheet/wood/medium_stack, /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "jJM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "jJS" = ( /obj/structure/surface/table/reinforced/prison, @@ -13225,27 +15730,29 @@ /area/fiorina/station/park) "jJT" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "jKb" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "jKm" = ( /obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "jKG" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "jKI" = ( /obj/structure/platform/kutjevo/smooth{ @@ -13262,11 +15769,15 @@ /turf/open/space, /area/fiorina/oob) "jKL" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/bright_clean_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean_marked" + }, /area/fiorina/station/power_ring) "jKR" = ( /obj/structure/machinery/shower{ @@ -13275,33 +15786,47 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/ice_lab) "jLs" = ( -/turf/open/floor/prison/floor_plate, +/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/greencorner{ - dir = 4 +/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/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/station/security) "jLN" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /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/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "jMe" = ( /obj/structure/bed/chair/office/dark, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "jMf" = ( /obj/item/stack/tile/plasteel{ @@ -13316,7 +15841,7 @@ /area/fiorina/tumor/servers) "jMz" = ( /obj/structure/machinery/power/smes/buildable, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "jMH" = ( /obj/structure/barricade/metal/wired{ @@ -13335,8 +15860,9 @@ /area/fiorina/station/research_cells) "jNA" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/transit_hub) "jOr" = ( @@ -13352,7 +15878,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "jOt" = ( /obj/structure/surface/table/reinforced/prison, @@ -13360,25 +15889,34 @@ pixel_x = 11; pixel_y = 14 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "jOJ" = ( /obj/structure/machinery/space_heater, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jOO" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "jOW" = ( /obj/item/trash/eat, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "jPz" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "jPK" = ( @@ -13394,7 +15932,9 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "jRf" = ( /obj/structure/girder/displaced, @@ -13417,8 +15957,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "jRp" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -13431,12 +15972,15 @@ /area/fiorina/station/disco) "jRR" = ( /obj/structure/inflatable, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "jSC" = ( /obj/structure/largecrate/random/case/small, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "jSD" = ( @@ -13453,15 +15997,20 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "jTk" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "jTG" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "jTJ" = ( @@ -13471,7 +16020,9 @@ /obj/structure/window/reinforced/tinted, /obj/item/storage/briefcase, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "jUs" = ( /obj/structure/machinery/light/double/blue{ @@ -13485,28 +16036,39 @@ flipped = 1 }, /obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jUB" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "jUI" = ( -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "jUK" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "jVC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ pixel_y = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/oob) "jVE" = ( /obj/structure/surface/table/reinforced/prison, @@ -13523,17 +16085,22 @@ /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "jVH" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "jVQ" = ( /obj/structure/window/framed/prison/reinforced, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "jVW" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/power_ring) "jWy" = ( /obj/structure/barricade/handrail, @@ -13546,7 +16113,7 @@ /area/fiorina/station/research_cells) "jWB" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "jXj" = ( /obj/item/stack/rods, @@ -13558,7 +16125,7 @@ /area/fiorina/tumor/ship) "jXv" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "jXz" = ( /turf/closed/wall/prison, @@ -13568,25 +16135,31 @@ network = list("omega") }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "jXD" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "jXO" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "jXQ" = ( /obj/structure/platform{ @@ -13595,14 +16168,18 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "jXZ" = ( /turf/closed/shuttle/elevator, /area/fiorina/tumor/aux_engi) "jYd" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -13617,18 +16194,25 @@ /area/fiorina/station/research_cells) "jYB" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, -/turf/open/floor/prison/whitegreenfull, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "jZb" = ( /obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "jZc" = ( /obj/structure/disposalpipe/segment{ @@ -13644,14 +16228,19 @@ /obj/structure/barricade/handrail/type_b{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "kaB" = ( /obj/effect/decal{ @@ -13661,16 +16250,24 @@ pixel_y = -11 }, /obj/structure/closet/bombcloset, -/turf/open/floor/prison/floor_plate, +/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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "kaH" = ( /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/power_ring) "kaO" = ( /obj/structure/machinery/light/double/blue{ @@ -13693,7 +16290,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kbi" = ( /obj/item/ammo_casing{ @@ -13708,11 +16305,15 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "kbO" = ( -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "kbT" = ( @@ -13722,14 +16323,19 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecaltopleft" }, -/turf/open/floor/prison/sterile_white, +/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 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "kcz" = ( /obj/structure/platform{ @@ -13741,7 +16347,7 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kcO" = ( /obj/structure/surface/table/reinforced/prison, @@ -13755,19 +16361,26 @@ pixel_x = 5; pixel_y = 11 }, -/turf/open/floor/prison/whitegreenfull, +/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/floor_plate, +/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/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "kdk" = ( @@ -13782,11 +16395,15 @@ /obj/item/phone{ pixel_y = 7 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "kdo" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "kdw" = ( /obj/structure/surface/table/reinforced/prison, @@ -13795,11 +16412,15 @@ icon_state = "mwbloodyo"; pixel_y = 6 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "kdG" = ( -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/tumor/servers) "kdK" = ( @@ -13813,7 +16434,9 @@ "keF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flash, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "keL" = ( /obj/structure/prop/structure_lattice{ @@ -13824,26 +16447,37 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "keV" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/spawner/random/gun/rifle, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "kfl" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) "kfA" = ( -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "kfF" = ( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "kfW" = ( /obj/structure/surface/table/reinforced/prison, @@ -13859,13 +16493,16 @@ /area/fiorina/maintenance) "kge" = ( /obj/effect/spawner/random/gun/rifle/highchance, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "kgP" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "khu" = ( /obj/structure/prop/structure_lattice{ @@ -13882,13 +16519,15 @@ /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "kik" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/security) "kil" = ( @@ -13900,31 +16539,41 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "kiE" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "kiW" = ( /obj/item/ammo_casing{ icon_state = "casing_1" }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "kjo" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "kjz" = ( /obj/item/trash/cigbutt/cigarbutt, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "kjA" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kjP" = ( /obj/structure/surface/table/reinforced/prison, @@ -13944,25 +16593,28 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "kky" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "klb" = ( /obj/item/tool/wirecutters, -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "klg" = ( /obj/item/stack/sheet/cardboard, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "klp" = ( /turf/closed/shuttle/ert{ @@ -13972,8 +16624,9 @@ /area/fiorina/tumor/ship) "klv" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "klC" = ( @@ -13987,24 +16640,29 @@ dir = 8 }, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "klL" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/chapel) "kmB" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/telecomm/lz1_tram) "kmE" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "kmL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ @@ -14023,7 +16681,7 @@ /area/fiorina/station/security/wardens) "kng" = ( /obj/item/tool/stamp, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "knh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -14033,21 +16691,28 @@ /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibup1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "knu" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "knv" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "kny" = ( /obj/item/stack/tile/plasteel{ @@ -14062,7 +16727,9 @@ density = 0; dir = 4 }, -/turf/open/floor/prison/platingdmg3, +/turf/open/floor/prison{ + icon_state = "platingdmg3" + }, /area/fiorina/station/security) "kow" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -14090,11 +16757,12 @@ dir = 6 }, /obj/structure/closet/emcloset, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "kpm" = ( -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/transit_hub) "kpp" = ( @@ -14111,10 +16779,14 @@ pixel_x = 1; pixel_y = -1 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "kqe" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/platform{ dir = 8; layer = 2.5 @@ -14123,23 +16795,31 @@ /area/fiorina/station/telecomm/lz1_tram) "kqr" = ( /obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "kqz" = ( -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "kqC" = ( /turf/closed/wall/prison, /area/fiorina/station/lowsec) "kqF" = ( /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "kqP" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "krn" = ( /obj/structure/barricade/handrail/type_b{ @@ -14154,13 +16834,14 @@ /obj/item/ammo_casing{ icon_state = "casing_9_1" }, -/turf/open/floor/prison/yellowangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellowcorner" }, /area/fiorina/station/lowsec) "krr" = ( /obj/structure/machinery/filtration/console, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "krG" = ( /obj/structure/platform{ @@ -14172,22 +16853,28 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "krQ" = ( /obj/item/trash/popcorn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "krT" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "ksk" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "ksV" = ( /obj/structure/barricade/handrail/type_b{ @@ -14201,26 +16888,34 @@ "kte" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/kitchen/rollingpin, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "kty" = ( /obj/structure/prop/ice_colony/surveying_device, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/tumor/servers) "ktD" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "ktI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/poster, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "kul" = ( -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "kur" = ( @@ -14230,7 +16925,10 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "kuS" = ( /obj/structure/machinery/optable{ @@ -14241,12 +16939,16 @@ desc = "It crinkles, aggressively."; name = "sterile wax sheet" }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "kvd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/golden_cup, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "kvh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -14266,7 +16968,9 @@ "kvn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/energy/taser, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "kvx" = ( /obj/effect/landmark/monkey_spawn, @@ -14280,15 +16984,17 @@ }, /obj/item/organ/eyes, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "kwm" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "kwv" = ( /obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "kwy" = ( /obj/structure/surface/table/reinforced/prison, @@ -14296,7 +17002,9 @@ /obj/item/reagent_container/food/snacks/hugemushroomslice{ pixel_y = 3 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "kwK" = ( /obj/structure/bed/chair{ @@ -14308,8 +17016,9 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "kwL" = ( @@ -14335,12 +17044,13 @@ icon_state = "poster10"; pixel_x = 32 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kxM" = ( /obj/item/stack/rods, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "kxQ" = ( @@ -14351,23 +17061,30 @@ /area/fiorina/station/park) "kxV" = ( /obj/item/device/motiondetector, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "kye" = ( /obj/structure/bed/chair{ dir = 4; pixel_x = -5 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "kyl" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant/pottedplant_17{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; pixel_y = 13 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "kyW" = ( /obj/item/stack/sandbags/large_stack, @@ -14395,15 +17112,20 @@ pixel_y = 8 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/oob) "kzN" = ( -/turf/open/floor/prison/floorscorched2, +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, /area/fiorina/station/security) "kzO" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; @@ -14414,12 +17136,15 @@ "kAo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "kAr" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) @@ -14428,7 +17153,7 @@ mags_max = 0; mags_min = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "kAO" = ( /obj/item/folder/yellow, @@ -14442,21 +17167,27 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "kCg" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "kCv" = ( /obj/item/trash/cigbutt/ucigbutt, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "kCG" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "kCI" = ( /obj/item/weapon/baseballbat/metal, @@ -14464,7 +17195,10 @@ /area/fiorina/station/chapel) "kCK" = ( /obj/item/trash/c_tube, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "kCY" = ( /obj/item/tool/weldingtool, @@ -14472,7 +17206,9 @@ /area/fiorina/tumor/servers) "kDg" = ( /obj/item/trash/cigbutt/cigarbutt, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "kDj" = ( /obj/structure/janitorialcart, @@ -14480,14 +17216,15 @@ pixel_x = -4; pixel_y = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "kDq" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "kDN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -14505,7 +17242,10 @@ name = "overhead pipe"; pixel_y = 12 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "kDW" = ( /obj/item/tool/warning_cone{ @@ -14522,7 +17262,9 @@ }, /obj/structure/surface/rack, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "kEj" = ( /obj/structure/largecrate/random/barrel/blue, @@ -14532,7 +17274,7 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "kEy" = ( /obj/structure/bed/chair/dropship/pilot{ @@ -14546,7 +17288,9 @@ /turf/open/floor/plating/prison, /area/fiorina/oob) "kEE" = ( -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/chapel) "kEZ" = ( /obj/item/stack/tile/plasteel{ @@ -14560,40 +17304,52 @@ /obj/structure/machinery/computer/secure_data{ dir = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "kFH" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "kFM" = ( /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "kGh" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "kGi" = ( /obj/structure/bed/chair/office/light, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "kGq" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "kGu" = ( /obj/structure/surface/rack, /obj/item/storage/box/sprays, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "kGw" = ( /obj/structure/platform{ @@ -14602,11 +17358,13 @@ /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ layer = 3.5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "kGW" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kHa" = ( /obj/item/storage/toolbox, @@ -14625,7 +17383,9 @@ /obj/effect/decal/medical_decals{ icon_state = "cryocell2deval" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "kHG" = ( /obj/effect/decal/cleanable/blood/oil, @@ -14634,7 +17394,7 @@ "kIc" = ( /obj/structure/platform_decoration, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kIe" = ( /obj/structure/surface/table/reinforced/prison, @@ -14662,7 +17422,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "kJf" = ( /obj/item/tool/wrench, @@ -14670,8 +17432,9 @@ /area/fiorina/station/transit_hub) "kJC" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "kJI" = ( @@ -14679,8 +17442,9 @@ desc = "Watch your step."; icon_state = "gib6" }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "kJS" = ( @@ -14696,13 +17460,16 @@ }, /area/fiorina/tumor/servers) "kJX" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, /area/fiorina/station/disco) "kKZ" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "kLo" = ( @@ -14711,7 +17478,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "kLI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -14740,26 +17509,31 @@ pixel_x = -3; pixel_y = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kLQ" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "kLT" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "kLX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "kLY" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/chapel) "kMq" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -14773,7 +17547,10 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "kNs" = ( /obj/effect/decal/cleanable/blood, @@ -14783,8 +17560,9 @@ }, /area/fiorina/station/chapel) "kNz" = ( -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "kNB" = ( @@ -14801,7 +17579,7 @@ /area/fiorina/tumor/ship) "kNP" = ( /obj/item/stack/medical/bruise_pack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "kNW" = ( /obj/structure/barricade/handrail/type_b{ @@ -14821,8 +17599,9 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "kOb" = ( -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/tumor/servers) "kOB" = ( @@ -14832,48 +17611,61 @@ }, /area/fiorina/station/civres_blue) "kOM" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/station/park) "kOZ" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "kPe" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "kPi" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/tumor/aux_engi) "kPv" = ( -/turf/open/floor/prison/kitchen, +/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/p_stair_ew_full_cap{ - dir = 8 +/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/darkbrown2full, +/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/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "kRt" = ( @@ -14886,11 +17678,17 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "kRM" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "kSh" = ( /turf/closed/shuttle/elevator{ @@ -14899,31 +17697,44 @@ /area/fiorina/station/telecomm/lz1_cargo) "kSp" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "kSI" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "kSL" = ( /obj/structure/platform, /obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "kSP" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "kSU" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_cargo) "kTK" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "kTL" = ( /obj/item/stack/rods, @@ -14947,7 +17758,9 @@ "kUr" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "kUI" = ( /obj/structure/machinery/light/double/blue{ @@ -14955,8 +17768,9 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "kVg" = ( @@ -14969,35 +17783,48 @@ /area/fiorina/station/power_ring) "kVz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "kWj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/briefcase, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "kWn" = ( /obj/structure/inflatable, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "kWD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck/uno, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "kWJ" = ( /obj/item/tool/shovel/snow, /obj/item/device/flashlight, /obj/structure/surface/rack, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "kXw" = ( /obj/item/circuitboard/machine/rdserver, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "kXD" = ( /obj/structure/window/framed/prison, @@ -15016,7 +17843,10 @@ /obj/item/reagent_container/food/snacks/cherrypie{ pixel_y = 7 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "kXR" = ( /obj/structure/machinery/light/small{ @@ -15028,7 +17858,10 @@ /area/fiorina/tumor/ship) "kYM" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "kYZ" = ( /obj/structure/surface/table/woodentable, @@ -15037,7 +17870,9 @@ /area/fiorina/station/civres_blue) "kZb" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "kZy" = ( /obj/item/clothing/mask/breath, @@ -15046,7 +17881,9 @@ /area/fiorina/station/power_ring) "kZI" = ( /obj/item/stool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "kZQ" = ( /obj/structure/surface/table/reinforced/prison, @@ -15056,7 +17893,9 @@ pixel_x = -6; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "kZS" = ( /obj/structure/machinery/light/double/blue{ @@ -15075,21 +17914,25 @@ /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "lax" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "laD" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "laJ" = ( @@ -15098,22 +17941,27 @@ /area/fiorina/lz/near_lzI) "laP" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkyellow2full, +/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" }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "lbe" = ( /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "lbk" = ( @@ -15122,7 +17970,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "lbt" = ( /obj/structure/disposalpipe/segment{ @@ -15141,12 +17989,13 @@ /obj/structure/sign/prop2{ pixel_y = 32 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "lcu" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/whitegreenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "lcH" = ( @@ -15158,7 +18007,7 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/maintenance) "lde" = ( /obj/structure/prop/resin_prop{ @@ -15171,16 +18020,18 @@ dir = 8; pixel_y = 8 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "ldt" = ( /obj/item/ammo_casing{ icon_state = "casing_6" }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "ldy" = ( @@ -15188,7 +18039,10 @@ dir = 4; layer = 3.25 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "ldT" = ( /obj/structure/machinery/light/double/blue{ @@ -15196,13 +18050,17 @@ pixel_y = 21 }, /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "leq" = ( /obj/effect/landmark/corpsespawner/prison_security, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lev" = ( /obj/structure/largecrate/random/case/double, @@ -15216,34 +18074,46 @@ /area/fiorina/station/civres_blue) "leR" = ( /obj/item/device/whistle, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lfo" = ( /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "lfJ" = ( -/turf/open/floor/prison/greenbluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenblue" }, /area/fiorina/station/botany) "lfS" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "lgy" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "lhj" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "lhQ" = ( -/turf/open/floor/prison/greencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, /area/fiorina/tumor/civres) "lhY" = ( @@ -15266,12 +18136,16 @@ /obj/item/fuelCell, /obj/item/stack/sheet/plasteel, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "lik" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/pills/lowchance, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "liA" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -15281,7 +18155,9 @@ /area/fiorina/maintenance) "liX" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "liZ" = ( /obj/structure/machinery/light/double/blue{ @@ -15304,26 +18180,33 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "ljW" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "ljZ" = ( /obj/item/device/flashlight/flare, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "lka" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "lku" = ( @@ -15333,15 +18216,17 @@ /area/fiorina/oob) "lle" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "lll" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/aspen, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "lls" = ( @@ -15363,11 +18248,15 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "llG" = ( /obj/structure/prop/almayer/computers/sensor_computer3, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "llQ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -15379,8 +18268,9 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "lml" = ( @@ -15399,14 +18289,17 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) "lmr" = ( -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/chapel) "lmy" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "lmM" = ( /obj/structure/machinery/light/double/blue{ @@ -15414,10 +18307,10 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "lmV" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/fiberbush) "lmX" = ( /obj/structure/sink{ @@ -15428,14 +18321,17 @@ /obj/structure/mirror{ pixel_x = -29 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "lnf" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "lnK" = ( @@ -15443,21 +18339,26 @@ /area/fiorina/station/telecomm/lz1_tram) "lnU" = ( /obj/item/stool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "lok" = ( -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/oob) "loy" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "lpf" = ( /obj/item/storage/belt/marine, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "lpl" = ( /turf/closed/shuttle/ert{ @@ -15466,7 +18367,10 @@ /area/fiorina/lz/near_lzI) "lpm" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "lpp" = ( /obj/structure/barricade/sandbags{ @@ -15474,8 +18378,9 @@ layer = 2.97; pixel_y = -14 }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "lpr" = ( @@ -15486,11 +18391,13 @@ /area/fiorina/station/chapel) "lps" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "lpA" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "lpV" = ( /obj/item/device/flashlight/lamp/tripod, @@ -15498,17 +18405,21 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "lqi" = ( /obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "lqo" = ( /obj/structure/dropship_equipment/medevac_system, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/power_ring) "lqq" = ( /turf/open/floor/wood, @@ -15519,18 +18430,22 @@ dir = 4 }, /obj/item/weapon/classic_baton, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "lrm" = ( /obj/structure/barricade/metal/wired{ health = 250; icon_state = "metal_3" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "lro" = ( /obj/item/stack/cable_coil/blue, -/turf/open/floor/prison/whitegreenangle, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, /area/fiorina/tumor/ice_lab) "lrA" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -15538,7 +18453,9 @@ /area/fiorina/tumor/servers) "lrC" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "lrE" = ( /obj/structure/bed, @@ -15548,18 +18465,28 @@ /area/fiorina/tumor/ship) "lsf" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "lsl" = ( /obj/item/tool/shovel, -/turf/open/floor/prison/greencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, /area/fiorina/tumor/civres) "lso" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "lsr" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "lsU" = ( /obj/effect/decal{ @@ -15569,7 +18496,9 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "ltb" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -15581,27 +18510,36 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "ltu" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "lty" = ( /obj/item/toy/bikehorn, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "ltV" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "luv" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer3/laptop/secure_data, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "luy" = ( /obj/item/trash/candle, @@ -15622,12 +18560,16 @@ pixel_x = -6; pixel_y = 3 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "luU" = ( /obj/effect/spawner/random/gun/rifle/midchance, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "lvg" = ( @@ -15643,7 +18585,10 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lvi" = ( /obj/structure/sign/poster{ @@ -15654,15 +18599,18 @@ /area/fiorina/station/security/wardens) "lvk" = ( /obj/structure/bed/sofa/south/grey, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "lvs" = ( -/turf/open/floor/prison/green, +/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/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "lvy" = ( @@ -15680,7 +18628,7 @@ }, /obj/item/weapon/gun/pistol/heavy, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "lwd" = ( /obj/structure/machinery/light/double/blue{ @@ -15695,34 +18643,44 @@ dir = 1; layer = 2.7 }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "lwG" = ( -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "lwK" = ( -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "lwO" = ( /obj/structure/largecrate/supply/supplies/water, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "lxe" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/heavy, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "lxk" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + 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/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "lyf" = ( /obj/structure/flora/bush/ausbushes/ausbush{ @@ -15743,7 +18701,9 @@ pixel_x = 6; pixel_y = 20 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "lyF" = ( /obj/structure/surface/table/reinforced/prison, @@ -15751,7 +18711,9 @@ dir = 4; reason = "Visitor" }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "lyJ" = ( /obj/item/tool/crowbar, @@ -15760,8 +18722,16 @@ "lyX" = ( /obj/structure/inflatable/popped/door, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) +"lzb" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/disco) "lzm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced/tinted, @@ -15778,21 +18748,31 @@ /area/fiorina/station/park) "lzO" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "lzW" = ( /obj/structure/barricade/sandbags{ dir = 8; icon_state = "sandbag_0" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "lzX" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/park) "lAf" = ( /obj/item/tool/crowbar, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "lAh" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -15804,10 +18784,12 @@ /obj/structure/mirror{ pixel_y = 28 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "lAS" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "lAV" = ( /obj/structure/bed/stool, @@ -15822,30 +18804,38 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "lBJ" = ( /obj/structure/bed/chair{ dir = 4; layer = 2.8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "lCm" = ( /obj/item/ammo_casing{ icon_state = "cartridge_1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lCs" = ( /obj/structure/barricade/metal/wired{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "lCw" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "lCz" = ( @@ -15859,30 +18849,40 @@ /obj/structure/closet/basketball, /obj/item/storage/pill_bottle/tramadol/skillless, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "lCE" = ( /obj/structure/platform{ dir = 4 }, /obj/item/tool/shovel/spade, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "lCZ" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "lDe" = ( /obj/structure/prop/souto_land/streamer{ dir = 6 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "lDm" = ( /obj/structure/foamed_metal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "lDC" = ( /obj/structure/platform/kutjevo/smooth, @@ -15892,7 +18892,9 @@ /turf/open/space/basic, /area/fiorina/oob) "lEa" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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/chapel) @@ -15922,11 +18924,14 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/disco) "lEI" = ( -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/tumor/servers) "lFc" = ( @@ -15936,7 +18941,10 @@ /area/fiorina/station/park) "lFj" = ( /obj/effect/spawner/random/gun/pistol, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "lFx" = ( /obj/effect/decal/cleanable/blood, @@ -15944,28 +18952,38 @@ icon_state = "abed" }, /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "lFC" = ( /obj/item/clothing/head/cmcap, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/transit_hub) "lFO" = ( /obj/structure/largecrate/supply/supplies/water, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "lGh" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "lGm" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "lGA" = ( /obj/structure/machinery/bioprinter{ @@ -15975,28 +18993,36 @@ /obj/structure/machinery/door/window/eastright{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lHc" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/card/id/visa, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "lHx" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "lHy" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/disco) "lHB" = ( /obj/effect/spawner/random/gun/rifle/lowchance, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "lHL" = ( /obj/structure/surface/rack, @@ -16004,8 +19030,9 @@ /obj/effect/decal/cleanable/blood, /obj/item/attachable/bipod, /obj/item/device/multitool, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "lIv" = ( @@ -16015,7 +19042,9 @@ /area/fiorina/lz/near_lzI) "lIx" = ( /obj/item/tool/wet_sign, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "lIG" = ( /obj/structure/extinguisher_cabinet, @@ -16032,13 +19061,16 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "lJm" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "lJv" = ( /obj/structure/surface/table/reinforced/prison, @@ -16048,23 +19080,33 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "lJy" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "lKd" = ( -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "lKt" = ( /obj/structure/sign/poster{ icon_state = "poster18"; pixel_y = 32 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "lLe" = ( /obj/item/stack/sheet/metal, @@ -16074,7 +19116,7 @@ /obj/structure/machinery/landinglight/ds2{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "lLE" = ( /obj/item/bedsheet/blue, @@ -16084,13 +19126,16 @@ /obj/structure/bookcase/manuals/research_and_development{ pixel_y = 10 }, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "lLU" = ( /obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "lMi" = ( /obj/structure/largecrate/random, @@ -16098,14 +19143,20 @@ /area/fiorina/station/research_cells) "lMB" = ( /obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "lMM" = ( -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/tumor/servers) "lNg" = ( -/obj/structure/monorail/launchtrack, -/turf/open/floor/prison/floor_plate, +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "lNv" = ( /obj/item/handcuffs/cable/pink, @@ -16139,34 +19190,46 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "lOa" = ( -/turf/open/floor/prison/damaged2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, /area/fiorina/station/lowsec) "lOb" = ( /obj/structure/closet/crate/internals, /obj/item/tool/crew_monitor, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "lOo" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "lOE" = ( -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/station/chapel) "lPq" = ( /obj/structure/prop/dam/crane, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, /area/fiorina/tumor/servers) "lPV" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "lPW" = ( /obj/structure/machinery/light/double/blue{ @@ -16174,39 +19237,48 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "lQd" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "lQf" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "lQZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/emails{ pixel_y = 5 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "lRe" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "lRH" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "lRI" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "lRT" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -16220,14 +19292,19 @@ /area/fiorina/station/research_cells) "lSY" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "lTm" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/machinery/photocopier, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "lTp" = ( /obj/structure/sink{ @@ -16238,11 +19315,14 @@ }, /area/fiorina/tumor/ship) "lUg" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "lUi" = ( /turf/closed/shuttle/ert{ @@ -16257,7 +19337,10 @@ /obj/item/reagent_container/food/drinks/coffee{ pixel_y = 13 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "lUs" = ( /obj/structure/ice/thin/indestructible{ @@ -16294,7 +19377,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/damaged2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, /area/fiorina/station/lowsec) "lWD" = ( /obj/structure/machinery/light/double/blue{ @@ -16302,22 +19388,28 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "lXc" = ( /obj/item/stool, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "lXf" = ( -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/power_ring) "lXk" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "lXs" = ( /obj/item/book/manual/marine_law, @@ -16344,29 +19436,42 @@ /area/fiorina/tumor/ice_lab) "lYc" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2, +/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/whitegreenfull, +/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/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "lYA" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "lZf" = ( /turf/closed/shuttle/elevator{ @@ -16383,7 +19488,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/maintenance) "lZL" = ( /obj/structure/barricade/sandbags{ @@ -16396,24 +19503,30 @@ pixel_y = 21 }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "mak" = ( /obj/structure/machinery/shower{ pixel_y = 13 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "mam" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "maC" = ( /obj/structure/window/reinforced{ @@ -16421,24 +19534,26 @@ }, /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/faxmachine, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "maE" = ( /obj/item/device/motiondetector, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "mbc" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "mbe" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "mbg" = ( @@ -16450,7 +19565,10 @@ icon_state = "docstripingdir" }, /obj/item/stack/rods/plasteel, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mbp" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -16474,10 +19592,14 @@ /area/fiorina/station/lowsec) "mbN" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "mcc" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "mcr" = ( /obj/structure/surface/table/reinforced/prison, @@ -16486,13 +19608,15 @@ /area/fiorina/station/park) "mct" = ( /obj/item/trash/kepler, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mcE" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/lz/near_lzI) "mcG" = ( @@ -16501,19 +19625,27 @@ name = "xeno_hive_spawn" }, /obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "mcN" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzI) "mcT" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.4 }, -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "mdd" = ( /obj/item/storage/toolbox/electrical, @@ -16521,7 +19653,9 @@ /area/fiorina/tumor/servers) "mdn" = ( /obj/structure/machinery/recharge_station, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "mdJ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -16533,12 +19667,13 @@ "mea" = ( /obj/item/fuelCell, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/maintenance) "med" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "mei" = ( @@ -16557,11 +19692,15 @@ /area/fiorina/station/medbay) "mel" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/power_ring) "mey" = ( /obj/item/trash/chunk, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "meF" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -16569,25 +19708,31 @@ }, /obj/item/clothing/under/marine/ua_riot, /obj/item/clothing/suit/storage/marine/veteran/ua_riot, -/turf/open/floor/prison/redfull, +/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/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/power_ring) "meM" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/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/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "mfe" = ( @@ -16598,19 +19743,24 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "mfo" = ( -/obj/structure/stairs/perspective/p_stair_full, +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "mfK" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "mfR" = ( /obj/structure/bed{ @@ -16624,8 +19774,9 @@ /area/fiorina/station/civres_blue) "mfV" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "mgC" = ( @@ -16634,23 +19785,30 @@ icon_state = "poster11"; pixel_y = 32 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "mgU" = ( /obj/effect/landmark/nightmare{ insert_tag = "birthday" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "mhb" = ( -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mhe" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "mho" = ( @@ -16662,7 +19820,10 @@ /area/fiorina/station/security/wardens) "mhu" = ( /obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "mhv" = ( /obj/structure/platform_decoration/kutjevo{ @@ -16689,29 +19850,35 @@ pixel_x = -4; pixel_y = 9 }, -/turf/open/floor/prison/floor_plate, +/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/pottedplant_18{ +/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/floor_plate, +/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 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "miB" = ( @@ -16719,18 +19886,20 @@ health = 85; icon_state = "metal_1" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "miU" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/disco) "miZ" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "mjx" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -16748,28 +19917,37 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "mki" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "mky" = ( /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mkB" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "mli" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "mlC" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -16781,11 +19959,11 @@ dir = 8; layer = 3.5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "mmh" = ( /obj/item/trash/burger, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "mmp" = ( /obj/structure/surface/table/reinforced/prison, @@ -16802,8 +19980,9 @@ /area/fiorina/station/power_ring) "mmP" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail/launchtrack{ - dir = 10 +/obj/structure/monorail{ + dir = 10; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) @@ -16811,11 +19990,13 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "mnp" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "mny" = ( /turf/closed/wall/prison, @@ -16829,7 +20010,9 @@ pixel_x = -8; pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "moW" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, @@ -16845,32 +20028,39 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "mpO" = ( /obj/structure/machinery/power/smes/buildable{ capacity = 1e+006; dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "mpT" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "mqc" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "mqo" = ( /obj/structure/barricade/metal{ health = 250; icon_state = "metal_1" }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "mqY" = ( @@ -16878,7 +20068,10 @@ dir = 4; pixel_y = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mrk" = ( /obj/structure/machinery/light/double/blue{ @@ -16892,11 +20085,16 @@ pixel_x = 5; pixel_y = 5 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "mrn" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "mrG" = ( /obj/structure/extinguisher_cabinet, @@ -16904,8 +20102,12 @@ /turf/open/floor/plating/prison, /area/fiorina/station/disco) "mrO" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "mrX" = ( /obj/structure/bed/chair{ @@ -16932,7 +20134,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "msu" = ( /obj/structure/barricade/wooden{ @@ -16946,8 +20150,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "mtj" = ( @@ -16959,13 +20164,16 @@ /turf/open/floor/wood, /area/fiorina/station/park) "mtk" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "mtm" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "mtr" = ( /obj/structure/surface/table/reinforced/prison, @@ -16973,34 +20181,41 @@ pixel_x = 2; pixel_y = 3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "muB" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "muO" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "muT" = ( /obj/item/device/flashlight/flare/on, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "muZ" = ( /obj/item/storage/briefcase, -/turf/open/floor/prison/floor, +/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/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "mwU" = ( /obj/structure/barricade/handrail/type_b{ @@ -17013,15 +20228,18 @@ name = "overhead ducting"; pixel_y = 33 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "mxk" = ( /obj/item/trash/tray, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/power_ring) "mxn" = ( -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/chapel) "mxs" = ( @@ -17034,17 +20252,21 @@ /area/fiorina/station/park) "mxz" = ( /obj/item/bedsheet, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "mxO" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "mxQ" = ( /turf/closed/wall/prison, @@ -17055,11 +20277,14 @@ /area/fiorina/station/chapel) "myg" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "myt" = ( -/turf/open/floor/prison/redcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "red" }, /area/fiorina/station/power_ring) "myO" = ( @@ -17068,8 +20293,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mzp" = ( @@ -17079,7 +20305,10 @@ name = "overhead ducting"; pixel_y = 33 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "mzy" = ( /obj/structure/largecrate/random/barrel/green, @@ -17091,13 +20320,15 @@ /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "mzF" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "mzS" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -17121,7 +20352,9 @@ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "mAv" = ( /obj/item/ammo_magazine/rifle/m16{ @@ -17132,18 +20365,19 @@ /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "mAz" = ( /obj/structure/closet/emcloset, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mAA" = ( /obj/item/storage/briefcase/inflatable, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "mAB" = ( /obj/structure/filingcabinet{ @@ -17155,40 +20389,53 @@ pixel_y = 4 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "mAE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/reagent_dispensers/water_cooler/stacks{ pixel_y = 11 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "mAG" = ( /obj/structure/machinery/shower{ pixel_y = 13 }, /obj/item/tool/soap/nanotrasen, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "mBm" = ( /obj/item/storage/briefcase, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "mBy" = ( /obj/structure/bed/chair{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "mBV" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "mCA" = ( /obj/structure/prop/resin_prop, @@ -17200,28 +20447,34 @@ /area/fiorina/station/lowsec) "mCG" = ( /obj/structure/machinery/processor, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "mCT" = ( /obj/structure/surface/rack, /obj/item/handcuffs/zip, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "mDi" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "mDs" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "mDz" = ( @@ -17231,48 +20484,62 @@ /turf/open/floor/carpet, /area/fiorina/station/civres_blue) "mDV" = ( -/turf/open/floor/prison/darkyellow2angle, +/turf/open/floor/prison{ + icon_state = "darkyellowcorners2" + }, /area/fiorina/station/telecomm/lz1_cargo) "mEb" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "mEc" = ( -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/station/park) "mEv" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/mre_pack/meal5, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /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" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "mEO" = ( /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "mFf" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/oob) "mFh" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mFm" = ( /obj/item/tool/mop, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "mFz" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibmid1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mGe" = ( /obj/structure/bed/chair{ @@ -17284,11 +20551,13 @@ pixel_x = -11; pixel_y = -6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "mGx" = ( /obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "mHC" = ( /obj/effect/decal/cleanable/blood/oil, @@ -17296,7 +20565,9 @@ /area/fiorina/maintenance) "mHN" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "mHR" = ( /obj/structure/sign/prop3{ @@ -17310,15 +20581,19 @@ pixel_y = 8 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "mIk" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mIu" = ( /obj/effect/spawner/random/sentry/midchance, @@ -17329,16 +20604,19 @@ icon_state = "abed" }, /obj/item/bedsheet/green, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "mIE" = ( -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "mJe" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "mJk" = ( /obj/structure/surface/table/reinforced/prison, @@ -17360,28 +20638,37 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "mJy" = ( -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mJz" = ( /obj/structure/closet/emcloset, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "mJM" = ( /obj/item/trash/uscm_mre, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mKt" = ( /obj/item/storage/toolbox, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "mKy" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "mKG" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, /area/fiorina/station/lowsec) "mKS" = ( /obj/structure/platform/kutjevo/smooth{ @@ -17401,17 +20688,24 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "mLB" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "mLP" = ( /obj/structure/surface/table/reinforced/prison, @@ -17430,13 +20724,18 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "mMb" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mMf" = ( /obj/structure/window/reinforced{ @@ -17444,15 +20743,25 @@ health = 80 }, /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mMo" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "mMq" = ( /obj/item/trash/chips, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "mMH" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -17478,7 +20787,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "mNh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -17487,15 +20798,22 @@ "mNj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "mNn" = ( /obj/structure/machinery/door/airlock/almayer/marine, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "mNC" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "mNJ" = ( /obj/structure/barricade/sandbags{ @@ -17507,35 +20825,48 @@ icon_state = "sandbag_0"; pixel_y = -14 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "mOn" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "mOr" = ( /obj/item/poster, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "mOC" = ( /obj/structure/closet/crate/medical, /obj/effect/spawner/random/toolbox, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "mOF" = ( -/turf/open/floor/prison/blueangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "bluecorner" }, /area/fiorina/station/civres_blue) "mOW" = ( /obj/structure/barricade/handrail/type_b{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) +"mPA" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "mPW" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -17545,13 +20876,17 @@ /area/fiorina/station/telecomm/lz1_cargo) "mQe" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "mQn" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "mQD" = ( /obj/structure/barricade/sandbags{ @@ -17560,7 +20895,7 @@ pixel_y = 2 }, /obj/item/storage/toolbox/syndicate, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "mQG" = ( /obj/structure/barricade/handrail/type_b{ @@ -17571,6 +20906,12 @@ 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; @@ -17585,15 +20926,18 @@ pixel_y = 8 }, /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2full, +/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/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "mRT" = ( @@ -17606,7 +20950,9 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "mRU" = ( /obj/structure/surface/table/reinforced/prison, @@ -17615,25 +20961,34 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "mSM" = ( /obj/item/stack/tile/plasteel{ pixel_x = 3; pixel_y = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "mSN" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/tumor/servers) "mSY" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/atmos_alert, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "mTa" = ( /obj/structure/ice/thin/indestructible{ @@ -17653,15 +21008,18 @@ layer = 2.8 }, /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor_plate, +/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" }, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/oob) "mTJ" = ( @@ -17669,7 +21027,9 @@ /obj/item/trash/cigbutt{ pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "mTM" = ( /obj/item/tool/warning_cone, @@ -17677,11 +21037,14 @@ /area/fiorina/maintenance) "mTS" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "mTX" = ( -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "mUk" = ( @@ -17690,14 +21053,18 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "mUr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/crayons, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mUA" = ( /obj/effect/decal/cleanable/blood/oil, @@ -17706,24 +21073,34 @@ "mUV" = ( /obj/structure/closet/basketball, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "mVg" = ( /obj/structure/window{ dir = 8 }, /obj/item/circuitboard/machine/rdserver, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "mWg" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /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, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "mWx" = ( /obj/structure/machinery/light/double/blue{ @@ -17731,21 +21108,22 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "mWF" = ( /obj/structure/bed/chair{ dir = 1; layer = 2.7 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "mWV" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xtracks" }, -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) "mWX" = ( @@ -17765,8 +21143,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "mXe" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -17786,39 +21165,53 @@ /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "mXI" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mXT" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/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/bluecorner{ - 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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mYp" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/storage/bible/hefa, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "mYu" = ( /obj/structure/window/reinforced{ @@ -17829,7 +21222,10 @@ /obj/structure/machinery/computer/med_data/laptop{ dir = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "mYN" = ( /obj/structure/platform_decoration{ @@ -17838,11 +21234,14 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "mYZ" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "mZo" = ( /obj/item/tool/shovel, @@ -17852,14 +21251,21 @@ /obj/structure/prop/almayer/computers/sensor_computer1{ name = "computer" }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "mZG" = ( /obj/item/paper/crumpled/bloody, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "mZV" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/light/double/blue{ dir = 4; pixel_x = 10; @@ -17872,11 +21278,15 @@ /area/fiorina/oob) "naj" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "naN" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "naW" = ( /turf/closed/wall/r_wall/prison, @@ -17887,22 +21297,26 @@ /area/fiorina/station/telecomm/lz2_maint) "nbo" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "nbv" = ( -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "nbU" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "ncn" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "ncP" = ( @@ -17911,13 +21325,15 @@ pixel_x = 10; pixel_y = -1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "ncQ" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "ndh" = ( /obj/effect/decal/hefa_cult_decals/d32{ @@ -17926,7 +21342,7 @@ /obj/item/weapon/gun/shotgun/pump{ starting_attachment_types = list(/obj/item/attachable/stock/shotgun) }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "ndl" = ( /obj/item/storage/box/cups, @@ -17944,16 +21360,18 @@ pixel_y = -1 }, /obj/structure/largecrate/random/mini/chest/c, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "ndt" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "ndC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/faxmachine, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "ndZ" = ( /obj/structure/machinery/constructable_frame{ @@ -17980,32 +21398,44 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "nes" = ( -/turf/open/floor/prison/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_tram) "neD" = ( /obj/effect/landmark/xeno_spawn, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "neH" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "neX" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "nfA" = ( /obj/structure/platform, @@ -18022,8 +21452,9 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "nga" = ( @@ -18034,42 +21465,53 @@ /area/fiorina/station/civres_blue) "ngd" = ( /obj/item/trash/hotdog, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "ngk" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "ngq" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "ngr" = ( /obj/structure/platform_decoration, /obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "nhd" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/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, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "nho" = ( /obj/structure/platform{ @@ -18082,16 +21524,21 @@ /turf/open/floor/wood, /area/fiorina/station/park) "nhz" = ( -/turf/open/floor/prison/whitepurpleangle, +/turf/open/floor/prison{ + icon_state = "whitepurplecorner" + }, /area/fiorina/station/research_cells) "nhF" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "nhR" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "nhY" = ( /obj/structure/extinguisher_cabinet, @@ -18113,7 +21560,7 @@ layer = 2.97; pixel_y = -14 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "niw" = ( /obj/structure/barricade/handrail{ @@ -18125,10 +21572,12 @@ /area/fiorina/station/research_cells) "njq" = ( /obj/item/tool/weldpack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "njx" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "njC" = ( /obj/effect/decal{ @@ -18137,8 +21586,9 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "njK" = ( @@ -18161,7 +21611,9 @@ pixel_x = 8; pixel_y = 8 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "nlw" = ( /turf/open/floor/almayer{ @@ -18185,12 +21637,17 @@ }, /area/fiorina/station/research_cells) "nmx" = ( -/obj/structure/flora/pottedplant/pottedplant_21, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "nmQ" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/research_cells) "nmT" = ( /obj/item/toy/crayon/blue, @@ -18203,11 +21660,14 @@ pixel_x = -2; pixel_y = 7 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "nnX" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, @@ -18223,15 +21683,25 @@ }, /area/fiorina/station/park) "noY" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) +"nph" = ( +/obj/item/stool, +/turf/open/floor/prison{ + icon_state = "damaged2" + }, +/area/fiorina/station/lowsec) "npp" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "npx" = ( /obj/structure/barricade/handrail/type_b{ @@ -18243,11 +21713,15 @@ }, /area/fiorina/station/civres_blue) "npz" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_tram) "npN" = ( /obj/structure/sink{ @@ -18255,23 +21729,28 @@ pixel_x = -12 }, /obj/effect/spawner/random/gun/pistol, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "npV" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "nql" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "nqs" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "nqL" = ( @@ -18287,7 +21766,10 @@ /area/fiorina/station/security) "nqV" = ( /obj/item/device/cassette_tape/nam, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "nre" = ( /obj/item/stack/rods, @@ -18295,12 +21777,15 @@ /area/fiorina/station/civres_blue) "nrq" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "nrI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/plantspray/pests, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "nrL" = ( /obj/structure/barricade/sandbags{ @@ -18308,27 +21793,32 @@ pixel_y = -14 }, /obj/structure/machinery/m56d_hmg, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "nrR" = ( -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/station/transit_hub) "nrY" = ( -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/chapel) "nsb" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "nsg" = ( -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/tumor/civres) "nsn" = ( @@ -18337,27 +21827,35 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/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, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "nsC" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "nsH" = ( /obj/structure/platform, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/security) "ntg" = ( -/obj/structure/flora/pottedplant/pottedplant_27{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; pixel_y = 6 }, /turf/open/floor/wood, @@ -18380,11 +21878,16 @@ /area/fiorina/tumor/ice_lab) "nuE" = ( /obj/structure/inflatable/popped, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "nvz" = ( /obj/structure/flora/pottedplant/random, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "nvC" = ( /obj/structure/platform{ @@ -18396,8 +21899,9 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nvD" = ( @@ -18405,7 +21909,7 @@ /area/fiorina/station/botany) "nvF" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "nvO" = ( /obj/structure/machinery/light/double/blue{ @@ -18413,18 +21917,24 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "nvZ" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "nwh" = ( /obj/effect/decal/medical_decals{ icon_state = "docstripingdir" }, /obj/structure/bed/roller, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "nxl" = ( /obj/structure/machinery/light/double/blue{ @@ -18438,7 +21948,10 @@ /area/fiorina/station/civres_blue) "nxH" = ( /obj/item/trash/boonie, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "nxM" = ( /obj/structure/barricade/sandbags{ @@ -18446,39 +21959,47 @@ icon_state = "sandbag_0"; pixel_y = 2 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "nyk" = ( /obj/structure/machinery/power/geothermal, -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "nyl" = ( /obj/structure/window{ dir = 1 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "nyo" = ( /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "nyy" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "nyD" = ( /obj/structure/barricade/handrail{ dir = 8 }, -/turf/open/floor/prison/red{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, /area/fiorina/station/security) "nyQ" = ( /obj/structure/dropship_equipment/mg_holder, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "nyS" = ( /obj/structure/platform{ @@ -18493,11 +22014,13 @@ "nza" = ( /obj/structure/machinery/deployable/barrier, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "nzm" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "nzI" = ( /obj/structure/largecrate/random, @@ -18520,12 +22043,16 @@ /turf/open/floor/wood, /area/fiorina/station/park) "nAr" = ( -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "nBp" = ( /obj/item/weapon/gun/smg/nailgun, /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "nBu" = ( /obj/structure/surface/table/reinforced/prison, @@ -18534,24 +22061,34 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "nBB" = ( /obj/structure/largecrate/random/barrel, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "nBG" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "nBK" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "nBM" = ( /obj/structure/closet/secure_closet/security_empty, @@ -18559,32 +22096,43 @@ dir = 8 }, /obj/item/ammo_magazine/shotgun/beanbag, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "nBO" = ( /obj/effect/spawner/random/powercell, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "nBR" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "nBV" = ( -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "nCa" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "nCl" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "nCu" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "nCw" = ( /obj/structure/machinery/light/double/blue{ @@ -18593,7 +22141,16 @@ /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) +"nCC" = ( +/obj/item/trash/candy, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "nCX" = ( /turf/open/organic/grass{ @@ -18604,26 +22161,30 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nDT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/handcuffs, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "nDW" = ( /obj/structure/machinery/space_heater, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nEs" = ( -/turf/open/floor/prison/greenangle, +/turf/open/floor/prison{ + icon_state = "greencorner" + }, /area/fiorina/tumor/civres) "nEy" = ( /obj/item/explosive/grenade/high_explosive/frag, @@ -18631,7 +22192,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "nEN" = ( /obj/item/clothing/glasses/material, @@ -18651,17 +22212,22 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "nGk" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "nGq" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "nGy" = ( /obj/item/newspaper, @@ -18669,15 +22235,20 @@ /area/fiorina/station/security/wardens) "nGz" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "nGI" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "nGW" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform_decoration{ dir = 8 @@ -18690,7 +22261,7 @@ dir = 8; icon_state = "commb" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "nHb" = ( /obj/structure/machinery/light/double/blue{ @@ -18698,7 +22269,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "nHm" = ( /obj/structure/surface/table/woodentable/fancy, @@ -18710,8 +22283,9 @@ /area/fiorina/station/chapel) "nHG" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/chapel) "nHH" = ( @@ -18720,8 +22294,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "nHZ" = ( @@ -18752,52 +22327,67 @@ }, /obj/item/stool, /obj/item/clothing/shoes/slippers_worn, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "nIh" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "nIn" = ( /obj/item/reagent_container/food/snacks/wrapped/booniebars, -/turf/open/floor/prison/greenfull, +/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/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "nIq" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, /area/fiorina/tumor/aux_engi) "nIy" = ( /obj/item/explosive/grenade/high_explosive/frag, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "nID" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "nJC" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "nJQ" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/nailgun, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "nKl" = ( /obj/structure/platform{ @@ -18816,7 +22406,10 @@ dir = 4 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "nKG" = ( /obj/item/stack/sheet/metal, @@ -18840,7 +22433,10 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "nLh" = ( /obj/structure/platform{ @@ -18850,11 +22446,14 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "nLl" = ( -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) "nLV" = ( @@ -18899,8 +22498,9 @@ /turf/open/floor/wood, /area/fiorina/station/chapel) "nOF" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "nPa" = ( @@ -18908,7 +22508,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "nPj" = ( /obj/item/clothing/glasses/gglasses, @@ -18930,8 +22532,9 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nQq" = ( @@ -18939,7 +22542,9 @@ /turf/closed/wall/prison, /area/fiorina/station/medbay) "nQN" = ( -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/botany) "nQS" = ( /obj/structure/reagent_dispensers/water_cooler{ @@ -18947,14 +22552,16 @@ pixel_x = -11; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "nRb" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security/wardens) "nRf" = ( /obj/structure/largecrate/random/barrel/white, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "nRI" = ( /obj/structure/machinery/light/small{ @@ -18962,25 +22569,33 @@ pixel_x = 11; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "nSa" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "nSi" = ( /obj/structure/machinery/door/window/eastright{ dir = 2 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "nSx" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/disco) "nSz" = ( -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "nSU" = ( /obj/structure/surface/rack, @@ -18997,8 +22612,9 @@ dir = 8 }, /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nUb" = ( @@ -19035,22 +22651,27 @@ dir = 2; name = "Confession Booth" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "nUF" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "nUJ" = ( /obj/effect/spawner/random/technology_scanner, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "nVq" = ( -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/power_ring) "nVA" = ( @@ -19061,15 +22682,18 @@ icon_state = "medium"; name = "ice shard" }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "nVH" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "nWC" = ( /obj/item/clothing/shoes/yellow, @@ -19084,14 +22708,18 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "nXj" = ( /obj/structure/curtain/black, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "nXq" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/disco) "nYi" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -19100,16 +22728,20 @@ /turf/open/floor/plating/prison, /area/fiorina/station/security) "nYk" = ( -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/botany) "nYw" = ( -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "nYA" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -19124,23 +22756,28 @@ /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "oan" = ( /obj/item/trash/semki, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "oaI" = ( /obj/structure/barricade/wooden{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "oaX" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/supply_kit, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "obz" = ( /obj/structure/machinery/computer/arcade, @@ -19154,11 +22791,15 @@ /area/fiorina/tumor/civres) "obL" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "obT" = ( -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "occ" = ( @@ -19190,7 +22831,7 @@ /area/fiorina/station/park) "ocd" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "ocB" = ( /obj/structure/bed{ @@ -19198,15 +22839,19 @@ }, /obj/item/coin/uranium, /obj/item/bedsheet/green, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "ocJ" = ( /obj/structure/toilet{ dir = 4; pixel_y = 8 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "ocS" = ( @@ -19222,23 +22867,29 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "odg" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "odH" = ( /obj/item/trash/candle, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "odN" = ( /obj/structure/bed/chair{ dir = 8 }, /obj/effect/spawner/random/gun/rifle/midchance, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "odQ" = ( @@ -19247,11 +22898,16 @@ /area/fiorina/station/research_cells) "oem" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "oex" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "oeG" = ( /obj/structure/largecrate/random, @@ -19259,20 +22915,22 @@ /obj/item/device/camera/oldcamera{ pixel_y = 11 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "oeZ" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "ofb" = ( /obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "ofo" = ( /obj/effect/spawner/random/tool, /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "ofq" = ( /turf/closed/shuttle/elevator{ @@ -19283,7 +22941,9 @@ /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "ofw" = ( /obj/structure/machinery/newscaster, @@ -19291,26 +22951,32 @@ /area/fiorina/station/transit_hub) "ofy" = ( /obj/structure/machinery/photocopier, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "ofF" = ( /obj/structure/prop/souto_land/pole, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "ogd" = ( /obj/structure/machinery/lapvend, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "ogo" = ( -/obj/structure/monorail/launchtrack{ - dir = 9 +/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/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "ogM" = ( @@ -19321,19 +22987,25 @@ /obj/vehicle/powerloader{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "ohF" = ( /obj/structure/platform/kutjevo/smooth, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/ice_lab) "ohI" = ( -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "ohN" = ( /obj/structure/machinery/shower{ @@ -19343,7 +23015,9 @@ /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "ohY" = ( /obj/item/circuitboard/machine/pacman/super, @@ -19354,23 +23028,28 @@ /area/fiorina/tumor/aux_engi) "oii" = ( /obj/structure/inflatable/popped, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "oiu" = ( -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "oiR" = ( /obj/effect/landmark/queen_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "oja" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, @@ -19378,12 +23057,15 @@ /area/fiorina/station/medbay) "ojf" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "ojh" = ( /obj/item/stack/rods/plasteel, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "ojv" = ( @@ -19453,7 +23135,9 @@ /area/fiorina/station/research_cells) "okM" = ( /obj/structure/machinery/vending/dinnerware, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "okT" = ( /obj/item/device/flashlight/lamp/tripod, @@ -19491,12 +23175,16 @@ pixel_y = 8 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "olo" = ( /obj/structure/machinery/disposal, @@ -19514,8 +23202,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) "olC" = ( -/turf/open/floor/prison/greenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greencorner" }, /area/fiorina/station/chapel) "olG" = ( @@ -19523,14 +23212,19 @@ /obj/structure/machinery/computer/station_alert{ dir = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "olT" = ( /obj/structure/machinery/computer3/server/rack, /obj/structure/window{ dir = 8 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "omb" = ( /obj/structure/surface/table/woodentable/fancy, @@ -19549,14 +23243,21 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "omw" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/bright_clean2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean2" + }, /area/fiorina/station/park) "omD" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -19567,7 +23268,10 @@ /area/fiorina/tumor/aux_engi) "omF" = ( /obj/structure/curtain/shower, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "omI" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -19575,7 +23279,9 @@ /area/fiorina/station/transit_hub) "ond" = ( /obj/structure/machinery/computer3/server/rack, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "onw" = ( /obj/structure/bed/chair, @@ -19583,14 +23289,19 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "onz" = ( /obj/structure/machinery/optable{ desc = "This maybe could be used for advanced medical procedures."; name = "Exam Table" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ooF" = ( /obj/structure/machinery/power/apc, @@ -19609,35 +23320,42 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "opB" = ( /obj/structure/machinery/constructable_frame, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "opC" = ( -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "opV" = ( /obj/structure/bed{ icon_state = "psychbed" }, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "oqn" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/botany) "oqu" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) @@ -19656,31 +23374,39 @@ /area/fiorina/station/chapel) "ors" = ( /obj/item/trash/candle, -/turf/open/floor/prison/floor_plate, +/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/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "orA" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "orG" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "osO" = ( /obj/structure/inflatable/door, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "osR" = ( /obj/item/trash/semki, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "osX" = ( /obj/structure/cable/heavyduty{ @@ -19690,29 +23416,32 @@ /area/fiorina/tumor/aux_engi) "oti" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "otq" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "otB" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "otG" = ( /obj/item/tool/scythe, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "otP" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "ouH" = ( /obj/structure/surface/table/reinforced/prison, @@ -19723,7 +23452,10 @@ /area/fiorina/tumor/ship) "ouS" = ( /obj/item/stack/rods, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ovc" = ( /obj/structure/sink{ @@ -19736,32 +23468,38 @@ pixel_x = 1; pixel_y = -1 }, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "ovj" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor, +/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/yellow{ - dir = 1 +/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/whitegreenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "ovE" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/flight_deck) "ovJ" = ( @@ -19778,12 +23516,18 @@ /area/fiorina/station/chapel) "ovZ" = ( /obj/structure/largecrate/supply/floodlights, -/turf/open/floor/prison/floor_plate, +/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/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "owv" = ( /obj/structure/bed/roller, @@ -19796,13 +23540,17 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "owG" = ( /obj/structure/machinery/landinglight/ds1, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "oxg" = ( /obj/structure/machinery/light/double/blue{ @@ -19810,15 +23558,18 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/darkpurple2full, +/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" }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "oxA" = ( @@ -19834,7 +23585,10 @@ /area/fiorina/tumor/aux_engi) "oxN" = ( /obj/structure/machinery/vending/hydroseeds, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "oxS" = ( /obj/item/paper/crumpled/bloody, @@ -19844,7 +23598,9 @@ /area/fiorina/station/chapel) "oxT" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "oxZ" = ( /obj/structure/inflatable/popped, @@ -19852,8 +23608,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "oyd" = ( @@ -19861,8 +23618,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "oyg" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/security/wardens) "oys" = ( @@ -19871,8 +23629,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/station/chapel) "oyC" = ( @@ -19890,15 +23649,23 @@ dir = 9 }, /obj/structure/largecrate/random, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "ozh" = ( -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "ozH" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "oAa" = ( /obj/structure/surface/table/woodentable/fancy, @@ -19906,20 +23673,25 @@ 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/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "oAm" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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) "oAv" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "oAH" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "oAL" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -19936,7 +23708,9 @@ pixel_x = -12; pixel_y = 2 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "oAQ" = ( /obj/item/shard{ @@ -19946,19 +23720,20 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "oAV" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "oBd" = ( /obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "oBj" = ( /obj/effect/decal/cleanable/blood, @@ -19973,8 +23748,9 @@ /turf/open/ice/noweed, /area/fiorina/station/research_cells) "oBP" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "oCe" = ( @@ -19984,7 +23760,9 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "oDe" = ( /obj/effect/landmark/monkey_spawn, @@ -19993,18 +23771,22 @@ "oDn" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "oDz" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "oDG" = ( /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "oEs" = ( @@ -20025,7 +23807,9 @@ pixel_x = 3; pixel_y = 5 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "oED" = ( /obj/effect/landmark/monkey_spawn, @@ -20035,7 +23819,9 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "oEK" = ( /obj/structure/surface/table/reinforced/prison, @@ -20053,8 +23839,9 @@ /area/fiorina/station/power_ring) "oEY" = ( /obj/item/explosive/grenade/incendiary/molotov, -/turf/open/floor/prison/red{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" }, /area/fiorina/station/security) "oFk" = ( @@ -20067,7 +23854,9 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/disco) "oFI" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -20080,7 +23869,9 @@ dir = 1; layer = 2.7 }, -/turf/open/floor/prison/whitegreenangle, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, /area/fiorina/station/medbay) "oGm" = ( /obj/structure/machinery/light/double/blue{ @@ -20088,11 +23879,16 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "oGT" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/station/park) "oGU" = ( /obj/structure/surface/table/woodentable, @@ -20106,17 +23902,24 @@ icon = 'icons/obj/items/policetape.dmi'; icon_state = "engineering_v" }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "oHn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/pill_bottle/imidazoline, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "oHI" = ( -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/disco) "oHX" = ( /obj/structure/ice/thin/indestructible{ @@ -20140,13 +23943,16 @@ /area/fiorina/tumor/ice_lab) "oIR" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/blueangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "bluecorner" }, /area/fiorina/station/chapel) "oJs" = ( /obj/structure/machinery/photocopier, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "oJL" = ( /obj/structure/machinery/light/small{ @@ -20166,8 +23972,9 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "oJU" = ( @@ -20175,25 +23982,28 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/greenblue{ - dir = 1 +/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/floor, +/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" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "oKl" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "oKn" = ( /obj/structure/holohoop{ @@ -20220,16 +24030,18 @@ /area/fiorina/station/civres_blue) "oLd" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "oLB" = ( /obj/structure/platform{ dir = 8 }, -/obj/structure/stairs/perspective/p_stair_ew_half_cap{ - 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) @@ -20237,20 +24049,23 @@ /obj/structure/barricade/metal/wired{ dir = 1 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "oMz" = ( /obj/structure/inflatable, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "oMR" = ( /obj/item/paper, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "oNx" = ( @@ -20270,8 +24085,9 @@ /area/fiorina/maintenance) "oOK" = ( /obj/item/device/multitool, -/turf/open/floor/prison/greencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "green" }, /area/fiorina/tumor/civres) "oOV" = ( @@ -20284,7 +24100,9 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "oPN" = ( /obj/structure/inflatable/popped/door, @@ -20294,7 +24112,9 @@ /obj/structure/closet/crate/medical, /obj/item/clothing/gloves/latex, /obj/item/clothing/gloves/latex, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "oPZ" = ( /obj/structure/largecrate/random/case/double, @@ -20304,12 +24124,13 @@ /obj/item/prop/almayer/comp_closed{ pixel_x = -1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "oQF" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "oQI" = ( @@ -20322,11 +24143,16 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "oQY" = ( -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "oRb" = ( /obj/item/trash/boonie, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "oRR" = ( /obj/structure/surface/table/reinforced/prison, @@ -20334,28 +24160,38 @@ /area/fiorina/station/park) "oSo" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/lowsec) "oSK" = ( -/obj/structure/monorail/launchtrack{ - dir = 9 +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "oSR" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "oTe" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ pixel_y = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "oTl" = ( /obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "oTz" = ( /obj/structure/barricade/handrail/type_b{ @@ -20371,11 +24207,14 @@ /area/fiorina/station/civres_blue) "oTH" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "oTU" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "oUg" = ( @@ -20391,18 +24230,23 @@ "oVn" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "oVC" = ( -/turf/open/floor/prison/greencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, /area/fiorina/tumor/civres) "oWc" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "oWz" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "oWB" = ( /obj/structure/prop/structure_lattice{ @@ -20414,7 +24258,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/research_cells) "oWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -20423,22 +24269,27 @@ "oWV" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "oWW" = ( -/turf/open/floor/prison/redangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "redcorner" }, /area/fiorina/station/security) "oXE" = ( /obj/item/newspaper, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "oXJ" = ( /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "oXR" = ( /obj/structure/ice/thin/indestructible{ @@ -20462,28 +24313,41 @@ dir = 1; pixel_y = -1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "oYm" = ( /obj/item/ammo_casing{ icon_state = "casing_5" }, /obj/item/clothing/suit/armor/vest/security, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "oYH" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "oYM" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "oYX" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "oZc" = ( -/turf/open/floor/prison/darkyellow2angle, +/turf/open/floor/prison{ + icon_state = "darkyellowcorners2" + }, /area/fiorina/station/flight_deck) "oZy" = ( /obj/structure/platform{ @@ -20506,7 +24370,9 @@ /obj/structure/machinery/door/window/eastright{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "pab" = ( /obj/item/tool/weldpack{ @@ -20527,30 +24393,37 @@ "pan" = ( /obj/item/reagent_container/food/snacks/meat, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenblue, +/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" }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/chapel) "pax" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "paQ" = ( /obj/structure/platform{ dir = 4 }, /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "pbp" = ( @@ -20561,18 +24434,19 @@ /area/fiorina/station/telecomm/lz1_cargo) "pbC" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "pbF" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "pbS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/surgical_tray/empty, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "pbV" = ( /obj/structure/platform/kutjevo/smooth{ @@ -20593,8 +24467,9 @@ pixel_x = 1; pixel_y = 3 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "pcl" = ( @@ -20602,14 +24477,19 @@ dir = 1; pixel_y = -1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "pcu" = ( /turf/open/floor/almayer_hull, /area/fiorina/oob) "pcD" = ( /obj/structure/bookcase/manuals/engineering, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "pcK" = ( /obj/structure/surface/rack, @@ -20618,7 +24498,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/chapel) "pdf" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, @@ -20628,14 +24510,16 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "pdw" = ( /obj/item/stack/rods, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "pdB" = ( @@ -20649,7 +24533,9 @@ /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "peh" = ( /obj/structure/platform_decoration{ @@ -20658,35 +24544,45 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "pes" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "peY" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "pfi" = ( -/obj/structure/monorail/launchtrack{ - dir = 6 +/obj/structure/monorail{ + dir = 6; + name = "launch track" }, /turf/open/space, /area/fiorina/oob) "pfE" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "pfW" = ( /obj/item/trash/cigbutt/cigarbutt, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "pgV" = ( /obj/item/book/manual/atmospipes, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "phe" = ( @@ -20695,27 +24591,33 @@ /area/fiorina/maintenance) "phg" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "phz" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "pie" = ( -/turf/open/floor/prison/platingdmg3, +/turf/open/floor/prison{ + icon_state = "platingdmg3" + }, /area/fiorina/station/transit_hub) "pip" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "piy" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "piL" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/tumor/aux_engi) "pjT" = ( @@ -20728,26 +24630,29 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "pkc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/dropper, /obj/item/attachable/bipod, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "pkp" = ( /obj/item/stack/cable_coil/cut, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "pkG" = ( /obj/item/stool, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "pkM" = ( @@ -20756,14 +24661,16 @@ /area/fiorina/station/medbay) "plc" = ( /obj/structure/machinery/computer/arcade, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "plr" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "plu" = ( /obj/item/device/flashlight/lamp/tripod, @@ -20777,38 +24684,51 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "pmo" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) "pmy" = ( /obj/item/device/t_scanner, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "pmM" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "pnc" = ( /obj/structure/largecrate/random/case/double, /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottom" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "pnv" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/greenbluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "greenblue" + }, /area/fiorina/station/botany) "pnA" = ( /obj/item/toy/handcard/uno_reverse_blue, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "pnS" = ( /obj/structure/surface/table/reinforced/prison, @@ -20816,21 +24736,25 @@ /area/fiorina/tumor/servers) "poo" = ( /obj/item/tool/crowbar/red, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "poD" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 9 +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "ppb" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "ppG" = ( /obj/item/stack/rods/plasteel, @@ -20847,7 +24771,9 @@ /obj/item/storage/donut_box{ pixel_y = 6 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "ppO" = ( /obj/structure/machinery/light/double/blue{ @@ -20855,8 +24781,9 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "ppX" = ( @@ -20875,8 +24802,9 @@ pixel_y = 2 }, /obj/item/storage/pouch/tools/full, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "pqq" = ( @@ -20886,7 +24814,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "pqz" = ( /obj/item/clothing/suit/storage/labcoat, @@ -20902,7 +24832,9 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "pqO" = ( /turf/closed/shuttle/ert{ @@ -20918,17 +24850,22 @@ /area/fiorina/tumor/ship) "pri" = ( /obj/structure/machinery/space_heater, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "pry" = ( /obj/structure/prop/resin_prop{ icon_state = "coolanttank" }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "prP" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "pso" = ( @@ -20941,8 +24878,9 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "psO" = ( @@ -20954,19 +24892,26 @@ pixel_x = -16; pixel_y = 12 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "pte" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/power_ring) "pty" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/greenfull_2, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "ptV" = ( /obj/vehicle/train/cargo/trolley, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "ptZ" = ( /obj/structure/surface/table/reinforced/prison, @@ -20974,7 +24919,7 @@ pixel_y = 9 }, /obj/item/storage/pill_bottle/kelotane/skillless, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "puw" = ( /obj/effect/decal/cleanable/blood/drip, @@ -20987,7 +24932,10 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "puE" = ( /turf/open/floor/plating/prison, @@ -20999,19 +24947,27 @@ }, /area/fiorina/oob) "pvT" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, -/turf/open/floor/prison/floor_plate, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "pwg" = ( /obj/structure/platform/stair_cut/alt, -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "pwi" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "pwL" = ( /obj/item/stack/tile/plasteel{ @@ -21022,11 +24978,15 @@ /area/fiorina/tumor/civres) "pwN" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "pxa" = ( /obj/item/circuitboard/machine/rdserver, -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/tumor/servers) "pxk" = ( /obj/structure/closet/cabinet, @@ -21037,29 +24997,37 @@ /area/fiorina/station/civres_blue) "pxu" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "pxI" = ( /obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "pxR" = ( /obj/structure/closet/crate/trashcart, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "pya" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "pyv" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "pyK" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, @@ -21074,7 +25042,10 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "pzh" = ( /obj/item/toy/beach_ball, @@ -21085,8 +25056,9 @@ /area/fiorina/station/park) "pzG" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "pzN" = ( @@ -21095,25 +25067,32 @@ pixel_y = 18 }, /obj/item/stool, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "pzQ" = ( /obj/item/paper, /obj/structure/inflatable/door, -/turf/open/floor/prison/darkpurple2full, +/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/darkyellow2{ - dir = 4 +/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/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "pAt" = ( /obj/effect/decal{ @@ -21125,8 +25104,9 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "pAB" = ( @@ -21135,17 +25115,23 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "pAN" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "pAO" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -21153,11 +25139,16 @@ "pBg" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/electrical, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "pBn" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "pBq" = ( /obj/structure/largecrate/random/barrel/white, @@ -21193,17 +25184,20 @@ /area/fiorina/tumor/ice_lab) "pCF" = ( /obj/structure/lz_sign/prison_sign, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "pCN" = ( /obj/structure/toilet{ dir = 1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "pCS" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "pCX" = ( /obj/item/stack/sheet/metal, @@ -21211,23 +25205,28 @@ /area/fiorina/tumor/servers) "pCZ" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "pDg" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /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/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "pDV" = ( /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "pEe" = ( @@ -21235,13 +25234,15 @@ /obj/item/reagent_container/food/drinks/coffee{ pixel_y = 13 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "pEw" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "pEL" = ( @@ -21251,11 +25252,15 @@ pixel_y = 21 }, /obj/effect/spawner/random/gun/smg/lowchance, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "pER" = ( /obj/structure/closet/secure_closet/engineering_materials, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "pEY" = ( /obj/structure/barricade/sandbags{ @@ -21267,14 +25272,19 @@ icon_state = "sandbag_0"; pixel_y = -14 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "pFg" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/reagent_container/food/snacks/wrapped/barcardine, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "pFi" = ( /obj/structure/platform_decoration{ @@ -21303,7 +25313,9 @@ /area/fiorina/tumor/ice_lab) "pFY" = ( /obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "pGf" = ( /obj/structure/platform{ @@ -21311,17 +25323,24 @@ }, /obj/item/prop/almayer/handheld1, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "pGg" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "pGi" = ( -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_tram) "pGv" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/lz/near_lzII) "pGH" = ( /turf/closed/shuttle/ert{ @@ -21338,7 +25357,9 @@ /area/fiorina/station/park) "pHc" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "pHh" = ( /obj/structure/ice/thin/indestructible{ @@ -21353,8 +25374,9 @@ /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) "pHu" = ( -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "pIi" = ( @@ -21362,13 +25384,16 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "pIo" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/chapel) "pIs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -21391,25 +25416,30 @@ /area/fiorina/station/park) "pIK" = ( /obj/structure/platform, -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/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, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "pJa" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "pJo" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "pJK" = ( @@ -21420,7 +25450,10 @@ "pKd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "pKh" = ( /obj/item/stool{ @@ -21431,13 +25464,17 @@ icon_state = "poster1"; pixel_y = 32 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "pKz" = ( /obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "pKJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, @@ -21460,11 +25497,16 @@ /area/fiorina/station/civres_blue) "pLh" = ( /obj/structure/bed/sofa/vert/grey/bot, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/transit_hub) "pLk" = ( /obj/structure/machinery/door/airlock/prison/horizontal, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "pLQ" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -21483,7 +25525,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "pNj" = ( /obj/structure/bookcase, @@ -21497,27 +25541,36 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "pNV" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "pOd" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "pOm" = ( /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "pON" = ( /obj/structure/closet, /obj/item/storage/backpack/clown, /obj/item/toy/bikehorn, -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "pPb" = ( -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/oob) "pPd" = ( /obj/structure/prop/resin_prop{ @@ -21527,7 +25580,7 @@ /area/fiorina/tumor/ice_lab) "pPf" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "pPG" = ( /obj/structure/disposalpipe/segment{ @@ -21547,8 +25600,9 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "pQb" = ( @@ -21556,33 +25610,44 @@ /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "pQh" = ( /obj/item/trash/liquidfood, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "pQq" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "pQu" = ( /obj/structure/holohoop{ dir = 1 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "pQD" = ( /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "pRn" = ( /obj/item/paper/crumpled, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "pRG" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -21600,7 +25665,10 @@ pixel_x = -8 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "pSJ" = ( /obj/effect/landmark/corpsespawner/pmc, @@ -21618,7 +25686,9 @@ /obj/structure/toilet{ dir = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "pTR" = ( /obj/structure/machinery/light/double/blue{ @@ -21642,16 +25712,18 @@ /obj/structure/sign/nosmoking_1{ pixel_y = 30 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "pVq" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/research_cells) "pVv" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "pVw" = ( /obj/structure/mirror{ @@ -21661,7 +25733,10 @@ dir = 8; pixel_x = -12 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "pVR" = ( /obj/structure/surface/table/woodentable/fancy, @@ -21676,7 +25751,9 @@ /obj/item/storage/beer_pack{ pixel_y = 7 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "pWp" = ( /turf/closed/shuttle/ert{ @@ -21685,7 +25762,7 @@ /area/fiorina/tumor/ship) "pWH" = ( /obj/item/clipboard, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "pWO" = ( /obj/item/stack/rods, @@ -21696,7 +25773,7 @@ /area/fiorina/tumor/aux_engi) "pXj" = ( /obj/item/tool/wet_sign, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "pXH" = ( /obj/item/device/flashlight/lamp/tripod, @@ -21708,7 +25785,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "pXY" = ( /obj/structure/bookcase{ @@ -21724,30 +25801,39 @@ /area/fiorina/station/chapel) "pYh" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "pYp" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "pYI" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/bible/hefa, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "pYO" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/darkyellow2angle, +/turf/open/floor/prison{ + icon_state = "darkyellowcorners2" + }, /area/fiorina/station/telecomm/lz1_cargo) "pYW" = ( /obj/item/tool/weldingtool/hugetank, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "pZb" = ( -/turf/open/floor/prison/yellowangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellowcorner" }, /area/fiorina/station/lowsec) "pZm" = ( @@ -21766,7 +25852,9 @@ /area/fiorina/oob) "qam" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "qaO" = ( /obj/structure/barricade/handrail/type_b{ @@ -21794,18 +25882,25 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qbD" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/greenfull_2, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/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" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "qbW" = ( /obj/item/tool/candle{ @@ -21822,26 +25917,29 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "qcv" = ( -/turf/open/floor/prison/yellow{ - 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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "qcM" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/skills{ dir = 4 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "qcT" = ( /obj/structure/barricade/metal/wired{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "qdd" = ( /obj/structure/grille, @@ -21850,7 +25948,9 @@ /area/fiorina/oob) "qdB" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "qdJ" = ( /obj/structure/window/framed/prison/reinforced, @@ -21860,13 +25960,16 @@ /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security/wardens) "qeu" = ( /obj/structure/toilet{ pixel_y = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "qew" = ( /obj/structure/disposalpipe/segment{ @@ -21878,7 +25981,7 @@ pixel_y = 12 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "qeC" = ( /obj/structure/surface/table/reinforced/prison, @@ -21903,7 +26006,10 @@ }, /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qeX" = ( /obj/structure/surface/table/reinforced/prison{ @@ -21928,17 +26034,24 @@ pixel_x = 12 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/oob) "qfI" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qfU" = ( -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "qgd" = ( @@ -21951,7 +26064,9 @@ "qgh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/surgery, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "qgi" = ( /obj/structure/disposalpipe/segment{ @@ -21979,11 +26094,16 @@ pixel_x = -6; pixel_y = 6 }, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/power_ring) "qgA" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qgB" = ( /obj/item/clothing/gloves/rainbow, @@ -21998,33 +26118,37 @@ pixel_y = -1 }, /obj/item/stack/barbed_wire, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "qhB" = ( /obj/effect/decal/cleanable/blood, /obj/item/trash/kepler, -/turf/open/floor/prison/floor, +/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/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "qjc" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/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, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "qjp" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ @@ -22041,11 +26165,12 @@ pixel_x = 2; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "qjC" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -22053,14 +26178,20 @@ "qjY" = ( /obj/item/device/flashlight/lamp/tripod, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "qkf" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; layer = 3.5; pixel_y = 6 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "qkg" = ( /obj/structure/machinery/light/double/blue, @@ -22070,7 +26201,9 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "qks" = ( /obj/structure/surface/table/reinforced/prison, @@ -22079,7 +26212,9 @@ pixel_y = 7 }, /obj/item/tool/pen, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qkN" = ( /obj/structure/surface/table/reinforced/prison, @@ -22091,8 +26226,9 @@ icon_state = "abed" }, /obj/effect/spawner/random/sentry/midchance, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "qlf" = ( @@ -22103,20 +26239,22 @@ /area/fiorina/station/civres_blue) "qmd" = ( /obj/item/storage/toolbox/antag, -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/tumor/civres) "qms" = ( /obj/structure/barricade/deployable{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "qmz" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "qmC" = ( @@ -22132,7 +26270,10 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomright" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qmO" = ( /obj/structure/surface/table/reinforced/prison, @@ -22141,33 +26282,44 @@ pixel_y = 22 }, /obj/item/reagent_container/food/snacks/cheesyfries, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "qmS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/wood/medium_stack, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "qnc" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/power_ring) "qnq" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "qnu" = ( -/turf/open/floor/prison/damaged1, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, /area/fiorina/station/disco) "qnB" = ( -/obj/structure/monorail/launchtrack{ - dir = 6 +/obj/structure/monorail{ + dir = 6; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) @@ -22177,17 +26329,21 @@ health = 85; icon_state = "metal_1" }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "qnK" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "qnQ" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "qob" = ( /obj/structure/machinery/light/double/blue{ @@ -22202,7 +26358,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "qoG" = ( /obj/item/toy/crayon/rainbow, @@ -22215,12 +26373,16 @@ /obj/structure/pipes/standard/simple/visible{ dir = 9 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "qpa" = ( /obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "qpw" = ( @@ -22228,7 +26390,7 @@ dir = 1; layer = 3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "qpB" = ( /obj/item/stack/cable_coil/blue, @@ -22249,32 +26411,40 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "qqu" = ( /obj/structure/surface/rack, /obj/item/poster, /obj/item/poster, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "qqJ" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "qqM" = ( /obj/structure/closet/emcloset, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "qqX" = ( /obj/item/disk, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "qqZ" = ( -/turf/open/floor/prison/whitepurpleangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurplecorner" }, /area/fiorina/station/research_cells) "qrz" = ( @@ -22291,21 +26461,28 @@ /area/fiorina/maintenance) "qtq" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "qty" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "qtX" = ( /obj/structure/blocker/invisible_wall, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/oob) "quk" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "qun" = ( @@ -22321,7 +26498,10 @@ /area/fiorina/station/park) "quy" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/darkpurple2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "quU" = ( /obj/structure/filingcabinet{ @@ -22334,7 +26514,9 @@ pixel_x = -7; pixel_y = 11 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qva" = ( /obj/structure/surface/table/reinforced/prison, @@ -22346,11 +26528,15 @@ /area/fiorina/station/research_cells) "qvk" = ( /obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "qvn" = ( -/obj/structure/monorail/launchtrack{ - dir = 10 +/obj/structure/monorail{ + dir = 10; + name = "launch track" }, /turf/open/space, /area/fiorina/oob) @@ -22358,25 +26544,34 @@ /obj/structure/barricade/metal/wired{ dir = 8 }, -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/disco) "qvL" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/power_ring) "qwh" = ( /obj/structure/barricade/wooden{ dir = 4 }, /obj/structure/barricade/wooden, -/turf/open/floor/prison/floor_plate, +/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/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "qws" = ( /obj/effect/decal/hefa_cult_decals/d32{ @@ -22389,8 +26584,9 @@ /area/fiorina/maintenance) "qwy" = ( /obj/item/weapon/baton/cattleprod, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "qwJ" = ( @@ -22399,25 +26595,32 @@ pixel_x = 5; pixel_y = 22 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "qwU" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) "qxB" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "qxL" = ( /obj/item/toy/deck, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qxN" = ( /obj/structure/barricade/sandbags{ @@ -22429,27 +26632,34 @@ /area/fiorina/lz/near_lzII) "qyc" = ( /obj/structure/largecrate/random/case/small, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "qyi" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "qyk" = ( /obj/structure/machinery/power/port_gen/pacman, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "qyB" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "qyX" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "qzl" = ( /obj/structure/machinery/shower{ @@ -22458,52 +26668,69 @@ /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "qzn" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "qzy" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/aux_engi) "qzB" = ( /obj/item/reagent_container/food/condiment/peppermill{ pixel_x = -5; pixel_y = -11 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "qzI" = ( /obj/item/tool/crowbar/red, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "qzS" = ( /obj/structure/largecrate/random/barrel/red, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "qzW" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "qzX" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qBh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/handcard/aceofspades, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "qBk" = ( /obj/item/reagent_container/food/drinks/cans/aspen, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "qBs" = ( /obj/item/tool/mop{ @@ -22513,7 +26740,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "qBB" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -22535,14 +26762,19 @@ /obj/structure/inflatable/popped/door, /obj/item/stack/barbed_wire, /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/whitegreencorner, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "qCa" = ( /obj/structure/prop/resin_prop{ @@ -22554,14 +26786,19 @@ /area/fiorina/tumor/aux_engi) "qCs" = ( /obj/structure/largecrate/random/case/small, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "qCw" = ( /obj/structure/inflatable/popped/door, /obj/item/ammo_casing{ icon_state = "casing_1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "qCW" = ( /turf/closed/shuttle/elevator{ @@ -22569,13 +26806,16 @@ }, /area/fiorina/tumor/aux_engi) "qDc" = ( -/obj/structure/monorail/launchtrack{ - dir = 9 +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "qDd" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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) @@ -22584,7 +26824,9 @@ pixel_x = -5; pixel_y = -6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "qDn" = ( /obj/item/stool, @@ -22599,11 +26841,11 @@ /area/fiorina/maintenance) "qDo" = ( /obj/structure/janitorialcart, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "qDy" = ( /obj/item/reagent_container/glass/bucket/janibucket, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "qDD" = ( /obj/structure/machinery/light/double/blue{ @@ -22612,17 +26854,24 @@ pixel_y = -3 }, /obj/structure/largecrate/random/case, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "qDG" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor_plate, +/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" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qDI" = ( /obj/structure/toilet{ @@ -22630,8 +26879,9 @@ pixel_y = 8 }, /obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "qDY" = ( @@ -22639,17 +26889,23 @@ icon_state = "sandbag_0"; pixel_y = -14 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "qEn" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitepurple{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "qFg" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "qFi" = ( /obj/structure/machinery/light/small{ @@ -22669,19 +26925,22 @@ /turf/open/space/basic, /area/fiorina/oob) "qFQ" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/barricade/handrail/type_b{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "qGl" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "qGn" = ( @@ -22697,17 +26956,15 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/aux_engi) -"qHh" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/area/fiorina/tumor/aux_engi) +"qHC" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/area/fiorina/station/disco) +/area/fiorina/lz/near_lzI) "qHG" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 25 @@ -22716,11 +26973,13 @@ /area/fiorina/tumor/ship) "qHK" = ( /obj/item/gift, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "qHZ" = ( /obj/item/tool/warning_cone, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "qIk" = ( /obj/structure/platform{ @@ -22733,7 +26992,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "qIq" = ( /obj/structure/largecrate/random/case/small, @@ -22741,18 +27002,24 @@ /area/fiorina/maintenance) "qIy" = ( /obj/item/tool/match, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qIO" = ( /obj/item/stock_parts/manipulator/pico, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "qIZ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "qJf" = ( /obj/structure/surface/table/reinforced/prison, @@ -22785,8 +27052,9 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "qJK" = ( @@ -22810,14 +27078,16 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/spray/pepper, /obj/item/clothing/glasses/sunglasses/sechud, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "qKF" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "qKT" = ( /obj/item/stack/rods/plasteel, @@ -22827,11 +27097,13 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "qLz" = ( /obj/structure/machinery/autolathe/medilathe/full, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "qLI" = ( /obj/item/storage/toolbox, @@ -22846,7 +27118,7 @@ /area/fiorina/station/civres_blue) "qLJ" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "qLN" = ( /obj/item/storage/toolbox/mechanical/green, @@ -22858,14 +27130,17 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/power_ring) "qNm" = ( /obj/structure/closet/secure_closet/engineering_materials, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "qNv" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -22878,19 +27153,29 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "qNS" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "qNW" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/station/park) "qOd" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/yellowfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "qOk" = ( /obj/structure/platform/kutjevo/smooth{ @@ -22905,12 +27190,14 @@ "qOy" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer3/laptop/secure_data, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "qOG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/cups, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "qON" = ( /obj/item/stack/cable_coil/cyan, @@ -22935,7 +27222,9 @@ /obj/structure/window/reinforced, /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "qPb" = ( /turf/open/organic/grass{ @@ -22948,23 +27237,29 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/maintenance) "qPC" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/park) "qPG" = ( /obj/structure/machinery/washing_machine, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "qPT" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "qQf" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "qQj" = ( @@ -22991,12 +27286,12 @@ /area/fiorina/station/chapel) "qQO" = ( /obj/item/tool/wet_sign, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "qQU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/prop/helmetgarb/raincover, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "qRg" = ( /obj/structure/sign/prop3{ @@ -23018,15 +27313,19 @@ /area/fiorina/station/lowsec) "qRD" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "qSg" = ( /obj/structure/machinery/bot/medbot{ name = "Dr. O" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "qSv" = ( /obj/structure/machinery/vending/snack/packaged, @@ -23035,11 +27334,14 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "qTa" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/security) "qTp" = ( @@ -23053,11 +27355,17 @@ pixel_x = 5; pixel_y = 25 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "qTr" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "qTy" = ( /obj/structure/reagent_dispensers/water_cooler{ @@ -23072,7 +27380,9 @@ pixel_x = 1; pixel_y = 8 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "qUe" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, @@ -23083,7 +27393,7 @@ health = 250; icon_state = "metal_1" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "qUo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -23110,21 +27420,28 @@ name = "xeno_hive_spawn" }, /obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "qUx" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "qUQ" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "qUZ" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, /obj/structure/machinery/light/double/blue{ @@ -23137,7 +27454,9 @@ desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; name = "\improper Fiorina Green Block Canteen Vendor" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "qVq" = ( /obj/item/ammo_box/magazine/misc/flares{ @@ -23145,7 +27464,10 @@ pixel_y = 16 }, /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "qVt" = ( /obj/structure/machinery/light/double/blue{ @@ -23153,7 +27475,10 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_tram) "qVD" = ( /obj/structure/platform, @@ -23163,31 +27488,38 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "qVF" = ( /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/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/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "qWf" = ( /obj/item/trash/popcorn, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "qWi" = ( /obj/structure/largecrate/guns/merc, /obj/item/toy/deck/uno, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "qWw" = ( /obj/structure/prop/souto_land/streamer{ @@ -23198,19 +27530,25 @@ dir = 1 }, /obj/effect/landmark/corpsespawner/security/liaison, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "qWB" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "qXl" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison/floor_plate, /area/fiorina/station/security) "qXM" = ( /obj/item/stack/tile/plasteel, @@ -23218,29 +27556,33 @@ /area/fiorina/tumor/civres) "qXP" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "qYc" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "qZa" = ( /obj/item/shard{ icon_state = "large"; name = "ice shard" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "qZh" = ( /obj/structure/platform_decoration, @@ -23248,14 +27590,19 @@ icon_state = "medium"; name = "ice shard" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "qZx" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; layer = 3.5; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "qZL" = ( /obj/structure/machinery/computer/arcade, @@ -23264,12 +27611,13 @@ pixel_x = 12; pixel_y = 25 }, -/obj/structure/flora/pottedplant/pottedplant_22{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; layer = 2.8; pixel_x = 15; pixel_y = 5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "qZW" = ( /obj/structure/surface/table/reinforced/prison, @@ -23277,7 +27625,9 @@ pixel_x = 5; pixel_y = 2 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "rar" = ( /obj/structure/window/reinforced{ @@ -23286,7 +27636,9 @@ /obj/structure/window/reinforced, /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "raD" = ( /obj/structure/machinery/light/double/blue{ @@ -23294,8 +27646,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/whitepurple{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "raF" = ( @@ -23304,18 +27657,25 @@ name = "certified powerloader operator card"; registered_name = "John Forklift" }, -/turf/open/floor/prison/bluefull, +/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 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "rbE" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rbK" = ( /obj/effect/spawner/random/tool, @@ -23323,40 +27683,47 @@ /area/fiorina/station/power_ring) "rcu" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/redfull, -/area/fiorina/station/security) -"rds" = ( -/obj/structure/inflatable, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + icon_state = "redfull" }, -/area/fiorina/station/lowsec) +/area/fiorina/station/security) "rdS" = ( /obj/structure/machinery/light/double/blue{ dir = 8; pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "rdX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "rev" = ( -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/power_ring) "reO" = ( /obj/structure/platform_decoration{ dir = 4 }, -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "rfd" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, @@ -23367,27 +27734,31 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "rfq" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "rfD" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitepurple{ - dir = 8 +/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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "rfJ" = ( /obj/structure/surface/table/reinforced/prison, @@ -23395,14 +27766,18 @@ name = "\improper prison food"; pixel_y = 9 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "rfR" = ( /obj/item/shard{ icon_state = "medium"; name = "ice shard" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "rgg" = ( /obj/item/tool/candle{ @@ -23412,45 +27787,60 @@ /area/fiorina/station/chapel) "rgD" = ( /obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "rhF" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/surface/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "rhK" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "rib" = ( /obj/item/trash/cigbutt/cigarbutt, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + 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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "riu" = ( /obj/structure/reagent_dispensers/water_cooler{ pixel_x = 1; pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "rja" = ( /turf/closed/wall/prison, /area/fiorina/station/civres_blue) "rjn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "rjz" = ( -/obj/structure/stairs/perspective/p_stair_full, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, /obj/effect/decal/cleanable/blood{ icon_state = "gibarm_flesh" }, @@ -23462,8 +27852,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/cell_stripe{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/medbay) "rjM" = ( @@ -23472,7 +27863,9 @@ name = "Lung Transplants for Dummies"; pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "rkb" = ( /obj/structure/closet/secure_closet/engineering_welding, @@ -23482,19 +27875,21 @@ pixel_y = 13 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /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/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "rkr" = ( -/turf/open/floor/prison/greenbluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "greenblue" }, /area/fiorina/station/botany) "rkB" = ( @@ -23510,7 +27905,10 @@ /obj/structure/surface/table/woodentable/fancy, /obj/item/stack/rods, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/chapel) "rkR" = ( /obj/item/clothing/glasses/science, @@ -23528,17 +27926,24 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/chapel) "rmb" = ( /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "rmg" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "rmh" = ( /obj/structure/surface/rack, @@ -23550,14 +27955,17 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "rmA" = ( -/turf/open/floor/prison/platingdmg3, +/turf/open/floor/prison{ + icon_state = "platingdmg3" + }, /area/fiorina/station/security) "rmG" = ( /obj/item/ammo_casing{ icon_state = "casing_5" }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "rmI" = ( @@ -23567,8 +27975,9 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" }, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "rmS" = ( @@ -23580,8 +27989,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "rna" = ( @@ -23595,8 +28005,9 @@ /turf/open/floor/wood, /area/fiorina/station/civres_blue) "rol" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) @@ -23605,20 +28016,24 @@ dir = 8; pixel_x = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "ror" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "rov" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6" }, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "rox" = ( @@ -23627,42 +28042,55 @@ dir = 4; layer = 3.5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "roC" = ( /obj/item/tool/weldpack, -/turf/open/floor/prison/floor, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "roS" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "roY" = ( -/turf/open/floor/prison/sterile_white, +/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/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "rqL" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "rrb" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "rrj" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "rru" = ( /obj/effect/spawner/random/goggles/midchance, @@ -23672,8 +28100,9 @@ /area/fiorina/station/research_cells) "rrP" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/station/chapel) "rsh" = ( @@ -23681,7 +28110,9 @@ /obj/item/clothing/mask/cigarette/weed{ icon_state = "ucigoff" }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "rsp" = ( /obj/item/toy/crayon/purple, @@ -23690,7 +28121,10 @@ "rss" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rsz" = ( /obj/structure/prop/structure_lattice{ @@ -23702,20 +28136,24 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "rsE" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "rsW" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "rth" = ( @@ -23724,41 +28162,51 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "rtM" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "rue" = ( -/obj/structure/monorail/launchtrack{ - dir = 10 +/obj/structure/monorail{ + dir = 10; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "ruv" = ( -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/station/chapel) "ruy" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "ruB" = ( /obj/effect/decal/medical_decals{ dir = 4; icon_state = "triagedecaldir" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ruD" = ( /turf/open/floor/wood, /area/fiorina/oob) "ruE" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "ruJ" = ( /obj/structure/disposalpipe/segment{ @@ -23776,11 +28224,15 @@ dir = 1; icon_state = "human2" }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "rvu" = ( /obj/structure/toilet, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "rvR" = ( /obj/structure/surface/table/reinforced/prison, @@ -23792,11 +28244,15 @@ pixel_x = 9; pixel_y = 2 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "rvW" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/power_ring) "rwj" = ( /obj/structure/barricade/plasteel, @@ -23806,7 +28262,9 @@ /area/fiorina/station/park) "rwt" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "rwu" = ( /obj/structure/bed/chair{ @@ -23825,8 +28283,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "rxr" = ( @@ -23837,7 +28296,7 @@ /area/fiorina/oob) "rxz" = ( /obj/structure/curtain/open/black, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/maintenance) "rym" = ( /obj/structure/inflatable/popped/door, @@ -23845,11 +28304,13 @@ /area/fiorina/station/disco) "ryt" = ( /obj/structure/window/framed/prison/reinforced, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "ryx" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "ryJ" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ @@ -23858,8 +28319,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) "ryN" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "rzt" = ( @@ -23868,14 +28330,18 @@ /area/fiorina/station/power_ring) "rzR" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/blueangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "rAa" = ( /obj/item/pamphlet/skill/powerloader, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rAe" = ( /obj/structure/platform/kutjevo/smooth, @@ -23883,13 +28349,14 @@ /turf/open/space, /area/fiorina/oob) "rAk" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "rAm" = ( /obj/structure/surface/rack, @@ -23898,7 +28365,9 @@ /area/fiorina/station/telecomm/lz2_maint) "rAt" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "rAK" = ( /obj/structure/barricade/metal{ @@ -23918,14 +28387,17 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "rAW" = ( /obj/structure/largecrate/random, /obj/structure/barricade/wooden, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "rBa" = ( /obj/structure/surface/table/reinforced/prison, @@ -23933,7 +28405,9 @@ dir = 8 }, /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "rBr" = ( /obj/item/device/flashlight/lamp/tripod, @@ -23955,8 +28429,9 @@ /area/fiorina/station/flight_deck) "rBR" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzI) "rCq" = ( @@ -23982,28 +28457,39 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "rCO" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "rDm" = ( /obj/item/tool/crowbar/red, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rEe" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "rEg" = ( /obj/structure/sink{ @@ -24011,21 +28497,28 @@ pixel_x = 12 }, /obj/item/storage/fancy/cigarettes/blackpack, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "rEm" = ( /obj/item/tool/weldingtool/largetank, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "rEH" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/oob) "rFr" = ( /obj/structure/barricade/wooden{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/disco) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, @@ -24037,7 +28530,9 @@ /obj/item/ammo_casing{ icon_state = "casing_7_1" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "rGf" = ( /turf/open/auto_turf/sand/layer1, @@ -24066,19 +28561,26 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/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/darkpurple2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "rHj" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rHr" = ( /obj/effect/alien/weeds/node, @@ -24094,19 +28596,24 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "rIo" = ( -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/chapel) "rIC" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "rIE" = ( /obj/item/stack/rods, @@ -24116,7 +28623,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "rIS" = ( /obj/structure/sign/poster{ @@ -24126,10 +28633,15 @@ /area/fiorina/station/medbay) "rIW" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/red, +/turf/open/floor/prison{ + icon_state = "red" + }, /area/fiorina/station/security) "rIX" = ( -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/civres_blue) "rJh" = ( /obj/effect/decal/cleanable/blood, @@ -24142,14 +28654,16 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "rJK" = ( -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/chapel) "rJO" = ( /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "rJT" = ( /obj/item/storage/bag/trash, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "rJZ" = ( /obj/item/stack/cable_coil/green, @@ -24168,36 +28682,42 @@ "rKB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/rifle/m16, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "rKS" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/darkpurple2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "rKX" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "rKZ" = ( /obj/item/storage/toolbox/electrical, -/turf/open/floor/prison/floor, +/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/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "rLC" = ( /obj/structure/window{ dir = 4 }, /obj/item/circuitboard/machine/rdserver, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "rLJ" = ( /obj/structure/largecrate/random/case/double, @@ -24205,27 +28725,40 @@ /area/fiorina/station/chapel) "rLT" = ( /obj/structure/machinery/photocopier, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "rMg" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/greenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "rMt" = ( /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "rME" = ( /obj/structure/machinery/bot/medbot, -/turf/open/floor/prison/whitegreenfull, +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "rMS" = ( /obj/structure/largecrate/random/secure, @@ -24234,7 +28767,10 @@ pixel_x = 10; pixel_y = 1 }, -/turf/open/floor/prison/whitegreencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "rMY" = ( /obj/structure/machinery/light/small{ @@ -24260,25 +28796,29 @@ "rNp" = ( /obj/item/reagent_container/glass/bucket/mopbucket, /obj/item/tool/mop, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "rNF" = ( /obj/item/stack/sandbags/large_stack, -/turf/open/floor/prison/greencorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "green" + }, /area/fiorina/tumor/civres) "rOa" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "rOm" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "rOo" = ( -/obj/structure/monorail/launchtrack{ - dir = 9 +/obj/structure/monorail{ + dir = 9; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) @@ -24289,7 +28829,9 @@ /area/fiorina/maintenance) "rOE" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "rOI" = ( /obj/structure/flora/bush/ausbushes/ausbush{ @@ -24303,17 +28845,22 @@ /obj/structure/closet/crate/trashcart, /obj/item/storage/pill_bottle/kelotane/skillless, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "rPh" = ( -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/ice_lab) "rPu" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "rPI" = ( /obj/structure/surface/table/reinforced/prison, @@ -24348,7 +28895,9 @@ icon_state = "poster11"; pixel_x = -24 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "rPS" = ( /obj/item/device/flashlight/lamp/tripod, @@ -24373,12 +28922,15 @@ pixel_y = 13 }, /obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "rQF" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/greenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greencorner" }, /area/fiorina/tumor/aux_engi) "rQK" = ( @@ -24393,15 +28945,18 @@ /obj/structure/machinery/power/terminal{ dir = 8 }, -/turf/open/floor/prison/blueangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "bluecorner" }, /area/fiorina/station/power_ring) "rRb" = ( /obj/item/shard{ icon_state = "large" }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "rRO" = ( /obj/item/ammo_magazine/rifle/m16{ @@ -24411,15 +28966,19 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "rRT" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "rSh" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "rSr" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -24430,11 +28989,14 @@ /area/fiorina/station/research_cells) "rSM" = ( /obj/structure/inflatable/popped, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "rTb" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) @@ -24446,18 +29008,22 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "rTL" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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/civres_blue) "rUc" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzI) "rUr" = ( -/obj/structure/monorail/launchtrack{ - dir = 4 +/obj/structure/monorail{ + dir = 4; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) @@ -24467,25 +29033,32 @@ /area/fiorina/tumor/fiberbush) "rUL" = ( /obj/item/stack/cable_coil/green, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "rUT" = ( /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "rUY" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "rVy" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/effect/spawner/random/pills/midchance, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "rVM" = ( @@ -24502,20 +29075,30 @@ /area/fiorina/station/power_ring) "rVS" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "rVZ" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/civres_blue) "rWi" = ( /obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "rWX" = ( -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/disco) "rWZ" = ( /obj/item/weapon/gun/rifle/m16, @@ -24523,40 +29106,53 @@ dir = 6; icon_state = "casing_5" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "rXz" = ( /obj/structure/pipes/unary/freezer{ icon_state = "freezer_1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "rXT" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "rYC" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 10 +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "rYJ" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "rZa" = ( /obj/structure/barricade/metal/wired{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "rZh" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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/park) @@ -24567,24 +29163,30 @@ /area/fiorina/station/power_ring) "rZr" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "rZP" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/aux_engi) "sad" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "saI" = ( /obj/item/stack/rods, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "saQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/pill_bottle/inaprovaline/skillless, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "sbf" = ( /obj/effect/landmark/corpsespawner/prisoner, @@ -24595,21 +29197,39 @@ /area/fiorina/station/park) "sbg" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "sbj" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "sbp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) +"sbM" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/disco) "sbQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "sbY" = ( /obj/structure/inflatable, @@ -24617,11 +29237,16 @@ /obj/structure/barricade/handrail/type_b{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "scg" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "sct" = ( /obj/structure/closet/crate/delta{ @@ -24629,14 +29254,16 @@ name = "crate" }, /obj/item/ammo_box/magazine/shotgun/buckshot, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "scw" = ( /obj/item/storage/beer_pack{ pixel_y = 10 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "scM" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -24646,7 +29273,9 @@ dir = 4 }, /obj/item/storage/briefcase, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "scZ" = ( /obj/structure/platform, @@ -24660,13 +29289,18 @@ /area/fiorina/station/security) "sde" = ( /obj/item/tool/kitchen/utensil/fork, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "sdK" = ( /obj/structure/surface/table/woodentable, @@ -24684,8 +29318,9 @@ }, /area/fiorina/station/civres_blue) "sel" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, @@ -24699,7 +29334,9 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "sfi" = ( /obj/structure/platform_decoration{ @@ -24718,7 +29355,10 @@ }, /area/fiorina/station/chapel) "sfw" = ( -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/station/power_ring) "sfW" = ( /obj/structure/platform{ @@ -24728,7 +29368,10 @@ /area/fiorina/station/power_ring) "sgb" = ( /obj/item/ammo_box/magazine/misc/flares/empty, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "sgw" = ( /obj/structure/window_frame/prison, @@ -24744,11 +29387,16 @@ /area/fiorina/station/civres_blue) "shq" = ( /obj/structure/machinery/space_heater, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "shC" = ( /obj/structure/machinery/autolathe/full, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "shG" = ( /obj/structure/sink{ @@ -24757,16 +29405,22 @@ }, /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/gloves/latex, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "siz" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "siR" = ( /obj/structure/machinery/shower{ @@ -24776,33 +29430,45 @@ /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/gun/special, /obj/effect/landmark/objective_landmark/far, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "sjc" = ( /obj/structure/barricade/sandbags{ dir = 8; icon_state = "sandbag_0" }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "sjl" = ( /obj/item/stack/nanopaste, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "sjn" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" }, -/turf/open/floor/prison/whitegreenfull, /area/fiorina/tumor/ice_lab) "sjw" = ( -/turf/open/floor/prison/whitegreenangle, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, /area/fiorina/station/medbay) "sjx" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "sjR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -24820,15 +29486,19 @@ /obj/effect/landmark/nightmare{ insert_tag = "repairpanelslz" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "skO" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "slG" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "slM" = ( /obj/structure/closet/crate/trashcart, @@ -24840,23 +29510,32 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "sma" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "smh" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "smq" = ( /obj/structure/closet/emcloset, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "smv" = ( /obj/item/trash/used_stasis_bag{ @@ -24867,13 +29546,16 @@ /area/fiorina/lz/near_lzI) "smX" = ( /obj/item/stock_parts/matter_bin/super, -/turf/open/floor/prison/darkpurple2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "snp" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "snq" = ( /obj/structure/platform{ @@ -24883,14 +29565,19 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "sns" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "snO" = ( -/turf/open/floor/prison/bluecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, /area/fiorina/station/power_ring) "soc" = ( /obj/effect/decal/cleanable/blood{ @@ -24898,8 +29585,9 @@ icon_state = "gib6" }, /obj/effect/spawner/random/gun/rifle, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "sol" = ( @@ -24909,7 +29597,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "sov" = ( /turf/closed/shuttle/ert{ @@ -24927,8 +29618,9 @@ /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "spl" = ( @@ -24941,14 +29633,15 @@ }, /area/fiorina/station/research_cells) "sqg" = ( -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "sql" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "sqx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -24962,8 +29655,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/park) "sqC" = ( @@ -24977,15 +29671,18 @@ pixel_x = 7; pixel_y = 22 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "srz" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "srI" = ( @@ -25002,7 +29699,9 @@ indestructible = 1; name = "launch bay door" }, -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/oob) "ssJ" = ( @@ -25023,26 +29722,34 @@ /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) "stq" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/disco) "stX" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "suj" = ( /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "sun" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, /obj/structure/platform{ dir = 8 }, @@ -25050,7 +29757,7 @@ /area/fiorina/station/disco) "suB" = ( /obj/structure/dropship_equipment/fulton_system, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "suE" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -25061,7 +29768,9 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "svh" = ( /obj/structure/machinery/computer/telecomms/monitor, @@ -25069,13 +29778,14 @@ /area/fiorina/station/medbay) "svF" = ( /obj/structure/blocker/invisible_wall, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/oob) "svG" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "swg" = ( /obj/structure/platform_decoration/kutjevo, @@ -25083,7 +29793,7 @@ /area/fiorina/oob) "swh" = ( /obj/structure/machinery/power/geothermal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "sws" = ( /obj/structure/bed/chair/comfy{ @@ -25093,14 +29803,17 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "syf" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/type_b{ dir = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "syF" = ( /obj/structure/machinery/microwave{ @@ -25109,7 +29822,7 @@ pixel_y = 6 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "syG" = ( /obj/item/tool/wirecutters/clippers, @@ -25141,33 +29854,44 @@ /area/fiorina/station/park) "szQ" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "sAe" = ( /obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "sAk" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "sAv" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "sAx" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/effect/spawner/random/goggles/lowchance, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "sAK" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/greenblue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greenblue" }, /area/fiorina/station/botany) "sBl" = ( @@ -25185,11 +29909,16 @@ pixel_y = 12 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "sBA" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -25203,8 +29932,9 @@ icon_state = "abed" }, /obj/item/card/id/silver/clearance_badge, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "sCj" = ( @@ -25213,21 +29943,31 @@ icon_state = "mwo"; pixel_y = 6 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "sCo" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "sDp" = ( /obj/structure/largecrate/random, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "sDF" = ( /obj/structure/surface/table/reinforced/prison, @@ -25235,7 +29975,9 @@ pixel_y = 7 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -25245,42 +29987,55 @@ /turf/open/floor/plating/prison, /area/fiorina/oob) "sEi" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "sFn" = ( /obj/structure/machinery/door/window/northleft{ dir = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security/wardens) "sFI" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; name = "Residential Archives" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "sFN" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/chem_dispenser/soda, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /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" }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "sGu" = ( @@ -25290,7 +30045,9 @@ pixel_y = 4 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "sGI" = ( /obj/structure/largecrate/random/case/double, @@ -25300,16 +30057,20 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "sHw" = ( /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/yellowangle, +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, /area/fiorina/station/lowsec) "sHH" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "sHO" = ( /obj/structure/platform/kutjevo/smooth{ @@ -25322,7 +30083,10 @@ /area/fiorina/oob) "sHQ" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "sII" = ( /obj/structure/bookcase{ @@ -25337,13 +30101,18 @@ /area/fiorina/lz/near_lzI) "sIQ" = ( /obj/item/stack/tile/plasteel, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "sIT" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "sJc" = ( /obj/structure/machinery/light/double/blue{ @@ -25351,11 +30120,16 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "sJl" = ( /obj/structure/largecrate/random/barrel/white, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "sJu" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -25364,7 +30138,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "sJw" = ( -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/station/chapel) "sJN" = ( /obj/structure/sign/prop3{ @@ -25373,34 +30149,48 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzI) "sJT" = ( -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "sKn" = ( /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "sKq" = ( -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/lz/near_lzII) "sKP" = ( /obj/structure/barricade/handrail/type_b{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "sKS" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "sLo" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "sLx" = ( /obj/structure/disposalpipe/segment{ @@ -25414,7 +30204,9 @@ /area/fiorina/tumor/civres) "sLT" = ( /obj/item/tool/weldingtool/largetank, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "sMj" = ( /obj/structure/largecrate/random/secure, @@ -25423,7 +30215,9 @@ "sMo" = ( /obj/item/clothing/under/marine/ua_riot, /obj/item/weapon/gun/rifle/m16, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "sNb" = ( /obj/item/device/radio, @@ -25433,14 +30227,22 @@ }, /area/fiorina/tumor/fiberbush) "sNd" = ( -/obj/structure/flora/pottedplant/pottedplant_21, -/turf/open/floor/prison/whitegreenfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "sNu" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "sNK" = ( /obj/structure/machinery/light/double/blue{ @@ -25448,7 +30250,7 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "sNN" = ( /obj/structure/platform, @@ -25456,8 +30258,9 @@ /area/fiorina/station/lowsec) "sNT" = ( /obj/effect/spawner/random/gun/pistol/lowchance, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "sOf" = ( @@ -25476,15 +30279,18 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "sOn" = ( -/turf/open/floor/prison/redfull, +/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" }, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "sOs" = ( @@ -25495,25 +30301,30 @@ }, /area/fiorina/tumor/ship) "sPk" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "sPC" = ( /obj/item/paper_bin{ pixel_x = 5; pixel_y = 22 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "sQK" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gibdown1" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "sQL" = ( /obj/structure/platform, @@ -25529,31 +30340,43 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "sRg" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "sRk" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "sRH" = ( /obj/item/pamphlet/engineer, /obj/structure/closet, /obj/item/handcuffs, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/lowsec) "sRV" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "sSJ" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, /area/fiorina/station/lowsec) "sSY" = ( /obj/structure/disposalpipe/segment{ @@ -25567,8 +30390,9 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) "sTa" = ( -/turf/open/floor/prison/red{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "red" }, /area/fiorina/station/security) "sTd" = ( @@ -25589,10 +30413,16 @@ icon_state = "S" }, /obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "sTV" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/power_ring) "sUl" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -25602,7 +30432,9 @@ /area/fiorina/tumor/civres) "sUq" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "sUX" = ( /obj/effect/decal/cleanable/blood/oil, @@ -25621,13 +30453,14 @@ desc = "Wow, instant sand. They really have everything in space."; name = "Insta-Sand! bag" }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "sVi" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "sVv" = ( /obj/structure/platform/kutjevo/smooth{ @@ -25641,7 +30474,7 @@ layer = 3.5 }, /obj/item/storage/bag/plasticbag, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "sVy" = ( /obj/structure/barricade/handrail/type_b{ @@ -25649,24 +30482,35 @@ layer = 3.5 }, /obj/item/trash/barcardine, -/turf/open/floor/prison/whitegreenfull, +/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, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "sVM" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "sVN" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "sVP" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "sVU" = ( @@ -25680,10 +30524,16 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "sWF" = ( -/turf/open/floor/prison/damaged2, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged2" + }, /area/fiorina/station/disco) "sXi" = ( /turf/open/floor/corsat{ @@ -25692,7 +30542,9 @@ /area/fiorina/tumor/aux_engi) "sXy" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "sYn" = ( /obj/structure/machinery/light/double/blue, @@ -25707,7 +30559,9 @@ /area/fiorina/oob) "sYM" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "sYP" = ( /obj/item/stack/sheet/metal, @@ -25715,7 +30569,10 @@ /area/fiorina/station/security) "sZr" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tam" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -25728,7 +30585,9 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "tan" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -25741,7 +30600,9 @@ /area/fiorina/station/park) "tax" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "taX" = ( /obj/structure/prop/structure_lattice{ @@ -25752,7 +30613,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "taY" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -25760,32 +30623,41 @@ /area/fiorina/lz/near_lzI) "tbs" = ( /obj/structure/largecrate/random/secure, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "tbC" = ( -/turf/open/floor/prison/greencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, /area/fiorina/tumor/aux_engi) "tbZ" = ( /obj/structure/filingcabinet, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "tcl" = ( /obj/structure/largecrate/random/mini/med, -/turf/open/floor/prison/whitegreencorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "tcJ" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" }, -/turf/open/floor/prison/floor_plate, /area/fiorina/station/botany) "tcO" = ( -/turf/open/floor/prison/blueangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "bluecorner" }, /area/fiorina/station/chapel) "tdb" = ( @@ -25793,32 +30665,37 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "tdo" = ( /obj/structure/largecrate/random/case/small, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "tdA" = ( -/turf/open/floor/prison/redangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "redcorner" }, /area/fiorina/station/power_ring) "tdG" = ( /obj/item/storage/backpack/satchel/lockable, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "tdZ" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "tef" = ( -/obj/structure/flora/pottedplant/pottedplant_22{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; layer = 2.5 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "tel" = ( /turf/closed/wall/mineral/bone_resin, @@ -25835,11 +30712,16 @@ /area/fiorina/station/telecomm/lz1_cargo) "teH" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "teT" = ( /obj/item/paper/crumpled, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tfx" = ( /obj/structure/barricade/wooden{ @@ -25856,14 +30738,18 @@ /area/fiorina/station/civres_blue) "tgc" = ( /obj/item/tool/wet_sign, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "tgv" = ( /obj/structure/machinery/computer/emails{ pixel_y = 6 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "tgB" = ( /obj/structure/barricade/wooden{ @@ -25872,16 +30758,21 @@ /turf/open/floor/plating/prison, /area/fiorina/station/chapel) "the" = ( -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/station/security) "thi" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/tumor/aux_engi) "thU" = ( /obj/structure/prop/almayer/computers/sensor_computer1, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "tih" = ( /obj/item/tool/warning_cone, @@ -25890,20 +30781,21 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "tik" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 }, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "tiW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/chunk, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "tiX" = ( /obj/item/stack/sheet/mineral/plastic, @@ -25911,12 +30803,15 @@ /area/fiorina/station/lowsec) "tjo" = ( /obj/structure/machinery/vending/coffee/simple, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "tjQ" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/green{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "green" }, /area/fiorina/station/chapel) "tjU" = ( @@ -25925,10 +30820,14 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "tke" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/constructable_frame{ icon_state = "box_1" }, @@ -25936,18 +30835,24 @@ /area/fiorina/lz/near_lzI) "tkk" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "tld" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/floor, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "tlp" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ pixel_y = 7 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "tlq" = ( /obj/structure/surface/table/reinforced/prison, @@ -25967,7 +30872,10 @@ /area/fiorina/tumor/ship) "tlM" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "tlQ" = ( /obj/effect/decal/cleanable/blood/oil, @@ -25976,7 +30884,9 @@ "tlS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "tlV" = ( /obj/structure/machinery/space_heater, @@ -25987,7 +30897,10 @@ /area/fiorina/station/telecomm/lz2_maint) "tmi" = ( /obj/item/device/flashlight, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "tmx" = ( /obj/structure/bed/chair{ @@ -26012,46 +30925,62 @@ /area/fiorina/station/chapel) "tnd" = ( /obj/structure/largecrate/supply/medicine/medkits, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tng" = ( /obj/structure/computerframe, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "tnj" = ( /obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison/yellowcorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "tno" = ( /obj/item/stack/sheet/cardboard, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "tnr" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "tnA" = ( /obj/structure/platform, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/floor_plate, +/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/floor_plate, +/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/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "tob" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -26069,8 +30998,9 @@ /area/fiorina/station/disco) "tov" = ( /obj/effect/spawner/random/gun/smg/midchance, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "toE" = ( @@ -26085,7 +31015,9 @@ /obj/structure/machinery/computer/cameras{ dir = 8 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "tpa" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -26122,7 +31054,7 @@ pixel_x = 6; pixel_y = 31 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "tpY" = ( /obj/effect/landmark/monkey_spawn, @@ -26130,7 +31062,9 @@ /area/fiorina/station/civres_blue) "tqM" = ( /obj/structure/filingcabinet, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "tqN" = ( /obj/structure/surface/table/reinforced/prison, @@ -26141,11 +31075,15 @@ pixel_x = -2; pixel_y = 10 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "tqQ" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" }, /area/fiorina/lz/near_lzI) "tqR" = ( @@ -26155,8 +31093,9 @@ /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "trl" = ( @@ -26165,14 +31104,19 @@ /area/fiorina/tumor/ice_lab) "trB" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "trH" = ( /obj/structure/bed/chair{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "trS" = ( /obj/structure/barricade/wooden{ @@ -26183,29 +31127,36 @@ /area/fiorina/station/chapel) "tsi" = ( /obj/structure/barricade/metal/wired, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "tsu" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/station/power_ring) "tsQ" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "tts" = ( /obj/structure/machinery/landinglight/ds2, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "ttK" = ( /obj/structure/machinery/landinglight/ds2/delaythree, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "tuf" = ( /obj/item/clothing/shoes/jackboots{ @@ -26231,15 +31182,20 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "tur" = ( -/turf/open/floor/prison/whitegreencorner, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "tuD" = ( /obj/structure/platform{ @@ -26249,7 +31205,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "tuH" = ( /obj/structure/machinery/light/double/blue{ @@ -26259,7 +31215,9 @@ dir = 1; layer = 2.8 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "tuX" = ( /obj/structure/platform{ @@ -26275,7 +31233,9 @@ /area/fiorina/station/power_ring) "tvu" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "tvI" = ( /obj/structure/platform/kutjevo/smooth{ @@ -26294,20 +31254,22 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "tvU" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/flora/pottedplant/pottedplant_27{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; layer = 3.1; pixel_x = -2; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "tvX" = ( -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/chapel) "twb" = ( @@ -26315,8 +31277,9 @@ /area/fiorina/maintenance) "twd" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "twB" = ( @@ -26324,15 +31287,19 @@ /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "twL" = ( /obj/vehicle/train/cargo/trolley, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "txS" = ( /obj/item/stack/sandbags, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "tyb" = ( /obj/structure/surface/table/reinforced/prison, @@ -26340,32 +31307,43 @@ pixel_x = -4; pixel_y = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "tyk" = ( /obj/structure/barricade/handrail, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "tyO" = ( /obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "tyQ" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "tzj" = ( -/turf/open/floor/prison/greenangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greencorner" }, /area/fiorina/tumor/civres) "tzx" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "tzy" = ( /obj/item/ammo_magazine/smg/mp5, @@ -26376,7 +31354,10 @@ /area/fiorina/station/research_cells) "tzF" = ( /obj/item/storage/pill_bottle/tramadol/skillless, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tAb" = ( /obj/structure/surface/rack, @@ -26390,22 +31371,31 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor/prison/sterile_white, +/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/floor_plate, +/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/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + 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/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "tBe" = ( /obj/effect/decal{ @@ -26415,17 +31405,21 @@ pixel_y = -11 }, /obj/item/device/flashlight/flare, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "tBt" = ( /obj/item/newspaper, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/transit_hub) "tBy" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/telecomm/lz1_tram) "tBD" = ( @@ -26433,7 +31427,9 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "tBP" = ( /obj/structure/machinery/shower{ @@ -26445,22 +31441,41 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkyellow2full, +/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/floor_plate, +/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 }, -/turf/open/floor/prison/floor_plate, +/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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "tCZ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -26503,17 +31518,22 @@ dir = 1 }, /obj/item/tool/pickaxe, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "tEb" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/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, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "tEH" = ( /obj/structure/window/framed/prison, @@ -26528,7 +31548,7 @@ /area/fiorina/station/transit_hub) "tFu" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "tFA" = ( /obj/structure/platform{ @@ -26541,31 +31561,40 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "tGl" = ( /obj/structure/bed/sofa/vert/grey, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "tGF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, /obj/item/attachable/bipod, -/turf/open/floor/prison/darkyellow2, +/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 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/tumor/ice_lab) "tHh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/atmos_alert{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "tHl" = ( /obj/structure/inflatable, @@ -26573,14 +31602,20 @@ /area/fiorina/station/lowsec) "tHr" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "tHs" = ( -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "tHu" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitepurple, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "tHL" = ( /obj/structure/blocker/invisible_wall, @@ -26591,13 +31626,15 @@ /area/fiorina/station/medbay) "tHP" = ( /obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison/darkyellow2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "tHU" = ( -/obj/structure/monorail/launchtrack{ - dir = 5 +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) @@ -26605,7 +31642,10 @@ /obj/effect/decal/medical_decals{ icon_state = "cryomid" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tIC" = ( /obj/structure/flora/bush/ausbushes/ausbush{ @@ -26620,12 +31660,16 @@ /area/fiorina/tumor/fiberbush) "tII" = ( /obj/item/reagent_container/food/drinks/bottle/rum, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "tIK" = ( /obj/item/tool/screwdriver, -/turf/open/floor/prison/greencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/tumor/civres) "tIU" = ( @@ -26633,13 +31677,16 @@ /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) "tJe" = ( -/turf/open/floor/prison/greencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/station/chapel) "tJM" = ( /obj/item/prop/helmetgarb/riot_shield, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "tJR" = ( /obj/structure/machinery/computer/cameras/wooden_tv{ @@ -26667,7 +31714,7 @@ pixel_x = 7; pixel_y = 6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/chapel) "tKv" = ( /obj/structure/machinery/computer/secure_data{ @@ -26682,7 +31729,9 @@ dir = 4; pixel_y = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "tLC" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -26690,30 +31739,41 @@ /area/fiorina/maintenance) "tLT" = ( /obj/item/reagent_container/food/drinks/bottle/sake, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "tLY" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "tMe" = ( -/turf/open/floor/prison/redangle, +/turf/open/floor/prison{ + icon_state = "redcorner" + }, /area/fiorina/station/power_ring) "tMn" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "tMr" = ( /obj/item/toy/deck, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "tMx" = ( /obj/structure/prop/almayer/computers/sensor_computer2, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "tMz" = ( /obj/structure/closet/crate/bravo, @@ -26721,11 +31781,13 @@ /obj/item/stack/sheet/metal/medium_stack, /obj/item/fuelCell, /obj/item/stack/sheet/plasteel, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "tMA" = ( /obj/structure/machinery/fuelcell_recycler, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "tMF" = ( /obj/structure/barricade/handrail/type_b{ @@ -26735,7 +31797,9 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "tML" = ( /obj/structure/surface/table/reinforced/prison, @@ -26743,20 +31807,27 @@ pixel_y = 12 }, /obj/item/cell/super, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "tMP" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "tNs" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "tNu" = ( /obj/structure/surface/table/reinforced/prison, @@ -26764,7 +31835,9 @@ pixel_x = -1; pixel_y = 5 }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "tNS" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, @@ -26772,7 +31845,7 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "tNV" = ( /obj/item/stack/sheet/wood, @@ -26787,15 +31860,19 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/blue_plate_2, +/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/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "tOG" = ( @@ -26805,8 +31882,9 @@ /area/fiorina/station/civres_blue) "tOK" = ( /obj/structure/inflatable, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "tOS" = ( @@ -26825,12 +31903,18 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "tPi" = ( -/obj/structure/monorail/launchtrack, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "tPz" = ( @@ -26851,12 +31935,15 @@ /area/fiorina/maintenance) "tPP" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "tPQ" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/station/security) "tQi" = ( /obj/structure/prop/souto_land/streamer{ @@ -26864,8 +31951,9 @@ pixel_y = 24 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "tQm" = ( @@ -26874,17 +31962,21 @@ /area/fiorina/tumor/aux_engi) "tQn" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "tQq" = ( -/turf/open/floor/prison/greenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greencorner" }, /area/fiorina/tumor/civres) "tQs" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/greenblue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "greenblue" }, /area/fiorina/station/botany) "tQB" = ( @@ -26893,7 +31985,9 @@ /area/fiorina/station/medbay) "tQJ" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "tQL" = ( /obj/structure/platform{ @@ -26905,11 +31999,14 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "tRa" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "tRt" = ( @@ -26917,8 +32014,9 @@ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/greenblue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greenblue" }, /area/fiorina/station/botany) "tRH" = ( @@ -26926,27 +32024,35 @@ /area/fiorina/station/botany) "tSi" = ( /obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "tSn" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/medbay) "tST" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "tTr" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/blueangle{ - dir = 8 +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "tTA" = ( /obj/structure/prop/souto_land/pole{ @@ -26955,16 +32061,23 @@ /turf/open/floor/wood, /area/fiorina/station/park) "tTK" = ( -/obj/structure/flora/pottedplant/pottedplant_7, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "tTV" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "tUe" = ( /obj/structure/platform{ @@ -26974,12 +32087,15 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "tUr" = ( /obj/structure/closet/toolcloset, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "tUs" = ( @@ -26991,8 +32107,9 @@ }, /obj/item/explosive/grenade/incendiary/molotov, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "tUS" = ( @@ -27003,14 +32120,20 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/turf/open/floor/prison/sterile_white, +/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" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "tVB" = ( /obj/item/ammo_casing{ @@ -27023,14 +32146,17 @@ icon_state = "metal_2" }, /obj/effect/spawner/random/gun/smg, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "tVG" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "tVV" = ( /obj/effect/landmark/corpsespawner/ua_riot, @@ -27040,24 +32166,33 @@ /obj/structure/window/reinforced/tinted, /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "tVZ" = ( /obj/structure/machinery/vending/security, -/turf/open/floor/prison/redfull, +/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, -/turf/open/floor/prison/whitegreenfull, +/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 }, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "tWq" = ( /obj/structure/surface/table/reinforced/prison, @@ -27065,7 +32200,9 @@ pixel_x = 1; pixel_y = 3 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "tWI" = ( /obj/structure/platform/kutjevo/smooth, @@ -27081,17 +32218,23 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "tXQ" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/tumor/servers) "tYc" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; icon_state = "engineering_v" }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "tYd" = ( /obj/structure/machinery/light/double/blue{ @@ -27107,7 +32250,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "tYw" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -27115,30 +32258,39 @@ "tYx" = ( /obj/structure/surface/rack, /obj/item/tool/lighter, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "tZo" = ( /obj/item/newspaper, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "tZs" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "tZN" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "tZS" = ( -/turf/open/floor/prison/platingdmg1, +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, /area/fiorina/tumor/civres) "tZV" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "tZW" = ( /obj/item/tool/wet_sign, @@ -27151,7 +32303,9 @@ dir = 4 }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "uap" = ( /obj/structure/surface/table/reinforced/prison, @@ -27159,8 +32313,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "uat" = ( -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "ubc" = ( @@ -27168,13 +32323,16 @@ /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "ubk" = ( -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/tumor/aux_engi) "ubH" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "ubN" = ( /turf/closed/shuttle/ert{ @@ -27194,13 +32352,15 @@ /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "uch" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "ucj" = ( /turf/closed/shuttle/ert{ @@ -27208,8 +32368,9 @@ }, /area/fiorina/station/power_ring) "ucr" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "ucS" = ( @@ -27221,8 +32382,9 @@ dir = 2; icon_state = "casing_5" }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "udY" = ( @@ -27230,11 +32392,14 @@ dir = 8 }, /obj/item/prop/almayer/flight_recorder, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "uef" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "uep" = ( /obj/effect/decal/cleanable/blood, @@ -27249,33 +32414,45 @@ /turf/open/floor/wood, /area/fiorina/station/park) "ueA" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/sterile_white, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "ueF" = ( /obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "ufo" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "ufX" = ( /obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "ugC" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "ugH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "ugT" = ( @@ -27284,8 +32461,9 @@ /area/fiorina/tumor/aux_engi) "ugU" = ( /obj/structure/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "uhb" = ( @@ -27300,11 +32478,12 @@ pixel_x = 1; pixel_y = -1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "uhd" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "uhm" = ( @@ -27315,29 +32494,39 @@ /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 }, -/turf/open/floor/prison/darkyellow2full, +/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 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "uix" = ( /obj/structure/bed/chair/office/dark, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "uiK" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "uiR" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "uiV" = ( /obj/structure/platform{ @@ -27364,11 +32553,14 @@ /obj/structure/toilet{ dir = 8 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "ujJ" = ( -/obj/structure/monorail/launchtrack{ - dir = 5 +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) @@ -27384,7 +32576,10 @@ dir = 4; pixel_y = 8 }, -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/park) "ukk" = ( /obj/structure/sink{ @@ -27392,8 +32587,9 @@ pixel_x = -12 }, /obj/effect/spawner/random/pills/lowchance, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "ukr" = ( @@ -27407,20 +32603,24 @@ "ukz" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/gun/pistol/midchance, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "ukI" = ( -/turf/open/floor/prison/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "ukN" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "ukR" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -27432,19 +32632,25 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "ulW" = ( /obj/structure/prop/almayer/computers/sensor_computer2, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "umq" = ( /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "umy" = ( /obj/structure/prop/resin_prop{ @@ -27465,27 +32671,34 @@ "unc" = ( /obj/structure/coatrack, /obj/item/clothing/suit/storage/CMB, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "unW" = ( /obj/structure/machinery/shower{ pixel_y = 13 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "uod" = ( /obj/structure/largecrate/random/barrel/white, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "uol" = ( /obj/structure/machinery/landinglight/ds1{ dir = 4 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "upt" = ( /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/ice_lab) "upF" = ( /obj/structure/machinery/processor{ @@ -27496,7 +32709,10 @@ pixel_y = 10 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "upM" = ( /obj/structure/disposalpipe/broken, @@ -27511,19 +32727,22 @@ 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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "uqo" = ( /obj/effect/landmark/queen_spawn, -/turf/open/floor/prison/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "uqp" = ( /obj/structure/bed/sofa/vert/grey/bot{ pixel_y = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "urc" = ( /obj/structure/largecrate/random/barrel/white, @@ -27531,17 +32750,20 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "uri" = ( /obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "urw" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "urJ" = ( /obj/structure/platform/kutjevo/smooth, @@ -27549,13 +32771,15 @@ /area/fiorina/oob) "urS" = ( /obj/item/trash/chunk, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "usa" = ( -/turf/open/floor/prison/greencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "green" }, /area/fiorina/station/chapel) "usg" = ( @@ -27564,22 +32788,29 @@ /area/fiorina/maintenance) "usq" = ( /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "usz" = ( -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "usA" = ( /obj/structure/sink{ dir = 4; pixel_x = 12 }, -/turf/open/floor/prison/whitepurplecorner, +/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/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "uts" = ( /obj/structure/surface/rack, @@ -27588,8 +32819,9 @@ /area/fiorina/maintenance) "utC" = ( /obj/item/stool, -/turf/open/floor/prison/cell_stripe{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/flight_deck) "utV" = ( @@ -27597,8 +32829,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "uuJ" = ( @@ -27629,11 +32862,15 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "uvi" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "uvy" = ( /obj/effect/landmark{ @@ -27641,18 +32878,23 @@ name = "xeno_hive_spawn" }, /obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/prison/whitegreenangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "uvG" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/down, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "uwg" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "uwk" = ( @@ -27664,26 +32906,35 @@ capacity = 1e+006; dir = 1 }, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "uwP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "uxa" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/darkbrown2full, +/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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "uxp" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "uxv" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, @@ -27699,30 +32950,40 @@ "uxO" = ( /obj/effect/landmark/objective_landmark/far, /obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "uxY" = ( -/turf/open/floor/prison/darkyellow2corner, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "uyd" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "uyq" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "uyr" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/chapel) "uyM" = ( /obj/effect/decal/cleanable/blood/oil, @@ -27736,8 +32997,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "uzd" = ( -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/station/disco) "uzw" = ( @@ -27756,7 +33018,10 @@ dir = 8 }, /obj/structure/barricade/wooden, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "uAi" = ( /obj/structure/sink{ @@ -27764,16 +33029,23 @@ pixel_x = 12 }, /obj/item/clothing/suit/armor/bulletproof/badge, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "uAv" = ( -/turf/open/floor/prison/bluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "uAG" = ( /obj/structure/inflatable, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "uAX" = ( /obj/effect/decal/hefa_cult_decals/d32, @@ -27791,18 +33063,25 @@ /area/fiorina/station/power_ring) "uBS" = ( /obj/structure/closet/secure_closet/personal, -/turf/open/floor/prison/darkpurple2full, +/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/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "uCa" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "uCu" = ( /obj/effect/decal{ @@ -27812,7 +33091,10 @@ pixel_y = -11 }, /obj/structure/barricade/metal/wired, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "uCz" = ( /obj/structure/sink{ @@ -27822,7 +33104,10 @@ pixel_x = -11; pixel_y = -5 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "uCD" = ( /obj/effect/landmark/nightmare{ @@ -27832,52 +33117,70 @@ /area/fiorina/station/medbay) "uCW" = ( /obj/item/reagent_container/glass/bucket/janibucket, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "uEj" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "uEm" = ( -/turf/open/floor/prison/red{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "red" }, /area/fiorina/station/security) "uEN" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "uFc" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/disco) "uFh" = ( -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "uFE" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "uFM" = ( /obj/structure/surface/table/reinforced/prison{ dir = 4; flipped = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "uFX" = ( -/turf/open/floor/prison/darkpurple2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "uGb" = ( /obj/structure/barricade/metal/wired{ dir = 8 }, /obj/effect/spawner/random/sentry/midchance, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "uGq" = ( @@ -27885,7 +33188,9 @@ icon_state = "cryomid" }, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "uGu" = ( /obj/effect/decal/hefa_cult_decals/d32{ @@ -27899,10 +33204,10 @@ "uGD" = ( /obj/item/tool/kitchen/knife, /obj/structure/bed/roller, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "uGM" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "uGT" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -27916,36 +33221,46 @@ pixel_x = -4; pixel_y = 23 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "uHX" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "uIb" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/yellow, +/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/sterile_white, +/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/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "uIG" = ( /obj/structure/prop/structure_lattice{ @@ -27956,7 +33271,7 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/civres) "uIS" = ( /obj/structure/window/framed/prison, @@ -27972,8 +33287,9 @@ /area/fiorina/maintenance) "uJj" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "uJk" = ( @@ -27982,30 +33298,35 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "uJM" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, /area/fiorina/maintenance) "uJX" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "uKh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/secure_data{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "uKx" = ( /turf/closed/shuttle/ert, /area/fiorina/lz/near_lzI) "uLd" = ( /obj/structure/foamed_metal, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "uLr" = ( /obj/vehicle/powerloader, @@ -28024,7 +33345,9 @@ pixel_y = 21 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "uLJ" = ( /obj/structure/surface/table/reinforced/prison, @@ -28033,7 +33356,9 @@ /area/fiorina/station/transit_hub) "uLX" = ( /obj/structure/machinery/computer/arcade, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "uMq" = ( /obj/structure/machinery/light/small{ @@ -28049,8 +33374,9 @@ /area/fiorina/station/security/wardens) "uMH" = ( /obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "uNM" = ( @@ -28058,33 +33384,43 @@ /area/fiorina/tumor/aux_engi) "uNR" = ( /obj/item/stack/cable_coil, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "uNX" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2angle, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, /area/fiorina/tumor/aux_engi) "uOb" = ( /obj/structure/platform_decoration{ dir = 8 }, /obj/item/stack/cable_coil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "uOR" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/botany) "uPg" = ( /obj/item/circuitboard/mecha/gygax/targeting, /obj/structure/surface/rack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "uPz" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "uPA" = ( /obj/structure/platform{ @@ -28103,7 +33439,9 @@ density = 0; pixel_y = 18 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "uQE" = ( /obj/item/stack/tile/plasteel{ @@ -28117,39 +33455,52 @@ /obj/structure/machinery/computer/emails{ dir = 4 }, -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "uRe" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "uRK" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "uRO" = ( -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/station/chapel) "uRX" = ( /obj/item/tool/shovel/spade, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "uSb" = ( /obj/structure/barricade/wooden{ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/damaged1, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, /area/fiorina/station/disco) "uSo" = ( /obj/item/poster, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "uSA" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -28166,7 +33517,9 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "uSY" = ( /obj/structure/platform{ @@ -28179,25 +33532,30 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "uTi" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "uTk" = ( /obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "uTp" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "uTS" = ( /obj/item/stock_parts/micro_laser/ultra, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "uTX" = ( -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "uUT" = ( @@ -28206,7 +33564,9 @@ pixel_x = 2; pixel_y = 4 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "uVn" = ( /turf/closed/shuttle/ert{ @@ -28217,11 +33577,11 @@ /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "uVv" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "uVD" = ( /turf/open/floor/corsat{ @@ -28230,7 +33590,7 @@ /area/fiorina/station/medbay) "uVQ" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "uVX" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ @@ -28247,7 +33607,9 @@ /area/fiorina/tumor/civres) "uWg" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "uWQ" = ( /obj/structure/platform{ @@ -28267,18 +33629,25 @@ dir = 4; flipped = 1 }, -/turf/open/floor/prison/sterile_white, +/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/sterile_white, +/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/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "uXm" = ( @@ -28286,7 +33655,7 @@ /obj/item/inflatable/door, /obj/item/inflatable/door, /obj/structure/surface/rack, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "uXn" = ( /obj/structure/flora/bush/ausbushes/ausbush{ @@ -28301,7 +33670,9 @@ /area/fiorina/tumor/fiberbush) "uXu" = ( /obj/item/stock_parts/matter_bin/super, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "uXw" = ( /obj/structure/surface/table/reinforced/prison, @@ -28321,15 +33692,19 @@ /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "uXW" = ( /obj/structure/bed/chair/office/light{ dir = 8 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "uYx" = ( /obj/structure/prop/resin_prop{ @@ -28342,8 +33717,9 @@ icon_state = "abed" }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "uYR" = ( @@ -28351,21 +33727,30 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "uZe" = ( /obj/item/stack/sheet/wood, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "uZn" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "uZr" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "uZA" = ( /turf/closed/shuttle/ert{ @@ -28379,11 +33764,16 @@ name = "overhead ducting"; pixel_y = 33 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "uZM" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/tumor/aux_engi) "uZX" = ( /obj/structure/curtain, @@ -28391,38 +33781,46 @@ /area/fiorina/station/power_ring) "vaj" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, -/turf/open/floor/prison/redfull, +/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/floor, +/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/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "vbe" = ( /obj/structure/machinery/m56d_hmg/mg_turret/dropship{ dir = 1 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "vbl" = ( /obj/structure/closet/bombcloset, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "vbn" = ( /obj/item/ammo_box/magazine/M16, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "vbt" = ( @@ -28435,11 +33833,15 @@ pixel_x = 14; pixel_y = 7 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "vbF" = ( /obj/item/stack/rods, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "vbG" = ( /obj/structure/prop/structure_lattice{ @@ -28452,8 +33854,9 @@ dir = 6; icon_state = "casing_5" }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "vcf" = ( @@ -28462,8 +33865,9 @@ }, /area/fiorina/oob) "vco" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "vcr" = ( @@ -28477,13 +33881,15 @@ pixel_x = 2; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "vcy" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "vcC" = ( /obj/item/stack/rods, @@ -28493,11 +33899,15 @@ /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "vdI" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -28514,7 +33924,9 @@ pixel_x = 11; pixel_y = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "vea" = ( /obj/effect/decal{ @@ -28523,8 +33935,9 @@ layer = 2.5; pixel_y = -11 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "vee" = ( @@ -28536,12 +33949,15 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "vei" = ( -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "vem" = ( /turf/closed/shuttle/ert{ @@ -28552,15 +33968,22 @@ /obj/effect/decal/medical_decals{ icon_state = "cryomid" }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "veB" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/lowsec) "veM" = ( /obj/item/stock_parts/micro_laser/ultra, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "vfz" = ( /obj/item/storage/box/donkpockets, @@ -28573,7 +33996,9 @@ /area/fiorina/station/power_ring) "vfJ" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "vfM" = ( /turf/closed/shuttle/ert{ @@ -28582,21 +34007,23 @@ /area/fiorina/station/power_ring) "vfQ" = ( /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "vfR" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "vgS" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "vha" = ( @@ -28604,19 +34031,25 @@ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "vhe" = ( /obj/structure/closet/wardrobe/orange, /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "vhB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) "vhC" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "vhI" = ( /turf/open/gm/river{ @@ -28626,13 +34059,16 @@ /area/fiorina/station/park) "viH" = ( /obj/item/clipboard, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "viV" = ( -/obj/structure/monorail/launchtrack{ - dir = 5 +/obj/structure/monorail{ + dir = 5; + name = "launch track" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "vjl" = ( /obj/structure/closet/crate/trashcart, @@ -28647,7 +34083,10 @@ /area/fiorina/station/power_ring) "vjz" = ( /obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "vjG" = ( /obj/item/device/flashlight/lamp/tripod, @@ -28659,7 +34098,10 @@ pixel_y = 5 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/servers) "vjR" = ( /obj/structure/disposalpipe/segment, @@ -28678,42 +34120,52 @@ /turf/open/floor/wood, /area/fiorina/station/civres_blue) "vky" = ( -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "vkC" = ( /obj/structure/inflatable/popped/door, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "vkM" = ( /obj/item/reagent_container/food/drinks/bottle/pwine, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "vkZ" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "vli" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "vlm" = ( /obj/structure/machinery/power/apc{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "vlt" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "vlT" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/darkyellow2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "vlX" = ( @@ -28723,8 +34175,9 @@ }, /obj/item/clothing/gloves/combat, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "vmj" = ( @@ -28737,11 +34190,16 @@ /area/fiorina/station/medbay) "vmr" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "vmH" = ( /obj/item/tool/mop, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "vmW" = ( /obj/structure/reagent_dispensers/water_cooler{ @@ -28749,14 +34207,16 @@ pixel_x = -8; pixel_y = 16 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "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/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "vok" = ( /obj/structure/surface/table/reinforced/prison, @@ -28771,7 +34231,9 @@ pixel_x = 9; pixel_y = -10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "voq" = ( /obj/structure/machinery/computer/secure_data{ @@ -28782,8 +34244,9 @@ /area/fiorina/station/security/wardens) "voS" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "vpk" = ( @@ -28791,59 +34254,79 @@ desc = "Wow, instant sand. They really have everything in space."; name = "Insta-Sand! bag" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "vpB" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "vpJ" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "vqb" = ( /obj/structure/platform, -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "vqg" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "vqi" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/lowsec) "vqM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/tomatosoup, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/power_ring) "vqZ" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "vrc" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/fiorina/station/transit_hub) "vrf" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/donut_box{ pixel_y = 6 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "vro" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "vrp" = ( /obj/structure/ice/thin/indestructible{ @@ -28854,7 +34337,9 @@ /area/fiorina/station/research_cells) "vrw" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "vrF" = ( /obj/item/toy/crayon/green, @@ -28864,10 +34349,14 @@ /obj/structure/closet/secure_closet/security_empty, /obj/item/book/manual/security_space_law, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "vrN" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /obj/structure/machinery/door/poddoor/almayer/locked{ indestructible = 1; name = "launch bay door" @@ -28882,27 +34371,36 @@ /area/fiorina/station/chapel) "vrX" = ( /obj/item/newspaper, -/turf/open/floor/prison/whitepurpleangle, +/turf/open/floor/prison{ + icon_state = "whitepurplecorner" + }, /area/fiorina/station/research_cells) "vsc" = ( -/turf/open/floor/prison/floorscorched1, +/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/darkbrown2corner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" }, /area/fiorina/maintenance) "vsq" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "vsz" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "vsT" = ( /obj/structure/cable/heavyduty{ @@ -28916,7 +34414,10 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "vtl" = ( /obj/structure/bed/sofa/south/grey/left, @@ -28924,8 +34425,9 @@ /area/fiorina/station/park) "vtn" = ( /obj/structure/barricade/wooden, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "vtG" = ( @@ -28933,14 +34435,20 @@ dir = 8; health = 80 }, -/turf/open/floor/prison/whitegreenfull, +/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 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/telecomm/lz1_cargo) "vub" = ( /obj/structure/prop/structure_lattice{ @@ -28952,7 +34460,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "vuc" = ( /obj/structure/platform/kutjevo/smooth{ @@ -28972,7 +34482,7 @@ "vuE" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2/delayone, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vuW" = ( /obj/structure/reagent_dispensers/water_cooler{ @@ -28987,12 +34497,15 @@ pixel_x = 1; pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "vvk" = ( /obj/structure/barricade/handrail, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "vvp" = ( @@ -29013,10 +34526,20 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) -"vwc" = ( -/turf/open/floor/prison/darkbrown2{ +"vvX" = ( +/obj/structure/platform_decoration{ dir = 8 }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/fiorina/station/disco) +"vwc" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "vwt" = ( /obj/effect/landmark/objective_landmark/medium, @@ -29029,11 +34552,13 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "vxp" = ( -/turf/open/floor/prison/yellow, +/turf/open/floor/prison{ + icon_state = "yellow" + }, /area/fiorina/station/disco) "vxr" = ( /obj/item/newspaper, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "vxs" = ( /turf/closed/shuttle/ert{ @@ -29041,7 +34566,9 @@ }, /area/fiorina/tumor/ship) "vxV" = ( -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "vyu" = ( /obj/item/clothing/suit/storage/hazardvest, @@ -29050,7 +34577,9 @@ "vyz" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/goggles/lowchance, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "vyA" = ( /obj/structure/bed/chair{ @@ -29063,7 +34592,9 @@ dir = 8; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "vyF" = ( /obj/structure/platform{ @@ -29074,16 +34605,30 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) +"vyU" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/telecomm/lz1_cargo) "vyX" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "vza" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/spawner/random/gun/rifle, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "vzh" = ( /obj/structure/foamed_metal, @@ -29091,7 +34636,9 @@ /area/fiorina/station/civres_blue) "vzk" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "vzn" = ( /obj/structure/bed/chair/dropship/pilot{ @@ -29117,13 +34664,22 @@ opacity = 0 }, /area/fiorina/tumor/ship) +"vzZ" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) "vAi" = ( /obj/item/stack/sandbags_empty/half, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "vAZ" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "vBc" = ( /obj/structure/surface/table/reinforced/prison{ @@ -29131,14 +34687,17 @@ flipped = 1 }, /obj/item/device/flashlight/lamp, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "vBO" = ( /obj/effect/decal/cleanable/blood{ layer = 3 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "vBP" = ( @@ -29152,30 +34711,37 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "vBV" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "vBY" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/blue{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "vCv" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "vDc" = ( /obj/structure/bed/sofa/south/grey/left, /obj/item/reagent_container/food/snacks/sandwich{ pixel_y = 2 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "vDj" = ( /obj/structure/surface/table/reinforced/prison, @@ -29184,15 +34750,19 @@ pixel_x = 11 }, /obj/item/clothing/gloves/latex, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/medbay) "vDx" = ( /obj/item/clothing/shoes/marine/upp_knife, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "vDK" = ( /obj/item/stack/sheet/metal/medium_stack, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "vDO" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -29217,13 +34787,14 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "vEK" = ( /turf/open/floor/plating/plating_catwalk/prison, @@ -29232,8 +34803,9 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "vFi" = ( @@ -29267,12 +34839,15 @@ /area/fiorina/station/security/wardens) "vFF" = ( /obj/item/trash/candy, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "vFQ" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/civres) "vFY" = ( @@ -29281,7 +34856,7 @@ /area/fiorina/tumor/fiberbush) "vGe" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "vGv" = ( /obj/structure/barricade/metal/wired{ @@ -29293,27 +34868,38 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "vGV" = ( /obj/item/shard{ icon_state = "large" }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "vHG" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "vHK" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/floor/prison/darkbrown2, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "vHR" = ( /obj/item/tool/screwdriver, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "vHU" = ( /obj/structure/surface/table/woodentable/fancy, @@ -29329,11 +34915,15 @@ icon_state = "mwo"; pixel_y = 6 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "vII" = ( -/turf/open/floor/prison/whitepurple{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "vJh" = ( @@ -29349,16 +34939,19 @@ "vJp" = ( /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vJq" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/whitegreenangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" }, /area/fiorina/tumor/ice_lab) "vJD" = ( -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "vJN" = ( /obj/structure/surface/table/reinforced/prison, @@ -29373,7 +34966,9 @@ dir = 1; pixel_y = 2 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "vKP" = ( /obj/structure/surface/rack, @@ -29387,17 +34982,22 @@ "vLV" = ( /obj/item/inflatable, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "vMb" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/security) "vMh" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) @@ -29412,15 +35012,18 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/station/power_ring) "vMQ" = ( -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/station/chapel) "vMS" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "vNq" = ( /turf/closed/wall/r_wall/prison, @@ -29433,12 +35036,15 @@ /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "vNt" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/greencorner{ - dir = 1 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/station/chapel) "vNx" = ( @@ -29446,24 +35052,27 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "vNF" = ( -/turf/open/floor/prison/greenangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "greencorner" }, /area/fiorina/station/chapel) "vNY" = ( /obj/item/tool/kitchen/utensil/pfork, -/turf/open/floor/prison/blue{ - dir = 4 +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "vOp" = ( /obj/structure/platform{ @@ -29475,11 +35084,13 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "vOz" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "vOP" = ( /obj/structure/disposalpipe/segment{ @@ -29493,15 +35104,20 @@ /area/fiorina/tumor/servers) "vPa" = ( /obj/item/tool/soap, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "vPk" = ( /obj/structure/window/framed/prison, -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "vPA" = ( /obj/structure/machinery/landinglight/ds2/delayone, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vPM" = ( /obj/structure/platform_decoration/kutjevo{ @@ -29525,11 +35141,12 @@ icon_state = "sandbag_0"; pixel_y = -14 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "vQN" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /turf/open/floor/plating/prison, @@ -29537,7 +35154,9 @@ "vRj" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "vRA" = ( /turf/open/floor/plating/prison, @@ -29549,12 +35168,15 @@ pixel_y = 6 }, /obj/item/storage/box/cups, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "vTl" = ( /obj/item/stack/rods, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/disco) "vTv" = ( @@ -29575,7 +35197,7 @@ pixel_x = -10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "vTT" = ( /obj/structure/disposalpipe/segment{ @@ -29585,18 +35207,22 @@ name = "overhead pipe"; pixel_y = 20 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "vUa" = ( /obj/structure/inflatable, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "vUf" = ( /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "vUn" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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) @@ -29608,7 +35234,9 @@ /area/fiorina/station/security) "vUE" = ( /obj/structure/machinery/computer/prisoner, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "vVi" = ( /obj/structure/window/framed/prison, @@ -29617,7 +35245,9 @@ "vVu" = ( /obj/structure/surface/rack, /obj/item/ammo_box/magazine/nailgun, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "vVJ" = ( /obj/structure/machinery/light/double/blue{ @@ -29625,7 +35255,10 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "vWe" = ( /obj/structure/extinguisher_cabinet, @@ -29633,30 +35266,46 @@ /area/fiorina/station/medbay) "vWs" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "vWI" = ( -/obj/structure/flora/pottedplant/pottedplant_22, -/turf/open/floor/prison/yellowfull, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/disco) "vXi" = ( /obj/item/storage/briefcase, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "vXr" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "vXB" = ( /obj/item/shard{ icon_state = "large" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "vXS" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) "vXT" = ( @@ -29670,18 +35319,23 @@ }, /area/fiorina/tumor/ship) "vYA" = ( -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/disco) "vYL" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/floor_plate, +/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/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "vYP" = ( /obj/structure/machinery/shower{ @@ -29691,7 +35345,9 @@ dir = 1; pixel_y = -1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "vZc" = ( /obj/structure/disposalpipe/segment{ @@ -29706,12 +35362,13 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/servers) "vZx" = ( /obj/item/trash/cigbutt, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/power_ring) "vZD" = ( @@ -29720,7 +35377,9 @@ /area/fiorina/maintenance) "vZU" = ( /obj/item/paper/crumpled, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "vZV" = ( /turf/closed/wall/strata_ice/jungle{ @@ -29739,11 +35398,15 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "waz" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/disco) "waN" = ( /obj/structure/platform{ @@ -29760,14 +35423,18 @@ "waP" = ( /obj/structure/largecrate/random/case, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/station/park) "waU" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) "wbn" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) "wbp" = ( @@ -29806,7 +35473,9 @@ /area/fiorina/station/park) "wcm" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/greenblue, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, /area/fiorina/station/botany) "wcP" = ( /obj/effect/landmark/queen_spawn, @@ -29819,22 +35488,31 @@ "wcX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/hypospray, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "wdA" = ( /obj/item/trash/used_stasis_bag, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzI) "wdX" = ( /obj/structure/prop/almayer/computers/mapping_computer, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "wef" = ( /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) "wek" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wen" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -29843,13 +35521,14 @@ pixel_x = -7; pixel_y = 7 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "wew" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/surface/rack, -/turf/open/floor/prison/darkyellow2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkyellow2" }, /area/fiorina/lz/near_lzI) "weH" = ( @@ -29860,33 +35539,44 @@ dir = 4; layer = 3.25 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "weK" = ( /obj/structure/platform_decoration{ dir = 1 }, -/turf/open/floor/prison/darkbrown2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" }, /area/fiorina/station/park) "weN" = ( /obj/structure/largecrate/random/case, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "weQ" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "weS" = ( /obj/structure/machinery/processor, /obj/effect/decal/cleanable/blood{ pixel_y = 20 }, -/turf/open/floor/prison/blue_plate, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "weX" = ( /obj/structure/barricade/metal{ @@ -29897,19 +35587,27 @@ /area/fiorina/station/park) "wfi" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/chapel) "wfp" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "wfy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, /obj/item/tool/stamp, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "wfV" = ( /obj/effect/landmark/monkey_spawn, @@ -29930,7 +35628,9 @@ /area/fiorina/oob) "wgH" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "whf" = ( /turf/closed/shuttle/elevator{ @@ -29939,24 +35639,30 @@ /area/fiorina/station/civres_blue) "whp" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "whu" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/civres) "whL" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "whR" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "wir" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = 30 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "wiQ" = ( /obj/structure/surface/table/reinforced/prison, @@ -29968,19 +35674,23 @@ pixel_x = 6; pixel_y = 7 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "wjk" = ( -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/chapel) "wjx" = ( /obj/structure/barricade/deployable{ dir = 1 }, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "wjH" = ( @@ -29993,7 +35703,10 @@ /area/fiorina/station/medbay) "wkp" = ( /obj/structure/machinery/iv_drip, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "wkD" = ( /obj/structure/largecrate/random/case/double, @@ -30001,13 +35714,18 @@ /area/fiorina/station/disco) "wlp" = ( /obj/item/reagent_container/food/snacks/donkpocket, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "wly" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzII) "wlz" = ( -/obj/structure/flora/pottedplant/pottedplant_22, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "wlG" = ( @@ -30024,19 +35742,27 @@ /obj/item/bodybag{ pixel_y = 2 }, -/turf/open/floor/prison/floor_plate, +/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, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "wmG" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "wnq" = ( /obj/item/tool/match, @@ -30048,6 +35774,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"wnz" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/lowsec) "wnB" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -30068,32 +35800,47 @@ pixel_x = 2; pixel_y = 25 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "wot" = ( /obj/item/weapon/baseballbat/metal, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/chapel) "woI" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/station/civres_blue) "wpf" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "wpp" = ( -/turf/open/floor/prison/darkyellow2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkyellow2" + }, /area/fiorina/station/power_ring) "wpu" = ( /obj/item/tool/soap, /obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "wpD" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -30120,16 +35867,19 @@ /area/fiorina/tumor/fiberbush) "wqx" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "wqM" = ( /obj/structure/platform, /obj/structure/closet/radiation, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "wrQ" = ( -/turf/open/floor/prison/whitepurpleangle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurplecorner" }, /area/fiorina/station/research_cells) "wrR" = ( @@ -30140,27 +35890,34 @@ indestructible = 1; name = "launch bay door" }, -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/oob) "wsN" = ( /obj/item/tool/surgery/cautery, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "wsY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pizzabox/margherita, -/turf/open/floor/prison/whitegreenfull, +/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 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "wul" = ( /obj/item/bedsheet/green, @@ -30190,7 +35947,10 @@ /area/fiorina/station/park) "wuP" = ( /obj/structure/machinery/power/apc, -/turf/open/floor/prison/blue_plate_3, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "wuT" = ( /obj/structure/lattice, @@ -30208,7 +35968,7 @@ /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "wvH" = ( /obj/effect/landmark/objective_landmark/medium, @@ -30222,7 +35982,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "wvY" = ( /obj/item/reagent_container/food/snacks/eat_bar, @@ -30236,33 +35998,43 @@ /obj/structure/machinery/computer/cameras{ dir = 4 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "wwH" = ( /obj/item/tool/wirecutters, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/lowsec) "wwR" = ( /obj/structure/largecrate/random/case, /obj/item/storage/toolbox/emergency{ pixel_y = 4 }, -/turf/open/floor/prison/whitepurplecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "wwZ" = ( /obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wxj" = ( /obj/item/newspaper, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/civres_blue) "wxo" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "wxX" = ( /obj/structure/machinery/computer/cameras{ @@ -30293,7 +36065,7 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "wyT" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -30309,14 +36081,17 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/lowsec) "wzS" = ( -/obj/structure/flora/pottedplant/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_y = 6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "wAa" = ( /obj/structure/machinery/vending/snack/packaged, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wAj" = ( /obj/structure/machinery/shower{ @@ -30325,11 +36100,16 @@ /obj/structure/machinery/shower{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/lowsec) "wAl" = ( /obj/structure/machinery/space_heater, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "wAn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -30350,25 +36130,29 @@ pixel_y = 10 }, /obj/item/tool/pen, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "wAv" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "wAD" = ( /obj/item/shard{ icon_state = "large" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "wAR" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ pixel_x = 16 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "wAT" = ( /obj/structure/surface/table/reinforced/prison, @@ -30377,14 +36161,19 @@ pixel_y = 8 }, /obj/item/trash/cigbutt, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "wBr" = ( /obj/structure/bed/chair{ dir = 1; layer = 2.7 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "wBK" = ( /obj/item/stack/tile/plasteel, @@ -30396,46 +36185,62 @@ /area/fiorina/station/power_ring) "wCA" = ( /obj/item/reagent_container/glass/bucket/janibucket, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wCV" = ( /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "wDF" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "wDV" = ( /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/darkyellow2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "wEa" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wEn" = ( /obj/structure/barricade/handrail/type_b{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "wEQ" = ( /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/yellowcorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, /area/fiorina/station/disco) "wER" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/oob) "wEX" = ( /obj/structure/machinery/light/double/blue{ @@ -30449,20 +36254,29 @@ /area/fiorina/tumor/aux_engi) "wEY" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/chapel) "wFk" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "wFo" = ( -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/tumor/civres) "wFD" = ( /obj/structure/bed/sofa/south/grey/right, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "wFE" = ( /obj/structure/bed/chair{ @@ -30477,7 +36291,7 @@ /obj/structure/prop/souto_land/streamer{ pixel_y = 24 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "wFU" = ( /obj/structure/window/framed/prison/reinforced/hull, @@ -30487,7 +36301,9 @@ /obj/structure/barricade/metal/wired{ dir = 8 }, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "wGf" = ( /obj/item/stack/rods, @@ -30497,13 +36313,17 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/telecomm/lz1_cargo) "wGD" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "wGM" = ( /obj/item/device/taperecorder{ @@ -30528,25 +36348,33 @@ /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) "wHx" = ( -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /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, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "wHX" = ( /obj/item/tool/lighter/random, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + dir = 10; + icon_state = "kitchen" + }, /area/fiorina/tumor/civres) "wII" = ( /obj/structure/toilet{ dir = 8; pixel_y = 8 }, -/turf/open/floor/prison/yellowcorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "wIJ" = ( @@ -30568,7 +36396,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "wJd" = ( /obj/structure/barricade/handrail, @@ -30578,11 +36408,16 @@ /area/fiorina/station/research_cells) "wJf" = ( /obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "wJt" = ( /obj/structure/bed/chair/comfy, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "wJw" = ( /obj/structure/closet/crate/trashcart, @@ -30595,8 +36430,9 @@ /area/fiorina/maintenance) "wJJ" = ( /obj/structure/closet/bodybag, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "wKb" = ( @@ -30608,7 +36444,7 @@ health = 120; icon_state = "metal_2" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "wKE" = ( /obj/effect/landmark/monkey_spawn, @@ -30617,11 +36453,15 @@ "wKF" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "wLf" = ( /obj/structure/machinery/deployable/barrier, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "wLA" = ( /obj/structure/extinguisher_cabinet, @@ -30630,25 +36470,34 @@ "wLI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_box/magazine/misc/flares, -/turf/open/floor/prison/floor_plate, +/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/darkbrown2, +/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/whitegreenfull, +/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/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "wLX" = ( /obj/item/stack/cable_coil, @@ -30656,8 +36505,9 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "wMi" = ( @@ -30673,28 +36523,38 @@ /area/fiorina/station/security/wardens) "wMG" = ( /obj/item/stack/rods, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "wMI" = ( /obj/item/storage/box/gloves, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "wMP" = ( /obj/item/stool, /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /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/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "wMR" = ( /obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "wMS" = ( /obj/structure/sink{ @@ -30702,7 +36562,10 @@ pixel_x = 12 }, /obj/structure/largecrate/random/case/double, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "wNi" = ( /obj/effect/landmark/yautja_teleport, @@ -30718,8 +36581,9 @@ }, /area/fiorina/station/chapel) "wNw" = ( -/turf/open/floor/prison/darkpurple2corner{ - dir = 4 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "wOc" = ( @@ -30730,37 +36594,52 @@ /obj/structure/platform_decoration{ dir = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "wOD" = ( -/turf/open/floor/prison/floor_marked, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, /area/fiorina/tumor/servers) "wOM" = ( /obj/item/tool/kitchen/knife, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "wOR" = ( -/turf/open/floor/prison/greenbluecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "greenblue" }, /area/fiorina/station/botany) "wOS" = ( -/turf/open/floor/prison/redangle, +/turf/open/floor/prison{ + icon_state = "redcorner" + }, /area/fiorina/station/security) "wOT" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "wPz" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/telecomm/lz1_cargo) "wPF" = ( /obj/item/trash/semki, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "wPL" = ( /obj/structure/platform_decoration, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "wQh" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ @@ -30770,15 +36649,20 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "wQn" = ( /obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison/floor_plate, +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "wQN" = ( /obj/structure/machinery/floodlight/landing/floor, @@ -30799,30 +36683,37 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/whitegreen{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "wRn" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "wRo" = ( /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "wRv" = ( /obj/structure/bed/chair, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "wRG" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "wRP" = ( @@ -30838,14 +36729,18 @@ icon_state = "chair"; pixel_y = 6 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "wRZ" = ( -/turf/open/floor/prison/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "wSe" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/tumor/servers) "wSm" = ( @@ -30856,41 +36751,53 @@ dir = 4 }, /obj/item/stool, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "wTy" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "wTz" = ( /obj/structure/machinery/vending/security, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "wTO" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/reagent_container/food/drinks/flask/marine, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "wTV" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "wUA" = ( -/turf/open/floor/prison/green{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "green" }, /area/fiorina/tumor/aux_engi) "wVu" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "wVI" = ( /obj/structure/sink{ @@ -30898,13 +36805,15 @@ pixel_x = -12 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/whitepurplecorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "wVK" = ( -/turf/open/floor/prison/darkpurple2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "wVL" = ( @@ -30916,8 +36825,9 @@ pixel_x = -10; pixel_y = -3 }, -/turf/open/floor/prison/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "wWs" = ( @@ -30932,27 +36842,40 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/station/medbay) +"wXf" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, +/area/fiorina/station/flight_deck) "wXP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper, -/turf/open/floor/prison/darkpurple2, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, /area/fiorina/tumor/servers) "wYx" = ( /obj/item/storage/box/flashbangs, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "wYE" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "cell_stripe" }, /area/fiorina/lz/near_lzII) "wYG" = ( /obj/structure/barricade/wooden{ dir = 1 }, -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_cargo) "wZn" = ( @@ -30962,7 +36885,9 @@ /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/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "wZo" = ( /obj/structure/machinery/light/double/blue{ @@ -30970,7 +36895,9 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "wZv" = ( /obj/item/stack/sheet/metal, @@ -30980,7 +36907,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "wZN" = ( /obj/item/reagent_container/food/drinks/bottle/melonliquor, @@ -30988,17 +36917,22 @@ /area/fiorina/station/civres_blue) "xaK" = ( /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "xaS" = ( /obj/structure/prop/almayer/computers/sensor_computer1, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/tumor/servers) "xbq" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "xbu" = ( @@ -31010,20 +36944,30 @@ pixel_y = 13 }, /obj/structure/barricade/handrail/type_b, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "xbB" = ( -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/station/flight_deck) "xbQ" = ( -/turf/open/floor/prison/panelscorched, +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, /area/fiorina/station/civres_blue) "xca" = ( -/turf/open/floor/prison/platingdmg2, +/turf/open/floor/prison{ + icon_state = "platingdmg2" + }, /area/fiorina/station/security) "xcf" = ( /obj/item/reagent_container/food/snacks/donkpocket, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "xck" = ( /obj/structure/largecrate/random/case/small, @@ -31037,17 +36981,23 @@ /obj/structure/platform_decoration{ dir = 6 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "xdy" = ( -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/oob) "xdE" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_tram) "xec" = ( -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/research_cells) "xed" = ( /obj/structure/window/reinforced{ @@ -31058,7 +37008,7 @@ }, /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/secure_data, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "xeh" = ( /obj/structure/surface/rack, @@ -31068,7 +37018,10 @@ pixel_y = -5 }, /obj/item/tool/crowbar, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xew" = ( /turf/closed/shuttle/ert{ @@ -31077,14 +37030,18 @@ /area/fiorina/lz/near_lzI) "xeD" = ( /obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/blue_plate_3, +/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/p_stair_ew_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, /obj/structure/platform/stair_cut, /obj/structure/machinery/light/double/blue{ @@ -31095,36 +37052,47 @@ /area/fiorina/lz/near_lzI) "xfq" = ( /obj/effect/alien/weeds/node, -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "xfw" = ( /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkpurple2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "xfA" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xfR" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/darkpurple2{ - dir = 1 +/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/blue_plate_2, +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue_plate" + }, /area/fiorina/station/botany) "xgn" = ( /obj/structure/machinery/optable, @@ -31134,8 +37102,9 @@ /area/fiorina/station/medbay) "xgr" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "xgx" = ( @@ -31151,7 +37120,10 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "xhc" = ( -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "xiF" = ( /obj/structure/largecrate/random/case/double, @@ -31172,28 +37144,38 @@ /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) "xjv" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) "xjw" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 8 }, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/lz/near_lzI) "xjK" = ( -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "xjW" = ( /obj/item/device/flashlight/flare, -/turf/open/floor/prison/darkyellow2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "xkj" = ( /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "xkv" = ( /turf/closed/wall/prison, @@ -31205,8 +37187,9 @@ /obj/structure/machinery/m56d_hmg/mg_turret/dropship{ dir = 4 }, -/turf/open/floor/prison/cell_stripe{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "cell_stripe" }, /area/fiorina/station/disco) "xkG" = ( @@ -31215,11 +37198,15 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "xkP" = ( /obj/item/tool/mop, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "xlp" = ( /obj/structure/bed/chair/office/dark{ @@ -31229,8 +37216,9 @@ /area/fiorina/station/research_cells) "xlq" = ( /obj/structure/largecrate/supply, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "xlZ" = ( @@ -31245,7 +37233,9 @@ /area/fiorina/oob) "xmg" = ( /obj/effect/landmark/static_comms/net_two, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "xmj" = ( /obj/structure/surface/table/woodentable/fancy, @@ -31253,30 +37243,34 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "xmH" = ( -/turf/open/floor/prison/green{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "green" }, /area/fiorina/tumor/aux_engi) "xmM" = ( /obj/structure/barricade/metal/wired{ dir = 1 }, -/turf/open/floor/prison/darkyellow2, +/turf/open/floor/prison{ + icon_state = "darkyellow2" + }, /area/fiorina/lz/near_lzI) "xmX" = ( /obj/structure/cargo_container/grant/right{ health = 5000; unacidable = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "xna" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "xng" = ( -/turf/open/floor/prison/darkyellow2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) "xno" = ( @@ -31284,8 +37278,9 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "xnp" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 4 +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) @@ -31293,7 +37288,10 @@ /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "xns" = ( /obj/structure/surface/rack, @@ -31301,31 +37299,41 @@ 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/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xnA" = ( /obj/structure/curtain/red, -/turf/open/floor/prison/sterile_white, +/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/floor, +/turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "xnK" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xnM" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap, +/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/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "xnR" = ( /obj/structure/surface/table/reinforced/prison, @@ -31335,11 +37343,12 @@ pixel_x = 8; pixel_y = 16 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "xnS" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" }, /area/fiorina/station/park) "xnU" = ( @@ -31350,12 +37359,13 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/flight_deck) "xog" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/limb, -/turf/open/floor/prison/whitegreenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" }, /area/fiorina/station/medbay) "xoi" = ( @@ -31364,17 +37374,23 @@ /area/fiorina/station/medbay) "xoB" = ( /obj/item/trash/chunk, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "xoF" = ( -/turf/open/floor/prison/bluecorner{ - dir = 8 +/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, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "xoK" = ( /obj/structure/closet, @@ -31385,12 +37401,17 @@ /area/fiorina/station/security/wardens) "xoQ" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "xpB" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xqf" = ( /obj/structure/closet/bombcloset, @@ -31398,35 +37419,40 @@ /obj/item/stack/sheet/mineral/plastic, /obj/item/stack/sheet/mineral/plastic, /obj/item/stack/sheet/mineral/plastic, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "xqj" = ( /obj/structure/bed{ icon_state = "abed" }, -/turf/open/floor/prison/whitepurple{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "xqD" = ( /obj/item/explosive/grenade/high_explosive/frag, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "xqG" = ( /obj/item/stack/rods, -/turf/open/floor/prison/greenangle{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greencorner" }, /area/fiorina/station/chapel) "xri" = ( -/turf/open/floor/prison/yellow{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "xrn" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/gun/pistol/lowchance, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "xrs" = ( /obj/structure/surface/table/woodentable/fancy, @@ -31435,10 +37461,15 @@ pixel_x = 1; pixel_y = 13 }, -/turf/open/floor/prison/greenfull_2, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "xrG" = ( -/obj/structure/stairs/perspective/p_stair_ew_full_cap, +/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/disco) @@ -31450,22 +37481,29 @@ /area/fiorina/lz/near_lzII) "xrJ" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "xrT" = ( /obj/structure/inflatable, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ship) "xrU" = ( /obj/structure/machinery/vending/cigarette, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "xsa" = ( /obj/structure/bed/chair/comfy{ dir = 1 }, -/turf/open/floor/prison/redangle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "redcorner" }, /area/fiorina/station/power_ring) "xsg" = ( @@ -31475,7 +37513,7 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "xst" = ( /obj/structure/platform, @@ -31500,30 +37538,45 @@ /turf/open/space, /area/fiorina/oob) "xub" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "xup" = ( /obj/structure/largecrate/supply/generator, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "xuw" = ( /obj/item/stool, -/turf/open/floor/prison/sterile_white, +/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/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "xvs" = ( /obj/item/stack/rods, -/turf/open/floor/prison/sterile_white, +/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/whitegreen{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "xvB" = ( @@ -31535,12 +37588,16 @@ "xvD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/ricepudding, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/servers) "xvH" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "xvI" = ( /obj/structure/disposalpipe/segment{ @@ -31554,7 +37611,10 @@ /area/fiorina/tumor/ice_lab) "xvR" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/tumor/civres) "xwi" = ( /obj/item/explosive/grenade/phosphorus, @@ -31562,7 +37622,10 @@ /obj/item/explosive/grenade/phosphorus, /obj/structure/surface/rack, /obj/item/explosive/grenade/phosphorus, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xwt" = ( /obj/structure/bed/chair/comfy, @@ -31574,31 +37637,35 @@ "xwy" = ( /obj/structure/closet/firecloset, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor, +/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/floor, +/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/largetank, -/turf/open/floor/prison/floor, +/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/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "xxh" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkbrown2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "xxD" = ( @@ -31606,7 +37673,9 @@ /area/fiorina/station/civres_blue) "xxE" = ( /obj/item/stack/rods/plasteel, -/turf/open/floor/prison/damaged3, +/turf/open/floor/prison{ + icon_state = "damaged3" + }, /area/fiorina/station/security) "xxP" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -31628,33 +37697,38 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "xyK" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/power_ring) "xyR" = ( /obj/structure/bedsheetbin, -/turf/open/floor/prison/yellow{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "xzb" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "xzj" = ( /turf/open/floor/carpet, /area/fiorina/tumor/civres) "xzr" = ( /obj/item/prop/helmetgarb/gunoil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/maintenance) "xzs" = ( /obj/structure/machinery/space_heater, @@ -31670,8 +37744,9 @@ health = 150; icon_state = "metal_2" }, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "xzW" = ( @@ -31679,11 +37754,16 @@ /obj/item/explosive/mine/pmc, /obj/effect/spawner/random/gun/smg, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/yellowfull, +/turf/open/floor/prison{ + icon_state = "yellowfull" + }, /area/fiorina/station/lowsec) "xAi" = ( /obj/structure/machinery/vending/sovietsoda, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "xAl" = ( /obj/structure/cargo_container/grant/right{ @@ -31699,7 +37779,10 @@ }, /area/fiorina/tumor/fiberbush) "xAw" = ( -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 8; + icon_state = "sterile_white" + }, /area/fiorina/station/lowsec) "xAR" = ( /obj/structure/prop/structure_lattice{ @@ -31711,7 +37794,9 @@ layer = 3.1; pixel_y = 10 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/park) "xBl" = ( /obj/structure/surface/table/woodentable, @@ -31730,27 +37815,33 @@ "xBv" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "xBI" = ( -/turf/open/floor/prison/cell_stripe{ - dir = 4 +/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/pottedplant_29{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; pixel_x = 1; pixel_y = 10 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "xBR" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security/wardens) "xBT" = ( -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security/wardens) "xCa" = ( /obj/item/toy/crayon/rainbow, @@ -31761,7 +37852,10 @@ icon_state = "sandbag_0"; pixel_y = -14 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/flight_deck) "xCo" = ( /obj/structure/prop/structure_lattice{ @@ -31780,29 +37874,40 @@ name = "overhead pipe"; pixel_y = 20 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "xCs" = ( /obj/effect/decal/medical_decals{ icon_state = "cryocell1decal" }, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/station/medbay) "xCy" = ( /obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/station/research_cells) "xCW" = ( /obj/structure/grille, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/research_cells) "xDe" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/green, +/turf/open/floor/prison{ + icon_state = "green" + }, /area/fiorina/station/chapel) "xDg" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "xDq" = ( /turf/closed/shuttle/ert{ @@ -31814,16 +37919,19 @@ /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "xDz" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 1 +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 8 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "xDQ" = ( -/turf/open/floor/prison/cell_stripe, +/turf/open/floor/prison{ + icon_state = "cell_stripe" + }, /area/fiorina/station/security) "xEa" = ( /obj/structure/closet/secure_closet/security_empty, @@ -31831,10 +37939,13 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "xEE" = ( -/obj/structure/flora/pottedplant/pottedplant_22{ +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; indestructible = 1 }, /obj/item/clothing/head/that{ @@ -31845,8 +37956,9 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "xFe" = ( -/obj/structure/stairs/perspective/p_stair_full{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, /obj/structure/platform, /obj/structure/barricade/handrail/type_b{ @@ -31861,13 +37973,14 @@ }, /area/fiorina/tumor/aux_engi) "xFx" = ( -/turf/open/floor/prison/greencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "green" }, /area/fiorina/tumor/civres) "xFB" = ( /obj/structure/platform, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/botany) "xFP" = ( /turf/closed/shuttle/ert{ @@ -31886,14 +37999,19 @@ dir = 4; pixel_y = 4 }, -/turf/open/floor/prison/bright_clean_marked, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean_marked" + }, /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/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "xIb" = ( /obj/structure/platform{ @@ -31903,11 +38021,16 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "xIg" = ( /obj/structure/largecrate/supply/medicine/medivend, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xIh" = ( /obj/structure/surface/table/reinforced/prison, @@ -31919,7 +38042,10 @@ /turf/open/floor/wood, /area/fiorina/station/park) "xIo" = ( -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/station/park) "xIx" = ( /obj/structure/largecrate/random, @@ -31933,7 +38059,9 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/ice_lab) "xJw" = ( /turf/closed/wall/r_wall/prison_unmeltable, @@ -31944,8 +38072,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/blue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "xKj" = ( @@ -31956,8 +38085,9 @@ /turf/open/floor/plating/prison, /area/fiorina/station/disco) "xLa" = ( -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/oob) "xLi" = ( @@ -31968,11 +38098,15 @@ /obj/item/device/radio{ pixel_y = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/power_ring) "xLP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, -/turf/open/floor/prison/whitegreen, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, /area/fiorina/tumor/ice_lab) "xLQ" = ( /obj/structure/window/framed/prison, @@ -31984,30 +38118,39 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "xMg" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 8 +/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/bluefull, +/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/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "xMR" = ( -/turf/open/floor/prison/whitepurple{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" }, /area/fiorina/station/research_cells) "xMT" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/prison/blueangle, +/turf/open/floor/prison{ + icon_state = "bluecorner" + }, /area/fiorina/station/power_ring) "xMW" = ( /obj/structure/barricade/handrail{ @@ -32027,7 +38170,9 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/card/id/guest, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/redfull, +/turf/open/floor/prison{ + icon_state = "redfull" + }, /area/fiorina/station/security) "xNg" = ( /obj/effect/decal/hefa_cult_decals/d32{ @@ -32042,17 +38187,20 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/station/security) "xNQ" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/disco) "xOa" = ( /obj/structure/bookcase/manuals/engineering, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "xOE" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ @@ -32064,19 +38212,22 @@ /area/fiorina/tumor/ship) "xOI" = ( /obj/structure/machinery/vending/coffee, -/turf/open/floor/prison/floor_plate, +/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 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzII) "xOV" = ( /obj/structure/machinery/gibber, -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "xPG" = ( @@ -32087,13 +38238,16 @@ /area/fiorina/maintenance) "xPO" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/prison/yellow{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "xPX" = ( /obj/structure/machinery/disposal, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/transit_hub) "xQb" = ( /obj/structure/surface/table/reinforced/prison, @@ -32105,7 +38259,10 @@ pixel_x = 5; pixel_y = 2 }, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "xQC" = ( /obj/structure/platform/kutjevo/smooth, @@ -32118,33 +38275,41 @@ "xQE" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/up, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/lowsec) "xRg" = ( /obj/item/trash/popcorn, -/turf/open/floor/prison/blue{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" }, /area/fiorina/station/power_ring) "xRh" = ( -/turf/open/floor/prison/whitegreencorner{ - dir = 1 +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" }, /area/fiorina/tumor/ice_lab) "xSd" = ( -/turf/open/floor/prison/bluecorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" }, /area/fiorina/station/civres_blue) "xSg" = ( /obj/structure/flora/pottedplant/random, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "xSB" = ( /obj/effect/spawner/random/toolbox, /obj/structure/surface/rack, /obj/item/device/flashlight, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/transit_hub) "xTa" = ( /obj/structure/machinery/light/double/blue{ @@ -32152,19 +38317,22 @@ pixel_x = 10; pixel_y = 13 }, -/turf/open/floor/prison/greenblue{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenblue" }, /area/fiorina/station/botany) "xTe" = ( /obj/structure/machinery/recharge_station, -/turf/open/floor/prison/bluecorner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" }, /area/fiorina/station/power_ring) "xTi" = ( -/obj/structure/stairs/perspective/p_stair_sn_full_cap{ - dir = 8 +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/platform{ dir = 4 @@ -32176,15 +38344,18 @@ dir = 8; pixel_y = 24 }, -/turf/open/floor/prison/darkbrown2{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" }, /area/fiorina/station/park) "xTy" = ( /obj/structure/barricade/deployable{ dir = 4 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "xUi" = ( /obj/structure/surface/rack, @@ -32197,26 +38368,34 @@ /area/fiorina/lz/near_lzII) "xUq" = ( /obj/item/stack/barbed_wire, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xUt" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "xUz" = ( -/turf/open/floor/prison/blueangle{ - dir = 8 +/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/floor, +/turf/open/floor/prison, /area/fiorina/station/transit_hub) "xVm" = ( /obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/security) "xVv" = ( /obj/structure/sink{ @@ -32224,13 +38403,18 @@ pixel_x = 12 }, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/whitepurplecorner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, /area/fiorina/station/research_cells) "xVD" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/aux_engi) "xVK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -32244,8 +38428,9 @@ }, /area/fiorina/station/park) "xVP" = ( -/turf/open/floor/prison/darkyellow2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "xVR" = ( @@ -32254,7 +38439,9 @@ pixel_y = 32 }, /obj/item/tool/kitchen/knife/butcher, -/turf/open/floor/prison/kitchen, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, /area/fiorina/station/power_ring) "xWc" = ( /obj/item/clothing/shoes/dress, @@ -32262,7 +38449,10 @@ /area/fiorina/oob) "xWp" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/tumor/ice_lab) "xWH" = ( /obj/structure/machinery/computer/emails{ @@ -32270,19 +38460,25 @@ pixel_y = 4 }, /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "xWN" = ( /obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/civres_blue) "xYg" = ( /obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "xYA" = ( -/turf/open/floor/prison/blue_plate_3{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue_plate" }, /area/fiorina/station/botany) "xYB" = ( @@ -32296,7 +38492,10 @@ pixel_y = -11 }, /obj/item/reagent_container/food/snacks/doughslice, -/turf/open/floor/prison/darkyellow2full, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/fiorina/station/flight_deck) "xYY" = ( /obj/item/stool, @@ -32304,19 +38503,22 @@ dir = 1; pixel_y = 21 }, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/civres_blue) "xZb" = ( /obj/item/stack/rods, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/park) "xZk" = ( /obj/item/ammo_casing{ dir = 8; icon_state = "cartridge_2" }, -/turf/open/floor/prison/darkyellow2angle{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) "xZo" = ( @@ -32326,7 +38528,9 @@ pixel_x = 7; pixel_y = 6 }, -/turf/open/floor/prison/blue, +/turf/open/floor/prison{ + icon_state = "blue" + }, /area/fiorina/station/chapel) "xZD" = ( /obj/structure/surface/table/reinforced/prison, @@ -32347,11 +38551,13 @@ /obj/structure/platform, /obj/structure/closet/firecloset/full, /obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "yaC" = ( /obj/structure/machinery/vending/cigarette/free, -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/tumor/aux_engi) "yaJ" = ( /obj/structure/machinery/vending/sovietsoda, @@ -32359,8 +38565,9 @@ /area/fiorina/station/medbay) "yaU" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/floor/prison/darkbrown2{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" }, /area/fiorina/tumor/aux_engi) "yaY" = ( @@ -32391,7 +38598,9 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "ybU" = ( /obj/structure/prop/resin_prop{ @@ -32402,25 +38611,31 @@ "ybY" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "ycd" = ( -/turf/open/floor/prison/darkbrown2full, +/turf/open/floor/prison{ + icon_state = "darkbrownfull2" + }, /area/fiorina/maintenance) "ycg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/vials/random, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "ycj" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "ycn" = ( -/turf/open/floor/prison/darkbrown2angle{ - dir = 1 +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" }, /area/fiorina/tumor/aux_engi) "ycC" = ( @@ -32432,40 +38647,53 @@ /area/fiorina/tumor/fiberbush) "ycN" = ( /obj/item/tool/wrench, -/turf/open/floor/prison/bluefull, +/turf/open/floor/prison{ + icon_state = "bluefull" + }, /area/fiorina/station/power_ring) "ycX" = ( -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) "ydk" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/prison/floorscorched1, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, /area/fiorina/station/chapel) "ydX" = ( -/turf/open/floor/prison/darkyellow2corner{ - dir = 8 +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkyellow2" }, /area/fiorina/station/telecomm/lz1_tram) "ydY" = ( /obj/structure/surface/rack, -/turf/open/floor/prison/darkbrown2corner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, /area/fiorina/maintenance) "yft" = ( /obj/item/clothing/under/color/orange, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/security) "yfB" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" }, /obj/item/stack/cable_coil/blue, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "yfC" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/lz/near_lzII) "yfE" = ( /obj/structure/disposalpipe/junction{ @@ -32479,7 +38707,9 @@ pixel_x = 10; pixel_y = -3 }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + icon_state = "sterile_white" + }, /area/fiorina/station/civres_blue) "yge" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -32496,7 +38726,7 @@ /area/fiorina/station/park) "ygv" = ( /obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor, +/turf/open/floor/prison, /area/fiorina/station/medbay) "ygw" = ( /obj/structure/surface/table/reinforced/prison, @@ -32516,15 +38746,19 @@ /obj/item/ammo_casing{ icon_state = "casing_1" }, -/turf/open/floor/prison/sterile_white, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, /area/fiorina/station/medbay) "ygS" = ( /obj/structure/largecrate/random/secure, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, -/turf/open/floor/prison/yellowcorner{ - dir = 4 +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" }, /area/fiorina/station/disco) "yhu" = ( @@ -32533,7 +38767,10 @@ /area/fiorina/tumor/aux_engi) "yhE" = ( /obj/structure/machinery/vending/hydroseeds, -/turf/open/floor/prison/greenfull, +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, /area/fiorina/station/botany) "yhR" = ( /obj/structure/sign/prop3{ @@ -32544,7 +38781,10 @@ "yhT" = ( /obj/structure/largecrate/supply/ammo, /obj/item/storage/fancy/crayons, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_plate" + }, /area/fiorina/station/telecomm/lz1_cargo) "yil" = ( /obj/structure/bed/roller, @@ -32552,8 +38792,9 @@ pixel_y = 19 }, /obj/item/bedsheet/green, -/turf/open/floor/prison/whitegreen{ - dir = 4 +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" }, /area/fiorina/station/medbay) "yio" = ( @@ -32567,29 +38808,42 @@ /area/fiorina/tumor/civres) "yiD" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/prison/darkred2full, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, /area/fiorina/lz/near_lzI) "yiG" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/disco) "yjs" = ( /obj/item/reagent_container/food/snacks/eat_bar, -/turf/open/floor/prison/whitegreenfull, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, /area/fiorina/station/medbay) "yjO" = ( /obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/civres) "yke" = ( /obj/effect/spawner/random/tool, -/turf/open/floor/prison/darkpurple2full, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, /area/fiorina/station/research_cells) "ykI" = ( /obj/structure/largecrate/random/barrel/green, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/station/medbay) "ykO" = ( /obj/structure/ice/thin/indestructible{ @@ -32599,8 +38853,9 @@ /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) "ykT" = ( -/turf/open/floor/prison/darkpurple2{ - dir = 8 +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkpurple2" }, /area/fiorina/tumor/servers) "ykX" = ( @@ -32611,10 +38866,14 @@ /area/fiorina/station/telecomm/lz2_maint) "ylf" = ( /obj/structure/surface/table/reinforced/prison, -/turf/open/floor/prison/floor_plate, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, /area/fiorina/tumor/fiberbush) "yls" = ( -/obj/structure/monorail/launchtrack, +/obj/structure/monorail{ + name = "launch track" + }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "ylu" = ( @@ -34630,14 +40889,14 @@ dXG dIo hDx dXG -lhQ +diP qmd xFx -lhQ +diP kDO -lhQ +diP qty -lhQ +diP qty oOK sUl @@ -34845,13 +41104,13 @@ dXG bjx dXG oVC -diP +lhQ kDO -diP +lhQ qty -diP +lhQ gcr -diP +lhQ aEi pRH qPb @@ -35054,7 +41313,7 @@ dXG dIo wJa dXG -diP +lhQ dXG vAZ hDx @@ -36323,9 +42582,9 @@ clu dIo xHV xHV -lhQ +diP qty -lhQ +diP qty dXG hDx @@ -36535,9 +42794,9 @@ dXG dIo xHV qty -diP +lhQ qty -diP +lhQ qty qty hDx @@ -36957,11 +43216,11 @@ hDx pwL oKq hDx -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty qty hDx @@ -37169,11 +43428,11 @@ qty dXG dXG hDx -diP +lhQ qty -diP +lhQ qty -diP +lhQ dXG qty hDx @@ -38446,7 +44705,7 @@ dIo dXG rsz dXG -lhQ +diP xFx hDx sRg @@ -38661,13 +44920,13 @@ dXG bjx tQq xFx -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP sUl qPb qPb @@ -38870,16 +45129,16 @@ xHV xHV xHV xHV -diP +lhQ fpp oVC -diP +lhQ qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ sUl qPb qPb @@ -38929,7 +45188,7 @@ kbT kbT kbT ogM -ncn +jVH bEn qbd bEn @@ -40523,13 +46782,13 @@ agi agi mjx eda -fLq +eQR efz -fLq +eQR efz -fLq +eQR eda -fLq +eQR efz dXG hDx @@ -40729,19 +46988,19 @@ agi agi agi cBU -vco +wNw ykT uhd hoZ mjx efz -eQR +fLq efz -eQR +fLq efz -eQR +fLq efz -eQR +fLq efz dXG dXG @@ -40785,9 +47044,9 @@ hDx qty qty qty -lhQ +diP qty -lhQ +diP nsg xFx xHV @@ -40798,7 +47057,7 @@ xHV jlk uNM uNM -ncn +jVH bEn gPO bEn @@ -40997,9 +47256,9 @@ qWB qty qty qty -diP +lhQ qty -diP +lhQ tzj lvs hDx @@ -41153,19 +47412,19 @@ agi agi hoZ cBU -wNw +vco wVK uFX lwK mjx efz -fLq +eQR efz -fLq +eQR efz -fLq +eQR efz -fLq +eQR efz doD doD @@ -41212,7 +47471,7 @@ dIo dIo hDx hDx -diP +lhQ oVC nsg nsg @@ -41371,13 +47630,13 @@ dCl lwK mjx egY -eQR +fLq efz -eQR +fLq efz -eQR +fLq kur -eQR +fLq efz hoZ fGb @@ -41577,7 +47836,7 @@ agi gEF pCX lwK -vco +wNw ykT uhd lwK @@ -41636,7 +47895,7 @@ xHV xHV dIo hSF -lhQ +diP xFx hDx hDx @@ -42001,7 +48260,7 @@ cVQ gEF hoZ lwK -wNw +vco wVK uFX lwK @@ -42060,7 +48319,7 @@ xHV dIo dIo hSF -lhQ +diP xFx igA nsg @@ -42425,7 +48684,7 @@ hoZ gEF hoZ lwK -vco +wNw ykT uhd lwK @@ -42484,7 +48743,7 @@ whu hDx rMg hDx -lhQ +diP tIK hDx hDx @@ -42683,22 +48942,22 @@ dXG xHV qty qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP qty -lhQ +diP hcb lvs -lhQ +diP foZ xFx rNF @@ -42713,7 +48972,7 @@ jXZ qCW amF geU -ncn +jVH lwG aKW aKW @@ -42849,7 +49108,7 @@ hoZ gEF hoZ lwK -wNw +vco wVK uFX lwK @@ -42895,22 +49154,22 @@ xHV xHV xHV qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ qty -diP +lhQ tzj lvs -diP +lhQ qty lsl xFx @@ -43120,7 +49379,7 @@ whu hDx rMg hDx -diP +lhQ oVC hDx hDx @@ -43544,7 +49803,7 @@ hDx kUj kUj xHV -diP +lhQ oVC gWT fpp @@ -43968,7 +50227,7 @@ xzj fBP xHV kUj -diP +lhQ oVC hDx hDx @@ -44197,7 +50456,7 @@ rGq pyK sXi pyK -jVH +ncn gUf sJT sJT @@ -44392,7 +50651,7 @@ dXG xHV xHV dIo -diP +lhQ oVC fpp fpp @@ -44816,7 +51075,7 @@ egv egv gma apf -diP +lhQ oVC hDx vkM @@ -44833,7 +51092,7 @@ rGq sXi sXi sXi -ncn +jVH lwG jlk jlk @@ -45530,7 +51789,7 @@ jgu dxd cdD ajK -iFj +hhy vwc vwc vwc @@ -45664,7 +51923,7 @@ apf gma gma apf -lhQ +diP qXM mLB tYw @@ -45939,7 +52198,7 @@ war kXD oRR dLq -iFj +hhy vwc vwc oTU @@ -46164,7 +52423,7 @@ wbI wbI kXD dxd -hhy +iFj bDN irB irB @@ -46520,7 +52779,7 @@ cyL ubk hAY sJT -jVH +ncn peY peY peY @@ -47714,7 +53973,7 @@ ieW fGb nBV nyl -vco +wNw rKS uhd chS @@ -47722,7 +53981,7 @@ uTX fGb nBV nyl -vco +wNw ykT uhd chS @@ -48138,7 +54397,7 @@ mlM fGb nBV nyl -wNw +vco wVK cfz chS @@ -48146,7 +54405,7 @@ uTX fGb nBV nyl -wNw +vco wVK uFX chS @@ -48271,7 +54530,7 @@ kXD aBJ wKb wbI -hhy +iFj bDN bDN gqH @@ -48562,7 +54821,7 @@ ieW fGb nBV nyl -vco +wNw ykT uhd chS @@ -48570,7 +54829,7 @@ uTX fGb nBV nyl -vco +wNw ykT uhd chS @@ -48986,7 +55245,7 @@ mlM fGb nBV nyl -wNw +vco xfw quy chS @@ -48994,7 +55253,7 @@ uTX qqX nBV nyl -wNw +vco rHd uFX chS @@ -49112,7 +55371,7 @@ xkP lIx xub uGM -hhy +iFj xIo uGM uGM @@ -50266,7 +56525,7 @@ uTX fGb agi nyl -vco +wNw ykT ifq chS @@ -50384,7 +56643,7 @@ xub xub xub xub -iFj +hhy aNn uGM uGM @@ -50394,7 +56653,7 @@ uGM uGM uGM uGM -iFj +hhy aNn uGM uGM @@ -50682,7 +56941,7 @@ hoZ njx njx nyl -wNw +vco wVK uFX rMt @@ -50690,7 +56949,7 @@ uTX fGb uXu lwK -wNw +vco pxa uFX chS @@ -51106,7 +57365,7 @@ hoZ njx njx nyl -vco +wNw ykT uhd chS @@ -51114,7 +57373,7 @@ uTX fGb veM lwK -vco +wNw esF uhd chS @@ -51530,7 +57789,7 @@ hoZ tXQ njx nyl -wNw +vco wVK uFX rRb @@ -51755,7 +58014,7 @@ rLC kcw aWV agi -wNw +vco wVK qdJ apf @@ -52292,7 +58551,7 @@ dMO uGM uGM xub -hhy +iFj bDN bDN eQv @@ -53228,7 +59487,7 @@ aWV jXz lwK lwK -vco +wNw njx uhd lwK @@ -53657,10 +59916,10 @@ xvD nGX ukz lwK -vco +wNw uhd njx -vco +wNw uhd egv gma @@ -54288,7 +60547,7 @@ hoZ gEF eQD lwK -wNw +vco usq uFX lwK @@ -54505,10 +60764,10 @@ ykT lwK njx pyv -wNw +vco uFX agi -wNw +vco uFX apf esS @@ -55418,7 +61677,7 @@ bJF dgF bis sXy -ghP +usa vNF uqa kEE @@ -55482,7 +61741,7 @@ eLu sGI szK wbI -hhy +iFj xIo uGM eLu @@ -55547,7 +61806,7 @@ sqg sqg xRh hhl -hUh +hTt iHU iYq xjK @@ -55971,7 +62230,7 @@ azZ ghv ezJ xjK -hTt +hUh iJC iZZ xjK @@ -57114,7 +63373,7 @@ mTX axi bis sXy -usa +ghP xqG oTl kEE @@ -57829,7 +64088,7 @@ oly vZX vZX jwc -cEB +lCw uat qwU gfo @@ -58253,7 +64512,7 @@ qkN vZX vZX aWk -lCw +cEB jrk rkb czj @@ -60316,10 +66575,10 @@ rHu rJu uzw kqC -avl +cCq dHp dHp -cCq +uFh abJ usz usz @@ -60730,9 +66989,9 @@ cME qIq eLu lcH -avl -dHp cCq +dHp +uFh lcH wQT eLu @@ -62433,10 +68692,10 @@ kqC isP fAs kqC -uFh +avl ocB kqC -avl +cCq dHp dHp dHp @@ -62444,7 +68703,7 @@ ugU gNW gNW gNW -oMz +hKE xGt mni tHs @@ -62854,11 +69113,11 @@ pHu ikA vei usz -avl +cCq dHp dHp dHp -cCq +uFh jRR pHu sHH @@ -63066,7 +69325,7 @@ pHu mcc vei usz -uFh +avl xri xri xri @@ -63490,10 +69749,10 @@ cMg mcc vei kqC -avl +cCq awo kqC -avl +cCq mIA kqC pHu @@ -64338,10 +70597,10 @@ pHu mcc vei kqC -uFh +avl fAs kqC -uFh +avl jms kqC pHu @@ -64762,11 +71021,11 @@ pHu mcc vei usz -avl +cCq dHp dHp wsN -cCq +uFh jRR wjx uyd @@ -64988,7 +71247,7 @@ nhR sql pZb kWn -oMz +hKE hZR kPz kPz @@ -65398,13 +71657,13 @@ ldt mcc vei kqC -avl +cCq pDV kqC -avl +cCq qkY kqC -uFh +avl xri xri xri @@ -65828,9 +72087,9 @@ kqC kqC kqC mCF -rds -kWn oMz +kWn +hKE kqC wAj fXS @@ -65838,9 +72097,9 @@ fXS fXS gpq kqC -avl -dHp cCq +dHp +uFh abJ usz usz @@ -66246,10 +72505,10 @@ pHu mcc vei kqC -uFh +avl jms kqC -uFh +avl aIv kqC pHu @@ -66648,7 +72907,7 @@ rkB rFr miU uSb -sDp +lzb ecM bQM bQM @@ -66674,7 +72933,7 @@ dHp hCd dHp dHp -cCq +uFh usz pHu mcc @@ -67307,9 +73566,9 @@ vza mcc mcc mcc -avl +cCq kqC -avl +cCq sCh kqC cLE @@ -67496,7 +73755,7 @@ cjF miU xKX gqe -sDp +lzb ecM ecM mlC @@ -67511,14 +73770,14 @@ erT bQM wzE scw -cCq +uFh mcc mcc mcc evf dWM mcc -avl +cCq pHu kqC wII @@ -67942,7 +74201,7 @@ mcc mcc rFT mcc -uFh +avl xPO kqC qDI @@ -68155,9 +74414,9 @@ qBk dui mcc mcc -uFh +avl kqC -uFh +avl iUy kqC ggp @@ -68338,11 +74597,11 @@ cjF gqe gqe gqe -iOJ sad +rsW kJX oXE -sWF +sED gqe kJX gqe @@ -68570,7 +74829,7 @@ wpO usz usz usz -uFh +avl xri xri xri @@ -68582,16 +74841,16 @@ mcc pZb dHp dHp -cCq +uFh hZR bQM hZR dDM -avl +cCq dHp dHp dHp -cCq +uFh dDM duF jao @@ -68975,7 +75234,7 @@ gqe gqe gqe cTA -sad +rsW hLO gqe gqe @@ -69186,7 +75445,7 @@ dAe lps gqe gqe -rsW +iOJ ozh kJX gqe @@ -69214,10 +75473,10 @@ pHu mcc vei kqC -avl +cCq fOZ kqC -avl +cCq pDV wzE kPz @@ -69411,9 +75670,9 @@ gqe oEI jKb abJ -avl -dHp cCq +dHp +uFh wBr kqC vRA @@ -69859,10 +76118,10 @@ wzE bQM hZR vbd -uFh +avl iUy vbd -uFh +avl iUy vbd duF @@ -70057,15 +76316,15 @@ aru dHp dHp dHp -cCq +uFh pHu mcc vei kqC -uFh +avl jms kqC -uFh +avl jms wzE wzE @@ -70264,11 +76523,11 @@ mcc vei abJ usz -avl +cCq dHp dHp dHp -cCq +uFh iUy pHu mcc @@ -70448,7 +76707,7 @@ iZV jYs vWI nSz -iOJ +sad qpa nSz nSz @@ -70476,21 +76735,21 @@ mcc vei vRA usz -uFh +avl xri xri xri iUy -cCq +uFh qWf mcc vei usz -avl +cCq dHp dHp dHp -cCq +uFh usz duF koy @@ -70660,9 +76919,9 @@ dyM jYs nSz ozh -rsW +iOJ ozh -rsW +iOJ vYA oDz fnW @@ -70689,7 +76948,7 @@ dzj kqC kqC usz -uFh +avl xri xri xri @@ -70698,7 +76957,7 @@ pHu mcc vei usz -uFh +avl xri xri xri @@ -71082,7 +77341,7 @@ bQM bQM bQM uwk -rsW +iOJ cjF jBL cjF @@ -71095,8 +77354,8 @@ cjF krQ cjF gqe -iOJ -dDy +sad +aPi ecM mlC mlC @@ -71112,20 +77371,20 @@ mcc vei wBr kqC -uFh +avl jms kqC -uFh +avl jms kqC ulJ mcc vei kqC -avl +cCq pDV kqC -avl +cCq pDV kqC qOG @@ -71297,13 +77556,13 @@ uwk gqe naN cjF -sad -kJX rsW -ozh -sad kJX +iOJ +ozh rsW +kJX +iOJ cjF cjF gqe @@ -71319,7 +77578,7 @@ bKs rUY xNQ vRA -uFh +avl lka iUy usz @@ -71506,7 +77765,7 @@ bQM bQM bQM uwk -sad +rsW uyb cjF stq @@ -71721,18 +77980,18 @@ vnr ozh cjF cjF -rsW +iOJ mlC bQM kPz bQM mlC -sad +rsW cjF cjF gqe -gNP gtM +sbM mlC kPz kPz @@ -71930,7 +78189,7 @@ jsn ycX eOS vNq -qHh +srz cjF cjF gqe @@ -71939,11 +78198,11 @@ kPz kPz kPz mlC -iOJ +sad cjF cjF gqe -rsW +iOJ dhN ecM mlC @@ -71970,10 +78229,10 @@ pHu mcc vei kqC -uFh +avl jms kqC -uFh +avl jms kqC riu @@ -72145,13 +78404,13 @@ sun gqe cjF cjF -sad +rsW mlC bQM kPz bQM mlC -rsW +iOJ cjF cjF gqe @@ -72164,8 +78423,8 @@ gqe gqe gqe gqe -iOJ sad +rsW gqe gqe gqe @@ -72394,11 +78653,11 @@ pHu mcc vei usz -avl +cCq dHp dHp dHp -cCq +uFh usz ntv lAS @@ -72569,21 +78828,21 @@ mfo cjF cjF cjF -rsW +iOJ fnt -sad -gqe rsW +gqe +iOJ fnt -sad +rsW cjF cjF -iOJ sad +rsW gqe gqe -iOJ sad +rsW gqe gqe gqe @@ -72602,11 +78861,11 @@ usz fpY usz mcc -uFh +avl xri iUy usz -uFh +avl xri xri xri @@ -72778,7 +79037,7 @@ ycX qHZ ycX jRp -dPQ +vvX cjF cjF cjF @@ -72790,11 +79049,11 @@ cjF cjF cjF cjF -rsW +iOJ ozh gqe bKs -rsW +iOJ ozh gqe gqe @@ -72991,25 +79250,25 @@ ycX eOS vNq hvE -dPQ +vvX ozh -sad +rsW hmg dyi dQY -hyI -uch eIp +uch +flo dQY -aJR +dPQ gqe gqe hmg uch uch cWU -iOJ sad +rsW gqe hYK lpp @@ -73030,7 +79289,7 @@ sHH sHH qOd kqC -avl +cCq pDV mxQ fCZ @@ -73224,7 +79483,7 @@ gCb ejO gqe gqe -rsW +iOJ ozh gqe gqe @@ -73232,7 +79491,7 @@ mAA atx jxy wjH -hDr +nph vHG pQq dtg @@ -73645,11 +79904,11 @@ ecM nSx aah ckD -cjF +mQZ gqe -iOJ sad -cjF +rsW +mQZ gqe gqe gqe @@ -73858,11 +80117,11 @@ cVV glH xKX jbk -cjF -rsW +mQZ iOJ sad -cjF +rsW +mQZ gqe gqe uix @@ -74071,10 +80330,10 @@ xKX rGf xKX bRU -cjF -rsW +mQZ +iOJ ozh -sad +rsW gqe gqe gqe @@ -74284,8 +80543,8 @@ xKX sGb ozh gqe -cjF -rsW +mQZ +iOJ ozh gqe gqe @@ -74491,11 +80750,11 @@ jLs wGm nSx nSx -srz -sad -cjF +ajD +rsW +mQZ gqe -iOJ +sad vEX nSx qKF @@ -74703,12 +80962,12 @@ tTV aap fvk oHI -rsW iOJ sad -cjF rsW +mQZ iOJ +sad ygS nSx qKF @@ -74915,15 +81174,15 @@ jLs aap jLs oHI -cjF -rsW +mQZ +iOJ ozh -sad -cjF rsW +mQZ +iOJ pKz -sad -cjF +rsW +mQZ gqe gqe kqC @@ -75127,16 +81386,16 @@ kCK aap jLs oHI -sad -cjF rsW +mQZ iOJ +sad vEX nSx urc -iOJ sad -cjF +rsW +mQZ uix jGV ntv @@ -75340,16 +81599,16 @@ aap jLs oHI ozh -sad -cjF rsW +mQZ +iOJ ozh qGl nSx -qHh +srz ozh -sad -cjF +rsW +mQZ kqC kqC kqC @@ -75552,21 +81811,21 @@ aap xnq nSx kcP +iOJ rsW -sad -cjF -rsW +mQZ iOJ sad -cjF rsW +mQZ iOJ sad +rsW jZR -mcc -mcc -avl +wnz +wnz cCq +uFh jTJ bxl jOO @@ -75750,7 +82009,7 @@ eRi eRi eRi gHW -gyI +nCC uTi eRi eRi @@ -75763,21 +82022,21 @@ eNm cfc lzW oHI -cjF -rsW +mQZ +iOJ ozh vEX nSx -qHh +srz ozh -sad -cjF rsW +mQZ +iOJ ozh jZR sHH -mcc -uFh +wnz +avl iUy jTJ mgC @@ -75968,31 +82227,31 @@ jLs bQx lYr jLs -laD +mPA jLs jfD jLs aap fvk oHI -sad -cjF rsW +mQZ iOJ +sad vEX nSx -qHh -bbR +srz +dDy izZ kcP bGT kqC rGV -mcc +wnz mCF kqC jTJ -pOd +wXf jOO xbB pOd @@ -76188,23 +82447,23 @@ aap jLs oHI ozh -sad -cjF rsW +mQZ +iOJ ozh -sad -cjF rsW +mQZ +iOJ gWf -cjF -cjF +mQZ +mQZ aRG aRG aRG aRG aRG oAv -pOd +wXf jOO ovE xng @@ -76390,7 +82649,7 @@ xoB wGm oUg jPO -fPF +dSz aRY nCw ggh @@ -76398,17 +82657,17 @@ rmS tVu tYc tVu -cjF -rsW +mQZ +iOJ ozh vYA ozh -cjF -cjF +mQZ +mQZ sDp -cjF +mQZ fiI -cjF +mQZ gNK aRG aRG @@ -76416,7 +82675,7 @@ aRG aRG aRG aRG -pOd +wXf jOO oZc dxO @@ -76589,7 +82848,7 @@ qGn pbp qGn dpt -jLs +eph aap oUg qvk @@ -76600,7 +82859,7 @@ sJl dpt jLs aap -dgB +eBs cWM dCA lFx @@ -76611,24 +82870,24 @@ jLs flm xnq nSx -qHh +srz ozh -cjF +mQZ oFv izZ bEX bEX bEX iCU -cjF -cjF +mQZ +mQZ aRG oAv aRG aRG aRG aRG -pOd +wXf jOO ere wEn @@ -76801,18 +83060,18 @@ eqQ eqQ eqQ dpt -jLs +eph aap oUg gDz jLs aWP wQn -akc +vyU dpt bQx sjc -dgB +eBs rjM tTM jeY @@ -76822,7 +83081,7 @@ oHk tVu tYc tVu -iOJ +sad ovB vxp qvx @@ -76833,7 +83092,7 @@ lEz waz bEX uRe -cjF +mQZ bhX aRG vAi @@ -77013,7 +83272,7 @@ eqQ eqQ eqQ dpt -jLs +eph aap eUi xup @@ -77024,7 +83283,7 @@ jLs dpt jLs aap -dgB +eBs igD uin rvR @@ -77034,11 +83293,11 @@ dpt jLs aap dfZ -rsW -rsW +iOJ +iOJ ozh -cjF -cjF +mQZ +mQZ izZ uFc gWq @@ -77052,7 +83311,7 @@ aRG oAv mNJ aRG -pOd +wXf jOO xbB pOd @@ -77225,7 +83484,7 @@ qGn qGn qGn dpt -jLs +eph aap oUg ovZ @@ -77236,35 +83495,35 @@ qvk pYp jLs aap -dgB +eBs hjb gyI -jLs -jLs +eph +eph laD uGb puB kiW jLs -cjF +mQZ ovB vxp -cjF -cjF +mQZ +mQZ izZ hiK tOc tOc bgd -cjF -cjF +mQZ +mQZ bhX mhR bhX aRG nrL aRG -pOd +wXf jOO xbB pOd @@ -77449,9 +83708,9 @@ rmS tVu lsU oUg -dXz -umq -bpq +gUx +eza +bfs eir oUg dzk @@ -77459,9 +83718,9 @@ jLs aap jLs jLs -rsW +iOJ ozh -cjF +mQZ smh izZ bEX @@ -77476,7 +83735,7 @@ uVv vAi fpl aRG -pOd +wXf jOO xbB pOd @@ -77673,22 +83932,22 @@ ucr jLs jLs jLs -pOd -pOd -pOd +wXf +wXf +wXf bmO -pOd +wXf bmO -pOd +wXf bmO -pOd +wXf uFE -pOd +wXf iiP pEY -eEk -pOd -pOd +vzZ +wXf +wXf jOO ere pOd @@ -77861,26 +84120,26 @@ oUg llC qGn dpt -jLs -jLs -jLs -jLs -jLs -jLs +eph +eph +eph +eph +eph +eph skO gxL -jLs +eph rDl aAH -jLs +eph gxL -jLs -jLs +eph +eph ybR -jLs -jLs +eph +eph ybR -jLs +eph xZk eRi dJl @@ -78313,21 +84572,21 @@ eix dZA eix kaB -pOd +wXf uCu -pOd +wXf bmO -pOd +wXf xCm -pOd -pOd -pOd -pOd -pOd +wXf +wXf +wXf +wXf +wXf sde -wEn -wEn -pOd +tCf +tCf +wXf aRG aRG aRG @@ -78515,9 +84774,9 @@ rZa ljZ kDg rZa -cfN +qHC arq -cfN +qHC fxY qcT hlK @@ -78536,7 +84795,7 @@ dEy gOs wpf fTx -pOd +wXf fTx gOs fyQ @@ -78719,7 +84978,7 @@ xDw xDw lRT hTG -cfN +qHC kjo sIJ iJf @@ -78748,7 +85007,7 @@ kwm cll qmO lRe -pOd +wXf kwm xYB luH @@ -78960,7 +85219,7 @@ fTx lnf aVA fTx -eEk +vzZ fTx lnf aVA @@ -79143,7 +85402,7 @@ hKI hKI hsA iJf -cfN +qHC hlK dOX pkc @@ -79168,15 +85427,15 @@ iWq dzl aRG aRG -pOd -pOd -pOd -pOd -pOd -pOd -pOd -pOd -pOd +wXf +wXf +wXf +wXf +wXf +wXf +wXf +wXf +wXf pOd gCY vDO @@ -79384,7 +85643,7 @@ fTx gOs fyQ fTx -pOd +wXf fTx gOs fyQ @@ -79596,7 +85855,7 @@ kwm kXH jGP wDV -pOd +wXf kwm cll cDf @@ -79781,7 +86040,7 @@ xDw thU diR tVX -cfN +qHC iJf ojh dlW @@ -79808,7 +86067,7 @@ fTx lnf aVA fTx -pOd +wXf fTx lnf aVA @@ -79993,14 +86252,14 @@ lRT iuW hva nSi -cfN +qHC iJf -cfN +qHC wdA fsf -cfN -cfN -cfN +qHC +qHC +qHC lHB bFh hKI @@ -80019,9 +86278,9 @@ aRG aRG aRG aRG -pOd -pOd -pOd +wXf +wXf +wXf aRG pOd aRG @@ -80205,7 +86464,7 @@ xDw yiD aOJ jUp -cfN +qHC qyk dlW dlW @@ -81067,7 +87326,7 @@ hKI hKI iJf hKI -cfN +qHC nsC hKI lRT @@ -81279,7 +87538,7 @@ sEi sEi sEi ltV -cfN +qHC hlK xeO qDY @@ -81923,8 +88182,8 @@ hQh hQh hQh hQh -cfN -cfN +qHC +qHC lRT lRT fjd @@ -83619,8 +89878,8 @@ giX giX giX giX -cfN -cfN +qHC +qHC scM scM xkv @@ -84247,7 +90506,7 @@ dlW dlW dlW uxY -cfN +qHC hlK sEi sEi @@ -84458,8 +90717,8 @@ hKI hKI hKI iJf -cfN -cfN +qHC +qHC hlK dlW dlW diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index e69c2de5bcb8..13273b109344 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -60,6 +60,17 @@ icon_state = "orange" }, /area/lv624/lazarus/crashed_ship) +"bu" = ( +/obj/structure/transmitter/clf_net{ + phone_category = "CR-116"; + phone_id = "Cargo Bay"; + pixel_y = 32 + }, +/turf/open/floor{ + dir = 8; + icon_state = "damaged3" + }, +/area/lv624/lazarus/crashed_ship) "by" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) @@ -160,17 +171,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"fA" = ( -/obj/structure/transmitter/clf_net{ - phone_category = "CR-116"; - phone_id = "Armoury"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/lv624/lazarus/crashed_ship) "fX" = ( /obj/item/stool, /obj/effect/landmark/survivor_spawner/lv624_crashed_clf, @@ -523,6 +523,17 @@ /obj/item/tool/wet_sign, /turf/open/floor/plating/plating_catwalk, /area/lv624/lazarus/crashed_ship) +"nZ" = ( +/obj/structure/transmitter/clf_net{ + phone_category = "CR-116"; + phone_id = "Armoury"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/lv624/lazarus/crashed_ship) "of" = ( /obj/structure/machinery/light/small{ dir = 1; @@ -590,6 +601,18 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer, /area/lv624/lazarus/crashed_ship) +"pL" = ( +/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" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/lv624/lazarus/crashed_ship) "pS" = ( /turf/open/floor/plating{ dir = 1; @@ -661,18 +684,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" - }, -/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, @@ -956,17 +967,6 @@ icon_state = "whitebluefull" }, /area/lv624/lazarus/crashed_ship) -"Aa" = ( -/obj/effect/vehicle_spawner/van/fixed{ - color = "#4a9eed"; - desc = "A rather old hunk of metal with four wheels, you know what to do. Entrance on the back and sides. This one seems to be used by the CLF"; - name = "CLF Van" - }, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/lv624/lazarus/crashed_ship) "Ab" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) @@ -1347,6 +1347,19 @@ icon_state = "green" }, /area/lv624/lazarus/crashed_ship) +"Jk" = ( +/obj/structure/machinery/body_scanconsole, +/obj/structure/transmitter/clf_net{ + phone_category = "CR-116"; + phone_color = "green"; + phone_id = "Medical Bay"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "emerald" + }, +/area/lv624/lazarus/crashed_ship) "JC" = ( /obj/item/stack/rods, /obj/effect/landmark/survivor_spawner/lv624_crashed_clf, @@ -1388,6 +1401,17 @@ icon_state = "stan_leftengine" }, /area/lv624/lazarus/crashed_ship) +"Kl" = ( +/obj/effect/vehicle_spawner/van{ + color = "#4a9eed"; + desc = "A rather old hunk of metal with four wheels, you know what to do. Entrance on the back and sides. This one seems to be used by the CLF"; + name = "CLF Van" + }, +/turf/open/floor/plating{ + dir = 1; + icon_state = "warnplate" + }, +/area/lv624/lazarus/crashed_ship) "Kt" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" @@ -1655,19 +1679,6 @@ icon_state = "platingdmg1" }, /area/lv624/lazarus/crashed_ship) -"Qj" = ( -/obj/structure/machinery/body_scanconsole, -/obj/structure/transmitter/clf_net{ - phone_category = "CR-116"; - phone_color = "green"; - phone_id = "Medical Bay"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/lv624/lazarus/crashed_ship) "Qp" = ( /obj/item/stack/rods, /turf/open/gm/dirt, @@ -1986,17 +1997,6 @@ icon_state = "warnplate" }, /area/lv624/lazarus/crashed_ship) -"XM" = ( -/obj/structure/transmitter/clf_net{ - phone_category = "CR-116"; - phone_id = "Cargo Bay"; - pixel_y = 32 - }, -/turf/open/floor{ - dir = 8; - icon_state = "damaged3" - }, -/area/lv624/lazarus/crashed_ship) "XX" = ( /turf/closed/shuttle/ert{ icon_state = "stan8" @@ -2479,9 +2479,9 @@ xh wV lr gQ -sI +pL Xq -Qj +Jk lr lr Yz @@ -2535,7 +2535,7 @@ ch Xq pS bP -Aa +Kl Qf bP dN @@ -2956,7 +2956,7 @@ ag gD QQ Xq -XM +bu dN dN Bc @@ -2998,7 +2998,7 @@ Ar Ar Ar Xq -fA +nZ OL fe jr diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index dc1d7b2418c2..578b2658f15f 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -107,46 +107,6 @@ "aap" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"aaq" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/item/clothing/head/helmet/marine/tech{ - layer = 4.1; - pixel_y = 12 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/mob/living/simple_animal/mouse/brown{ - name = "rat" - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "aar" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_s) @@ -419,6 +379,24 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"abo" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/one{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "abp" = ( /obj/effect/step_trigger/clone_cleaner, /turf/closed/wall/almayer, @@ -548,18 +526,6 @@ icon_state = "redfull" }, /area/almayer/engineering/upper_engineering) -"abS" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/alpha) -"abT" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "abU" = ( /obj/structure/machinery/computer/aa_console, /obj/structure/bed/chair/ob_chair, @@ -631,12 +597,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"ack" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "acl" = ( /turf/open/floor/wood/ship, /area/almayer/living/basketball) @@ -707,12 +667,6 @@ icon_state = "plate" }, /area/almayer/living/chapel) -"acp" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) "acq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -835,20 +789,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"acJ" = ( -/mob/living/silicon/decoy/ship_ai{ - layer = 2.98; - pixel_y = -16 - }, -/obj/structure/blocker/invisible_wall, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "acK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -1110,19 +1050,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"adC" = ( -/obj/structure/surface/rack, -/obj/item/stock_parts/manipulator/nano{ - pixel_y = -9 - }, -/obj/item/stock_parts/scanning_module/adv{ - pixel_y = 15; - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "adD" = ( /obj/structure/window/reinforced{ dir = 1; @@ -1173,6 +1100,12 @@ /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) +"adN" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "adO" = ( /turf/closed/wall/almayer, /area/almayer/engineering/starboard_atmos) @@ -1444,21 +1377,6 @@ allow_construction = 0 }, /area/almayer/stair_clone) -"aeM" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) -"aeN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices/flight) "aeO" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -2365,12 +2283,30 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ahA" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "ahB" = ( /obj/structure/platform{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) +"ahD" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "ahE" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -2723,13 +2659,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"aiH" = ( -/obj/item/tool/crew_monitor, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "aiJ" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -2834,6 +2763,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) +"aji" = ( +/obj/structure/closet/firecloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_p) "ajj" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) @@ -3766,6 +3703,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) +"amt" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "amw" = ( /turf/open/floor/almayer{ dir = 9; @@ -4211,6 +4157,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"anQ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "anR" = ( /turf/open/floor/almayer{ dir = 4; @@ -4264,6 +4218,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"anY" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "aoa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5211,24 +5177,12 @@ icon_state = "plate" }, /area/almayer/medical/medical_science) -"aqI" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "aqJ" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, /area/almayer/command/lifeboat) -"aqK" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "aqM" = ( /obj/effect/projector{ name = "Almayer_Up2"; @@ -5541,15 +5495,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"arG" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/command/cic) "arH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -5946,11 +5891,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"asR" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/command/cic) "asS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5987,12 +5927,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"asX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "asY" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -6820,12 +6754,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"auT" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/command/cic) "auU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -6987,17 +6915,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"avv" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) "avw" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -7416,13 +7333,6 @@ "awC" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_missiles) -"awD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/prop/almayer/CICmap, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "awE" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliason) @@ -7459,6 +7369,31 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) +"awP" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + layer = 3.2; + pixel_x = 4; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/cans/souto{ + pixel_x = -10; + pixel_y = 1 + }, +/obj/item/reagent_container/food/snacks/grown/orange{ + layer = 3.3; + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/prop/magazine/book/starshiptroopers{ + pixel_x = 8; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "awQ" = ( /obj/structure/surface/table/almayer, /obj/item/cell/high{ @@ -7533,16 +7468,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"axc" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/item/tool/warning_cone{ - pixel_x = -20; - pixel_y = 18 - }, -/turf/open/floor/almayer, -/area/almayer/living/port_emb) "axe" = ( /turf/open/floor/almayer{ dir = 8; @@ -7878,20 +7803,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) -"ayr" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "ays" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -7939,38 +7850,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/navigation) -"ayy" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = 15 - }, -/obj/structure/machinery/light, -/obj/structure/transmitter/rotary{ - name = "Bravo Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Bravo Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"ayz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/command/cic) "ayD" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -8124,20 +8003,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"ayZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "azb" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8274,6 +8139,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"azu" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/shotgun/midchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "azw" = ( /obj/structure/machinery/light{ dir = 4 @@ -8407,40 +8279,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"azV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 8 - }, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - dir = 4; - name = "Normandy Remote Control Console"; - shuttleId = "dropship_normandy" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "azW" = ( /obj/structure/machinery/door/window/westright{ dir = 2 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) -"azX" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ - dir = 8; - name = "Alamo Remote Control Console"; - shuttleId = "dropship_alamo" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "azY" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, @@ -8587,70 +8431,6 @@ dir = 4 }, /area/almayer/command/cic) -"aAB" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/groundside_operations{ - dir = 4; - pixel_y = 8 - }, -/obj/structure/machinery/door/window/westright, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aAC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aAD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "CIC Lockdown"; - name = "CIC Lockdown"; - pixel_x = -7; - pixel_y = 9; - req_access_txt = "1" - }, -/obj/structure/machinery/door_control{ - id = "Hangar Lockdown"; - name = "Hangar Lockdown"; - pixel_x = -7; - pixel_y = 2; - req_access_txt = "1" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/obj/structure/machinery/door_control{ - id = "bot_armory"; - name = "Armory Lockdown"; - pixel_x = -7; - pixel_y = -5; - req_one_access_txt = "1;4" - }, -/obj/structure/transmitter/rotary{ - name = "Combat Information Center Telephone"; - phone_category = "Command"; - phone_id = "Combat Information Center"; - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/machinery/door/window/westright{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aAE" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -9061,13 +8841,6 @@ icon_state = "test_floor4" }, /area/almayer/living/synthcloset) -"aBR" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/glass, -/obj/item/storage/fancy/cigarettes/kpack, -/obj/item/device/whistle, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) "aBS" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -9077,30 +8850,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aBV" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 8; - layer = 3.2; - pixel_x = -17; - pixel_y = -17 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/transmitter/rotary{ - name = "Charlie Overwatch Telephone"; - phone_category = "Command"; - phone_id = "Charlie Overwatch" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aBW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -9119,49 +8868,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aBZ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 8 - }, -/obj/structure/window/reinforced/toughened, -/obj/structure/machinery/computer/cameras/almayer_network/vehicle{ - dir = 4; - layer = 2.99; - pixel_y = 4 - }, -/obj/structure/machinery/computer/almayer_control{ - dir = 4; - layer = 2.99; - pixel_y = 26 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aCa" = ( -/obj/structure/machinery/door/window/westright{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) -"aCb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/window/reinforced/toughened{ - dir = 4 - }, -/obj/structure/window/reinforced/toughened, -/obj/structure/machinery/computer/crew/alt{ - dir = 8; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "aCd" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -9462,6 +9168,12 @@ icon_state = "plate" }, /area/almayer/command/cic) +"aDw" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "aDx" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -9687,6 +9399,16 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) +"aEs" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "aEA" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -9812,28 +9534,6 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"aEZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves{ - pixel_x = -4; - pixel_y = 13 - }, -/obj/item/storage/box/masks{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/tool/hand_labeler{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/medical_science) "aFa" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -10186,6 +9886,13 @@ }, /turf/open/floor/plating, /area/almayer/engineering/port_atmos) +"aGA" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) "aGC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -10285,11 +9992,6 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) -"aGZ" = ( -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/numbertwobunks) "aHa" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -10439,6 +10141,12 @@ icon_state = "plate" }, /area/almayer/command/cic) +"aHL" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "aHM" = ( /turf/open/floor/almayer{ icon_state = "silver" @@ -10557,12 +10265,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"aIq" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aIr" = ( /obj/structure/platform_decoration{ dir = 4 @@ -10852,16 +10554,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) -"aJp" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "aJq" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/galley{ @@ -11247,6 +10939,12 @@ "aLd" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull) +"aLe" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/command/cichallway) "aLf" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) @@ -11379,6 +11077,24 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"aMe" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"aMf" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "aMg" = ( /obj/structure/sign/safety/intercom{ layer = 2.9; @@ -11486,21 +11202,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"aMx" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "aMz" = ( /turf/open/floor/almayer, /area/almayer/squads/alpha) @@ -11513,15 +11214,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"aMC" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) "aMD" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -11544,48 +11236,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"aMH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/landmark/start/marine/smartgunner/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"aMI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"aMM" = ( -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) -"aMO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aMP" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "aMQ" = ( /obj/structure/machinery/cm_vending/clothing/tl/alpha{ density = 0; @@ -11603,27 +11253,12 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"aMV" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "aMY" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"aNc" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "aNe" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -11649,12 +11284,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"aNl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "aNm" = ( /turf/open/floor/wood/ship, /area/almayer/living/chapel) @@ -11694,54 +11323,9 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"aNx" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aNG" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/hallways/starboard_hallway) -"aNI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "aNO" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"aNQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"aNT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aNY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -11816,18 +11400,6 @@ icon_state = "cargo" }, /area/almayer/command/telecomms) -"aOy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "aOz" = ( /turf/open/floor/almayer{ dir = 8; @@ -11888,28 +11460,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"aOK" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"aOL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "aOM" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer{ @@ -12015,60 +11565,12 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"aPf" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"aPi" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"aPj" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"aPl" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "aPm" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) -"aPn" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aPo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "aPr" = ( /turf/open/floor/almayer{ icon_state = "silverfull" @@ -12095,11 +11597,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"aPB" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/command/cic) "aPD" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer{ @@ -12175,16 +11672,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"aQg" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - layer = 3.25 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/command/cic) "aQo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12266,6 +11753,15 @@ icon_state = "sterile" }, /area/almayer/hull/upper_hull/u_a_s) +"aQD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "aQF" = ( /turf/closed/wall/almayer, /area/almayer/living/offices) @@ -12300,34 +11796,6 @@ /obj/effect/landmark/start/researcher, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"aQL" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/bravo) -"aQM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/engineering_guide{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"aQN" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/almayer, -/area/almayer/squads/bravo) -"aQT" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "aQW" = ( /obj/structure/machinery/vending/cola{ pixel_x = -6; @@ -12395,14 +11863,6 @@ icon_state = "sterile" }, /area/almayer/hull/upper_hull/u_a_s) -"aRo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aRp" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -12428,16 +11888,6 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_f_p) -"aRt" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/command/cic) -"aRu" = ( -/obj/structure/foamed_metal, -/turf/open/floor/plating, -/area/almayer/hallways/hangar) "aRv" = ( /obj/structure/machinery/light{ dir = 8 @@ -12446,14 +11896,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aRx" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aRy" = ( /turf/open/floor/almayer, /area/almayer/living/offices) @@ -12549,12 +11991,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/medical/upper_medical) -"aRP" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "aRS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -12564,16 +12000,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) -"aRT" = ( -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"aRU" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "aRV" = ( /obj/structure/platform{ dir = 4 @@ -12582,31 +12008,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"aRX" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aRZ" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"aSa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "aSb" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -12667,24 +12068,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"aSr" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/one{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "aSt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda/beer, @@ -12749,31 +12132,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"aSE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) -"aSH" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"aSI" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "aSJ" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -12897,31 +12255,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"aTv" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) -"aTw" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"aTx" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "aTy" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -12958,15 +12291,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aTB" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aTE" = ( /turf/open/floor/prison{ icon_state = "kitchen" @@ -13047,12 +12371,6 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/cells) -"aTW" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "aTY" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13103,21 +12421,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aUi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) -"aUj" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "aUk" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -13149,21 +12452,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aUo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aUp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13174,15 +12462,14 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"aUq" = ( +"aUu" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/bed/chair/comfy{ dir = 8 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ - icon_state = "bluefull" + dir = 5; + icon_state = "plating" }, /area/almayer/living/captain_mess) "aUw" = ( @@ -13231,35 +12518,26 @@ icon_state = "green" }, /area/almayer/living/offices) -"aUY" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"aUZ" = ( -/obj/structure/machinery/light{ - dir = 8 +"aUT" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + dir = 1; + icon_state = "blue" }, -/area/almayer/squads/bravo) -"aVd" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" +/area/almayer/squads/delta) +"aVc" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 }, -/area/almayer/squads/bravo) -"aVf" = ( /turf/open/floor/almayer{ - icon_state = "orange" + dir = 1; + icon_state = "blue" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "aVg" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -13274,24 +12552,6 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"aVi" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) -"aVk" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "aVl" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower_engineering) @@ -13326,13 +12586,6 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"aVC" = ( -/obj/structure/machinery/vending/cigarette, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "aVF" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/structure/machinery/light/small, @@ -13352,15 +12605,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aVI" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/chem_dispenser/soda{ - pixel_y = 5 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "aVL" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -13756,6 +13000,27 @@ icon_state = "mono" }, /area/almayer/hallways/stern_hallway) +"aXX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) +"aYb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "aYc" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -13796,6 +13061,14 @@ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) +"aYo" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "aYp" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -13999,19 +13272,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"aZf" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "aZg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14539,6 +13799,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"bbG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/squads/delta) "bbI" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -14613,31 +13882,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"bbY" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bbZ" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"bca" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bcb" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -14674,12 +13924,6 @@ "bcm" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) -"bco" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bcp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -14772,6 +14016,13 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"bcH" = ( +/obj/effect/decal/hefa_cult_decals/d32, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "bcK" = ( /obj/structure/machinery/smartfridge/chemistry, /turf/open/floor/almayer{ @@ -14827,14 +14078,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"bcZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bda" = ( /obj/structure/machinery/door_control{ id = "or02"; @@ -14930,25 +14173,6 @@ "bdr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"bds" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bdv" = ( -/obj/structure/machinery/cm_vending/clothing/leader/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bdw" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "bdy" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -14965,12 +14189,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"bdA" = ( -/obj/structure/machinery/cm_vending/clothing/medic/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bdC" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -14995,19 +14213,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bdJ" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "bdK" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer, @@ -15160,13 +14365,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"bew" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bez" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -15210,13 +14408,6 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) -"beP" = ( -/obj/item/stack/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/almayer, -/area/almayer/squads/alpha_bravo_shared) "beQ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -15234,27 +14425,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"beT" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"beU" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"beV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "beW" = ( /obj/structure/machinery/light{ dir = 8 @@ -15295,28 +14465,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"bfl" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) -"bfm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" +"bfi" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 5; + pixel_y = 1 }, -/area/almayer/living/cryo_cells) -"bfn" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "orange" }, -/area/almayer/squads/alpha_bravo_shared) -"bfo" = ( +/area/almayer/engineering/upper_engineering/starboard) +"bfl" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + dir = 5; + icon_state = "silver" }, /area/almayer/living/cryo_cells) "bfs" = ( @@ -15325,62 +14489,12 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower_engineering) -"bft" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"bfu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) -"bfw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bfy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"bfz" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bfA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -15392,42 +14506,6 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"bfC" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bfE" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "bfJ" = ( /obj/structure/surface/table/almayer, /obj/item/prop/almayer/handheld1, @@ -15467,11 +14545,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bga" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" +"bgb" = ( +/obj/structure/toilet{ + dir = 4 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "bgc" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -15681,30 +14760,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"bgU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bgW" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"bgY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "bhf" = ( /obj/structure/machinery/light{ dir = 4 @@ -15717,15 +14772,6 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) -"bhg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bhh" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "n_umbilical"; @@ -15795,24 +14841,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) -"bhG" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"bhJ" = ( -/obj/structure/machinery/cm_vending/clothing/staff_officer{ - density = 0; - pixel_x = -30 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "bhM" = ( /obj/structure/safe, /obj/item/coin/platinum, @@ -15839,6 +14867,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"bil" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/claymore/lowchance, +/obj/effect/spawner/random/claymore/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "biq" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -15919,6 +14955,11 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) +"biJ" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/starboard) "biL" = ( /obj/structure/platform{ dir = 4 @@ -15984,13 +15025,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) -"bjs" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bju" = ( /turf/open/floor/almayer{ dir = 1; @@ -16241,18 +15275,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"bkU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/start/senior, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bkY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -16351,21 +15373,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"blq" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/cryo_cells) "bls" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -16381,24 +15388,12 @@ icon_state = "plate" }, /area/almayer/living/offices) -"blA" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"blB" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"blJ" = ( +"blD" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "plating_striped" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/hull/lower_hull/l_a_s) "blZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop, @@ -16442,32 +15437,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/operating_room_four) -"bmh" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bmi" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -16517,12 +15486,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"bmr" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "bmu" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -16653,6 +15616,15 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"bmS" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "bmW" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -16721,82 +15693,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/chemistry) -"bno" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"bnr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bnt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bnu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bnA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"bnB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "bnD" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -16853,21 +15749,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"bnX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bob" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17026,6 +15907,15 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"boR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "boU" = ( /obj/structure/platform{ dir = 4; @@ -17077,6 +15967,15 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"bpc" = ( +/obj/structure/machinery/cryopod{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "bpd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -17159,21 +16058,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"bpC" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"bpG" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/medic, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"bpH" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/engineer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "bpJ" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -17188,18 +16072,14 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"bpL" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/obj/structure/machinery/light{ - dir = 8 +"bpP" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "bpQ" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 4; @@ -17381,22 +16261,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) -"bqW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/head/cmcap{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ - pixel_x = 5; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "bqZ" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -17430,39 +16294,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"brn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"brp" = ( -/obj/structure/supply_drop/bravo, -/turf/open/floor/plating, -/area/almayer/squads/req) -"brr" = ( -/obj/structure/machinery/cm_vending/clothing/medic/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brs" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brt" = ( -/obj/structure/machinery/cm_vending/clothing/engi/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"brv" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "brw" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -17475,28 +16306,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop) -"bry" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"brA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "brC" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/atmos_alert{ @@ -17506,17 +16315,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"brH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "brI" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -17715,20 +16513,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"bsG" = ( -/obj/structure/machinery/disposal{ - density = 0; - layer = 3.2; - pixel_y = 16 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "bsJ" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 4; @@ -17796,12 +16580,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"bsS" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bsT" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -17811,16 +16589,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"bsU" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bsV" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -17828,18 +16596,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"bsW" = ( -/obj/structure/machinery/cm_vending/clothing/leader/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"bsX" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "bsZ" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -17848,17 +16604,11 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"btc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, +"btd" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "plate" }, /area/almayer/squads/alpha) "bti" = ( @@ -18094,10 +16844,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"buz" = ( -/obj/structure/supply_drop/charlie, -/turf/open/floor/plating, -/area/almayer/squads/req) "buB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18134,31 +16880,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"buM" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"buN" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"buO" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "buQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -18168,12 +16889,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"buS" = ( -/obj/structure/machinery/cm_vending/gear/engi, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "buU" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -18239,6 +16954,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"bvi" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "bvl" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -18272,6 +16996,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_one) +"bvB" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "bvF" = ( /turf/open/floor/almayer{ dir = 8; @@ -18379,51 +17107,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"bwf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) -"bwg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"bwh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "bwj" = ( /obj/structure/pipes/standard/simple/visible, /obj/structure/sign/safety/nonpress_0g{ @@ -18588,12 +17271,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bxn" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/cryo_cells) "bxo" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -18603,6 +17280,17 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"bxq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "bxr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18625,18 +17313,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"bxB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "bxD" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -18791,11 +17467,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"byn" = ( -/obj/effect/landmark/start/marine/leader/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "byp" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -18856,6 +17527,19 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) +"byy" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "byz" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -19050,17 +17734,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"bzI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bzK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -19139,23 +17812,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) -"bAa" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) -"bAd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/squads/alpha) "bAe" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 @@ -19321,15 +17977,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bAZ" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bBa" = ( /turf/open/floor/almayer{ dir = 4; @@ -19509,32 +18156,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"bBD" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/structure/surface/table/almayer, -/obj/structure/transmitter/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office Second Line"; - pixel_x = -5; - pixel_y = 3 - }, -/obj/structure/transmitter/rotary{ - name = "Telephone"; - phone_category = "Almayer"; - phone_id = "Auxiliary Support Office"; - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bBN" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -19719,13 +18340,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"bCG" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "bCH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -19772,15 +18386,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"bCP" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/squads/alpha) "bCQ" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -19794,14 +18399,6 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) -"bCS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "bCW" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -20011,25 +18608,12 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bEb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bEc" = ( /obj/structure/machinery/computer/supplycomp, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/req) -"bEd" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "bEg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -20048,13 +18632,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bEi" = ( -/obj/structure/supply_drop/alpha, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/squads/req) "bEj" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -20065,13 +18642,6 @@ /obj/structure/machinery/computer/supply_drop_console/limited, /turf/closed/wall/almayer, /area/almayer/squads/req) -"bEm" = ( -/obj/structure/supply_drop/delta, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/squads/req) "bEn" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -20329,12 +18899,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"bES" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bET" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -20432,17 +18996,6 @@ icon_state = "silverfull" }, /area/almayer/living/cryo_cells) -"bFr" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) -"bFs" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "bFt" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -20490,15 +19043,6 @@ "bGb" = ( /turf/closed/wall/almayer, /area/almayer/hallways/port_hallway) -"bGc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "bGe" = ( /obj/structure/machinery/light{ dir = 1 @@ -20553,12 +19097,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/port_hallway) -"bGn" = ( -/obj/structure/barricade/plasteel/metal, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "bGo" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -20737,6 +19275,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bGS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "bGT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -20768,6 +19317,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"bHf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "bHk" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 1 @@ -20779,23 +19337,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) -"bHp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/machinery/disposal, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bHq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -20935,6 +19476,15 @@ "bHP" = ( /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) +"bHS" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "bHT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21120,22 +19670,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"bIA" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bII" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -21193,22 +19727,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bIU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bIX" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -21221,30 +19739,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bJe" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/structure/machinery/door_control{ - id = "Firing_Range_2"; - name = "range shutters"; - pixel_x = 9; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/cryo_cells) -"bJf" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "bJh" = ( /turf/closed/wall/almayer, /area/almayer/hallways/port_umbilical) @@ -21272,25 +19766,27 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"bJl" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Auxiliary Support Officers Quarters"; - req_one_access_txt = "37"; - access_modified = 1 +"bJm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "blue" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/squads/delta) "bJo" = ( /turf/closed/wall/almayer, /area/almayer/hallways/repair_bay) @@ -21315,34 +19811,12 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"bJC" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie) -"bJD" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"bJE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "bJF" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering/engine_core) -"bJH" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black{ - pixel_x = -4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bJI" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer{ @@ -21433,6 +19907,18 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"bJV" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/metal/large_stack, +/obj/item/stack/sheet/plasteel/large_stack, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "bJX" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -21599,11 +20085,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bKC" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "bKD" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer{ density = 0; @@ -21622,11 +20103,12 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) -"bKM" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +"bKF" = ( +/obj/structure/reagent_dispensers/oxygentank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "bKO" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -21671,14 +20153,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engine_core) -"bKX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "bLb" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -21994,63 +20468,53 @@ icon_state = "green" }, /area/almayer/squads/req) -"bMq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) -"bMt" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"bMu" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 +"bMd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) -"bMx" = ( -/obj/structure/machinery/light{ - dir = 8 + dir = 8; + icon_state = "cargo_arrow" }, -/turf/open/floor/almayer{ +/area/almayer/squads/delta) +"bMs" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/wooden_tv/prop{ dir = 8; - icon_state = "emerald" + layer = 3.2; + pixel_x = -3; + pixel_y = 6 }, -/area/almayer/squads/charlie) -"bMy" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" +/obj/item/trash/pistachios{ + layer = 2; + pixel_x = 6; + pixel_y = -6 }, -/area/almayer/squads/charlie) -"bMA" = ( -/obj/structure/machinery/light{ - dir = 1 +/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 = 1; - icon_state = "emerald" + dir = 6; + icon_state = "silver" }, -/area/almayer/squads/charlie) +/area/almayer/living/port_emb) "bMB" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -22060,22 +20524,6 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) -"bMC" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"bMD" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "bMF" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -22245,15 +20693,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/navigation) -"bNh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "bNi" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -22379,40 +20818,10 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bNC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "bND" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"bNE" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"bNF" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"bNG" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "bNL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -22455,15 +20864,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bNT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "bNW" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -22591,18 +20991,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"bOv" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) -"bOx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "bOC" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -22612,19 +21000,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"bOG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "bOJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -22690,14 +21065,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bOQ" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "bOR" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -22724,29 +21091,6 @@ icon_state = "plating" }, /area/almayer/shipboard/sea_office) -"bOX" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) -"bOZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"bPa" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "bPd" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 3" @@ -22849,6 +21193,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/lower_medical_medbay) +"bPw" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/squads/alpha) "bPz" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -22911,25 +21266,6 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) -"bPL" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) -"bPM" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "bPO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23055,29 +21391,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bQA" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"bQD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "bQE" = ( /obj/structure/surface/rack, /obj/structure/ob_ammo/ob_fuel, @@ -23152,48 +21465,12 @@ /obj/item/tool/pen, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bQZ" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/almayer, -/area/almayer/squads/charlie) -"bRa" = ( -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) -"bRc" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "bRe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bRf" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"bRg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "bRi" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -23382,29 +21659,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/vehiclehangar) -"bRV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"bSa" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "bSb" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -23421,12 +21675,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"bSe" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bSf" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_point_defense) @@ -23474,17 +21722,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/engineering_workshop) -"bSn" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "bSt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23510,25 +21747,6 @@ "bSy" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engine_core) -"bSD" = ( -/obj/item/reagent_container/glass/bucket{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_container/glass/bucket{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/reagent_container/glass/bucket{ - pixel_x = -4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "bSG" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/almayer{ @@ -23538,15 +21756,6 @@ "bSJ" = ( /turf/closed/wall/almayer, /area/almayer/squads/delta) -"bSK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/tool/wrench, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "bSL" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, @@ -23579,43 +21788,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"bSY" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bSZ" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"bTa" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"bTb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" - }, -/turf/open/floor/plating, -/area/almayer/squads/bravo) "bTg" = ( /obj/docking_port/stationary/emergency_response/external/hangar_port{ dwidth = 8 @@ -23714,21 +21886,6 @@ "bTA" = ( /turf/open/floor/almayer, /area/almayer/squads/delta) -"bTC" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTE" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "bTG" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -23747,34 +21904,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"bTJ" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTM" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bTN" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "bTO" = ( /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) @@ -23784,14 +21913,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"bTR" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bTS" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -23801,17 +21922,6 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/shipboard/weapon_room) -"bTU" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical, -/obj/item/dogtag{ - desc = "A blank marine's information dog tag. The word ranger and a pawprint is scratched into it." - }, -/obj/item/device/megaphone, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "bTV" = ( /obj/item/bedsheet/brown{ pixel_y = 13 @@ -23848,27 +21958,10 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"bUb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "bUc" = ( /obj/structure/foamed_metal, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_s) -"bUd" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) "bUe" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -23885,24 +21978,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"bUf" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"bUi" = ( -/obj/structure/sign/poster{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/charlie_delta_shared) "bUo" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/weapon/gun/shotgun/combat, @@ -23922,49 +21997,6 @@ icon_state = "redfull" }, /area/almayer/squads/req) -"bUp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/franks{ - pixel_x = 2; - pixel_y = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"bUq" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) -"bUr" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) "bUx" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -24002,11 +22034,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"bUF" = ( -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) "bUG" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -24038,20 +22065,6 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"bUM" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) -"bUN" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "bUO" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ @@ -24068,27 +22081,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) -"bUR" = ( -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) -"bUT" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "bUU" = ( /obj/structure/machinery/cm_vending/clothing/tl/delta{ density = 0; @@ -24160,30 +22152,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"bVn" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bVo" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"bVq" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "bVt" = ( /obj/structure/machinery/door_control{ id = "laddersoutheast"; @@ -24202,13 +22170,6 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) -"bVy" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "bVB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -24435,14 +22396,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"bWJ" = ( -/obj/structure/machinery/shower{ - dir = 4 - }, -/obj/structure/machinery/door/window/eastright, -/obj/structure/window/reinforced/tinted/frosted, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) "bWK" = ( /obj/structure/bed/chair{ dir = 1 @@ -24524,14 +22477,6 @@ "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"bXf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "bXl" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -25115,12 +23060,6 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_f_p) -"bZJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/effect/landmark/map_item, -/obj/item/device/binoculars, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/cic) "bZK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -25164,19 +23103,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"bZU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "cab" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -25255,22 +23181,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) -"cau" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/cryo_cells) "cav" = ( /obj/structure/machinery/light{ dir = 4 @@ -25668,13 +23578,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"ccb" = ( -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "ccc" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -25686,13 +23589,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) -"ccd" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "cce" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -25726,6 +23622,15 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"cci" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "cck" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -25888,12 +23793,6 @@ icon_state = "silvercorner" }, /area/almayer/hallways/repair_bay) -"ccN" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "ccO" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -25999,12 +23898,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_umbilical) -"cdf" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "cdk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -26014,14 +23907,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"cdm" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "cdn" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -26038,16 +23923,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"cdp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "cdr" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -26091,6 +23966,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/hangar) +"cdD" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "cdE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -26128,47 +24014,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"cdP" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) -"cdT" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdU" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdV" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cdX" = ( -/obj/structure/machinery/cm_vending/gear/engi, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "cdZ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -26186,15 +24031,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) -"ceg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "ceo" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -26314,34 +24150,20 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"cfo" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"cfp" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +"cfh" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/cm_vending/gear/medic{ + pixel_x = 32; + density = 0 }, -/area/almayer/squads/charlie) -"cfq" = ( -/obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cft" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 4; + icon_state = "blue" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) +/area/almayer/squads/delta) "cfx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -26413,70 +24235,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"cgl" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie_delta_shared) -"cgo" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) -"cgq" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"cgr" = ( -/obj/structure/machinery/cm_vending/clothing/medic/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgs" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgt" = ( -/obj/structure/machinery/cm_vending/clothing/engi/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgu" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgv" = ( -/obj/structure/machinery/cm_vending/clothing/leader/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cgy" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"cgA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "cgE" = ( /turf/open/floor/almayer, /area/almayer/living/cryo_cells) @@ -26520,6 +24278,17 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"cgR" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "cgT" = ( /obj/structure/bed/chair{ dir = 8 @@ -26530,60 +24299,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"chf" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, +"chu" = ( +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"chk" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/medic, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"chl" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/engineer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, -/area/almayer/squads/charlie) -"chm" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/spec, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/area/almayer/hallways/aft_hallway) +"chx" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 }, -/area/almayer/squads/charlie) -"chn" = ( -/obj/structure/machinery/door/airlock/almayer/marine/charlie/sl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 4 }, -/area/almayer/squads/charlie) -"chp" = ( +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) +"chy" = ( /obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/squads/bravo) -"chq" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"chu" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/port_hallway) "chC" = ( /obj/structure/platform_decoration, /turf/open/floor/plating/plating_catwalk, @@ -26600,128 +24337,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"chL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) -"chM" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chO" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"chS" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"chV" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) -"chW" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cib" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) -"cic" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -26828,6 +24443,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"ciH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -26848,54 +24471,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"ciU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/four{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "cjc" = ( /obj/effect/landmark/start/marine/alpha, /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"cjd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cjf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"cjg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "cjh" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer, @@ -26906,6 +24486,35 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) +"cjj" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "cjl" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/poddoor/almayer{ @@ -26954,45 +24563,6 @@ icon_state = "red" }, /area/almayer/hallways/port_hallway) -"cjA" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cjC" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"cjE" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "cjK" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -27093,13 +24663,6 @@ icon_state = "red" }, /area/almayer/hallways/port_hallway) -"ckr" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ckB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -27145,22 +24708,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"ckQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"ckR" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ckS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "Interrogation Shutters"; @@ -27215,120 +24762,6 @@ "clg" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"clh" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"cli" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"clj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) -"clk" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"cll" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) -"clm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"cln" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) -"clo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) -"clp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) -"clr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/squads/delta) "cls" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) @@ -27406,18 +24839,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) -"clI" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/smart, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) -"clJ" = ( -/obj/structure/machinery/cm_vending/clothing/medic/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clK" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -27429,18 +24850,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"clM" = ( -/obj/structure/machinery/cm_vending/clothing/specialist/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clN" = ( -/obj/structure/machinery/cm_vending/clothing/leader/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clO" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -27476,25 +24885,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"clS" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clT" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clV" = ( /obj/structure/machinery/computer/arcade, /obj/structure/disposalpipe/segment, @@ -27503,31 +24893,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"clW" = ( -/obj/structure/machinery/cm_vending/clothing/smartgun/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clX" = ( -/obj/structure/machinery/cm_vending/gear/smartgun, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"clY" = ( -/obj/structure/machinery/cm_vending/gear/medic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "clZ" = ( /obj/structure/machinery/cm_vending/gear/engi, /turf/open/floor/almayer{ @@ -27723,6 +25088,17 @@ icon_state = "test_floor4" }, /area/almayer/powered) +"cnh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Mech Ops's Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "cno" = ( /obj/structure/stairs, /obj/effect/projector{ @@ -27793,6 +25169,10 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"cnF" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "cnH" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Computer Lab" @@ -27805,35 +25185,6 @@ icon_state = "test_floor4" }, /area/almayer/command/computerlab) -"cnM" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "cnR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -27936,23 +25287,6 @@ icon_state = "cargo" }, /area/almayer/command/cic) -"cog" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"coj" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/squads/delta) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) @@ -27966,14 +25300,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"coB" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "coG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -28047,6 +25373,15 @@ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) +"cpF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "cpJ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -28099,9 +25434,9 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/armory) -"cqz" = ( -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black, +"cqp" = ( +/obj/effect/landmark/start/marine/leader/delta, +/obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) "cqJ" = ( @@ -28209,31 +25544,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"csZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "ctn" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -28281,6 +25591,22 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"ctT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "cuk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -28299,6 +25625,27 @@ icon_state = "outerhull_dir" }, /area/space/almayer/lifeboat_dock) +"cuu" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) +"cuv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"cuw" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "cuy" = ( /obj/item/tool/warning_cone{ pixel_y = 13 @@ -28313,14 +25660,18 @@ "cuC" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/starboard) -"cuY" = ( -/obj/structure/disposalpipe/segment{ +"cuZ" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "plating" }, -/area/almayer/squads/alpha) +/area/almayer/living/bridgebunks) "cvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -28339,6 +25690,13 @@ }, /turf/open/floor/almayer, /area/almayer/command/corporateliason) +"cvR" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/rifle/midchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "cvZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -28360,6 +25718,15 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"cwi" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -28423,6 +25790,41 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"cxO" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/living/port_emb) +"cya" = ( +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hull/lower_hull/l_a_s) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -28514,6 +25916,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"cAN" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "cBb" = ( /obj/structure/machinery/light{ dir = 1 @@ -28582,16 +25990,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"cBs" = ( -/obj/structure/bed/chair, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "cBA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28694,15 +26092,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"cDs" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "cDC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28714,6 +26103,12 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"cDT" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "plating_striped" + }, +/area/almayer/engineering/upper_engineering/port) "cDW" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer{ @@ -28721,13 +26116,6 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) -"cDZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/tankerbunks) "cEg" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -28767,28 +26155,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) -"cEC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "cEO" = ( /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ @@ -28819,14 +26185,6 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) -"cFn" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "cFA" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -28856,16 +26214,34 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"cGj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "cGr" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) -"cGV" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +"cGC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) +"cGO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "cHc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/ladder{ @@ -28876,18 +26252,15 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"cHl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"cHj" = ( +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "green" }, -/area/almayer/squads/bravo) +/area/almayer/hallways/port_hallway) "cHq" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/plating_catwalk, @@ -28895,15 +26268,28 @@ "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) -"cHE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"cHH" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"cHI" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + dir = 1; + icon_state = "silver" }, -/area/almayer/command/cichallway) +/area/almayer/hallways/port_hallway) "cHO" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -28912,6 +26298,13 @@ icon_state = "plate" }, /area/almayer/engineering/lower_engineering) +"cHV" = ( +/obj/structure/machinery/door/airlock/almayer/generic, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "cIe" = ( /obj/structure/machinery/light{ dir = 4 @@ -28938,14 +26331,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"cIG" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "cII" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -28988,6 +26373,12 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"cJt" = ( +/obj/structure/machinery/cm_vending/clothing/leader/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "cJu" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -29061,6 +26452,46 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"cKh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) +"cKm" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plushie_cade, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "cKt" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer{ @@ -29122,10 +26553,12 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) -"cLC" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +"cLF" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "cLN" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -29135,6 +26568,12 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"cLW" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "cMl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29144,23 +26583,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) -"cMN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) -"cMV" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 +"cMq" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 22 }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/auxiliary_officer_office) "cMW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -29186,11 +26614,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"cNf" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/living/briefing) "cNH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/containment{ id = "Containment Cell 4"; @@ -29206,6 +26629,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) +"cNR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "cNX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29228,19 +26660,20 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"cOK" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "umbilical wall" +"cOB" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer_hull{ - dir = 4; - icon_state = "outerhull_dir" +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_x = -32 }, -/area/almayer/engineering/upper_engineering/starboard) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "cOM" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -29248,6 +26681,22 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"cOR" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) +"cPb" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "cPg" = ( /obj/structure/sign/safety/north{ pixel_x = 32; @@ -29262,6 +26711,14 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"cPR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "cQc" = ( /turf/open/floor/almayer{ dir = 1; @@ -29308,6 +26765,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"cQR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "cRb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29341,6 +26808,13 @@ icon_state = "cargo" }, /area/almayer/shipboard/port_missiles) +"cRH" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "cRK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -29350,6 +26824,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"cRQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/living/briefing) "cSk" = ( /obj/structure/machinery/door/window/southleft, /turf/open/floor/almayer{ @@ -29392,15 +26874,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) -"cSQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "cST" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -29435,6 +26908,15 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) +"cUq" = ( +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/squads/alpha) "cUv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -29448,6 +26930,10 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) +"cVf" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "cVs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -29465,6 +26951,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"cVD" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "cVJ" = ( /obj/structure/largecrate/supply, /turf/open/floor/almayer{ @@ -29482,6 +26974,21 @@ icon_state = "plate" }, /area/almayer/living/gym) +"cWj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "cWr" = ( /obj/structure/machinery/photocopier{ density = 0; @@ -29610,6 +27117,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"cXE" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "cXF" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -29639,26 +27150,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"cXY" = ( -/obj/item/stack/catwalk, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "cXZ" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"cYu" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +"cYg" = ( +/obj/structure/barricade/plasteel/metal, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, -/area/almayer/command/lifeboat) +/area/almayer/hallways/port_hallway) "cYT" = ( /obj/structure/machinery/light{ dir = 8 @@ -29701,6 +27208,26 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) +"cZP" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/hallways/port_hallway) "cZV" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/fancy/cigarettes/wypacket, @@ -29786,12 +27313,6 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) -"dbq" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "plating_striped" - }, -/area/almayer/engineering/upper_engineering/port) "dbv" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/prop/almayer/computer{ @@ -29878,6 +27399,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"dcZ" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "ddj" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -29888,6 +27417,15 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"ddu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/living/port_emb) "ddz" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -29963,21 +27501,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_umbilical) -"dfg" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 24 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "dfk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -30046,6 +27569,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"dgY" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_x = -31 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "dhQ" = ( /obj/structure/sign/safety/terminal{ pixel_x = -17 @@ -30097,16 +27626,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_umbilical) -"diz" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat1-D4"; - linked_dock = "almayer-lifeboat1"; - throw_dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/port) "diF" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -30122,19 +27641,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"diJ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"djk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + dir = 1; + icon_state = "blue" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/delta) "djm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -30243,6 +27758,15 @@ icon_state = "red" }, /area/almayer/living/briefing) +"dkr" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -30272,12 +27796,13 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) -"dll" = ( -/obj/structure/surface/table/almayer, +"dlb" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/smg/lowchance, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "cargo" }, -/area/almayer/living/briefing) +/area/almayer/squads/req) "dlp" = ( /obj/structure/largecrate/supply/supplies/water, /obj/item/toy/deck{ @@ -30304,12 +27829,12 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"dmv" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" +"dmn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/area/almayer/command/cichallway) +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "dmA" = ( /turf/open/floor/almayer, /area/almayer/living/synthcloset) @@ -30321,6 +27846,16 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"dmO" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "dmQ" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -30376,12 +27911,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) -"dnE" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "dnH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -30400,6 +27929,11 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"dnM" = ( +/obj/effect/landmark/start/marine/leader/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "dnS" = ( /obj/structure/safe, /turf/open/floor/almayer{ @@ -30481,6 +28015,31 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"dpr" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "dpy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30492,15 +28051,31 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"dpO" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 +"dpF" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + dir = 4; + name = "Normandy Remote Control Console"; + shuttleId = "dropship_normandy" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) +"dpR" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) "dpV" = ( /obj/structure/machinery/firealarm{ @@ -30519,6 +28094,18 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"dqi" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dqj" = ( /turf/open/floor/almayer{ dir = 4; @@ -30528,15 +28115,6 @@ "dqw" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room/notunnel) -"dqD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "dqE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -30592,19 +28170,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"drj" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "drk" = ( /obj/structure/closet, /turf/open/floor/almayer{ @@ -30669,12 +28234,37 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"dsB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"dtI" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "dtM" = ( /turf/open/floor/almayer{ dir = 1; @@ -30719,6 +28309,10 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"dus" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/almayer, +/area/almayer/living/cryo_cells) "dut" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -30738,15 +28332,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"duw" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "dux" = ( /obj/structure/surface/table/almayer, /obj/item/pizzabox{ @@ -30774,15 +28359,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"duV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "dvg" = ( /obj/structure/reagent_dispensers/fueltank/custom, /obj/structure/sign/safety/chem_lab{ @@ -30853,6 +28429,25 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"dwL" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) +"dwN" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "dxm" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -30894,15 +28489,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"dxK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "dxL" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -30998,36 +28584,38 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"dAb" = ( -/obj/structure/largecrate/random/barrel/blue, +"dzq" = ( +/obj/structure/machinery/cm_vending/clothing/vehicle_crew, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_f_p) -"dAq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 +/area/almayer/living/tankerbunks) +"dzO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/bravo{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) -"dAX" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" + dir = 8; + icon_state = "cargo_arrow" }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = -17 +/area/almayer/squads/alpha) +"dzU" = ( +/obj/structure/machinery/light{ + dir = 1 }, +/obj/structure/foamed_metal, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"dAb" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/cic) +/area/almayer/hull/upper_hull/u_f_p) "dBj" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -31191,6 +28779,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"dDu" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/chem_dispenser/soda{ + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) +"dDw" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "dDC" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -31199,6 +28802,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"dDF" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "dDL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/research/main_terminal{ @@ -31212,6 +28821,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"dDP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dDQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31241,6 +28862,19 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"dEs" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/paper_bin, +/obj/item/tool/pen, +/obj/item/clothing/mask/rebreather/scarf, +/obj/item/clothing/mask/rebreather/scarf, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "dEt" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -31330,6 +28964,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"dGt" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) "dGw" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -31449,6 +29091,18 @@ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) +"dHD" = ( +/mob/living/simple_animal/cow{ + name = "Mumunya" + }, +/turf/open/floor/almayer, +/area/almayer/living/grunt_rnr) +"dHF" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "dHV" = ( /obj/structure/machinery/light{ dir = 1 @@ -31490,18 +29144,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"dII" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "dIR" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -31554,6 +29196,23 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"dLi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"dLk" = ( +/obj/structure/prop/server_equipment/broken, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "dLt" = ( /obj/structure/sign/safety/hazard{ pixel_x = -17; @@ -31579,12 +29238,6 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"dMB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "dMK" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 @@ -31610,15 +29263,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) -"dNt" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "dNx" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -31662,20 +29306,6 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) -"dPm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) -"dPC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "dPU" = ( /obj/structure/sign/safety/nonpress_ag{ pixel_x = 32 @@ -31716,6 +29346,18 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dQG" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/whistle{ + pixel_y = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "dQH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31732,15 +29374,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"dRv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/squads/alpha) "dRw" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -31765,15 +29398,6 @@ icon_state = "test_floor4" }, /area/almayer/living/offices/flight) -"dRG" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "dRT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -31795,6 +29419,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"dSh" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = list(26) + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "dSn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -31827,6 +29463,25 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"dSC" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "dSJ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -31877,11 +29532,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"dTV" = ( +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "dTZ" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"dUq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "dUE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -31929,6 +29595,33 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"dVB" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/glass{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/ashtray/glass{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"dVI" = ( +/obj/structure/sign/safety/debark_lounge{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "dVO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -31994,6 +29687,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"dWL" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "dWX" = ( /obj/structure/machinery/light{ dir = 8 @@ -32112,6 +29816,20 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"dZL" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew, +/obj/structure/sign/safety/hazard{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "eaf" = ( /obj/structure/machinery/cm_vending/clothing/military_police{ density = 0; @@ -32162,12 +29880,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"eaX" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "ebd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -32320,29 +30032,56 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"edE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/squads/delta) "edM" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) +"edX" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldpack, +/obj/item/tool/weldpack, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "eed" = ( /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/command/computerlab) -"eei" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/cups{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 7; - pixel_y = 14 +"eeh" = ( +/obj/structure/largecrate/supply/ammo/m41a/half, +/obj/structure/largecrate/supply/ammo/pistol/half{ + pixel_y = 12 }, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, -/area/almayer/command/cichallway) +/area/almayer/hull/lower_hull/l_f_p) "eem" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/kitchen/tray, @@ -32442,17 +30181,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"efK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "efU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -32543,6 +30271,24 @@ /obj/item/stack/catwalk, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"eho" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/corporateliason) "ehx" = ( /obj/effect/landmark/start/marine/tl/alpha, /obj/effect/landmark/late_join/alpha, @@ -32577,15 +30323,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"ehZ" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/tankerbunks) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32594,11 +30331,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"eiq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/prop/magazine/dirty, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "eiw" = ( /obj/structure/machinery/light{ dir = 4 @@ -32669,19 +30401,20 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ejo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"eiZ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/cups{ + pixel_x = -6; + pixel_y = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 7; + pixel_y = 14 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "greenfull" }, -/area/almayer/squads/charlie) +/area/almayer/command/cichallway) "ejp" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -32733,6 +30466,14 @@ "eky" = ( /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"ekV" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) "ekY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32933,16 +30674,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/lobby) -"epA" = ( -/obj/structure/largecrate/random/barrel/yellow, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "eqb" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp/denied{ @@ -33030,29 +30761,19 @@ dir = 1 }, /area/almayer/medical/containment/cell/cl) -"erh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"erm" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "umbilical wall" }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull{ + dir = 8; + icon_state = "outerhull_dir" }, -/area/almayer/squads/delta) +/area/almayer/engineering/upper_engineering/port) "erx" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -33066,15 +30787,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) -"erG" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/effect/landmark/start/marine/smartgunner/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "erN" = ( /obj/structure/machinery/light{ dir = 8 @@ -33086,6 +30798,23 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"erP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "erS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -33140,6 +30869,17 @@ dir = 9 }, /area/almayer/command/lifeboat) +"etb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "etf" = ( /turf/open/floor/almayer{ dir = 1; @@ -33202,6 +30942,14 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"euo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "eup" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -33210,6 +30958,13 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) +"euy" = ( +/obj/structure/platform, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/living/briefing) "euN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -33243,12 +30998,6 @@ icon_state = "logo_c" }, /area/almayer/command/cic) -"euY" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "eva" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -33305,18 +31054,22 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"ewO" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"ews" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat1-D3"; + linked_dock = "almayer-lifeboat1"; + throw_dir = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/squads/delta) +/area/almayer/engineering/upper_engineering/port) +"eww" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "ewS" = ( /turf/open/floor/almayer{ dir = 8; @@ -33331,10 +31084,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) -"exi" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "exr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -33369,6 +31118,22 @@ icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) +"exN" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"exT" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "eyd" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -33386,6 +31151,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"eyk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33459,18 +31230,6 @@ /obj/structure/bed/chair/wood/normal, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"eAg" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/squads/alpha) "eAC" = ( /obj/structure/machinery/light{ dir = 4 @@ -33479,13 +31238,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"eAL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "eAU" = ( /obj/structure/bed/chair{ dir = 8 @@ -33519,15 +31271,16 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/briefing) -"eBj" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 +"eBn" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat1-D4"; + linked_dock = "almayer-lifeboat1"; + throw_dir = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering/upper_engineering/port) "eBo" = ( /obj/structure/machinery/cm_vending/gear/commanding_officer, /turf/open/floor/wood/ship, @@ -33544,19 +31297,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"eBV" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +"eBU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "eBW" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -33608,12 +31354,6 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) -"eDu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/living/bridgebunks) "eDG" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -33637,6 +31377,33 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"eEg" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/bronze{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/trash/semki{ + layer = 2; + pixel_x = -13; + pixel_y = 14 + }, +/obj/item/prop/magazine/boots/n054{ + pixel_x = 29 + }, +/obj/item/prop/magazine/dirty/torn{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/clothing/glasses/disco_fever{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "eEk" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -33658,23 +31425,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"eFj" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "eFp" = ( /obj/structure/surface/rack, /obj/item/clothing/head/headband/red{ @@ -33718,6 +31468,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"eFO" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/squads/req) "eFT" = ( /obj/structure/bed/sofa/vert/grey, /obj/structure/bed/sofa/vert/grey{ @@ -33732,15 +31491,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"eGh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel{ - pixel_x = -1; - pixel_y = 10 - }, -/obj/item/stack/cable_coil, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "eGl" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -33811,6 +31561,21 @@ icon_state = "plate" }, /area/almayer/squads/req) +"eHc" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/window/reinforced/toughened, +/obj/structure/machinery/computer/crew/alt{ + dir = 8; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "eHf" = ( /obj/structure/machinery/light/small, /obj/structure/prop/invuln/overhead_pipe{ @@ -33820,6 +31585,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"eHg" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "eHj" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -33848,6 +31617,21 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"eHJ" = ( +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) +"eHS" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "cryo curtain" + }, +/turf/open/floor/plating, +/area/almayer/hallways/port_hallway) "eHY" = ( /obj/structure/surface/rack, /obj/item/device/taperecorder, @@ -33855,6 +31639,15 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"eIm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/command/cichallway) "eIA" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -33884,6 +31677,31 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"eJs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/item/clipboard{ + base_pixel_x = 20; + pixel_x = 5 + }, +/obj/item/paper{ + pixel_x = 5 + }, +/obj/item/tool/pen/blue{ + pixel_x = 5 + }, +/obj/structure/surface/table/reinforced/black, +/obj/structure/transmitter/rotary{ + name = "CIC Reception Telephone"; + phone_category = "Command"; + phone_id = "CIC Reception"; + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/cic) "eJQ" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -33978,6 +31796,14 @@ icon_state = "green" }, /area/almayer/living/offices) +"eLf" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/alpha) "eLz" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -33986,6 +31812,19 @@ icon_state = "silver" }, /area/almayer/hallways/repair_bay) +"eMb" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"eMe" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "eMh" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Laundry Room" @@ -33994,6 +31833,27 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"eMv" = ( +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) +"eMJ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -34041,12 +31901,22 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"eNZ" = ( +/obj/structure/machinery/status_display, +/turf/closed/wall/almayer, +/area/almayer/hallways/port_hallway) "eOh" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "redcorner" }, /area/almayer/shipboard/brig/evidence_storage) +"eOj" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "eOk" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -34097,6 +31967,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"ePw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "ePA" = ( /obj/structure/machinery/light{ dir = 1 @@ -34111,6 +31996,16 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/general_equipment) +"ePS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "ePY" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -34136,6 +32031,20 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"eQq" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "eRe" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -34172,6 +32081,32 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"eRH" = ( +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_x = -5; + pixel_y = 16 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = 13; + pixel_y = 15 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "eRL" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) @@ -34192,6 +32127,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"eSr" = ( +/obj/structure/machinery/cm_vending/gear/spec, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "eSJ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/transmitter/rotary{ @@ -34254,6 +32202,18 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"eTv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"eTC" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orangecorner" + }, +/area/almayer/engineering/upper_engineering/starboard) "eTO" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -34263,26 +32223,6 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"eUh" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "eUn" = ( /obj/structure/machinery/chem_master, /turf/open/floor/almayer{ @@ -34300,16 +32240,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"eUA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "eUR" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -34374,24 +32304,29 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"eVT" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 +"eVY" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/structure/machinery/disposal, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/medical/medical_science) -"eWp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 +/area/almayer/living/tankerbunks) +"eWc" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom" }, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "test_floor4" }, -/area/almayer/living/briefing) +/area/almayer/living/tankerbunks) +"eWz" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "eWF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -34470,6 +32405,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"eYy" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "eYz" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 1 @@ -34482,6 +32423,26 @@ /obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"eYE" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "eYH" = ( /obj/structure/platform{ dir = 4 @@ -34491,6 +32452,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"eYI" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "eYM" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -34510,15 +32480,6 @@ /obj/effect/landmark/start/synthetic, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"eYR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/engineering/upper_engineering/port) "eYW" = ( /obj/structure/filingcabinet/security, /turf/open/floor/wood/ship, @@ -34569,10 +32530,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"fay" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "faO" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"faP" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "faX" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -34587,24 +32561,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"fbb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "fbo" = ( /obj/structure/machinery/door_control{ id = "kitchen2"; @@ -34689,12 +32645,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) -"fcB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "fcE" = ( /turf/open/floor/almayer{ dir = 1; @@ -34756,6 +32706,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"fdt" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"fdu" = ( +/obj/structure/machinery/cm_vending/clothing/marine/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "fdA" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -34843,6 +32805,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) +"ffi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "ffE" = ( /turf/open/floor/almayer/no_build{ icon_state = "plating" @@ -34878,6 +32850,13 @@ /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) +"fgu" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "fgx" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -34929,26 +32908,35 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) +"fgZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "fhf" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"fhA" = ( -/obj/structure/machinery/light/small{ - dir = 1 +"fhC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/surface/rack, -/obj/item/storage/belt/utility/full{ - pixel_y = 8 +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/living/port_emb) +"fhD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/suit/storage/hazardvest/black, -/obj/item/tool/crowbar, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "orange" }, -/area/almayer/hull/lower_hull/l_a_s) +/area/almayer/engineering/upper_engineering/port) "fhH" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -34977,6 +32965,27 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"fjx" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) +"fjB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "fjO" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, @@ -34988,6 +32997,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"fkS" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "fkW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35013,6 +33028,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) +"flH" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "flP" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -35070,6 +33091,24 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"fmJ" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/two{ + pixel_x = 31; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "fmS" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/almayer{ @@ -35140,22 +33179,26 @@ icon_state = "cargo" }, /area/almayer/hull/upper_hull/u_a_s) -"foL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"foc" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/hull/upper_hull/u_a_p) +"fod" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" + icon_state = "plate" }, -/area/almayer/squads/charlie) -"foN" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) +/area/almayer/squads/alpha) "foP" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -35203,12 +33246,6 @@ icon_state = "plate" }, /area/almayer/engineering/starboard_atmos) -"fpT" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "fpW" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 32 @@ -35218,13 +33255,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"fqc" = ( -/obj/structure/machinery/vending/cigarette, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "fqe" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen/blue/clicky{ @@ -35249,6 +33279,21 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"fqA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "fqO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -35391,13 +33436,6 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) -"fsV" = ( -/obj/structure/target, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "fti" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -35416,6 +33454,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"fuo" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "fut" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35482,6 +33525,12 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"fvj" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/living/briefing) "fvu" = ( /obj/item/tool/crowbar, /turf/open/floor/almayer{ @@ -35518,6 +33567,34 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"fwb" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) +"fwd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) +"fwi" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fwD" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -35538,12 +33615,31 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"fwY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"fwQ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/groundside_operations{ + dir = 4; + pixel_y = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie_delta_shared) +/obj/structure/machinery/door/window/westright, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) +"fxm" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/tool/pen, +/obj/item/paper_bin/uscm{ + pixel_y = 7 + }, +/obj/item/clipboard{ + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "fxu" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8 @@ -35616,6 +33712,17 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) +"fyC" = ( +/obj/effect/decal/cleanable/ash, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -13; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/hangar) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -35624,18 +33731,32 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"fzq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"fyJ" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"fyQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/squads/charlie) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "fzP" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -35652,6 +33773,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) +"fzT" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical, +/obj/item/device/megaphone, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "fAa" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -35678,12 +33807,35 @@ /obj/structure/machinery/light, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"fAq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "fAt" = ( /obj/structure/largecrate/guns/merc{ name = "\improper dodgy crate" }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"fAB" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/living/briefing) +"fAI" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Tanker's Room" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "fAS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35745,31 +33897,24 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"fCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +"fCs" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "bluefull" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) +/area/almayer/hull/lower_hull/l_a_s) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fDh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +"fCY" = ( +/obj/structure/bed/chair, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, -/area/almayer/squads/delta) +/area/almayer/engineering/upper_engineering/port) "fDj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/defibrillator, @@ -35788,6 +33933,12 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) +"fDD" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/living/briefing) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -35797,13 +33948,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/upper_engineering) -"fDJ" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "fDS" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -35869,6 +34013,12 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"fEH" = ( +/obj/structure/machinery/cm_vending/gear/medic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fEN" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 4 @@ -35916,18 +34066,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_p) -"fFD" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "fFL" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -35955,31 +34093,15 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"fGu" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext"; - name = "Window Shutters"; - pixel_x = -26; - pixel_y = 6; - req_access_txt = "28" - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "researchlockdownext_door"; - name = "Door Shutters"; - pixel_x = -26; - pixel_y = 1; - req_access_txt = "28" +"fGm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/medical/medical_science) +/area/almayer/squads/alpha) "fGN" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -36023,6 +34145,41 @@ icon_state = "plate" }, /area/almayer/command/cic) +"fHo" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) +"fHx" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) "fHz" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -36084,11 +34241,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"fIM" = ( -/obj/effect/landmark/start/marine/tl/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "fIX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ name = "\improper Requisitions Auxiliary Storage Room"; @@ -36099,16 +34251,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"fIZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/boots/n117{ - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "fJm" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -36141,16 +34283,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"fJO" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "fJT" = ( /obj/structure/surface/rack, /obj/item/reagent_container/glass/bucket{ @@ -36186,6 +34318,14 @@ icon_state = "cargo_arrow" }, /area/almayer/command/airoom) +"fKd" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "fKe" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -36283,6 +34423,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) +"fMi" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,18) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "fMl" = ( /obj/structure/machinery/door_control{ id = "ARES Operations Right"; @@ -36324,6 +34474,21 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"fMw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + req_one_access_txt = "7;23;27" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "fMA" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -36410,6 +34575,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"fPd" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/squads/alpha) "fPn" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -36422,36 +34597,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"fPp" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "fPu" = ( /obj/structure/bed/chair{ dir = 1 @@ -36499,15 +34644,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"fRr" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "fRC" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -36591,6 +34727,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"fTC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "fTF" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -36637,6 +34779,19 @@ "fUA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"fUX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "fVz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -36657,6 +34812,30 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"fWB" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) +"fWF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "fWT" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -36718,11 +34897,42 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) +"fXG" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"fXX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "fYb" = ( /turf/open/floor/almayer{ dir = 8; @@ -36760,6 +34970,15 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"fYs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "fYG" = ( /turf/open/floor/almayer{ dir = 10; @@ -36800,11 +35019,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"fZZ" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "gai" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -36878,18 +35092,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"gbs" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/ashtray/plastic{ - icon_state = "ashtray_full_bl"; - pixel_x = 5; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "gbQ" = ( /obj/structure/toilet{ dir = 8 @@ -36921,17 +35123,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"gcN" = ( -/obj/structure/machinery/door/airlock/almayer/command{ - name = "\improper Senior Enlisted Advisor's Office"; - req_access = null; - req_access_txt = "19;29"; - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/sea_office) "gcT" = ( /turf/open/floor/almayer{ dir = 4; @@ -36989,6 +35180,10 @@ icon_state = "silvercorner" }, /area/almayer/hallways/repair_bay) +"gdE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "gdS" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -37019,25 +35214,52 @@ "gel" = ( /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell/cl) -"ger" = ( +"gew" = ( /obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_x = 6; - pixel_y = 5 +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 }, -/obj/item/tool/pen{ - pixel_x = 8 +/turf/open/floor/almayer{ + icon_state = "bluefull" }, -/obj/item/clipboard{ - pixel_x = -8 +/area/almayer/living/briefing) +"geA" = ( +/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/item/folder/white{ - pixel_x = -8 +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 10; + icon_state = "silver" }, -/area/almayer/medical/medical_science) +/area/almayer/living/port_emb) "geH" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -37089,13 +35311,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"gfo" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "gfu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -37122,6 +35337,18 @@ "gfW" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lockerroom) +"gga" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/starboard) "ggh" = ( /obj/structure/bed/chair{ dir = 8 @@ -37199,19 +35426,21 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"gip" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, +"giq" = ( +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + icon_state = "redfull" }, -/area/almayer/squads/bravo) +/area/almayer/hull/lower_hull/l_a_s) "gir" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/engineering_workshop) +"gix" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "giB" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -37302,6 +35531,12 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"gjz" = ( +/obj/structure/machinery/cm_vending/gear/tl, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "gjB" = ( /obj/structure/machinery/light{ dir = 1 @@ -37360,12 +35595,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"gll" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "glr" = ( /obj/item/tool/warning_cone{ pixel_x = -20; @@ -37389,16 +35618,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"glB" = ( -/obj/structure/sign/safety/chem_lab{ - pixel_x = 5; - pixel_y = 29 +"glD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/chem_master, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/medical/medical_science) +/area/almayer/hallways/port_hallway) "glM" = ( /obj/structure/window/reinforced{ dir = 8; @@ -37418,18 +35646,66 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"gms" = ( +"gmw" = ( +/obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/port) -"gnu" = ( +/area/almayer/squads/delta) +"gmE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/alpha) +"gmM" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"gnj" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + layer = 3.25 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) +"gnr" = ( /obj/structure/surface/table/almayer, -/obj/item/facepaint/green, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/facepaint/black, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "gnv" = ( /turf/open/floor/almayer{ dir = 5; @@ -37449,6 +35725,21 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"gnP" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"gof" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "goj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -37523,9 +35814,30 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"gpP" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_s) "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) +"gqu" = ( +/obj/structure/machinery/cm_vending/clothing/leader/delta{ + density = 0; + pixel_y = -31 + }, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "gqK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -37555,6 +35867,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"grx" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -37564,12 +35888,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"grR" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "grX" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -37649,6 +35967,14 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) +"gtF" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "guc" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -37658,6 +35984,12 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) +"guB" = ( +/obj/structure/bed/chair/wheelchair, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/lower_medical_medbay) "guC" = ( /obj/item/paper_bin/wy, /obj/structure/surface/table/woodentable/fancy, @@ -37689,26 +36021,21 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"guW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/sign/prop3{ - pixel_x = 28 - }, -/obj/structure/machinery/light{ - dir = 4 +"guX" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 6 }, -/obj/item/clothing/mask/gas{ - pixel_y = 7 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/obj/item/clothing/mask/gas{ - pixel_y = 3 +/obj/structure/sign/safety/rewire{ + pixel_x = 32 }, -/obj/item/storage/fancy/candle_box{ - pixel_x = 6; - pixel_y = -2 +/turf/open/floor/prison{ + icon_state = "kitchen" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/tankerbunks) "gvq" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -37884,6 +36211,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"gxG" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "gxO" = ( /turf/open/floor/almayer{ dir = 10; @@ -37899,6 +36232,12 @@ dir = 8 }, /area/almayer/medical/containment/cell) +"gxQ" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "gxU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -37912,6 +36251,22 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"gyn" = ( +/obj/structure/pipes/vents/scrubber, +/obj/structure/surface/table/reinforced/black, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/cable_coil{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/device/helmet_visor{ + pixel_x = 8; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "gyt" = ( /obj/item/storage/firstaid/regular, /obj/structure/surface/rack, @@ -37934,24 +36289,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"gyC" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/two{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "gyN" = ( /obj/structure/machinery/prop{ desc = "It's a server box..."; @@ -38059,14 +36396,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"gAj" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "gAl" = ( /obj/structure/machinery/light{ dir = 8 @@ -38090,30 +36419,12 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"gAA" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) "gAS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) -"gBc" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "gBi" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -38175,12 +36486,26 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"gDa" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "gDq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"gDT" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38193,27 +36518,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"gDX" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "gEg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices/flight) -"gEo" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) -"gEv" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "gEK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38224,6 +36536,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"gEQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "gFa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38253,14 +36572,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"gGf" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -38347,12 +36658,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"gHo" = ( -/obj/structure/machinery/door/airlock/almayer/marine/delta/tl, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38414,6 +36719,14 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"gJD" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "gJP" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -38423,6 +36736,16 @@ icon_state = "green" }, /area/almayer/living/offices) +"gJQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat2-D4"; + linked_dock = "almayer-lifeboat2"; + throw_dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "gKB" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/firealarm{ @@ -38562,6 +36885,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"gMm" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "gMx" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -38624,23 +36959,23 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"gNf" = ( +/obj/structure/machinery/disposal, +/obj/structure/machinery/power/apc/almayer{ + dir = 1; + pixel_y = 25 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "gNp" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"gNq" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "gNx" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -38676,6 +37011,25 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"gOR" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 2; + id_tag = "tc01"; + name = "\improper Treatment Center" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/lower_medical_medbay) "gPc" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -38735,6 +37089,15 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) +"gQy" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "gQF" = ( /obj/structure/bed/chair/comfy{ buckling_y = 2; @@ -38743,14 +37106,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"gQO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "gRd" = ( /obj/structure/platform, /obj/structure/target{ @@ -38762,6 +37117,12 @@ "gRn" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull) +"gRu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "gRP" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -38829,6 +37190,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cryo) +"gTu" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "gTx" = ( /obj/structure/machinery/vending/security, /turf/open/floor/almayer{ @@ -38876,6 +37246,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"gUE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "gUI" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, @@ -38941,12 +37321,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"gWE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/spec/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "gWG" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -39014,6 +37388,22 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) +"gXy" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) +"gXD" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"gXV" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "gXY" = ( /obj/structure/machinery/light{ dir = 8 @@ -39059,6 +37449,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"gYJ" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "gYS" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -39083,42 +37480,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) -"gZr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/item/device/camera/siliconcam{ - pixel_x = -6; - pixel_y = 11 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "gZw" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"gZK" = ( -/turf/open/floor/almayer, -/area/almayer/living/auxiliary_officer_office) -"gZP" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat2-D4"; - linked_dock = "almayer-lifeboat2"; - throw_dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) -"had" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) -"hal" = ( +"gZI" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, @@ -39127,6 +37493,9 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"gZK" = ( +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "ham" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -39154,6 +37523,26 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"haF" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "haM" = ( /obj/structure/machinery/constructable_frame, /obj/effect/decal/cleanable/blood/oil, @@ -39180,15 +37569,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"hbu" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "hbx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -39263,21 +37643,20 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"hcw" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/item/explosive/grenade/high_explosive/training, -/obj/structure/machinery/door_control{ - id = "Firing_Range_1"; - name = "range shutters"; - pixel_x = 9; - pixel_y = 10 +"hcx" = ( +/obj/structure/machinery/disposal/broken, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) +"hcz" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "blue" }, -/area/almayer/living/cryo_cells) +/area/almayer/squads/delta) "hcC" = ( /obj/structure/disposalpipe/up/almayer{ id = "almayerlink_OT_req" @@ -39386,26 +37765,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"hfa" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "hfk" = ( /obj/item/trash/crushed_cup, /turf/open/floor/almayer{ @@ -39547,6 +37906,19 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_umbilical) +"hhh" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "hhn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -39599,33 +37971,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"hji" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/squads/delta) "hjk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"hjs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) "hjA" = ( /turf/open/floor/almayer{ dir = 10; @@ -39753,36 +38104,18 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"hmC" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"hmF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/sign/poster{ - pixel_x = -32 +"hmA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/squads/alpha_bravo_shared) -"hmS" = ( -/obj/structure/pipes/vents/pump, +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "blue" + icon_state = "red" }, -/area/almayer/command/cichallway) +/area/almayer/squads/alpha) "hng" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/accessory/storage/black_vest/acid_harness, @@ -39862,12 +38195,25 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"hpU" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "hpY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"hqb" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) "hqh" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -39909,23 +38255,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"hrn" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ - name = "\improper Research Reception Laboratory" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/medical_science) "hrF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39945,6 +38274,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"hrQ" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "hrX" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/structure/machinery/light{ @@ -39967,33 +38302,52 @@ "hsr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) -"hss" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) -"hsW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"htb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/starboard) "htI" = ( /obj/structure/platform_decoration{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"htK" = ( +/obj/item/clothing/head/helmet/marine/tech{ + layer = 4.1; + pixel_y = 12 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/mob/living/simple_animal/mouse/brown{ + name = "rat" + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "htL" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/boots/n150{ @@ -40004,11 +38358,6 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"huK" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" - }, -/area/almayer/living/cryo_cells) "huO" = ( /obj/structure/machinery/light{ dir = 4 @@ -40031,31 +38380,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"hvv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/item/clipboard{ - base_pixel_x = 20; - pixel_x = 5 - }, -/obj/item/paper{ - pixel_x = 5 - }, -/obj/item/tool/pen{ - pixel_x = 5 - }, -/obj/structure/surface/table/reinforced/black, -/obj/structure/transmitter/rotary{ - name = "CIC Reception Telephone"; - phone_category = "Command"; - phone_id = "CIC Reception"; - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/command/cic) "hvw" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/plating, @@ -40067,6 +38391,14 @@ /obj/effect/landmark/start/professor, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) +"hwp" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "hwC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -40092,19 +38424,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) -"hxe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"hxg" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"hxm" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 4 - }, -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer, -/area/almayer/command/cic) +/area/almayer/hallways/port_hallway) "hxp" = ( /obj/structure/surface/table/almayer, /obj/item/fuelCell, @@ -40157,11 +38483,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"hyk" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -40286,12 +38607,21 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"hzM" = ( -/obj/structure/reagent_dispensers/fueltank, +"hzO" = ( +/obj/structure/surface/table/almayer, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/lower_hull/l_f_s) +/area/almayer/squads/alpha) "hzP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/almayer{ @@ -40347,18 +38677,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"hAZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -40397,6 +38715,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"hCe" = ( +/obj/structure/machinery/cm_vending/clothing/smartgun/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "hCo" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -40417,6 +38741,39 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"hCB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"hCD" = ( +/obj/structure/largecrate/random/case/small, +/obj/structure/largecrate/random/mini/wooden{ + pixel_x = 4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) +"hCJ" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "hCS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin/uscm{ @@ -40443,6 +38800,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"hDO" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_p) "hDR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/syringe_case{ @@ -40466,13 +38831,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"hEb" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "hEt" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket{ @@ -40495,12 +38853,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"hFw" = ( -/obj/structure/machinery/disposal/broken, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "hFC" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ @@ -40602,6 +38954,13 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_umbilical) +"hHT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "hHU" = ( /obj/structure/platform_decoration{ dir = 8 @@ -40614,20 +38973,24 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"hII" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +"hIs" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" }, -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/command/cichallway) +"hIE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + dir = 5; + icon_state = "plating" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "hIL" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -40649,6 +39012,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"hJd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "hJk" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -40662,6 +39034,15 @@ "hJp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"hJs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "hJu" = ( /obj/structure/sign/safety/stairs{ pixel_x = -15 @@ -40717,22 +39098,67 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"hKP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "hKQ" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, /area/almayer/engineering/engineering_workshop/hangar) +"hKS" = ( +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/port_hallway) +"hKY" = ( +/obj/structure/closet/firecloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) +"hLp" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/storage/box/autoinjectors{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/storage/box/pillbottles{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/device/mass_spectrometer{ + pixel_x = 8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "hLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"hLI" = ( -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "hLO" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -40770,13 +39196,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"hNw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/charlie) "hND" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -40808,15 +39227,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"hNM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/metal{ - layer = 2.9; - pixel_y = 6 - }, -/obj/item/tool/shovel/etool/folded, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "hOe" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32; @@ -40839,6 +39249,20 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"hOT" = ( +/obj/structure/machinery/cm_vending/gear/smartgun{ + pixel_y = 32; + density = 0 + }, +/obj/structure/machinery/cm_vending/clothing/smartgun/alpha{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "hPe" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research, @@ -40859,12 +39283,9 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"hPh" = ( -/obj/structure/bed/chair/comfy, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, +"hPn" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/auxiliary_officer_office) "hPo" = ( /obj/structure/surface/rack, @@ -40874,6 +39295,24 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"hPp" = ( +/obj/effect/landmark/start/marine/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"hPu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/bridgebunks) "hPK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -40899,18 +39338,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"hQc" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "hQU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -40923,19 +39350,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"hQW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "hQY" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -40956,12 +39370,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"hRd" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "hRg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/sign/safety/water{ @@ -41026,15 +39434,15 @@ "hSk" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"hSt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"hSq" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "test_floor4" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/squads/delta) "hSu" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -41071,14 +39479,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/repair_bay) -"hTc" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "hTf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -41131,17 +39531,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) "hTF" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ - isopen = 1; - starting_helmet_type = null; - starting_mask_type = null; - starting_suit_type = null; - starting_tank_type = null +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/hallways/port_hallway) "hTP" = ( /obj/structure/machinery/door_control{ id = "crate_room2"; @@ -41163,6 +39560,17 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) +"hTQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "hTT" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagentgrinder{ @@ -41247,11 +39655,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"hWr" = ( -/obj/effect/landmark/start/marine/smartgunner/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "hWs" = ( /obj/structure/machinery/flasher_button{ id = "briefing_flash"; @@ -41272,45 +39675,28 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"hWO" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" +"hXw" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/microwave{ + pixel_x = -2; + pixel_y = 7 }, -/area/almayer/command/cichallway) -"hWU" = ( -/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "greenfull" }, -/area/almayer/hull/upper_hull/u_a_s) -"hXb" = ( +/area/almayer/command/cichallway) +"hXC" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) -"hXd" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ammo_box/magazine/misc/mre{ - pixel_x = 4; - pixel_y = 15 - }, -/obj/item/storage/box/wy_mre{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -8; - pixel_y = 7 + dir = 5; + icon_state = "plating" }, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -7; - pixel_y = 8 +/area/almayer/hallways/port_hallway) +"hXL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/command/lifeboat) "hXY" = ( /turf/open/floor/almayer{ dir = 4; @@ -41351,6 +39737,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"hYY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "hZj" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -41411,24 +39806,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) -"ial" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"iaq" = ( -/obj/structure/machinery/vending/cola, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "iat" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -41506,6 +39883,15 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"idJ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "idX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -41598,6 +39984,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"ieU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "ieX" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/distribution_pipes{ @@ -41605,13 +39999,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"ifb" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) "iff" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -41672,6 +40059,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"igS" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ + isopen = 1; + starting_helmet_type = null; + starting_mask_type = null; + starting_suit_type = null; + starting_tank_type = null + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "ihn" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/souto/blue{ @@ -41687,18 +40086,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"ihM" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta{ - density = 0; - pixel_y = 16 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, +"ihB" = ( +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) +/area/almayer/hull/upper_hull/u_a_s) "ihX" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -41707,12 +40100,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"ihY" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/spec, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "iid" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; @@ -41730,25 +40117,6 @@ /obj/effect/landmark/start/reporter, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"iiz" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = -4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/corporateliason) "iiC" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -41759,18 +40127,19 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"iiO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "iiP" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"iiZ" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "ije" = ( /obj/item/tool/weldingtool, /obj/structure/surface/rack, @@ -41890,12 +40259,6 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ilZ" = ( -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "imo" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -41913,6 +40276,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) +"imL" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "ina" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -41920,12 +40292,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"ins" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "inw" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -41971,17 +40337,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"iow" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_y_offset = 0 +"iov" = ( +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "silver" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "ioU" = ( /turf/closed/wall/almayer, /area/almayer/command/securestorage) @@ -42012,14 +40376,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"ipE" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/squads/alpha_bravo_shared) "ipK" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -42071,16 +40427,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"iqp" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access = null; - req_one_access_txt = "37"; - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "iqx" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -42100,6 +40446,22 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"iqO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1; + req_one_access = list(18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "irn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -42219,6 +40581,14 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) +"itd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "itf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -42252,12 +40622,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"itX" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "iub" = ( /obj/structure/machinery/light{ dir = 4 @@ -42350,12 +40714,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"ivs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ivz" = ( /obj/structure/closet, /turf/open/floor/almayer{ @@ -42368,14 +40726,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"ivM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "iwh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -42384,6 +40734,22 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"iwn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "iwB" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -42432,6 +40798,28 @@ icon_state = "plate" }, /area/almayer/command/cic) +"ixx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "ixC" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -42444,15 +40832,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) -"ixD" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ixN" = ( /obj/structure/largecrate, /obj/item/folded_tent/reqs{ @@ -42476,6 +40855,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"ixW" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "iyq" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 2; @@ -42510,18 +40907,24 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"iyS" = ( -/obj/structure/disposalpipe/segment{ +"izg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ dir = 1; - name = "ship-grade camera" + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 }, /turf/open/floor/almayer{ - icon_state = "blue" + icon_state = "test_floor4" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "izk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -42553,6 +40956,12 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"izL" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "izU" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, @@ -42564,6 +40973,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"iAa" = ( +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/hangar) "iAw" = ( /obj/item/tool/warning_cone{ pixel_x = -12 @@ -42593,19 +41006,27 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"iAT" = ( -/obj/structure/sign/safety/south{ - pixel_x = -17; - pixel_y = 8 +"iBe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ dir = 8; - icon_state = "blue" + icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/engineering/upper_engineering/starboard) "iBt" = ( /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) +"iBA" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "greencorner" + }, +/area/almayer/hallways/starboard_hallway) "iBE" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ @@ -42687,6 +41108,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) +"iDK" = ( +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iDT" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner{ @@ -42703,12 +41133,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"iEg" = ( +"iEn" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" + icon_state = "test_floor4" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/living/cryo_cells) "iEr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -42729,6 +41165,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"iFk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "iFm" = ( /obj/structure/machinery/light{ dir = 1 @@ -42803,6 +41250,20 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"iGC" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "iGE" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -42832,6 +41293,21 @@ "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) +"iHi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/command/lifeboat) +"iHm" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "iHF" = ( /obj/structure/largecrate/random, /obj/item/reagent_container/food/snacks/cheesecakeslice{ @@ -42875,6 +41351,28 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"iIr" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) +"iIE" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Tanker Quarters"; + req_one_access_txt = "19;27" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -42889,17 +41387,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"iIR" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = 10; - pixel_y = 22 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "iIY" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -42919,17 +41406,18 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"iJS" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 +"iJO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "iKa" = ( /obj/structure/sink{ dir = 1; @@ -42950,14 +41438,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"iKc" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "iKf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -43009,15 +41489,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/general_equipment) -"iKZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "iLd" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -43033,20 +41504,21 @@ /obj/structure/machinery/computer/disk_reader, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"iLh" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "iLq" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) +"iLr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "iLs" = ( /obj/structure/ladder{ height = 1; @@ -43065,30 +41537,46 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) +"iLu" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/obj/item/device/binoculars, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/cic) +"iLD" = ( +/obj/structure/machinery/door/window/westright{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) +"iLI" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "iLO" = ( /turf/open/floor/almayer{ dir = 4; 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) -"iMr" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "iMx" = ( /obj/structure/platform{ dir = 1 @@ -43108,6 +41596,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"iMQ" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"iNU" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "iNZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -43132,6 +41633,16 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"iPk" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -43143,18 +41654,36 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"iPD" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +"iPF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "iPS" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/alpha) +"iQa" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "iQg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43166,31 +41695,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) -"iQi" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "iQj" = ( /obj/structure/ladder{ height = 2; @@ -43200,25 +41704,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"iQt" = ( -/obj/structure/largecrate/random/case/small, -/obj/item/toy/deck{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/sign/poster{ - desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; - icon_state = "poster12"; - name = "Beach Babe Pinup"; - pixel_x = -30; - pixel_y = 6; - serial_number = 12 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "iQx" = ( /obj/structure/machinery/light{ dir = 1 @@ -43280,17 +41765,21 @@ /obj/item/trash/chips, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"iSZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"iSR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/surface/table/almayer, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "iTf" = ( /obj/structure/closet/crate/trashcart, /obj/item/clothing/gloves/yellow, @@ -43304,14 +41793,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"iTw" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "iTz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43324,10 +41805,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"iTD" = ( -/obj/effect/landmark/start/auxiliary_officer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/bridgebunks) "iTI" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -43375,16 +41852,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"iUW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/tool/crowbar/red, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "iUZ" = ( /obj/docking_port/stationary/escape_pod/cl, /turf/open/floor/plating, @@ -43423,13 +41890,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"iVY" = ( -/obj/effect/decal/hefa_cult_decals/d32, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "iVZ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/black, @@ -43444,16 +41904,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"iWc" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "iWd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43492,6 +41942,30 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) +"iWS" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + layer = 3.1; + pixel_x = -12; + pixel_y = 14 + }, +/obj/item/toy/deck/uno{ + layer = 3.1; + pixel_x = -3; + pixel_y = -1 + }, +/obj/item/toy/handcard/uno_reverse_yellow{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 10 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/living/port_emb) "iXb" = ( /obj/structure/bed/chair/comfy/delta{ dir = 8 @@ -43507,10 +41981,21 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"iXT" = ( -/obj/item/trash/uscm_mre, +"iXw" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 4 + }, +/obj/structure/surface/table/reinforced/black, +/obj/item/device/whistle, /turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/command/cic) +"iXP" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "iXU" = ( /obj/structure/machinery/light{ dir = 8 @@ -43530,15 +42015,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"iYe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "iYf" = ( /obj/structure/machinery/cm_vending/clothing/medical_crew{ density = 0; @@ -43596,6 +42072,15 @@ icon_state = "plate" }, /area/almayer/living/gym) +"iZe" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/delta{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "iZg" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -43627,15 +42112,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/chief_mp_office) -"iZH" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) "iZP" = ( /obj/structure/platform{ dir = 8 @@ -43741,6 +42217,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"jbi" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "jbq" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -43761,6 +42243,20 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_s) +"jbF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/hangar{ + dir = 1; + pixel_x = -7; + pixel_y = -8 + }, +/obj/item/device/radio/intercom/alamo{ + layer = 2.9; + pixel_y = -4; + pixel_x = 9 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "jbH" = ( /obj/structure/machinery/light{ dir = 8 @@ -43797,23 +42293,46 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +"jcj" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "jcl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/wood/ship, /area/almayer/living/grunt_rnr) +"jcA" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"jcI" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/delta) "jcK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"jcP" = ( -/turf/open/floor/almayer{ - icon_state = "plating_striped" - }, -/area/almayer/engineering/upper_engineering/starboard) "jcZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -43829,20 +42348,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) -"jdm" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/trash/USCMtray, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) "jdy" = ( /obj/structure/sign/safety/autoopenclose{ pixel_x = 7; @@ -43870,9 +42375,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) -"jeb" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/alpha_bravo_shared) "jeq" = ( /obj/structure/surface/rack, /obj/item/storage/box/pillbottles{ @@ -43888,12 +42390,15 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"jew" = ( -/obj/structure/surface/table/reinforced/black, +"jey" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, /turf/open/floor/almayer{ + dir = 8; icon_state = "red" }, -/area/almayer/living/cryo_cells) +/area/almayer/living/briefing) "jez" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -43922,13 +42427,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"jeQ" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/living/cryo_cells) "jeU" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -43940,6 +42438,16 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"jfp" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat2-D1"; + linked_dock = "almayer-lifeboat2"; + throw_dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/starboard) "jfD" = ( /obj/structure/sign/safety/security{ pixel_y = -32 @@ -44031,14 +42539,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"jgl" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "jgu" = ( /obj/structure/sink{ dir = 4; @@ -44057,26 +42557,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) -"jgC" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_a_p) "jgF" = ( /obj/structure/platform, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"jgJ" = ( +"jgH" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/command/cichallway) +/area/almayer/engineering/upper_engineering/starboard) "jgM" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -44089,6 +42581,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"jha" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/squads/delta) "jhb" = ( /obj/structure/sign/safety/cryo{ pixel_x = -6; @@ -44102,15 +42605,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"jht" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "jhx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -44133,18 +42627,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"jhD" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "jhW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"jin" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "jip" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Main Kitchen"; @@ -44171,6 +42667,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"jje" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "jjn" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -44266,16 +42776,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"jks" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Firing_Range_2"; - name = "range shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "jkz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/handcuffs{ @@ -44350,13 +42850,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) -"jlT" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "jlX" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -44367,10 +42860,27 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"jmg" = ( -/obj/structure/largecrate/supply/ammo/shotgun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_a_s) +"jmo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"jmH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "jmK" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -44405,11 +42915,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"jmY" = ( -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/command/cichallway) +"jmS" = ( +/obj/structure/supply_drop/delta, +/turf/open/floor/plating, +/area/almayer/squads/req) "jnf" = ( /turf/open/floor/almayer{ dir = 1; @@ -44446,6 +42955,15 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"jnK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "jnT" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -44490,6 +43008,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"jph" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "jpp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -44530,6 +43054,17 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) +"jpT" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"jqz" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -44567,6 +43102,19 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"jrG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + req_access = null; + req_one_access_txt = "7;23;27" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "jrM" = ( /obj/structure/machinery/camera/autoname/almayer/containment{ dir = 4 @@ -44576,14 +43124,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"jss" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/captain_mess) "jsx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -44595,6 +43135,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"jsS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) "jtj" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -44624,6 +43180,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"jut" = ( +/obj/structure/machinery/cm_vending/gear/engi, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "juD" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -44667,31 +43229,15 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/general_equipment) -"jvp" = ( -/obj/structure/disposalpipe/segment, +"jvw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/squads/alpha) +/area/almayer/command/lifeboat) "jvB" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ @@ -44737,13 +43283,14 @@ "jvY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/telecomms) -"jwK" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +"jxf" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/bottle/tequila, +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "jxi" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer{ @@ -44751,12 +43298,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"jxx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "jxB" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -44785,10 +43326,48 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"jyB" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"jyC" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "jyE" = ( /obj/structure/machinery/light, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) +"jyL" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_x_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "jyR" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ req_one_access_txt = "7;23;27" @@ -44797,6 +43376,31 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"jyY" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) +"jzb" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/multitool{ + desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; + icon_state = "multitool_big"; + name = "\improper Oversized Security Access Tuner"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"jze" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "jzD" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -44850,15 +43454,15 @@ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) -"jAJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ +"jAX" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "blue" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/squads/delta) "jBy" = ( /obj/structure/machinery/light{ dir = 4 @@ -44868,6 +43472,31 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"jBA" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "jBB" = ( /obj/structure/surface/rack, /obj/item/circuitboard/firealarm, @@ -44891,15 +43520,6 @@ dir = 8 }, /area/almayer/medical/containment/cell) -"jBX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "jCa" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -44918,6 +43538,23 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"jDx" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"jDJ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "jDV" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -45019,6 +43656,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"jGF" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "jGI" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/drinks/cans/waterbottle, @@ -45037,15 +43683,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"jGR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "jHe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45065,6 +43702,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"jHj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "jHC" = ( /turf/open/floor/almayer{ dir = 1; @@ -45080,15 +43726,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"jHL" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "jHQ" = ( /obj/structure/machinery/crema_switch{ pixel_x = -24; @@ -45203,30 +43840,12 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"jLj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "jLs" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"jLK" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) "jMb" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -45237,20 +43856,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"jMi" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_y = 14 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 5; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "jMm" = ( /obj/effect/spawner/random/tool, /turf/open/floor/almayer{ @@ -45281,16 +43886,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"jMG" = ( -/obj/structure/largecrate/random/case/small, -/obj/structure/largecrate/random/mini/wooden{ - pixel_x = 4; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "jMK" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -45300,6 +43895,19 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) +"jMP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "jMQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -45364,28 +43972,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"jOi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, +"jOh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; - icon_state = "orangecorner" + icon_state = "orange" }, -/area/almayer/squads/bravo) +/area/almayer/engineering/upper_engineering/starboard) "jOk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/line_nexter_control{ @@ -45422,18 +44015,22 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"jOx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"jOy" = ( +/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/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "green" }, -/area/almayer/squads/bravo) +/area/almayer/hallways/port_hallway) "jOG" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/firealarm{ @@ -45445,18 +44042,21 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"jON" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "jPf" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"jPq" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 @@ -45471,6 +44071,48 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) +"jRc" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "CIC Lockdown"; + name = "CIC Lockdown"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/obj/structure/machinery/door_control{ + id = "Hangar Lockdown"; + name = "Hangar Lockdown"; + pixel_x = -7; + pixel_y = 2; + req_access_txt = "1" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/obj/structure/machinery/door_control{ + id = "bot_armory"; + name = "Armory Lockdown"; + pixel_x = -7; + pixel_y = -5; + req_one_access_txt = "1;4" + }, +/obj/structure/transmitter/rotary{ + name = "Combat Information Center Telephone"; + phone_category = "Command"; + phone_id = "Combat Information Center"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/machinery/door/window/westright{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "jRn" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/supply/supplies/mre, @@ -45491,15 +44133,6 @@ }, /turf/closed/wall/almayer/outer, /area/space) -"jRC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "jRK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -45524,17 +44157,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"jSp" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "jSw" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -45544,6 +44166,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"jST" = ( +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "jSU" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -45599,19 +44230,30 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"jTs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "jTu" = ( /obj/structure/sign/safety/nonpress_ag{ pixel_x = 32 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"jTI" = ( -/obj/structure/disposalpipe/segment, +"jTL" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" + dir = 4; + icon_state = "orange" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/engineering/upper_engineering/port) "jUb" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/toy/deck{ @@ -45688,6 +44330,17 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) +"jUV" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "jUW" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -45709,19 +44362,6 @@ "jVa" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"jVr" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "jVt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45736,6 +44376,12 @@ icon_state = "test_floor5" }, /area/almayer/command/computerlab) +"jVF" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/auxiliary_officer_office) "jWh" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/port) @@ -45789,6 +44435,10 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"jXq" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "jXW" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -45809,6 +44459,15 @@ icon_state = "mono" }, /area/almayer/hallways/vehiclehangar) +"jYl" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/port) "jYR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -45825,6 +44484,18 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) +"jYZ" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) "jZd" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -45870,12 +44541,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"jZv" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "jZL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -45938,17 +44603,6 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"kaB" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/squads/alpha) "kaF" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45960,14 +44614,11 @@ allow_construction = 0 }, /area/almayer/hallways/starboard_hallway) -"kaI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/charlie_delta_shared) +"kaM" = ( +/obj/effect/landmark/start/marine/spec/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "kaN" = ( /obj/structure/platform{ dir = 1 @@ -45992,21 +44643,6 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"kbc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 8 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "kbx" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46044,37 +44680,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) -"kbV" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) -"kcl" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/bravo) "kcp" = ( /turf/closed/wall/almayer, /area/almayer/living/auxiliary_officer_office) -"kcA" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "kcH" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/synthcloset) "kcN" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/commandbunks) +"kcO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull) +"kcU" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) +"kcV" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) +"kdf" = ( +/obj/structure/machinery/vending/cigarette, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "kdi" = ( /obj/item/device/flashlight/pen{ pixel_x = 4; @@ -46111,6 +44750,18 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"kea" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"kex" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "keO" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -46231,14 +44882,6 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"khd" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "khD" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -46274,6 +44917,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"kib" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "kif" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -46310,65 +44957,33 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"kiU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"kje" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "umbilical wall" }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orange" +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull{ + dir = 4; + icon_state = "outerhull_dir" }, -/area/almayer/squads/bravo) -"kiV" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 11 +/area/almayer/engineering/upper_engineering/starboard) +"kjH" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 32 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "cargo_arrow" }, -/area/almayer/squads/alpha) +/area/almayer/hallways/port_hallway) "kjN" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/surgery) -"kjV" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/obj/item/toy/plushie_cade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46392,6 +45007,14 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"kkU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -46400,6 +45023,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"kmb" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "kmd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46435,26 +45064,6 @@ /obj/item/tool/mop, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"kmL" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/regular{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -7 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -10; - pixel_y = 14 - }, -/obj/item/storage/xeno_tag_case/full{ - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/corporateliason) "kmM" = ( /obj/structure/sink{ pixel_y = 24 @@ -46512,20 +45121,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"koC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "koT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -46550,6 +45145,12 @@ icon_state = "plate" }, /area/almayer/hallways/aft_hallway) +"kpE" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "kpQ" = ( /obj/structure/machinery/door_control{ id = "engidorm"; @@ -46674,6 +45275,18 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"krh" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "kro" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -46689,6 +45302,21 @@ icon_state = "plate" }, /area/almayer/living/gym) +"krq" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ + dir = 8; + name = "Alamo Remote Control Console"; + shuttleId = "dropship_alamo" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "krN" = ( /obj/structure/machinery/conveyor{ id = "req_belt" @@ -46707,6 +45335,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"krY" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "krZ" = ( /obj/structure/closet/secure_closet/cargotech, /obj/item/clothing/accessory/storage/webbing, @@ -46722,14 +45358,12 @@ icon_state = "green" }, /area/almayer/squads/req) -"ksp" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, +"ksl" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/squads/bravo) +/area/almayer/living/tankerbunks) "ksA" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ @@ -46821,6 +45455,16 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) +"kus" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/item/device/binoculars/range, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "kuu" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -46828,12 +45472,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"kuw" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "kvh" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/station_alert{ @@ -46851,6 +45489,12 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) +"kvM" = ( +/obj/structure/machinery/cm_vending/clothing/marine/alpha, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "kvN" = ( /turf/open/floor/almayer{ dir = 10; @@ -46861,6 +45505,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"kwa" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/living/briefing) "kwd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -46894,6 +45544,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"kwI" = ( +/obj/structure/surface/rack{ + density = 0; + pixel_y = 16 + }, +/obj/structure/surface/rack{ + layer = 2.5 + }, +/obj/item/storage/fancy/candle_box{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "kwQ" = ( /obj/item/tool/warning_cone{ pixel_y = 16 @@ -46914,6 +45581,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"kxi" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/briefing) "kxo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -46948,6 +45624,27 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"kxO" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_x_offset = 0; + vend_y_offset = 0 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"kyu" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "kyI" = ( /obj/structure/machinery/light{ dir = 8 @@ -46980,6 +45677,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"kyS" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/living/cryo_cells) "kyX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -47017,40 +45720,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"kzK" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "kzP" = ( /turf/open/floor/almayer{ dir = 9; @@ -47102,6 +45771,21 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"kBn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "kBo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -47119,6 +45803,15 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"kBB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "kBP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47129,6 +45822,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"kBU" = ( +/obj/structure/machinery/cm_vending/sorted/medical{ + req_access = list(10) + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "kBY" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -47222,6 +45923,20 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"kDo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "kDt" = ( /obj/structure/machinery/light{ dir = 1 @@ -47250,6 +45965,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"kDX" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) "kEb" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -47263,6 +45987,18 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/morgue) +"kEs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "kFe" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -47307,6 +46043,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"kFK" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "kFO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -47318,6 +46063,20 @@ icon_state = "plating" }, /area/almayer/squads/req) +"kFU" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "kFY" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7 @@ -47336,16 +46095,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"kGF" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "kGL" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ @@ -47408,30 +46157,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) -"kHS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "kHT" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"kHY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "kIm" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -47441,25 +46172,11 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_umbilical) -"kIP" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "kIV" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"kJi" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "kJC" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -47512,6 +46229,12 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"kKl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "kKv" = ( /obj/effect/projector{ name = "Almayer_AresUp"; @@ -47563,15 +46286,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) -"kLk" = ( -/obj/structure/machinery/cm_vending/clothing/tl/bravo{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47582,6 +46296,28 @@ icon_state = "greencorner" }, /area/almayer/squads/req) +"kLQ" = ( +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/effect/landmark/start/auxiliary_officer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) +"kLR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "kMq" = ( /obj/structure/sign/poster{ desc = "It says DRUG."; @@ -47603,19 +46339,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"kMK" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "umbilical wall" - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer_hull{ - dir = 8; - icon_state = "outerhull_dir" - }, -/area/almayer/engineering/upper_engineering/port) "kMU" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -47636,12 +46359,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) -"kNk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/almayer, -/area/almayer/engineering/upper_engineering/starboard) "kNl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47662,6 +46379,28 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"kNA" = ( +/obj/structure/machinery/cm_vending/gear/smartgun, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"kNH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "kNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -47675,12 +46414,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"kNQ" = ( +"kNV" = ( /turf/open/floor/almayer{ dir = 1; - icon_state = "orangecorner" + icon_state = "silvercorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/port_hallway) "kNY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -47707,6 +46446,9 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"kOl" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hull/lower_hull/l_a_s) "kOv" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -47740,12 +46482,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"kOH" = ( +"kOO" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 32 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" + icon_state = "cargo_arrow" }, -/area/almayer/living/port_emb) +/area/almayer/squads/delta) "kPo" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -47753,6 +46497,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"kPu" = ( +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -47838,6 +46587,11 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) +"kQW" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/living/cryo_cells) "kRd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47876,6 +46630,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"kSr" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hull/lower_hull/l_a_s) "kSv" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/almayer{ @@ -47883,6 +46643,32 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"kSw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"kSx" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "kSy" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -47915,6 +46701,13 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"kSU" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "kTc" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/shotgun, @@ -47993,6 +46786,24 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) +"kUs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "kUt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -48030,6 +46841,20 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"kVm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "kVX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -48088,18 +46913,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"kXa" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo{ - density = 0; - pixel_y = 16 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "kXf" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -48163,6 +46976,13 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"kYq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "kYP" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48203,16 +47023,6 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"kZN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) "kZV" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -48227,12 +47037,13 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"lah" = ( +"laf" = ( +/obj/structure/device/broken_moog, +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" + icon_state = "orange" }, -/area/almayer/living/gym) +/area/almayer/engineering/upper_engineering/starboard) "laj" = ( /obj/structure/platform{ dir = 1 @@ -48279,17 +47090,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"laU" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Firing_Range_1"; - name = "range shutters" - }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) "laV" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -48315,51 +47115,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"lbf" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) -"lbB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) -"lbX" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +"lbY" = ( +/obj/structure/machinery/power/apc/almayer{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "lcg" = ( /obj/structure/machinery/ares/substrate, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"lcy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "lcV" = ( /obj/structure/bed/chair{ dir = 4 @@ -48442,24 +47209,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"lef" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"leg" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/hallways/hangar) "leh" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -48487,6 +47236,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"lfd" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "lfH" = ( /obj/structure/machinery/light{ dir = 4 @@ -48518,17 +47275,32 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"lgy" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ +"lgg" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) +"lgw" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = -32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Firing_Range_2"; - name = "range shutters" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating, -/area/almayer/living/cryo_cells) +/area/almayer/squads/alpha) "lgK" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ density = 0; @@ -48551,6 +47323,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"lgZ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/living/briefing) "lht" = ( /turf/open/floor/almayer{ dir = 6; @@ -48616,6 +47397,16 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"lij" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "lin" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -48633,6 +47424,18 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"liE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "liJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48675,11 +47478,15 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ljs" = ( -/obj/effect/landmark/start/marine/spec/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) +"ljn" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "ljG" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/condiment/coldsauce, @@ -48728,18 +47535,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lkM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "lkW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/belt/medical/lifesaver/full, @@ -48768,13 +47563,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"lml" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +"lms" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "lmw" = ( /obj/structure/closet/l3closet/general, /obj/structure/machinery/light{ @@ -48809,17 +47608,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"lne" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) -"lnm" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "lnt" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -48865,31 +47653,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"lok" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie{ - density = 0; - layer = 4.1; - pixel_y = -29 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"lol" = ( -/obj/structure/machinery/status_display{ - pixel_x = 16; - pixel_y = -30 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "lou" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -48915,23 +47678,6 @@ "loP" = ( /turf/closed/wall/almayer, /area/almayer/engineering/laundry) -"loS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "loV" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -48952,11 +47698,13 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"lpt" = ( +"lpi" = ( +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ - icon_state = "blue" + dir = 4; + icon_state = "red" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/squads/alpha) "lpy" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -48980,6 +47728,13 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"lpU" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "lpX" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -49010,27 +47765,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"lqK" = ( -/obj/effect/decal/cleanable/ash, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -13; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/hallways/hangar) -"lqN" = ( -/obj/item/device/assembly/mousetrap/armed, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "lqZ" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/almayer{ @@ -49078,10 +47812,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"lrT" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "lrV" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 3"; @@ -49168,19 +47898,29 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"lty" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "ltA" = ( /obj/item/tool/weldingtool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ltI" = ( +"ltD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "emerald" + icon_state = "plate" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "ltU" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer{ @@ -49207,6 +47947,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"lur" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "lut" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/almayer{ @@ -49287,13 +48039,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"luY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "luZ" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -49311,6 +48056,18 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) +"lvc" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19"; + access_modified = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_s) "lvA" = ( /obj/structure/machinery/power/apc/almayer/hardened{ dir = 1 @@ -49319,6 +48076,11 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"lvM" = ( +/obj/effect/landmark/start/marine/smartgunner/alpha, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "lvZ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -49400,35 +48162,22 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"lwJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/squads/charlie) -"lxo" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"lyf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/living/auxiliary_officer_office) -"lxW" = ( -/obj/structure/sign/prop2{ - pixel_y = 29 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "red" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/squads/alpha) "lyi" = ( /obj/structure/surface/table/almayer, /obj/item/trash/pistachios, @@ -49459,16 +48208,28 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"lyX" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = null; - req_access_txt = 37; - req_one_access = null +"lyL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22"; + welded = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/hallways/port_hallway) +"lzf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "lzj" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -49479,13 +48240,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"lzq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "lzx" = ( /turf/open/floor/almayer{ dir = 1; @@ -49509,6 +48263,15 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"lzS" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/command/cichallway) "lzW" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -49521,21 +48284,12 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"lAl" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"lAu" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"lAv" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 }, -/area/almayer/engineering/upper_engineering/port) +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "lAy" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -49567,18 +48321,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"lAQ" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "lBg" = ( /obj/structure/bedsheetbin, /turf/open/floor/almayer{ @@ -49597,18 +48339,15 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"lBv" = ( +"lBq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" + dir = 4; + icon_state = "orange" }, -/area/almayer/squads/charlie) +/area/almayer/engineering/upper_engineering/port) "lBF" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -49665,6 +48404,23 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"lCN" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "lCS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -49674,6 +48430,14 @@ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) +"lCX" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Mech Ops's Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "lDg" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddernorthwest"; @@ -49688,15 +48452,23 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"lDJ" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 +"lDA" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) +"lDD" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "cargo" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/port_hallway) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -49722,14 +48494,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"lDV" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/obj/structure/sign/safety/cryo{ - pixel_y = 26 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "lEf" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 1 @@ -49761,28 +48525,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"lEL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/prop/ice_colony/tiger_rug{ - desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; - icon_state = "HotlineAlt"; - layer = 2.9; - name = "Richard the tiger" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) -"lEO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "lEW" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, @@ -49938,6 +48680,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"lGV" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "lHc" = ( /obj/effect/landmark/start/doctor, /obj/structure/sign/safety/maint{ @@ -49965,6 +48719,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) +"lIe" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "lIh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49989,6 +48753,18 @@ icon_state = "test_floor4" }, /area/almayer/hallways/stern_hallway) +"lIz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/effect/landmark/start/senior, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "lII" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -50017,20 +48793,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engineering_workshop) +"lJb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "lJg" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"lJu" = ( -/obj/structure/barricade/metal{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "lJv" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -50063,18 +48840,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"lJO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "lJY" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) @@ -50089,15 +48854,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"lKb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha_bravo_shared) "lKk" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -50107,10 +48863,15 @@ icon_state = "red" }, /area/almayer/hallways/stern_hallway) -"lLC" = ( +"lKG" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50120,10 +48881,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"lLV" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_m_s) "lMc" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -50169,6 +48926,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"lNh" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/obj/structure/machinery/vending/cola, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/squads/alpha) "lNl" = ( /turf/open/floor/almayer{ dir = 6; @@ -50196,21 +48963,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"lNw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "lNy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -50233,6 +48985,15 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"lOk" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "lOl" = ( /obj/structure/machinery/light{ dir = 8 @@ -50296,6 +49057,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"lPI" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "lPO" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -50333,16 +49103,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"lQz" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "lQG" = ( /obj/structure/machinery/computer/tech_control, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) +"lQH" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "lQO" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -50365,19 +49135,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"lRs" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_y = 20 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "lRE" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -50399,6 +49156,31 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"lRV" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "lRX" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -50472,6 +49254,29 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"lVt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"lVE" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "lVS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -50550,6 +49355,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"lYy" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "lYA" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_m_s) @@ -50570,6 +49381,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"lYV" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/command/cichallway) "lYZ" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical/green{ @@ -50581,6 +49399,24 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"lZf" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "lZs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/intercom{ @@ -50691,6 +49527,49 @@ icon_state = "greencorner" }, /area/almayer/hallways/aft_hallway) +"mcf" = ( +/obj/item/toy/farwadoll{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + icon_state = "therapyred"; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/port_emb) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -50753,20 +49632,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"meu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "meJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -50794,11 +49659,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"meY" = ( -/turf/closed/wall/almayer{ - damage_cap = 15000 - }, -/area/almayer/squads/alpha) "mfe" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -50853,15 +49713,15 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"mgF" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +"mgK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + dir = 1; + icon_state = "silver" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/hallways/port_hallway) "mha" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -50897,32 +49757,14 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"mhG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) -"mhI" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = 13; - pixel_y = 15 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 +"mhJ" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "blue" }, -/area/almayer/squads/alpha) +/area/almayer/living/briefing) "miE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -50933,38 +49775,55 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) +"miF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) +"miH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat2-D3"; + linked_dock = "almayer-lifeboat2"; + throw_dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "miK" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"miV" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "mji" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"mjl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mjR" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"mjS" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) "mkc" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -51043,23 +49902,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"mkH" = ( -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/structure/surface/rack{ - layer = 2.5 - }, -/obj/item/storage/fancy/candle_box{ - pixel_x = 6; - pixel_y = -2 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "mlb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -51073,11 +49915,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"mlm" = ( -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/cryo_cells) "mlp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -51110,6 +49947,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"mmL" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "mmN" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -51149,6 +49996,15 @@ "mnm" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"mnq" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "mnA" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -51169,6 +50025,10 @@ icon_state = "blue" }, /area/almayer/living/briefing) +"mnT" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "mnW" = ( /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ @@ -51194,6 +50054,12 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"mnX" = ( +/obj/structure/machinery/cm_vending/gear/spec, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "moh" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -51227,12 +50093,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) -"moI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha_bravo_shared) "moM" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -51289,19 +50149,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"mqK" = ( -/obj/structure/machinery/cm_vending/gear/spec, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "mqU" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -51372,21 +50219,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) -"msm" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" +"msC" = ( +/obj/structure/machinery/autolathe, +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/squads/bravo) -"msP" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/squads/alpha) "msV" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -51409,20 +50250,36 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"mtr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"mtq" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "bot_armory"; + name = "\improper Armory Shutters" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/obj/structure/machinery/status_display{ - pixel_y = -29 +/area/almayer/command/cic) +"mts" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "cargo" + }, +/area/almayer/squads/delta) +"mtz" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51445,6 +50302,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"mtU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "mtX" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/rifle/m41aMK1/ap, @@ -51455,6 +50318,18 @@ icon_state = "redfull" }, /area/almayer/command/cic) +"mtY" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"mtZ" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(1) + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "mub" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -51482,19 +50357,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"mvl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -51508,6 +50370,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"mwp" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access_txt = "19;21"; + access_modified = 1; + req_one_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "mwA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -51626,11 +50499,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"mzg" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "mzo" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_p) @@ -51667,12 +50535,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"mzV" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "mAp" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -51720,14 +50582,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) -"mBc" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/charlie_delta_shared) "mBk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -51752,6 +50606,12 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/navigation) +"mBq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/starboard) "mBA" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -51774,6 +50634,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"mBQ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "mCo" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -51788,6 +50654,26 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"mCS" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "umbilical wall" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull{ + dir = 4; + icon_state = "outerhull_dir" + }, +/area/almayer/engineering/upper_engineering/port) +"mDe" = ( +/obj/structure/machinery/cm_vending/clothing/tl/delta{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "mDj" = ( /obj/structure/machinery/photocopier, /obj/item/paper{ @@ -51807,18 +50693,6 @@ "mDJ" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"mDT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie_delta_shared) -"mDW" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/living/briefing) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -51830,6 +50704,30 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mEI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "cryo curtain" + }, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_s) +"mES" = ( +/obj/structure/machinery/cm_vending/clothing/leader/alpha{ + density = 0; + pixel_y = 30 + }, +/obj/structure/machinery/cm_vending/gear/leader{ + density = 0; + pixel_x = 31 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "mFq" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -51889,22 +50787,17 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"mFO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "mGe" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/cichallway) +"mGl" = ( +/obj/item/trash/uscm_mre, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "mGn" = ( /obj/structure/machinery/cm_vending/clothing/military_police_warden, /turf/open/floor/almayer{ @@ -51977,6 +50870,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"mHP" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "mHR" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -52023,6 +50922,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"mIP" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/delta{ + density = 0; + pixel_y = -31 + }, +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mIW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -52054,13 +50967,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"mJj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/squads/alpha) "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) @@ -52071,32 +50977,6 @@ }, /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) -"mJP" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"mKb" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/squads/alpha) "mKf" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -52140,38 +51020,11 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"mKJ" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) +"mKU" = ( +/obj/effect/landmark/start/marine/smartgunner/delta, +/obj/effect/landmark/late_join/delta, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "mKX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -52215,19 +51068,6 @@ "mLE" = ( /turf/open/floor/plating, /area/almayer/command/airoom) -"mLF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "mLI" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -52288,6 +51128,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"mND" = ( +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "mNI" = ( /obj/structure/machinery/door/window/westleft{ dir = 2 @@ -52407,6 +51255,15 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) +"mPo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/vehicle/walker/prebuilt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "mPX" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -52421,6 +51278,17 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"mQk" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull) "mQC" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) @@ -52430,6 +51298,13 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"mQT" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/pistol/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "mQV" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -52491,9 +51366,34 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"mRT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) +"mRZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "mSi" = ( /obj/structure/bed/sofa/vert/grey/top{ pixel_y = 11 @@ -52541,12 +51441,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) -"mSU" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/charlie_delta_shared) "mTb" = ( /obj/structure/machinery/light{ dir = 4 @@ -52598,6 +51492,33 @@ icon_state = "cargo_arrow" }, /area/almayer/medical/hydroponics) +"mTr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/briefing) +"mTs" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/squads/delta) "mUa" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -52623,12 +51544,24 @@ icon_state = "plate" }, /area/almayer/living/offices) -"mUx" = ( -/obj/structure/machinery/door/airlock/almayer/marine/bravo/sl, +"mUy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/cmcap{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "blue" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "mUz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer/ares{ @@ -52693,6 +51626,21 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mVM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "mWe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -52724,15 +51672,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"mWy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha_bravo_shared) "mWD" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -52742,21 +51681,6 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) -"mWQ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/sign/banners/maximumeffort{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/squads/delta) "mWV" = ( /obj/structure/bed/chair/comfy/blue, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -52795,20 +51719,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"mYw" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "mYx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -52839,20 +51749,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"mZb" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "mZr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52887,6 +51783,16 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"mZG" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/black, +/obj/item/tank/oxygen, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "mZM" = ( /obj/structure/machinery/light{ dir = 8 @@ -52902,18 +51808,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"nar" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) -"nau" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) @@ -52958,15 +51852,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"ncp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "ncE" = ( /obj/structure/machinery/light{ dir = 8 @@ -53049,15 +51934,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/engineering_workshop) -"new" = ( -/obj/item/reagent_container/glass/bucket/janibucket, -/obj/item/reagent_container/glass/bucket/janibucket{ - pixel_y = 11 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "neE" = ( /obj/structure/platform_decoration{ dir = 1 @@ -53079,16 +51955,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"nff" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "nfp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53141,45 +52007,17 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"ngA" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, +"ngB" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "ngI" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" }, /area/almayer/living/briefing) -"ngU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/starboard) "nhi" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -53193,22 +52031,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"nhx" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/deck{ - desc = "A simple deck of playing cards. You could play Caravan with these!"; - pixel_y = 12 - }, -/obj/item/toy/deck/uno{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/clothing/mask/cigarette{ - pixel_x = -2; - pixel_y = -2 +"nhw" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/engineering/upper_engineering/starboard) "nhG" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper{ @@ -53236,6 +52066,21 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"nhY" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) +"nia" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "nig" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -53276,43 +52121,12 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"niR" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) -"niY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "nja" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"njd" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "njD" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/hazardvest, @@ -53333,12 +52147,17 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"njL" = ( +"njR" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_x_offset = 0 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/squads/delta) "njT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53349,6 +52168,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"njY" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "nka" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -53362,12 +52191,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/vehiclehangar) -"nkn" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "nkx" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -53377,6 +52200,17 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"nkP" = ( +/obj/structure/bed/chair/wheelchair, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"nll" = ( +/obj/structure/machinery/light, +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "nlB" = ( /turf/open/floor/almayer{ dir = 1; @@ -53389,14 +52223,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"nlW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "nmb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -53425,6 +52251,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"nmy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "nmD" = ( /obj/structure/machinery/light{ dir = 1 @@ -53469,6 +52301,13 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"nng" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/extinguisher, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "nnr" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical{ @@ -53486,13 +52325,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"nny" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "nnz" = ( /obj/structure/sign/safety/maint{ pixel_x = 32; @@ -53562,6 +52394,12 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"noH" = ( +/obj/structure/machinery/cm_vending/clothing/engi/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "noV" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -53569,6 +52407,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"noX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "nph" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53591,6 +52438,19 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"npE" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 20 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -53601,6 +52461,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"nqL" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "nqU" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) @@ -53640,15 +52506,6 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) -"nrw" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "nrz" = ( /obj/structure/surface/rack, /obj/item/tool/kitchen/rollingpin, @@ -53663,21 +52520,31 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"nrO" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +"nrZ" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/hallways/port_hallway) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"nso" = ( +/obj/structure/machinery/door/airlock/almayer/command{ + name = "\improper Senior Enlisted Advisor's Office"; + req_access = null; + req_access_txt = "19;29" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/sea_office) "nsu" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -53692,6 +52559,28 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"nsA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) +"nsB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "nsY" = ( /turf/closed/wall/almayer, /area/almayer/living/port_emb) @@ -53773,6 +52662,15 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) +"ntz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "ntA" = ( /obj/structure/machinery/light/small, /obj/effect/decal/warning_stripes{ @@ -53810,12 +52708,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"nuA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"nuu" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/stamp/ro{ + name = "spare requisitions officer's rubber stamp"; + pixel_x = -7; + pixel_y = 11 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "nuK" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -53841,6 +52744,23 @@ icon_state = "test_floor4" }, /area/almayer/powered) +"nvi" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"nvq" = ( +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53848,18 +52768,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/chemistry) -"nvT" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "nwb" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -53904,12 +52812,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) -"nwD" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/command/cic) "nwG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -53956,6 +52858,17 @@ icon_state = "green" }, /area/almayer/squads/req) +"nxn" = ( +/obj/item/bedsheet/orange, +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + density = 0; + pixel_y = 30 + }, +/turf/open/floor/wood/ship, +/area/almayer/engineering/ce_room) "nxq" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; @@ -53968,6 +52881,15 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/main_office) +"nxG" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "nxK" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -53980,6 +52902,16 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"nxS" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "nyj" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal2" @@ -54019,9 +52951,12 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"nyQ" = ( -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +"nzm" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/auxiliary_officer_office) "nzv" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/clipboard, @@ -54062,19 +52997,20 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"nBa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0; - vend_y_offset = 0 +"nAf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/delta) "nBb" = ( /turf/open/floor/almayer{ dir = 5; @@ -54139,35 +53075,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"nCf" = ( -/obj/effect/landmark/start/marine/tl/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) -"nCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) -"nCT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "nDd" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/smg/m39, @@ -54227,20 +53134,28 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"nEo" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +"nDV" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_f_p) "nEs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) +"nEv" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/squads/delta) "nEz" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, @@ -54295,6 +53210,10 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"nER" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "nFm" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/surgery/scalpel, @@ -54351,12 +53270,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"nFK" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -54404,18 +53317,27 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"nHF" = ( -/turf/open/floor/plating, -/area/almayer/hull/lower_hull/l_m_s) -"nHJ" = ( +"nHw" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) +"nHD" = ( /obj/structure/machinery/light{ - dir = 8 + dir = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" + dir = 1; + icon_state = "orange" }, -/area/almayer/living/cryo_cells) +/area/almayer/engineering/upper_engineering/port) +"nHF" = ( +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_m_s) "nHV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54428,6 +53350,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"nIe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "nIj" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -54439,6 +53372,13 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) +"nIC" = ( +/obj/structure/bed/stool, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "nID" = ( /obj/structure/machinery/light{ dir = 8 @@ -54482,6 +53422,17 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"nIH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "nIS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54520,6 +53471,14 @@ icon_state = "plating" }, /area/almayer/command/airoom) +"nKe" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access_txt = "2;7;200" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "nKq" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -54597,6 +53556,40 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"nLS" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "nMc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -54685,12 +53678,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"nNH" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "nNQ" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -54718,15 +53705,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"nNV" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/squads/charlie_delta_shared) "nNX" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Evacuation Airlock PU-1"; @@ -54851,6 +53829,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"nPY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "nQv" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -54879,6 +53866,14 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"nRI" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "nRR" = ( /turf/open/floor/almayer{ dir = 1; @@ -54889,6 +53884,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"nSm" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -54939,12 +53943,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"nTZ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/living/gym) "nUa" = ( /obj/structure/bed/chair{ dir = 1 @@ -54986,6 +53984,13 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"nUZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/masks, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "nVe" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/bridge{ @@ -55023,6 +54028,13 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"nVP" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "nVS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55034,6 +54046,20 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"nVT" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "nVU" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -30 @@ -55045,16 +54071,6 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"nVX" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat2-D1"; - linked_dock = "almayer-lifeboat2"; - throw_dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/starboard) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, @@ -55075,9 +54091,38 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"nXA" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"nXE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "nXP" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_f_s) +"nXR" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/bridgebunks) "nXU" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 1; @@ -55094,16 +54139,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"nYc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "nYd" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 @@ -55125,6 +54160,22 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"nYs" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ + dir = 1; + req_one_access = list(18,19) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) +"nYu" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "nYD" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -55152,19 +54203,23 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"nZy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/facepaint/black, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "nZF" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_a_s) +"nZN" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "oap" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -55184,12 +54239,12 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"oaW" = ( -/obj/structure/machinery/cryopod/right, +"oaB" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "obo" = ( /obj/structure/disposalpipe/up/almayer{ dir = 8; @@ -55213,15 +54268,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"obE" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "obG" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/card{ @@ -55231,12 +54277,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"obQ" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ocf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -55294,6 +54334,21 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"ocI" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/squads/alpha) "oda" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio{ @@ -55307,37 +54362,37 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"odb" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) -"odl" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +"odf" = ( +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/starboard) -"odu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/hallways/port_hallway) +"odk" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Lifeboat Control Bubble"; + req_access = null }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"odB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"odl" = ( +/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 = "cargo_arrow" + icon_state = "green" }, -/area/almayer/squads/bravo) +/area/almayer/hallways/port_hallway) "odD" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -55357,15 +54412,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"odV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "oed" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -55384,26 +54430,22 @@ icon_state = "outerhull_dir" }, /area/almayer/command/lifeboat) -"oef" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/alpha_bravo_shared) "oeo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"oer" = ( -/turf/closed/wall/almayer{ - damage_cap = 15000 - }, -/area/almayer/squads/delta) "oeB" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"oeE" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "oeL" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -55419,6 +54461,13 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"ofi" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/clothing/suit/space/compression/uscm, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "ofs" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -55428,35 +54477,25 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"ofH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) -"ofK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) +"ofW" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "ofZ" = ( /obj/structure/bed/sofa/south/grey, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"ohj" = ( -/obj/structure/machinery/cryopod, +"ogb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 1; + icon_state = "blue" }, -/area/almayer/squads/charlie) +/area/almayer/living/port_emb) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -55487,16 +54526,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"ohH" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat2-D3"; - linked_dock = "almayer-lifeboat2"; - throw_dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "ohJ" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -55536,15 +54565,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"oir" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +"ois" = ( +/obj/structure/sign/poster{ + pixel_y = 32 }, -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 4 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) +/area/almayer/squads/alpha) "oit" = ( /obj/effect/landmark/railgun_computer{ dir = 1 @@ -55563,15 +54592,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"oiQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "oiY" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -55588,28 +54608,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"ojF" = ( -/obj/structure/machinery/cm_vending/clothing/tl/charlie{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/lower_medical_medbay) -"oka" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "okd" = ( /obj/structure/platform_decoration, /obj/structure/machinery/power/apc/almayer{ @@ -55648,6 +54651,23 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"okC" = ( +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/machinery/disposal, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "okD" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer6" @@ -55700,6 +54720,11 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"olG" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/command/cichallway) "olM" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -55725,13 +54750,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"olU" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "omb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -55787,17 +54805,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"onN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "onQ" = ( /obj/structure/sign/safety/rewire{ pixel_x = 8; @@ -55808,17 +54815,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"onY" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/obj/item/device/flashlight/lamp{ - pixel_x = -8; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "oog" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -55832,9 +54828,39 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"ooj" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/window/reinforced/toughened, +/obj/structure/machinery/computer/cameras/almayer_network/vehicle{ + dir = 4; + layer = 2.99; + pixel_y = 4 + }, +/obj/structure/machinery/computer/almayer_control{ + dir = 4; + layer = 2.99; + pixel_y = 26 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/command/cic) "oos" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"oot" = ( +/obj/structure/machinery/power/apc/almayer, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "oou" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55850,6 +54876,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"oov" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"ooH" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "ooR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -55878,6 +54920,10 @@ icon_state = "green" }, /area/almayer/squads/req) +"opr" = ( +/obj/effect/landmark/start/auxiliary_officer, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -55903,19 +54949,25 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"oqu" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +"oqd" = ( +/obj/structure/machinery/cm_vending/gear/engi, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/area/almayer/living/cryo_cells) +"oqe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "silver" }, -/area/almayer/squads/delta) +/area/almayer/hallways/port_hallway) "oqv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -55970,6 +55022,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"oqV" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "oqY" = ( /obj/structure/machinery/conveyor{ id = "req_belt" @@ -56032,13 +55094,12 @@ dir = 10 }, /area/almayer/command/lifeboat) -"osc" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/obj/structure/machinery/light{ - dir = 8 +"osi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "osx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56079,22 +55140,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"osA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "osE" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -56276,26 +55321,44 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"owI" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 10; + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "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 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - req_access = null; - req_one_access = null; - req_one_access_txt = "19;29"; - access_modified = 1 +"owR" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "green" }, -/area/almayer/shipboard/sea_office) +/area/almayer/command/cichallway) +"oxd" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/boots/n055{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "oxi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -56322,6 +55385,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"oxA" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/training, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "oxU" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer, @@ -56367,15 +55436,6 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"ozq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "ozr" = ( /obj/structure/closet, /obj/item/reagent_container/food/drinks/bottle/sake, @@ -56398,34 +55458,6 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"ozN" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat2-D2"; - linked_dock = "almayer-lifeboat2"; - throw_dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/starboard) -"ozT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "oAd" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -56479,15 +55511,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"oCf" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "oCi" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -56637,15 +55660,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"oEX" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/living/port_emb) "oFG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56658,13 +55672,6 @@ /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_p) -"oFV" = ( -/obj/structure/sign/poster{ - pixel_x = -32; - serial_number = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "oGx" = ( /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 @@ -56694,39 +55701,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"oGP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/living/port_emb) -"oHc" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "oHl" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -56743,6 +55717,24 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"oHV" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_p) +"oHX" = ( +/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) "oIc" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -56753,12 +55745,6 @@ icon_state = "orange" }, /area/almayer/shipboard/brig/perma) -"oIm" = ( -/obj/structure/prop/server_equipment/broken, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "oIn" = ( /obj/structure/bed/chair{ dir = 8; @@ -56804,6 +55790,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"oJy" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "oJR" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -56851,6 +55848,23 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"oLa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "oLd" = ( /obj/structure/platform{ dir = 4 @@ -56869,11 +55883,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"oLi" = ( -/obj/effect/landmark/start/marine/medic/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha) "oLm" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -56928,6 +55937,43 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/lobby) +"oLP" = ( +/obj/structure/sign/poster{ + desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that."; + icon_state = "poster16"; + layer = 3.3; + name = "'Miss July' Pinup"; + pixel_y = 29; + serial_number = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "oLT" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -56957,17 +56003,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"oMi" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "oMs" = ( /obj/structure/machinery/computer/cameras/almayer{ dir = 1 @@ -56977,14 +56012,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"oMH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/alpha_bravo_shared) "oMM" = ( /obj/structure/machinery/light{ dir = 1 @@ -57014,19 +56041,28 @@ icon_state = "redfull" }, /area/almayer/hull/lower_hull/l_f_s) -"oNj" = ( -/obj/structure/sign/prop1{ - pixel_x = -32; - pixel_y = 2 +"oNh" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + dir = 1 }, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/port) "oNp" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"oND" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "oNJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -57040,6 +56076,17 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"oOp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "oOO" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -57049,12 +56096,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"oPf" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "oPk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -57110,6 +56151,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"oQm" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "oQo" = ( /obj/item/stool, /turf/open/floor/almayer{ @@ -57130,29 +56180,10 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) -"oQM" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/tool/pen, -/obj/item/book/manual/marine_law{ - pixel_x = 15; - pixel_y = 5 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 16; - pixel_y = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) +"oRa" = ( +/obj/structure/foamed_metal, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "oRj" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -57217,6 +56248,11 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"oSe" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "oSq" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -57244,29 +56280,23 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"oSL" = ( -/obj/structure/window/reinforced{ - dir = 8 +"oSG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer{ dir = 1; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 + icon_state = "blue" }, +/area/almayer/squads/delta) +"oSY" = ( +/obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -57296,21 +56326,32 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) +"oTs" = ( +/obj/structure/machinery/cm_vending/gear/tl{ + density = 0; + pixel_x = -32; + vend_x_offset = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "oTz" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"oTA" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8 +"oUB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 4; + icon_state = "orange" }, -/area/almayer/squads/alpha) +/area/almayer/engineering/upper_engineering/starboard) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -57320,6 +56361,27 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oUQ" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"oVb" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "oVP" = ( /obj/structure/bed/chair{ dir = 4 @@ -57380,15 +56442,16 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) -"oXb" = ( -/obj/effect/landmark/start/marine/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"oXt" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "oXJ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -57424,6 +56487,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"oYm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/engineering/upper_engineering/starboard) "oYp" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -57459,6 +56530,33 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +"oZz" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) +"oZA" = ( +/turf/closed/wall/almayer{ + damage_cap = 15000 + }, +/area/almayer/hallways/port_hallway) +"oZG" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/corporateliason) +"oZN" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "oZV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/roller, @@ -57489,20 +56587,16 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"paI" = ( -/obj/structure/sign/safety/debark_lounge{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "paL" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 }, /area/almayer/command/cic) +"paY" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "pbb" = ( /obj/effect/landmark/start/doctor, /turf/open/floor/plating/plating_catwalk, @@ -57524,32 +56618,22 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"pbs" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "pbC" = ( /obj/item/bedsheet/red, /obj/structure/bed, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"pbV" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" +"pce" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "17;18;21"; + vend_y_offset = 0 }, -/area/almayer/command/cic) -"pbW" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, -/area/almayer/command/cichallway) +/area/almayer/hallways/port_hallway) "pch" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -57562,15 +56646,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"pcv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "pcD" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -57635,6 +56710,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"pde" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "pdk" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -57647,6 +56726,18 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"pdC" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "pdG" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -57659,6 +56750,26 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/chief_mp_office) +"pdI" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"pdX" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "pef" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -57682,18 +56793,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/navigation) -"pfc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/starboard) "pfh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -57702,6 +56801,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"pfl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "pfp" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Up4"; @@ -57801,6 +56906,11 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) +"pis" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -57833,6 +56943,25 @@ "pji" = ( /turf/closed/wall/almayer, /area/almayer/hallways/stern_hallway) +"pjn" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/wy{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = 8 + }, +/obj/item/clipboard{ + pixel_x = -8 + }, +/obj/item/folder/white{ + pixel_x = -8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "pjw" = ( /turf/open/floor/almayer{ dir = 10; @@ -57858,6 +56987,13 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"pjL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "pjM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57876,6 +57012,16 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"pjQ" = ( +/obj/structure/barricade/metal, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "pky" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -57883,11 +57029,22 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"pkz" = ( +"pkI" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"pkM" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 6; + pixel_y = 4 + }, /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/briefing) "plE" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -57941,16 +57098,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"pmq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/delta) "pmH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -57971,12 +57118,22 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"pnc" = ( +/obj/structure/machinery/cm_vending/clothing/leader/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pno" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"pnA" = ( +/obj/item/clothing/under/gimmick/jason, +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) "pnC" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /turf/open/floor/almayer{ @@ -58024,12 +57181,6 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) -"ppe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer, -/area/almayer/living/auxiliary_officer_office) "pqc" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -58073,12 +57224,6 @@ /obj/item/trash/cigbutt, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"pqK" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "pqQ" = ( /turf/open/floor/almayer{ dir = 5; @@ -58091,15 +57236,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"prx" = ( -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/medical_science) "prE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/kitchen/tray, @@ -58109,6 +57245,12 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"prW" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "prY" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray, @@ -58116,14 +57258,6 @@ /obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"psa" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "psm" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_a_s) @@ -58187,13 +57321,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"ptj" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "ptv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/platform{ @@ -58204,6 +57331,12 @@ "ptK" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/starboard) +"pum" = ( +/obj/structure/machinery/cm_vending/gear/smartgun, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "pun" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -58248,6 +57381,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"puU" = ( +/obj/structure/machinery/cm_vending/gear/leader, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "pvh" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/item/tool/warning_cone{ @@ -58273,14 +57412,12 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"pvJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"pvD" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "greencorner" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/starboard_hallway) "pvK" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -58377,13 +57514,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"pyc" = ( -/obj/structure/bed/stool, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "pyi" = ( /obj/structure/prop/almayer/missile_tube{ icon_state = "missiletubesouth" @@ -58396,28 +57526,6 @@ "pyj" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"pyl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) "pyy" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer{ @@ -58460,6 +57568,10 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"pyZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "pzc" = ( /obj/structure/pipes/vents/pump, /obj/structure/bed/chair{ @@ -58495,12 +57607,6 @@ icon_state = "plating" }, /area/almayer/shipboard/starboard_point_defense) -"pzJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "pzO" = ( /obj/item/tool/warning_cone{ pixel_y = 13 @@ -58525,6 +57631,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"pAA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "pAR" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -58534,6 +57650,16 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_umbilical) +"pBj" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "pBn" = ( /obj/structure/sign/safety/escapepod{ pixel_x = 8; @@ -58614,36 +57740,29 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"pDt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"pDx" = ( +/obj/item/device/assembly/mousetrap/armed, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/bravo) -"pDB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + dir = 10; + icon_state = "red" }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/area/almayer/living/port_emb) +"pDG" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/squads/charlie) +/area/almayer/squads/alpha) +"pEb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "pEl" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58662,6 +57781,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"pEr" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "pEy" = ( /obj/item/ammo_casing/bullet, /turf/open/floor/plating/plating_catwalk, @@ -58752,6 +57877,22 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"pGx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "pGG" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/lucky_strikes, @@ -58829,12 +57970,6 @@ "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) -"pHA" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "pHG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58903,6 +58038,15 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"pJf" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pJi" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -58963,6 +58107,32 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"pKk" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;18;21"; + vend_y_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) +"pKn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) +"pKU" = ( +/obj/structure/machinery/door/airlock/almayer/marine/alpha/tl{ + req_one_access = list(); + req_access = list(32,15) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "pKZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -58976,10 +58146,15 @@ }, /area/almayer/medical/lower_medical_medbay) "pLv" = ( -/obj/structure/device/broken_moog, -/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"pLw" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) "pLO" = ( @@ -59019,6 +58194,16 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"pMl" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ + id_tag = "Boat2-D2"; + linked_dock = "almayer-lifeboat2"; + throw_dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/upper_engineering/starboard) "pMp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -59034,14 +58219,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"pML" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "pNa" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -59098,6 +58275,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"pOc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "pOi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -59179,6 +58365,20 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"pQf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/port_hallway) +"pQj" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/command/cichallway) "pQq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -59189,41 +58389,10 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"pQu" = ( -/obj/structure/machinery/chem_dispenser/soda{ - pixel_y = 20 - }, -/turf/open/floor/almayer, -/area/almayer/command/corporateliason) "pQy" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/bridgebunks) -"pQF" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_x_offset = 0; - vend_y_offset = 0 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) -"pQG" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_a_s) -"pQN" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/franks, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "pQP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -59298,6 +58467,12 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"pSM" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "pSU" = ( /obj/structure/machinery/light, /obj/structure/machinery/photocopier, @@ -59344,21 +58519,6 @@ icon_state = "mono" }, /area/almayer/command/computerlab) -"pUf" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "pUi" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/tool/crowbar{ @@ -59394,6 +58554,12 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"pUF" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "pUJ" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_f_p) @@ -59555,18 +58721,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"pXl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "pXn" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -59581,6 +58735,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"pXs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "pXx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -59589,6 +58755,16 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"pXN" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/explosive/grenade/high_explosive/training, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "pXQ" = ( /obj/structure/sign/safety/intercom{ pixel_x = 32; @@ -59608,11 +58784,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"pXZ" = ( -/obj/effect/landmark/start/marine/spec/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "pYi" = ( /obj/structure/machinery/light{ dir = 4 @@ -59822,15 +58993,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"qcy" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59886,17 +59048,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"qer" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "qeF" = ( /obj/structure/sign/safety/reception{ pixel_x = 8; @@ -59906,27 +59057,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"qeK" = ( -/obj/structure/pipes/vents/scrubber, -/obj/structure/surface/table/reinforced/black, -/obj/item/storage/toolbox/mechanical, -/obj/item/stack/cable_coil{ - pixel_x = -7; - pixel_y = 11 - }, -/obj/item/device/helmet_visor{ - pixel_x = 8; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) -"qeY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/beach_ball/holoball, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "qfa" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -59937,14 +59067,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/port_missiles) -"qfh" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) "qfy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -59992,6 +59114,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"qge" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "qgG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -60013,6 +59141,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"qgI" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "qgK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/generic/press{ @@ -60021,17 +59157,12 @@ }, /turf/open/floor/almayer, /area/almayer/command/combat_correspondent) -"qgN" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"qgQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" }, -/turf/open/floor/almayer, /area/almayer/squads/delta) "qhb" = ( /obj/structure/machinery/light, @@ -60046,6 +59177,30 @@ icon_state = "plate" }, /area/almayer/hallways/stern_hallway) +"qhf" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"qhp" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "qhx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -60071,21 +59226,23 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"qhU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"qhV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2 }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5 }, -/turf/open/floor/almayer{ - icon_state = "orange" +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/area/almayer/squads/bravo) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "qic" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -60099,16 +59256,6 @@ /obj/structure/sign/dartboard, /turf/closed/wall/almayer, /area/almayer/hallways/hangar) -"qih" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Tanker Quarters"; - req_one_access_txt = "19;27" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/tankerbunks) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -60162,19 +59309,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"qjV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) -"qki" = ( -/obj/effect/landmark/start/marine/smartgunner/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "qkn" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -60197,20 +59331,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"qmk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/facepaint/green, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "qmt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -60399,18 +59519,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"qoJ" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "qoX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -60499,36 +59607,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"qqQ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood{ - density = 0; - pixel_y = 16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"qrc" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/squads/delta) "qre" = ( /obj/structure/machinery/status_display{ pixel_x = 32 @@ -60571,12 +59649,58 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/ce_room) +"qsS" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) +"qti" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "19;27" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/tankerbunks) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/gym) +"qtw" = ( +/obj/structure/surface/rack{ + layer = 2.5 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 4; + pixel_y = 11 + }, +/obj/item/storage/box/matches, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) +"qtz" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "qtR" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -60587,6 +59711,10 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"quc" = ( +/obj/item/reagent_container/food/drinks/bottle/beer/craft, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "quq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -60627,19 +59755,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"quT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 2; - id_tag = "tc02"; - name = "\improper Treatment Center" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/lower_medical_medbay) "quV" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -60719,6 +59834,13 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"qxe" = ( +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "qxm" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -60787,24 +59909,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/perma) -"qyi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"qyo" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/command/cichallway) "qys" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -60854,14 +59958,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"qyW" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/squads/charlie_delta_shared) "qyZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/view_objectives, @@ -60968,22 +60064,63 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"qDq" = ( -/obj/effect/landmark/start/marine/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) -"qDt" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Lifeboat Control Bubble"; - req_access = null +"qCW" = ( +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 }, +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/living/port_emb) +"qCY" = ( +/obj/structure/machinery/cryopod, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) +"qDh" = ( +/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/command/lifeboat) +/area/almayer/hallways/port_hallway) "qDv" = ( /obj/structure/closet, /obj/item/stack/sheet/glass/large_stack, @@ -61080,27 +60217,15 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"qFG" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"qFK" = ( +"qFF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, /turf/open/floor/almayer{ - icon_state = "bluefull" + dir = 8; + icon_state = "orange" }, -/area/almayer/squads/delta) +/area/almayer/engineering/upper_engineering/port) "qFQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/prop/invuln/overhead_pipe{ @@ -61118,18 +60243,20 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"qGc" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha_bravo_shared) "qGF" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) +"qGS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "qHb" = ( /obj/structure/bed/chair{ dir = 8 @@ -61143,12 +60270,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"qHg" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "qHl" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -61188,6 +60309,20 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"qHL" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/cups{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/almayer/living/tankerbunks) "qHM" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -61278,6 +60413,20 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) +"qJP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "qJS" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -61288,30 +60437,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"qJY" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/bottle/orangejuice{ - layer = 3.1; - pixel_x = -12; - pixel_y = 14 - }, -/obj/item/toy/deck/uno{ - layer = 3.1; - pixel_x = -3; - pixel_y = -1 - }, -/obj/item/toy/handcard/uno_reverse_yellow{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/living/port_emb) "qJZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61500,6 +60625,12 @@ icon_state = "cargo" }, /area/almayer/squads/delta) +"qNi" = ( +/obj/structure/pipes/standard/tank/oxygen, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "qNv" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, @@ -61601,6 +60732,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"qQa" = ( +/obj/item/clipboard, +/obj/item/tool/pen/blue, +/obj/structure/surface/table/reinforced/black, +/obj/effect/landmark/map_item, +/turf/open/floor/almayer, +/area/almayer/command/cic) "qQc" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -61704,13 +60842,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) -"qSE" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/cholula, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "qSK" = ( /obj/item/stack/sheet/metal{ layer = 2.9; @@ -61722,6 +60853,16 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"qTF" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) +"qTP" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_f_p) "qTY" = ( /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, @@ -61760,19 +60901,19 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) -"qUq" = ( -/obj/structure/window/reinforced{ - dir = 8 +"qUs" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + dir = 5; + icon_state = "silver" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/command/cic) "qUH" = ( /obj/item/storage/bag/plasticbag, /obj/structure/surface/rack, @@ -61829,23 +60970,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"qWt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"qWN" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/smart{ + req_access = list(14,18); + req_one_access = list() }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, /area/almayer/squads/delta) "qWR" = ( @@ -61929,12 +61060,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"qYu" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "qYC" = ( /obj/structure/disposalpipe/down/almayer{ dir = 4; @@ -61975,19 +61100,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"qYQ" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "qYW" = ( /obj/item/clothing/shoes/red, /turf/open/floor/plating/plating_catwalk, @@ -62009,6 +61121,21 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"qZw" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) +"qZF" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_x = -1; + pixel_y = 11 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "qZH" = ( /obj/structure/surface/table/almayer, /obj/item/paper{ @@ -62019,14 +61146,6 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"qZX" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "rag" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -62048,18 +61167,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"raK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, +"raM" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, /turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" + dir = 4; + icon_state = "blue" }, -/area/almayer/squads/charlie) +/area/almayer/squads/delta) "rbp" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -62091,27 +61206,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"rbF" = ( -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) -"rbH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "rbX" = ( /obj/structure/sign/safety/manualopenclose{ pixel_x = 15; @@ -62221,15 +61315,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"rdY" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "ren" = ( /obj/structure/machinery/light{ dir = 4 @@ -62254,6 +61339,15 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"reN" = ( +/obj/structure/machinery/cm_vending/clothing/tl/alpha{ + density = 0; + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "rfa" = ( /obj/effect/landmark/start/marine/medic/alpha, /obj/effect/landmark/late_join/alpha, @@ -62290,6 +61384,23 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"rgw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) +"rgx" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "rgy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -62302,6 +61413,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"rgF" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/command/cichallway) "rgJ" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -62320,30 +61437,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"rgK" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.5; - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/attachable/bayonet{ - pixel_x = -14; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/auxiliary_officer_office) -"rgW" = ( -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -62358,6 +61451,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"rhT" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"riy" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "riA" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -62423,12 +61526,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"rjG" = ( -/obj/structure/pipes/standard/tank/oxygen, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "rjH" = ( /obj/structure/surface/rack, /obj/item/storage/beer_pack, @@ -62436,6 +61533,13 @@ icon_state = "plate" }, /area/almayer/command/corporateliason) +"rjU" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/squads/delta) "rka" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -62509,19 +61613,12 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"rll" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, +"rlj" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "rlz" = ( /obj/structure/filingcabinet{ density = 0; @@ -62546,6 +61643,14 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"rlP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "rlQ" = ( /turf/open/floor/almayer{ dir = 1; @@ -62557,26 +61662,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"rmc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) -"rmf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/engineering/upper_engineering/starboard) "rmv" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -62599,6 +61684,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rmR" = ( +/obj/structure/machinery/cm_vending/clothing/dress, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "rna" = ( /turf/closed/wall/almayer/white, /area/almayer/command/airoom) @@ -62638,6 +61730,13 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"roc" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "rod" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -62647,17 +61746,12 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) -"rou" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 4 - }, +"roi" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/squads/bravo) +/area/almayer/engineering/upper_engineering/port) "roG" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -62687,6 +61781,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"roV" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "rpd" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -62754,15 +61857,22 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"rqE" = ( +"rqG" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, /obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "blue" }, /area/almayer/squads/delta) "rra" = ( @@ -62785,18 +61895,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/offices/flight) -"rrq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) "rrB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{ name = "\improper Cryogenics Bay" @@ -62849,6 +61947,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rsv" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "rsx" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/high_voltage{ @@ -62899,35 +62005,22 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"rth" = ( -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "rtj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/req) -"rtA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/pen{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/paper_bin/uscm{ - pixel_x = -5; - pixel_y = 8 +"rtF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) -"rtV" = ( -/obj/structure/surface/table/almayer, -/obj/item/pizzabox{ - pixel_x = 6; - pixel_y = 6 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "rtY" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/bronze, @@ -62983,6 +62076,19 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"ruI" = ( +/obj/structure/surface/rack, +/obj/item/stock_parts/manipulator/nano{ + pixel_y = -9 + }, +/obj/item/stock_parts/scanning_module/adv{ + pixel_y = 15; + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "rvo" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -62994,25 +62100,6 @@ "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) -"rvT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) -"rwb" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_a_s) -"rwv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "rwS" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/random/case/double, @@ -63176,13 +62263,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"rAP" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "rBa" = ( /obj/structure/machinery/cm_vending/clothing/synth, /obj/structure/prop/invuln/overhead_pipe{ @@ -63216,17 +62296,6 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"rBx" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/stamp/ro{ - name = "spare requisitions officer's rubber stamp"; - pixel_x = -7; - pixel_y = 11 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "rBH" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -63273,18 +62342,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"rCD" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "rCK" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -63312,12 +62369,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"rDb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "rDd" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/emails{ @@ -63351,6 +62402,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"rDk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "rDr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -63432,19 +62492,13 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"rEv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"rEG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/area/almayer/squads/delta) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "rEL" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer, /turf/open/floor/almayer{ @@ -63479,12 +62533,6 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"rFy" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/engineering/upper_engineering/starboard) "rFB" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/effect/decal/warning_stripes{ @@ -63549,35 +62597,17 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"rGI" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "rHc" = ( /turf/open/floor/carpet, /area/almayer/command/cichallway) -"rHf" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha_bravo_shared) -"rHo" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 2; - id_tag = "tc01"; - name = "\improper Treatment Center" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/lower_medical_medbay) "rHs" = ( /obj/item/storage/firstaid, /turf/open/floor/plating/plating_catwalk, @@ -63593,6 +62623,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"rHA" = ( +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "rHN" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/plating/plating_catwalk, @@ -63695,21 +62732,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"rJu" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/living/briefing) -"rJx" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta/blue{ - dir = 2 - }, +"rJm" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "blue" }, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/squads/delta) "rJD" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -63717,10 +62745,6 @@ /obj/structure/machinery/cm_vending/own_points/experimental_tools, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"rJK" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "rKd" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 @@ -63754,17 +62778,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"rKA" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "rKO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63780,6 +62793,16 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"rLf" = ( +/obj/structure/sign/safety/north{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "rLk" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -63804,6 +62827,14 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) +"rNd" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/port_hallway) "rNF" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -63839,15 +62870,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"rOj" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +"rOh" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/living/cryo_cells) "rOs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -63884,23 +62913,29 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"rPn" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "rPt" = ( /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"rPC" = ( -/turf/open/floor/almayer{ - icon_state = "plate" +"rPv" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 }, -/area/almayer/hull/upper_hull/u_f_s) -"rPE" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, +/area/almayer/living/captain_mess) +"rPC" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) +/area/almayer/hull/upper_hull/u_f_s) "rPO" = ( /turf/open/floor/almayer{ dir = 10; @@ -63929,27 +62964,18 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/delta) +"rQE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "rQU" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"rQV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "rQW" = ( /obj/item/tool/screwdriver, /turf/open/floor/almayer, @@ -63965,9 +62991,51 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"rRj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) +"rRr" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"rRJ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) +"rRK" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/command/cichallway) "rRQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -64006,14 +63074,31 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"rSj" = ( -/obj/structure/bed/chair{ +"rSA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "orangefull" + dir = 8; + icon_state = "cargo_arrow" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/squads/alpha) "rSG" = ( /obj/structure/toilet{ pixel_y = 16 @@ -64046,6 +63131,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"rST" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/lower_hull/l_a_p) "rSW" = ( /obj/structure/machinery/light{ dir = 8 @@ -64067,12 +63164,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/chief_mp_office) -"rTJ" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "rTV" = ( /obj/structure/sign/safety/security{ pixel_x = 32 @@ -64100,12 +63191,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"rUh" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "rUk" = ( /obj/structure/bed/chair/wood/normal{ dir = 1 @@ -64153,6 +63238,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"rVs" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ + req_access = null; + req_one_access = null; + req_one_access_txt = "15;16;21"; + vend_x_offset = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "rVN" = ( /turf/open/floor/almayer{ dir = 8; @@ -64166,12 +63262,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"rWL" = ( -/obj/structure/barricade/metal, +"rWv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 6; + icon_state = "blue" }, -/area/almayer/living/cryo_cells) +/area/almayer/squads/delta) "rWT" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -64185,23 +63287,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"rXj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) -"rXk" = ( -/obj/structure/barricade/plasteel/metal{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "rXv" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -64211,6 +63296,12 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) +"rXA" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/port_hallway) "rXC" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -64218,18 +63309,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) -"rXS" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/delta) "rYi" = ( /obj/structure/bed/chair, /obj/structure/machinery/power/apc/almayer{ @@ -64311,6 +63390,13 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"saM" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "saW" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -64326,6 +63412,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"sbh" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "sbq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -64335,6 +63430,20 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"sbG" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "sbJ" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/powered/agent) @@ -64399,6 +63508,19 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) +"scG" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,18) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "scH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64475,14 +63597,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) -"sdC" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sdF" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -64515,12 +63629,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"sfC" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "sfU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/engineering/lower_engineering) +"sfX" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "sgc" = ( /obj/structure/closet/crate/freezer/cooler{ pixel_x = -7 @@ -64582,22 +63711,21 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) +"sgK" = ( +/obj/item/reagent_container/glass/bucket/janibucket, +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_y = 11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "sgM" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/engineering/engine_core) -"sgR" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sgU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64654,6 +63782,15 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"sik" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "sip" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -30 @@ -64724,15 +63861,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"skg" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "skl" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -64746,11 +63874,6 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/sea_office) -"skF" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie_delta_shared) "sld" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64800,12 +63923,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"sni" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/command/cic) "snm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64857,12 +63974,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"snR" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "soa" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/generic{ @@ -64967,32 +64078,50 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) -"spF" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 11 +"spu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) -"spK" = ( -/obj/structure/pipes/vents/scrubber{ +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"spw" = ( +/obj/structure/machinery/light{ dir = 1 }, -/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/starboard) -"spS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/area/almayer/engineering/upper_engineering/port) +"spB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/area/almayer/squads/charlie) +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) +"spF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 11 + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "spT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -65005,6 +64134,16 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"spZ" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/captain_mess) "sqa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -65037,6 +64176,27 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) +"srx" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -7 + }, +/obj/item/storage/xeno_tag_case/full{ + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/corporateliason) +"srP" = ( +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/port_hallway) "srV" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/firealarm{ @@ -65075,6 +64235,23 @@ icon_state = "test_floor4" }, /area/almayer/hallways/repair_bay) +"ssi" = ( +/obj/structure/machinery/cryopod, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) +"ssw" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/marine{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "ssD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -65097,12 +64274,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"ssU" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "ssW" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/shotgun/buckshot, @@ -65115,12 +64286,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"ssX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "ssZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -65199,14 +64364,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"svl" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "svp" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -65245,24 +64402,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"swH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -12; - pixel_y = 28 - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - pixel_x = -17 - }, -/obj/item/device/flashlight/lamp, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "swM" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -65313,15 +64452,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"syH" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/delta) "syM" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -65339,6 +64469,21 @@ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) +"szr" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + density = 0; + pixel_y = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "szy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -65358,33 +64503,12 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) -"szM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "szO" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"sAc" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sAm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -65402,20 +64526,37 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"sBp" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 +"sAN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, /turf/open/floor/almayer{ - dir = 8; + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"sBj" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/briefing) +"sBs" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "sBF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -65450,6 +64591,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"sCs" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "sCA" = ( /obj/structure/bed/chair/comfy/delta{ dir = 4 @@ -65466,20 +64615,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"sCD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "sCI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -65517,35 +64652,30 @@ icon_state = "silvercorner" }, /area/almayer/hallways/aft_hallway) +"sDE" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Pilot's Office"; + req_one_access_txt = "3;22;19"; + access_modified = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/offices/flight) "sDM" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "blue" }, /area/almayer/squads/delta) -"sDQ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emeraldcorner" - }, -/area/almayer/hallways/port_hallway) "sEa" = ( /turf/open/floor/almayer{ icon_state = "redcorner" }, /area/almayer/shipboard/brig/chief_mp_office) -"sEd" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "sEi" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -65607,25 +64737,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"sEM" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -12; - pixel_y = -28 - }, -/obj/item/device/flashlight/lamp, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - layer = 3.3; - pixel_x = -17 - }, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/cic) "sFf" = ( /turf/open/floor/almayer{ icon_state = "cargo" @@ -65741,6 +64852,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"sHs" = ( +/obj/structure/machinery/cm_vending/clothing/medic/delta{ + density = 0; + pixel_y = -30 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) "sHM" = ( /obj/structure/machinery/light{ dir = 8 @@ -65753,14 +64878,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"sHY" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) "sIf" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -65845,6 +64962,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/perma) +"sJg" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "sJC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -65854,21 +64977,58 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"sJY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "sKa" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"sKo" = ( +/obj/item/clothing/head/ushanka{ + layer = 3.3 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"sKx" = ( +/obj/structure/machinery/door/airlock/almayer/marine/delta/tl{ + req_one_access = list(); + req_access = list(18,32) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) +"sKI" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "sKY" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -65888,12 +65048,28 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"sLu" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) "sLE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"sMe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/engineering/upper_engineering/port) "sMs" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -65908,18 +65084,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"sNb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +"sMT" = ( +/obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "orange" + dir = 8; + icon_state = "bluecorner" }, -/area/almayer/squads/bravo) +/area/almayer/squads/delta) "sNz" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66045,6 +65218,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"sQy" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/squads/alpha) "sQF" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -66057,12 +65239,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) -"sQO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "sQS" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp{ @@ -66089,6 +65265,21 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"sRY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/prop/ice_colony/tiger_rug{ + desc = "A beat up beer stained, incredibly garish, polyester tiger rug. No one knows how it got here. Written on the wash tag are the words 'From Thedus, with love <3', in Sharpie."; + icon_state = "HotlineAlt"; + layer = 2.9; + name = "Richard the tiger" + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/port_emb) "sSa" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -66141,12 +65332,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"sSC" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/squads/delta) "sSR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -66207,16 +65392,6 @@ icon_state = "silverfull" }, /area/almayer/shipboard/brig/cic_hallway) -"sUj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/squads/delta) "sUs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66227,12 +65402,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"sUE" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "sUF" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -66243,21 +65412,6 @@ icon_state = "orangecorner" }, /area/almayer/hallways/stern_hallway) -"sUO" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "sVc" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/orangeseed, @@ -66288,6 +65442,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) +"sWH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -66326,21 +65485,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"sXt" = ( -/obj/structure/machinery/cm_vending/clothing/tl/alpha{ - density = 0; - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/squads/alpha) -"sXw" = ( -/obj/effect/landmark/start/marine/engineer/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "sXB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -66354,14 +65498,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"sXE" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Auxiliary Support Officer's Room" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/auxiliary_officer_office) "sXK" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66472,15 +65608,18 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"sZq" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 +"sZi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/charlie) +/area/almayer/squads/delta) "sZy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -66495,33 +65634,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"sZH" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/bronze{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/trash/semki{ - layer = 2; - pixel_x = -13; - pixel_y = 14 - }, -/obj/item/prop/magazine/boots/n054{ - pixel_x = 29 - }, -/obj/item/prop/magazine/dirty/torn{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/clothing/glasses/disco_fever{ - pixel_x = 5; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/living/port_emb) +"sZX" = ( +/obj/structure/supply_drop/alpha, +/turf/open/floor/plating, +/area/almayer/squads/req) "tab" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/flashbangs{ @@ -66540,6 +65656,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"tah" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "tak" = ( /turf/open/floor/almayer{ dir = 8; @@ -66555,15 +65680,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"taA" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) "taH" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ id = "Containment Cell 2"; @@ -66656,19 +65772,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/engine_core) -"tdE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "tdI" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_corner" @@ -66711,13 +65814,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"teu" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/shotgun/pump{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun) - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "tez" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -66792,15 +65888,28 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) -"tgK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"tge" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "orange" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/engineering/upper_engineering/port) +"tgB" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/squads/delta) +"tgK" = ( +/obj/structure/machinery/chem_master{ + vial_maker = 1 + }, +/obj/structure/sign/safety/chem_lab{ + pixel_x = 5; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "tgS" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/sign/safety/maint{ @@ -66817,6 +65926,29 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"tha" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"thq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) +"ths" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "thv" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -66826,19 +65958,13 @@ icon_state = "plate" }, /area/almayer/command/telecomms) -"thA" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" +"thz" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/squads/alpha_bravo_shared) +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "thL" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) @@ -66868,14 +65994,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tig" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/tabasco{ - pixel_x = 14; - pixel_y = 20 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "tii" = ( /obj/structure/machinery/firealarm{ pixel_x = 6; @@ -66906,17 +66024,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tiw" = ( -/obj/structure/machinery/constructable_frame{ - icon_state = "box_2" +"tiD" = ( +/obj/structure/machinery/status_display{ + pixel_x = 16; + pixel_y = -30 }, -/obj/item/weapon/baseballbat/metal{ - pixel_x = -2; - pixel_y = 8 +/obj/structure/sign/safety/airlock{ + pixel_y = -32 }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) "tiE" = ( @@ -66924,6 +66041,12 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/squads/req) +"tiG" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/starboard_hallway) "tiI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/syringes{ @@ -66967,12 +66090,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"tjj" = ( +"tiZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" + icon_state = "cargo" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/hallways/port_hallway) "tjl" = ( /turf/open/floor/almayer{ dir = 1; @@ -66984,13 +66109,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"tjw" = ( -/obj/structure/machinery/cm_vending/clothing/vehicle_crew{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer, -/area/almayer/living/tankerbunks) "tjU" = ( /obj/structure/bed/chair/wood/normal, /obj/item/bedsheet/brown, @@ -67003,17 +66121,35 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) -"tkN" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "15;16;21"; - vend_x_offset = 0 +"tkU" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "silver" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/port_emb) "tkV" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -67091,12 +66227,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"tmB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"tmI" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/attachment, +/obj/effect/spawner/random/attachment, +/obj/effect/spawner/random/attachment, +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +/area/almayer/squads/req) "tmK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -67163,6 +66302,23 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) +"tok" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/medical_science) "tou" = ( /obj/structure/bed/chair{ dir = 4 @@ -67187,6 +66343,20 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"toJ" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/living/cryo_cells) +"toM" = ( +/obj/structure/machinery/shower{ + dir = 4 + }, +/obj/structure/machinery/door/window/eastright, +/obj/structure/window/reinforced/tinted/frosted, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "tpa" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -67224,6 +66394,13 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) +"tpC" = ( +/obj/structure/bed/chair/comfy/bravo, +/obj/structure/bed/chair/comfy/alpha, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "tpD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -67310,6 +66487,26 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"tqM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/engineering_guide{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -8 + }, +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/squads/alpha) "tqV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -67407,17 +66604,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"tsy" = ( -/obj/structure/filingcabinet{ - pixel_x = 8 - }, -/obj/structure/filingcabinet{ - pixel_x = -8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "tsC" = ( /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, @@ -67442,20 +66628,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) -"tsM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "tsX" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/lobby) @@ -67514,42 +66686,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) @@ -67591,21 +66727,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tvN" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "tvQ" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -67613,19 +66734,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"twq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/hand_labeler{ - pixel_x = 7 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 5 - }, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "twB" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer2" @@ -67658,6 +66766,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"txb" = ( +/obj/structure/machinery/cm_vending/gear/medic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "txe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67678,6 +66792,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"txw" = ( +/obj/structure/largecrate/supply/supplies/mre, +/obj/structure/machinery/door_control/railings{ + pixel_y = -6; + id = "mechdoor"; + pixel_x = -31 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) +"txH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "txO" = ( /obj/structure/machinery/landinglight/ds1{ dir = 4 @@ -67714,6 +66848,12 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"tyJ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/alpha) "tyK" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ @@ -67721,6 +66861,12 @@ icon_state = "cargo_arrow" }, /area/almayer/shipboard/starboard_missiles) +"tyM" = ( +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "tzf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -67762,6 +66908,15 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"tzJ" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "tzL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -67785,12 +66940,24 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"tAh" = ( -/obj/structure/closet/emcloset, +"tAg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/cmcap{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/misc/mre{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = 5; + pixel_y = 7 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "silverfull" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/hallways/port_hallway) "tAi" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -67800,41 +66967,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"tAq" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/clothing/mask/breath{ - pixel_y = -5; - pixel_x = -3 - }, -/obj/item/clothing/head/helmet/space/compression/uscm, -/obj/item/cell/crap{ - pixel_x = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/pilotbunks) -"tAN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "tAR" = ( /obj/effect/spawner/random/toolbox, /obj/structure/largecrate/random/barrel/red, @@ -67855,6 +66993,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"tBp" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "tBz" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -67887,12 +67032,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"tCN" = ( +"tCz" = ( +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + dir = 1; + icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/squads/alpha) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -67901,6 +67047,38 @@ icon_state = "plate" }, /area/almayer/command/cic) +"tCX" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "tDx" = ( /obj/item/tool/wet_sign, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -67912,17 +67090,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) -"tDZ" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "tEi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -67945,15 +67112,6 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"tEO" = ( -/obj/effect/landmark/start/marine/medic/charlie, -/obj/effect/landmark/late_join/charlie, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -26 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "tFe" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -68046,6 +67204,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"tGr" = ( +/obj/structure/machinery/cm_vending/clothing/medic/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"tGG" = ( +/obj/structure/machinery/cm_vending/clothing/smartgun/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "tGO" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -68054,41 +67224,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; @@ -68098,6 +67233,14 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"tHm" = ( +/obj/item/trash/candle, +/obj/item/tool/match/paper, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "tHr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -68118,12 +67261,6 @@ icon_state = "silverfull" }, /area/almayer/command/airoom) -"tHv" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) "tHB" = ( /obj/structure/surface/table/almayer, /obj/structure/reagent_dispensers/peppertank{ @@ -68141,15 +67278,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" @@ -68176,15 +67304,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"tIQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "tIS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -68207,6 +67326,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"tIX" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/masks, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "tJa" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -68260,12 +67387,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) -"tJz" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "tJR" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/sign/safety/medical{ @@ -68292,17 +67413,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"tKr" = ( -/obj/structure/machinery/cryopod/right{ - dir = 2 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/bridgebunks) "tLc" = ( /obj/structure/surface/rack, /obj/item/storage/bag/plants{ @@ -68356,6 +67466,20 @@ /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"tMr" = ( +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/mob/living/silicon/decoy/ship_ai{ + layer = 2.98; + pixel_y = -16 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "tMW" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -68390,24 +67514,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/chief_mp_office) -"tNP" = ( -/obj/structure/sign/safety/debark_lounge{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) -"tNR" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) "tNT" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -68439,6 +67545,21 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) +"tOw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "tOC" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -68447,6 +67568,19 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"tOL" = ( +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"tOT" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) "tOW" = ( /turf/open/floor/almayer{ dir = 10; @@ -68469,12 +67603,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"tPI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "tQd" = ( /obj/structure/machinery/light{ dir = 8 @@ -68552,6 +67680,29 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"tSi" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext"; + name = "Window Shutters"; + pixel_x = -26; + pixel_y = 6; + req_access_txt = "28" + }, +/obj/structure/machinery/door_control{ + dir = 1; + id = "researchlockdownext_door"; + name = "Door Shutters"; + pixel_x = -26; + pixel_y = 1; + req_access_txt = "28" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "tSp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -68577,22 +67728,6 @@ icon_state = "redfull" }, /area/almayer/hallways/stern_hallway) -"tSB" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/living/briefing) -"tTp" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "tTu" = ( /turf/open/floor/almayer{ dir = 6; @@ -68619,12 +67754,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"tUo" = ( -/obj/item/clipboard, -/obj/structure/surface/table/reinforced/black, -/obj/item/tool/pen, -/turf/open/floor/almayer, -/area/almayer/command/cic) +"tUn" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/device/camera/siliconcam{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "tUv" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ @@ -68653,6 +67797,11 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"tVe" = ( +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "tVf" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -68661,26 +67810,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"tVh" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) -"tVq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "tVB" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -68721,15 +67850,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"tXb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "tXi" = ( /obj/structure/machinery/conveyor_switch{ id = "gym_2"; @@ -68777,43 +67897,21 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"tXT" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/structure/sign/poster{ - desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that."; - icon_state = "poster16"; - layer = 3.3; - name = "'Miss July' Pinup"; - pixel_y = 29; - serial_number = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 +"tXR" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, -/obj/structure/bed{ - can_buckle = 0 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "blue" }, -/area/almayer/living/port_emb) +/area/almayer/squads/delta) "tXW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -68878,20 +67976,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"tZm" = ( -/obj/structure/closet/crate/freezer{ - desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza." - }, -/obj/item/storage/beer_pack, -/obj/item/reagent_container/food/drinks/cans/beer, -/obj/item/reagent_container/food/drinks/cans/beer, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_a_s) "tZB" = ( /obj/structure/machinery/light{ dir = 1 @@ -68910,6 +67994,10 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) +"tZK" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "tZP" = ( /obj/structure/surface/rack, /obj/item/clothing/glasses/meson, @@ -68945,6 +68033,10 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"uag" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "uah" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -69011,6 +68103,15 @@ /obj/item/frame/table, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"ubx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "ubA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -69030,11 +68131,29 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"ucV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/living/briefing) +"udm" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "udr" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -69047,12 +68166,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"udx" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "udF" = ( /obj/structure/machinery/light{ dir = 1 @@ -69062,16 +68175,6 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"udG" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "udK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -69122,19 +68225,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/evidence_storage) -"ueG" = ( -/obj/item/bedsheet/orange, -/obj/structure/bed{ - icon_state = "psychbed" - }, -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - density = 0; - pixel_y = 30; - req_access = list(); - req_access_txt = "6" - }, -/turf/open/floor/wood/ship, -/area/almayer/engineering/ce_room) "ueJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -69146,15 +68236,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"ueZ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/alpha) "ufh" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -69215,17 +68296,6 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/living/briefing) -"ugJ" = ( -/obj/structure/largecrate/random/case/small, -/obj/structure/largecrate/random/mini/small_case{ - pixel_x = -1; - pixel_y = 9 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "ugT" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -69250,12 +68320,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"uhM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/starboard) "uhP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -69272,6 +68336,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"uif" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/squads/alpha) "uim" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -69284,19 +68359,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"uiR" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "umbilical wall" - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer_hull{ - dir = 8; - icon_state = "outerhull_dir" - }, -/area/almayer/engineering/upper_engineering/starboard) "uiT" = ( /turf/open/floor/almayer{ dir = 1; @@ -69372,13 +68434,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"ukV" = ( -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "ukW" = ( /obj/structure/machinery/door/airlock/almayer/security{ name = "\improper Security Checkpoint"; @@ -69437,21 +68492,22 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) -"umy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "umC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/medical/upper_medical) +"umK" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/boots/n117{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "umS" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -69470,6 +68526,11 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"une" = ( +/obj/effect/landmark/start/marine/delta, +/obj/effect/landmark/late_join/alpha, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -69499,6 +68560,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"unP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "unT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/crowbar, @@ -69529,6 +68599,19 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"uoq" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"uot" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/hangar) "uoA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -69568,6 +68651,19 @@ icon_state = "cargo" }, /area/almayer/engineering/engine_core) +"upF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -69648,16 +68744,24 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"uqA" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +"uqv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck{ + desc = "A simple deck of playing cards. You could play Caravan with these!"; + pixel_y = 12 + }, +/obj/item/toy/deck/uno{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" + icon_state = "silverfull" }, -/area/almayer/squads/bravo) +/area/almayer/hallways/port_hallway) "uqH" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -69677,11 +68781,6 @@ icon_state = "orangefull" }, /area/almayer/engineering/upper_engineering) -"urN" = ( -/obj/effect/landmark/start/marine/leader/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "ush" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -69745,6 +68844,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"utl" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "uto" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel{ @@ -69763,14 +68868,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) -"utK" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "utX" = ( /turf/closed/wall/almayer/research/containment/wall/connect_e2{ icon_state = "containment_wall_connect_e" @@ -69797,17 +68894,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) -"uuj" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, -/obj/item/reagent_container/food/condiment/hotsauce/cholula{ - pixel_x = -8; - pixel_y = 22 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "uuq" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -69819,6 +68905,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"uus" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/tool/crowbar/red, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69901,18 +68997,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"uvu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/squads/bravo) "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -69981,6 +69065,12 @@ "uwv" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room/notunnel) +"uwI" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/living/gym) "uwN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70007,22 +69097,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"uxp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -70064,9 +69138,49 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) +"uyk" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/gloves{ + pixel_x = -4; + pixel_y = 13 + }, +/obj/item/storage/box/masks{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "uys" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/squads/req) +"uyx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "uyC" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -70128,49 +69242,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, @@ -70216,44 +69287,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"uAC" = ( -/obj/item/bedsheet/purple{ - layer = 3.2 - }, -/obj/item/bedsheet/purple{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/port_emb) -"uAW" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "uBi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, @@ -70263,6 +69296,15 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/vehiclehangar) +"uBp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "uBw" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -70294,17 +69336,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"uBO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 +"uBQ" = ( +/obj/structure/bed/stool, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/storage/toolbox/emergency{ - pixel_x = -3 +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/living/port_emb) "uCh" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/safety/water{ @@ -70325,24 +69366,6 @@ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) -"uCM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "uCW" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -70366,6 +69389,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"uDs" = ( +/obj/structure/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/squads/alpha) "uDA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -70383,21 +69416,36 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"uDW" = ( -/obj/structure/machinery/cm_vending/clothing/tl/delta{ - density = 0; - pixel_x = 32 +"uDI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo{ + dir = 2; + req_one_access = list(15,18) }, /turf/open/floor/almayer{ - icon_state = "blue" + icon_state = "test_floor4" }, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "uEc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/engineering/engine_core) +"uEn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "uEv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -70462,6 +69510,21 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"uFZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "uGa" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -70524,6 +69587,22 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"uHz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "uId" = ( /obj/structure/bed/chair/comfy/teal{ dir = 8 @@ -70532,43 +69611,32 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"uIp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"uIB" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) "uII" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"uIJ" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/squads/alpha) -"uIT" = ( +"uIM" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "mechdoor"; + name = "Vehicle Bay One"; + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "uJk" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer4" @@ -70653,16 +69721,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"uKv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/multitool{ - desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; - icon_state = "multitool_big"; - name = "\improper Oversized Security Access Tuner"; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "uKA" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/light{ @@ -70670,6 +69728,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"uKH" = ( +/obj/structure/machinery/cm_vending/gear/leader, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "uKV" = ( /obj/structure/sign/safety/storage{ pixel_x = 32; @@ -70681,6 +69745,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"uLc" = ( +/obj/structure/sign/nosmoking_1, +/turf/closed/wall/almayer, +/area/almayer/hallways/port_hallway) "uLn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -70735,6 +69803,14 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/starboard) +"uMd" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/tankerbunks) "uMj" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70747,24 +69823,6 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"uMl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/alpha) -"uMn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/port_emb) "uMS" = ( /turf/open/floor/almayer{ dir = 5; @@ -70799,6 +69857,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"uND" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "uNF" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ @@ -70808,12 +69875,6 @@ "uNL" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_s) -"uNM" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emeraldcorner" - }, -/area/almayer/living/briefing) "uNN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70856,6 +69917,22 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"uOY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) "uPr" = ( /turf/open/floor/almayer{ dir = 5; @@ -70878,6 +69955,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"uQb" = ( +/obj/structure/closet/crate/freezer{ + desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza." + }, +/obj/item/storage/beer_pack, +/obj/item/reagent_container/food/drinks/cans/beer, +/obj/item/reagent_container/food/drinks/cans/beer, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_s) "uQm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -70900,13 +69991,12 @@ allow_construction = 0 }, /area/almayer/hallways/port_hallway) -"uRo" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_y = 7 +"uQZ" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha) +/area/almayer/living/port_emb) "uRr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -70976,6 +70066,21 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"uSd" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/hangar) +"uSh" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "uSq" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -70986,6 +70091,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"uSr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/delta) +"uSF" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/tankerbunks) "uSL" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -71005,14 +70123,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lockerroom) -"uTv" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "uTN" = ( /obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, @@ -71065,19 +70175,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"uUo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "uUs" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -71132,6 +70229,11 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) +"uUW" = ( +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/engineering/upper_engineering/starboard) "uVd" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -71146,6 +70248,15 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"uVt" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) "uVv" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -71160,16 +70271,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"uVD" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "uVF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71179,6 +70280,17 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/perma) +"uVI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "uVR" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -71198,12 +70310,6 @@ icon_state = "sterile" }, /area/almayer/living/pilotbunks) -"uWc" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "uWC" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -71235,21 +70341,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"uWY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "uXf" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -71282,6 +70373,9 @@ icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) +"uXV" = ( +/turf/open/floor/carpet, +/area/almayer/living/auxiliary_officer_office) "uYa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -71291,35 +70385,33 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"uYg" = ( -/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{ - dir = 4 +"uYp" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" + icon_state = "plate" }, -/area/almayer/living/port_emb) -"uZH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/area/almayer/squads/alpha) +"uYq" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "silverfull" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/hallways/port_hallway) +"uYO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "uZQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -71369,21 +70461,6 @@ "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"vbM" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vbR" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -71449,6 +70526,26 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"vdq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) +"vdu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering/starboard) "vdJ" = ( /obj/structure/surface/table/almayer, /obj/item/pipe{ @@ -71520,16 +70617,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"veu" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "vez" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, @@ -71548,18 +70635,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"vfa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "vfo" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -71582,22 +70657,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"vfx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vfB" = ( /turf/open/floor/almayer/no_build{ dir = 4 @@ -71617,6 +70676,18 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"vgh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) "vgk" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/camera/autoname/almayer{ @@ -71640,27 +70711,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/hydroponics) -"vgB" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/autoinjectors{ - pixel_x = -6; - pixel_y = -1 - }, -/obj/item/device/mass_spectrometer{ - pixel_x = 8 - }, -/obj/item/storage/box/pillbottles{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = 8; - pixel_y = 10 +"vgy" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/medical/medical_science) +/area/almayer/squads/alpha) "vgC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -71753,18 +70812,11 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"vhR" = ( -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos."; - icon_state = "pottedplant_22"; - name = "synthetic potted plant"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) +"vhQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/green, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "vhX" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -71798,24 +70850,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"vil" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "vim" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -71842,6 +70876,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"viw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) "viB" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -71866,13 +70908,6 @@ dir = 5 }, /area/almayer/living/briefing) -"viS" = ( -/obj/effect/landmark/start/marine/engineer/bravo, -/obj/effect/landmark/late_join/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "vjb" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -72012,16 +71047,16 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"vlX" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +"vlO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "orange" }, -/area/almayer/squads/alpha_bravo_shared) -"vme" = ( -/obj/structure/bed/chair, +/area/almayer/engineering/upper_engineering/starboard) +"vlT" = ( /turf/open/floor/almayer{ - dir = 1; + dir = 4; icon_state = "red" }, /area/almayer/squads/alpha) @@ -72071,6 +71106,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"vok" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/alpha) "vot" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72078,6 +71118,18 @@ /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"vow" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "vox" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio{ @@ -72116,12 +71168,6 @@ /obj/effect/landmark/start/police, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"vpV" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "emerald" - }, -/area/almayer/command/cic) "vpW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -72134,21 +71180,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) -"vqD" = ( -/obj/item/trash/candle, -/obj/item/tool/match/paper, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) -"vqK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "vqL" = ( /obj/item/clothing/under/shorts/black, /obj/structure/machinery/power/apc/almayer{ @@ -72202,9 +71233,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"vra" = ( -/turf/closed/wall/almayer, -/area/almayer/squads/charlie_delta_shared) +"vrg" = ( +/obj/structure/closet/secure_closet/guncabinet/red, +/obj/item/weapon/gun/shotgun/combat/guard, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/incendiary, +/obj/item/ammo_magazine/shotgun/slugs, +/obj/item/ammo_magazine/shotgun/flechette, +/turf/open/floor/almayer, +/area/almayer/living/auxiliary_officer_office) +"vrs" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/starboard) "vrx" = ( /obj/structure/machinery/status_display{ pixel_x = -32; @@ -72224,6 +71267,15 @@ icon_state = "cargo" }, /area/almayer/living/offices) +"vrK" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "vrM" = ( /obj/structure/closet/secure_closet{ name = "secure evidence locker"; @@ -72233,6 +71285,26 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/evidence_storage) +"vrN" = ( +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + name = "\improper Research Reception Laboratory" + }, +/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ + name = "\improper Research Reception Laboratory" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "vrQ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -72269,10 +71341,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"vsh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "vsF" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -72361,6 +71429,13 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"vty" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "vtT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -72394,18 +71469,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"vuL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/squads/delta) "vuR" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) @@ -72448,6 +71511,19 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"vwn" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "umbilical wall" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull{ + dir = 8; + icon_state = "outerhull_dir" + }, +/area/almayer/engineering/upper_engineering/starboard) "vwF" = ( /obj/structure/machinery/light{ dir = 1 @@ -72459,6 +71535,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"vwH" = ( +/obj/structure/machinery/cm_vending/sorted/attachments, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) "vwI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/microwave{ @@ -72521,6 +71601,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"vxn" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "vxC" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -72529,26 +71615,6 @@ "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) -"vxX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/wrench{ - pixel_x = 1; - pixel_y = 10 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/storage/bible{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "vyg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data, @@ -72645,15 +71711,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"vAq" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/hangar) "vAE" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -72691,6 +71748,15 @@ "vBm" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/main_office) +"vBn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/port_hallway) "vBp" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -72816,6 +71882,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"vEv" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "vEx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -72878,17 +71951,48 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"vFC" = ( +/obj/structure/surface/table/almayer, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/auxiliary_officer_office) +"vFP" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "vGk" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) -"vGr" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, +"vGl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/hull/upper_hull/u_a_p) +/area/almayer/squads/delta) "vGy" = ( /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/plating, @@ -72900,12 +72004,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"vGG" = ( -/obj/structure/bed/chair/comfy/bravo, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "vHa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/ares_console{ @@ -72960,6 +72058,20 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"vIl" = ( +/obj/structure/machinery/cm_vending/clothing/specialist/alpha{ + density = 0; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/gear/spec{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/squads/alpha) "vIm" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -73018,6 +72130,19 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"vJq" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/adv, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "vJy" = ( /obj/structure/machinery/vending/cigarette{ density = 0; @@ -73042,20 +72167,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"vJV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/firealarm{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/bravo) "vJZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -73111,6 +72222,15 @@ allow_construction = 0 }, /area/almayer/hallways/aft_hallway) +"vLf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/vehicle/walker, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vLh" = ( /obj/item/roller, /obj/structure/surface/rack, @@ -73134,20 +72254,44 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"vLA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"vLu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" }, +/area/almayer/engineering/upper_engineering/starboard) +"vLv" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/item/tool/warning_cone{ + pixel_x = -20; + pixel_y = 18 + }, +/mob/living/simple_animal/corgi/Ian{ + name = "Запойный Фрай"; + real_name = "Запойный Фрай" + }, +/turf/open/floor/almayer, +/area/almayer/living/port_emb) +"vLU" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = -17; + pixel_y = 8 + }, +/obj/structure/machinery/computer/ordercomp, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) +"vLV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + dir = 1; + icon_state = "green" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/starboard_hallway) "vMn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73171,12 +72315,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"vME" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "vMG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73203,13 +72341,37 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"vND" = ( +"vNe" = ( /obj/structure/bed/chair{ dir = 8; pixel_y = 3 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/squads/delta) +"vNs" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/squads/delta) +"vNE" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "vNF" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -73222,6 +72384,17 @@ dir = 9 }, /area/almayer/command/cic) +"vOb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "vOd" = ( /obj/structure/machinery/optable, /obj/structure/sign/safety/medical{ @@ -73299,17 +72472,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) -"vPK" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_y = -26 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/delta) "vPM" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -73345,11 +72507,43 @@ icon_state = "silvercorner" }, /area/almayer/command/securestorage) +"vQo" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "vQq" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"vQC" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_s) +"vQF" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) +"vQH" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "vQN" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -73393,20 +72587,6 @@ dir = 10 }, /area/almayer/command/cic) -"vRu" = ( -/obj/structure/surface/rack{ - layer = 2.5 - }, -/obj/item/tool/hand_labeler{ - pixel_x = 4; - pixel_y = 11 - }, -/obj/item/storage/box/matches, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "vRz" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_f_p) @@ -73502,16 +72682,6 @@ icon_state = "cargo" }, /area/almayer/squads/delta) -"vTu" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/command/cic) "vTv" = ( /obj/structure/surface/table/almayer, /obj/item/circuitboard/airlock, @@ -73537,21 +72707,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"vUb" = ( -/obj/effect/landmark/start/marine/alpha, -/obj/effect/landmark/late_join/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"vUe" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "vUh" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -73578,36 +72733,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) -"vUU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/three{ - pixel_x = 31; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"vVb" = ( -/obj/structure/machinery/cm_vending/gear/tl{ - density = 0; - pixel_x = -32; - vend_x_offset = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/squads/alpha) "vVd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73645,6 +72770,16 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"vWj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "vWo" = ( /turf/open/floor/almayer{ dir = 4; @@ -73696,31 +72831,6 @@ /obj/item/prop/magazine/book/theartofwar, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"vWB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/bcigbutt, -/obj/item/trash/cigbutt{ - pixel_x = -1; - pixel_y = 17 - }, -/obj/item/trash/cigbutt{ - icon_state = "ucigbutt"; - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/tool/lighter/random{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/sign/prop3{ - pixel_x = 28 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "vWJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -73741,6 +72851,13 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"vWW" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "vXd" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -73796,6 +72913,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) +"vYj" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_x = 5 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = -8; + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "vYm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -73856,18 +72984,28 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"vZb" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +"vYZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 }, -/obj/structure/sign/safety/maint{ - pixel_x = 16; - pixel_y = 26 +/obj/item/storage/toolbox/emergency{ + pixel_x = -3 }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 1; + icon_state = "red" }, /area/almayer/squads/alpha) +"vZh" = ( +/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/facepaint/black, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/delta) "vZv" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -73892,6 +73030,44 @@ icon_state = "green" }, /area/almayer/living/offices) +"waq" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) +"waz" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) +"waB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "waD" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_side" @@ -73912,15 +73088,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"wbh" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "wbj" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -74003,6 +73170,13 @@ icon_state = "silver" }, /area/almayer/command/cic) +"wce" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull) "wcn" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -74038,12 +73212,13 @@ allow_construction = 0 }, /area/almayer/hallways/starboard_hallway) -"wdf" = ( -/obj/structure/bed/chair{ - dir = 1 +"wdm" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/wirecutters, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/hallways/port_hallway) "wdo" = ( /obj/structure/machinery/door/airlock/almayer/research/reinforced{ dir = 8; @@ -74068,11 +73243,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"wdz" = ( -/obj/effect/landmark/start/marine/engineer/charlie, -/obj/effect/landmark/late_join/charlie, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/charlie) "wdF" = ( /turf/open/floor/almayer{ allow_construction = 0 @@ -74157,6 +73327,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"wfq" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/living/gym) "wft" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74263,6 +73439,11 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"whr" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "whA" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/living/briefing) @@ -74315,6 +73496,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"wiA" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_s) "wiG" = ( /obj/structure/sign/poster{ pixel_x = -30; @@ -74348,6 +73539,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"wiQ" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/hallways/port_hallway) "wiW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74389,15 +73586,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"wka" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/condiment/hotsauce/sriracha{ - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "wkc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -74412,6 +73600,20 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) +"wkr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74423,18 +73625,18 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wkH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/whistle{ - pixel_y = 4 +"wkJ" = ( +/obj/structure/sign/prop1{ + pixel_x = 32; + pixel_y = 2 }, -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "test_floor4" }, -/area/almayer/command/cichallway) +/area/almayer/hallways/starboard_hallway) "wkM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsLower"; @@ -74562,6 +73764,20 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"wmA" = ( +/obj/structure/machinery/cm_vending/clothing/medic/alpha{ + density = 0; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/gear/medic{ + pixel_x = 32; + density = 0 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/squads/alpha) "wmE" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 4"; @@ -74616,14 +73832,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"wnY" = ( -/obj/item/tool/crowbar/red, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "woh" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 4 @@ -74639,18 +73847,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"wos" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "woy" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -74672,12 +73868,27 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"woR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "wpg" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/shuttle/dropship{ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wpu" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "wpw" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -74703,15 +73914,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"wqc" = ( -/obj/structure/sign/poster{ - pixel_y = 32 +"wpM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" + icon_state = "silver" }, -/area/almayer/squads/charlie) +/area/almayer/hallways/port_hallway) "wqh" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -74721,6 +73931,20 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"wqj" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "mechdoor"; + name = "Vehicle Bay One"; + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "wqq" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -74775,6 +73999,33 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) +"wrp" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) +"wry" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) "wrC" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -74798,6 +74049,25 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"wrW" = ( +/obj/item/reagent_container/glass/bucket{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_container/glass/bucket{ + pixel_x = -4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "wse" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -74812,12 +74082,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"wsR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "wta" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -74835,15 +74099,28 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"wty" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"wtp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + req_access = null; + req_one_access = null; + req_one_access_txt = "19;29" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/squads/delta) +/area/almayer/shipboard/sea_office) +"wtA" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) "wtM" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -74885,18 +74162,6 @@ /obj/structure/supply_drop/echo, /turf/open/floor/almayer, /area/almayer/squads/req) -"wuq" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "wuH" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, @@ -74904,6 +74169,12 @@ /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"wuX" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "wvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74932,6 +74203,18 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) +"wvn" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/hull/lower_hull/l_a_s) "wvI" = ( /obj/item/paper_bin/uscm{ pixel_y = 7 @@ -74963,15 +74246,14 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) -"wwr" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) +"wwe" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) +"wwf" = ( +/obj/effect/landmark/start/tank_crew, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/tankerbunks) "wwD" = ( /obj/structure/bed/chair/comfy/orange, /turf/open/floor/almayer{ @@ -75025,6 +74307,20 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +"wxF" = ( +/obj/structure/machinery/cm_vending/gear/smartgun{ + pixel_y = -31; + density = 0 + }, +/obj/structure/machinery/cm_vending/clothing/smartgun/delta{ + pixel_x = 31; + density = 0 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/squads/delta) "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -75061,16 +74357,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"wyt" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/microwave{ - pixel_x = -2; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/command/cichallway) "wyv" = ( /obj/structure/machinery/door_control{ id = "ARES JoeCryo"; @@ -75114,14 +74400,6 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"wzg" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "wzx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -75129,6 +74407,31 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"wzR" = ( +/obj/structure/largecrate/random/case/small, +/obj/item/toy/deck{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/sign/poster{ + desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; + icon_state = "poster12"; + name = "Beach Babe Pinup"; + pixel_x = -30; + pixel_y = 6; + serial_number = 12 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/living/port_emb) +"wzS" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "wzZ" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -75153,6 +74456,12 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"wBU" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "wBY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -75263,21 +74572,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"wDJ" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "emerald" - }, -/area/almayer/squads/charlie_delta_shared) -"wDK" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/bravo) "wDR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -75287,17 +74581,28 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"wEd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"wDV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 2; + id_tag = "tc02"; + name = "\improper Treatment Center" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/squads/alpha) +/area/almayer/medical/lower_medical_medbay) +"wEf" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "wEg" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "agentshuttle"; @@ -75311,19 +74616,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"wEI" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/tool/pen, -/obj/item/paper_bin/uscm{ - pixel_y = 7 - }, -/obj/item/clipboard{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "wEO" = ( /obj/structure/platform_decoration{ dir = 4 @@ -75406,12 +74698,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"wGE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/marine/leader/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "wGI" = ( /obj/structure/machinery/light{ dir = 4 @@ -75421,18 +74707,6 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) -"wGX" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/auxiliary_officer_office) -"wHo" = ( -/turf/open/floor/almayer{ - icon_state = "emerald" - }, -/area/almayer/living/briefing) "wHp" = ( /obj/structure/bed/sofa/vert/grey, /obj/structure/bed/sofa/vert/grey{ @@ -75440,19 +74714,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"wIr" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = list(); - req_access_txt = "26" - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, +"wIw" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/squads/req) +/area/almayer/engineering/upper_engineering/starboard) "wIC" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/chief_mp_office) @@ -75499,6 +74766,18 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"wJr" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm, +/obj/item/attachable/bayonet, +/obj/item/device/flashlight/lamp{ + pixel_x = -8; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "wJw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -75509,24 +74788,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"wJD" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/squads/charlie) "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) @@ -75583,12 +74844,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"wLm" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) "wLu" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -75608,37 +74863,6 @@ dir = 1 }, /area/almayer/medical/containment/cell) -"wLG" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/clothing/head/ushanka{ - layer = 3.3 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/living/port_emb) "wLK" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray{ @@ -75684,43 +74908,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wNl" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - layer = 3.2; - pixel_x = 4; - pixel_y = 17 - }, -/obj/item/reagent_container/food/drinks/cans/souto{ - pixel_x = -10; - pixel_y = 1 - }, -/obj/item/reagent_container/food/snacks/grown/orange{ - layer = 3.3; - pixel_x = 1; - pixel_y = 13 - }, -/obj/item/prop/magazine/book/starshiptroopers{ - pixel_x = 8; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/living/port_emb) -"wNm" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull) -"wNT" = ( -/obj/structure/platform, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "wNU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 2; @@ -75744,15 +74931,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) -"wOK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "wPf" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -75762,29 +74940,49 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"wPj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/hand_labeler{ + pixel_x = 7 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 5 + }, +/obj/item/tool/pen, +/obj/item/tool/crew_monitor, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "wPk" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"wPz" = ( +"wPs" = ( +/obj/structure/sign/safety/debark_lounge{ + pixel_x = 15; + pixel_y = -32 + }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/medical/hydroponics) -"wPC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/area/almayer/engineering/upper_engineering/starboard) +"wPy" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" }, +/area/almayer/squads/delta) +"wPz" = ( /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + icon_state = "mono" }, -/area/almayer/squads/charlie) +/area/almayer/medical/hydroponics) "wPF" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ @@ -75831,6 +75029,12 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_a_s) +"wQy" = ( +/obj/item/stack/catwalk, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "wRm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75861,16 +75065,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"wRP" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "wRT" = ( /obj/structure/largecrate/random/case/double, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -75880,6 +75074,14 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"wSd" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "wSk" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -75947,17 +75149,6 @@ icon_state = "red" }, /area/almayer/living/briefing) -"wTw" = ( -/obj/structure/machinery/cm_vending/sorted/attachments/squad{ - req_access = null; - req_one_access = null; - req_one_access_txt = "17;18;21"; - vend_y_offset = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "wTy" = ( /obj/item/reagent_container/glass/rag, /turf/open/floor/almayer{ @@ -75976,14 +75167,15 @@ "wTM" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) -"wTN" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +"wUa" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/living/auxiliary_officer_office) +/area/almayer/living/bridgebunks) "wUd" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -76058,6 +75250,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"wUW" = ( +/obj/structure/machinery/cm_vending/clothing/tl/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "wUX" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ @@ -76075,6 +75273,15 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) +"wVk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "wVw" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/machinery/light/small{ @@ -76093,46 +75300,12 @@ /obj/item/weapon/gun/smg/m39, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) -"wVy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = -32 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie_delta_shared) "wVz" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"wVB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/bridgebunks) "wVD" = ( /obj/structure/surface/rack, /obj/item/tool/wirecutters, @@ -76191,13 +75364,6 @@ icon_state = "containment_corner_variant_2" }, /area/almayer/medical/containment/cell) -"wWq" = ( -/obj/structure/surface/table/reinforced/black, -/obj/item/clothing/suit/space/compression/uscm, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "wWz" = ( /turf/closed/wall/almayer/research/containment/wall/north, /area/almayer/medical/containment/cell) @@ -76210,6 +75376,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"wWF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/almayer, +/area/almayer/engineering/upper_engineering/starboard) "wWL" = ( /obj/item/tool/screwdriver, /obj/structure/platform_decoration{ @@ -76259,12 +75431,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"wXH" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "wXI" = ( /turf/open/floor/almayer{ dir = 1; @@ -76325,19 +75491,23 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/general_equipment) -"wZv" = ( -/obj/structure/prop/invuln{ - desc = "An inflated membrane. This one is puncture proof. Wow!"; - icon = 'icons/obj/items/inflatable.dmi'; - icon_state = "wall"; - name = "umbilical wall" +"wZf" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer_hull{ - dir = 4; - icon_state = "outerhull_dir" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/engineering/upper_engineering/port) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "wZy" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -76359,14 +75529,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"wZH" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_a_s) "wZM" = ( /obj/structure/bed/sofa/south, /turf/open/floor/almayer{ @@ -76386,12 +75548,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"wZX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "xad" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -76410,19 +75566,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) -"xaC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/reagent_container/food/snacks/mre_pack/meal5{ - desc = "How long has this been sitting here?"; - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "xaF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -76479,9 +75622,6 @@ dir = 5 }, /area/almayer/command/lifeboat) -"xba" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/living/cryo_cells) "xbd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -76525,6 +75665,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"xcy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/auxiliary_officer_office) "xdx" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular/empty, @@ -76539,6 +75685,25 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"xdC" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/port_hallway) +"xdK" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/alpha) "xeG" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -76601,19 +75766,12 @@ icon_state = "green" }, /area/almayer/squads/req) -"xfO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" +"xfJ" = ( +/mob/living/simple_animal/bunny{ + name = "Dina" }, -/area/almayer/living/bridgebunks) +/turf/open/floor/carpet, +/area/almayer/command/cichallway) "xfT" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -76636,12 +75794,14 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_lobby) -"xgm" = ( -/obj/structure/reagent_dispensers/oxygentank, +"xgj" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10" + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/living/tankerbunks) "xgn" = ( /obj/structure/ladder{ height = 1; @@ -76659,6 +75819,16 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"xgu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "xgx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -76730,6 +75900,16 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"xhf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/squads/alpha) "xhn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -76762,12 +75942,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_s) -"xhQ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "xhU" = ( /turf/open/floor/almayer{ dir = 8; @@ -76780,6 +75954,15 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) +"xic" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "xiC" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -76877,10 +76060,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"xlk" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/squads/bravo) "xlC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -76918,6 +76097,15 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"xmf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_a_s) "xmg" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -76970,6 +76158,15 @@ icon_state = "plate" }, /area/almayer/command/corporateliason) +"xnf" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/living/tankerbunks) "xnl" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Exterior Airlock"; @@ -76979,10 +76176,30 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_a_p) +"xnG" = ( +/obj/structure/filingcabinet{ + pixel_x = 8 + }, +/obj/structure/filingcabinet{ + pixel_x = -8 + }, +/turf/open/floor/almayer{ + icon_state = "greenfull" + }, +/area/almayer/command/cichallway) "xnI" = ( /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"xnK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "xnR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -76999,21 +76216,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"xoe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/squads/delta) "xoh" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -77029,12 +76231,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/port_point_defense) -"xoO" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "xoS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -77059,6 +76255,13 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/armory) +"xoZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/living/cryo_cells) "xpd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -77083,6 +76286,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"xpr" = ( +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_a_s) "xps" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -77124,6 +76333,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"xqb" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/delta) "xqg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -77208,6 +76426,12 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/evidence_storage) +"xsg" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -77269,6 +76493,28 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"xtW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "xuc" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -77284,6 +76530,20 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"xuf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "xuB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77353,6 +76613,27 @@ icon_state = "mono" }, /area/almayer/hallways/aft_hallway) +"xvj" = ( +/obj/structure/machinery/cm_vending/clothing/staff_officer{ + density = 0; + pixel_x = -30 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/bridgebunks) +"xvo" = ( +/obj/structure/largecrate/random/case/small, +/obj/structure/largecrate/random/mini/small_case{ + pixel_x = -1; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "xvr" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/chief_mp_office) @@ -77366,15 +76647,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"xvE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/charlie) "xvM" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -77389,25 +76661,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"xvX" = ( -/obj/structure/machinery/cm_vending/gear/leader, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"xwl" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha_bravo_shared) "xwp" = ( /obj/item/storage/box/matches{ pixel_x = -11; @@ -77476,6 +76729,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"xxk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "xxm" = ( /obj/structure/bed{ can_buckle = 0 @@ -77513,6 +76772,13 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"xxq" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/command/cichallway) "xxI" = ( /obj/structure/cargo_container/wy/mid, /obj/structure/sign/poster{ @@ -77603,6 +76869,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"xyy" = ( +/obj/structure/foamed_metal, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) "xyz" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -77646,6 +76919,23 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"xzx" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/port_hallway) +"xzJ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "xAe" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell) @@ -77658,14 +76948,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"xAt" = ( -/obj/structure/bed/chair/comfy/charlie{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" - }, -/area/almayer/living/briefing) "xAB" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -77697,6 +76979,18 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"xAS" = ( +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + icon_state = "pottedplant_22"; + name = "synthetic potted plant"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/squads/delta) "xAY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -77706,23 +77000,12 @@ "xBe" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/upper_engineering) -"xBn" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ - id_tag = "Boat1-D3"; - linked_dock = "almayer-lifeboat1"; - throw_dir = 1 - }, +"xBy" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering/port) -"xBQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) +/area/almayer/command/lifeboat) "xBV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -77872,6 +77155,19 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) +"xFC" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/obj/item/weapon/baseballbat/metal{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "xFD" = ( /obj/structure/ladder{ height = 1; @@ -77898,6 +77194,18 @@ icon_state = "plate" }, /area/almayer/living/gym) +"xGb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha) "xGh" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -77922,27 +77230,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"xGE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/bravo) "xGJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -77961,11 +77248,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"xHp" = ( +"xHn" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, /turf/open/floor/almayer{ - icon_state = "orange" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/squads/alpha_bravo_shared) +/area/almayer/hallways/port_hallway) "xHG" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -78031,6 +77325,18 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) +"xIt" = ( +/obj/structure/machinery/status_display{ + pixel_x = 16; + pixel_y = -30 + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "xIw" = ( /obj/structure/machinery/brig_cell/cell_2{ pixel_x = 32 @@ -78065,12 +77371,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"xJn" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" +"xJw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/engineering/upper_engineering/starboard) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "xJC" = ( /obj/structure/machinery/door/airlock/almayer/generic/corporate{ name = "Corporate Liaison's Closet" @@ -78079,11 +77388,6 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliason) -"xJH" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie_delta_shared) "xJR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -78094,18 +77398,24 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"xKM" = ( -/obj/structure/machinery/status_display{ - pixel_x = 16; - pixel_y = -30 +"xKH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck{ + desc = "A simple deck of playing cards. You could play Caravan with these!"; + pixel_y = 12 }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 +/obj/item/toy/deck/uno{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "blue" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/squads/delta) "xKT" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/machinery/power/apc/almayer{ @@ -78131,6 +77441,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"xLO" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/tankerbunks) "xMf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -78185,6 +77508,19 @@ allow_construction = 0 }, /area/almayer/hallways/aft_hallway) +"xMm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha) "xMs" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_two) @@ -78212,12 +77548,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; @@ -78236,12 +77566,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"xMR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/bravo) "xNb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -78281,21 +77605,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"xNz" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/microwave{ - pixel_y = 7 - }, -/obj/item/storage/box/cups{ - pixel_x = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 19 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/auxiliary_officer_office) "xNB" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/security{ @@ -78307,6 +77616,20 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"xOC" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/clothing/mask/breath{ + pixel_y = -5; + pixel_x = -3 + }, +/obj/item/clothing/head/helmet/space/compression/uscm, +/obj/item/cell/crap{ + pixel_x = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "xOL" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -78339,19 +77662,16 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"xPD" = ( +/obj/structure/machinery/cm_vending/clothing/engi/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "xPE" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"xPZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "xQa" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -78415,26 +77735,6 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) -"xRj" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "emeraldcorner" - }, -/area/almayer/squads/charlie) "xRk" = ( /obj/structure/machinery/light{ dir = 8 @@ -78474,14 +77774,6 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) -"xRJ" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "orangefull" - }, -/area/almayer/living/briefing) "xRU" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -78497,16 +77789,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"xSw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "cryo curtain" - }, -/turf/open/floor/plating, -/area/almayer/squads/charlie) "xSz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -78580,6 +77862,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) +"xTa" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/squads/delta) "xTp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78613,36 +77901,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cichallway) -"xTW" = ( -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/red{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/living/port_emb) "xUA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/tank, @@ -78728,22 +77986,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"xVT" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/closed/wall/almayer, -/area/almayer/living/tankerbunks) -"xWd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/squads/alpha_bravo_shared) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_one_access_txt = "19;21"; @@ -78773,6 +78015,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"xWM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/delta) "xWO" = ( /obj/item/stack/catwalk, /obj/structure/cable/heavyduty{ @@ -78794,6 +78045,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"xWV" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "xXa" = ( /turf/open/floor/almayer{ dir = 8; @@ -78810,6 +78065,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"xXM" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/living/numbertwobunks) "xYf" = ( /obj/structure/machinery/cm_vending/clothing/sea, /turf/open/floor/almayer{ @@ -78840,6 +78101,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) +"xYH" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/port_hallway) "xYN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -78857,6 +78121,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"xYR" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "xYZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78888,17 +78158,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"xZU" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "yac" = ( /obj/structure/platform_decoration{ dir = 8 @@ -78979,6 +78238,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"ybD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/squads/alpha) "ybO" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -79016,13 +78285,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"ycd" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/delta) "ycj" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 8 @@ -79052,25 +78314,6 @@ /obj/structure/curtain/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"ycZ" = ( -/obj/structure/sign/poster{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/squads/delta) -"ydh" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/surface/table/reinforced/black, -/obj/item/tank/oxygen, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/port) "ydx" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -79106,6 +78349,13 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"ydJ" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/port_hallway) "ydM" = ( /obj/structure/window{ dir = 8 @@ -79132,14 +78382,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/perma) -"ydY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "yeo" = ( /obj/structure/machinery/cm_vending/clothing/dress{ req_access = list(1) @@ -79194,13 +78436,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"yfm" = ( -/obj/effect/landmark/start/marine/delta, -/obj/effect/landmark/late_join/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "yfv" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -79262,6 +78497,33 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"ygU" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/squads/delta) +"yhh" = ( +/obj/structure/sign/safety/south{ + pixel_x = -17; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "yhI" = ( /turf/open/floor/almayer{ dir = 4; @@ -79271,16 +78533,13 @@ "yhQ" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_m_p) -"yiq" = ( -/obj/structure/sign/safety/north{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +"yic" = ( +/obj/structure/surface/table/almayer, +/obj/item/facepaint/black{ + pixel_x = -4 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/almayer, +/area/almayer/squads/alpha) "yit" = ( /obj/structure/machinery/light{ dir = 4 @@ -79309,15 +78568,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"yiW" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/squads/charlie) "yiX" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -79358,6 +78608,13 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"yjA" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/gun/shotgun/lowchance, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/squads/req) "yjM" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -79375,6 +78632,18 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"ykm" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/sign/prop1{ + pixel_x = 32; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/port_hallway) "yky" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -92205,9 +91474,9 @@ uNL tVf mGL oxp -kcp -bWJ -nar +bSv +toM +bgb alU bXo oCi @@ -92408,9 +91677,9 @@ mGL poR mGL pNp -kcp -bTS -bIA +bSv +paY +vNE alU uDn bKf @@ -92607,13 +91876,13 @@ hJp oPI uNL hJp -kcp -kcp -iqp -kcp -kcp -jgl -kcp +bSv +bSv +qti +bSv +bSv +eWc +bSv alU alU alU @@ -92810,13 +92079,13 @@ mGL dqd uNL hJp -kcp -bBD -bTS -bTS -lxo -qcy -kcp +bSv +jje +paY +dzq +dZL +fXG +bSv bAg edM egq @@ -92834,11 +92103,11 @@ jjs jjs jjs jYd -bSv -bSv -bSv -bSv -bSv +bzy +fIH +nqU +vhq +nqU nqU vRz aag @@ -93013,13 +92282,13 @@ pzZ ijp uNL mGL -kcp -bTR -iEg -oQM -aqI -aqI -kcp +bSv +dEs +bTH +uMd +uSF +bTH +bSv bzA bBB bBB @@ -93037,11 +92306,11 @@ afz afz afz iDd -qih -bTH -foN -cDZ -bSv +bzy +eeh +wlL +vhq +vhq pch vRz aag @@ -93216,13 +92485,13 @@ uNL uNL uNL mGL -kcp -lxW -hPh -wGX -bFr -ppe -kcp +bSv +xLO +quc +riy +pEb +pKn +bSv bzA bKh bKh @@ -93240,11 +92509,11 @@ afz afz afz iDd -bSv -tjw -bTH -bTV -bSv +bzy +mzo +mzo +mzo +vhq nqU vRz aag @@ -93419,13 +92688,13 @@ qDv aLk uNL xCR -kcp -wTN -kZN -rgK -hbu -iYe -bJl +bSv +qHL +bTH +kpE +bTH +cGO +iIE bKa bKa bKa @@ -93443,11 +92712,11 @@ afC afz afz bRx -bSv -ifb -bTH -bSv -xVT +bzy +cEY +fIH +mzo +rpW kAs vRz aag @@ -93622,13 +92891,13 @@ kmM eqk uNL hJp -kcp -oMi -bAZ -bTS -bTS -niR -kcp +bSv +guX +eVY +paY +paY +xgj +bSv bzA bKh bKh @@ -93646,11 +92915,11 @@ afz afz afz iDd -bSv -aIX -aIX -bSv -ehZ +bzy +nDV +qTP +mzo +oHX eXo vRz aag @@ -93825,13 +93094,13 @@ hJp hJp uNL hJp -kcp -kcp -kcp -sXE -kcp -kcp -kcp +bSv +bSv +bSv +fAI +bSv +bSv +bSv bzA bBB bBB @@ -93849,10 +93118,10 @@ afz afz afz iDd -bSv -cop -cop -bSv +bzy +vhq +wqE +mzo vhq nqU vRz @@ -94028,13 +93297,13 @@ aSY hJp uNL hJp -dqd -kcp -bTU -gZK -bTS -lyX -kcp +wwe +bSv +fzT +vty +aIX +aIX +bSv bAr bKh bBB @@ -94052,10 +93321,10 @@ eGg eGg eGg jYd -bSv -kBY -bTn -bSv +bzy +nqU +hDO +mzo vhq vhq vRz @@ -94231,13 +93500,13 @@ uNL lgY uNL mGL -hJp -kcp -onY -wdf -bTS -kcp -kcp +cop +bSv +wJr +xnf +wwf +wwf +bSv bzy bKh bBB @@ -94255,10 +93524,10 @@ hdh hdh hdh bRD -bSv -bSv -bSv -bSv +bzy +qOU +mzo +mzo mzo qOU vRz @@ -94434,13 +93703,13 @@ crc hJp qee mGL -hzM -kcp -xNz -utK -rKA -kcp -kcp +ksl +bSv +bTV +vFP +kBY +bTn +bSv bzy bXs bBB @@ -94544,13 +93813,13 @@ wSR mMV awz awz -aJp -jgJ -jgJ -jgJ -jgJ -jgJ -mZb +owR +aLe +aLe +aLe +aLe +aLe +rRK awz awz woy @@ -94637,13 +93906,13 @@ aQv aQv bcm bcm -kcp -kcp -kcp -kcp -kcp -kcp -kcp +bSv +bSv +bSv +bSv +bSv +bSv +bSv bzy bZL cat @@ -94746,15 +94015,15 @@ pZS pEB jUY qwp -aVI -jmY +dDu +olG rHc xhZ xhZ xhZ rHc -qyo -udx +pQj +wrp qwp pZS jHh @@ -94949,15 +94218,15 @@ vkR wsD jUY qwp -eei -jmY +eiZ +olG iwW sTm oSq sTm tdT -qyo -itX +pQj +eYy qwp vGA uwN @@ -95152,15 +94421,15 @@ kfE wsD jUY qwp -rBx -jmY +nuu +olG iwW sTm gwR sTm tdT -qyo -pbW +pQj +fkS qwp cDn uwN @@ -95355,15 +94624,15 @@ xDn pEB jUY awz -wkH -hmS +dQG +rgF mWV jZu sco fqO lIp -hWO -fqc +lYV +kdf awz gGr jHh @@ -95558,15 +94827,15 @@ nNv pEB jUY qwp -wyt -jmY +hXw +olG iwW dCr gwR sTm tdT -qyo -tsy +pQj +xnG qwp ora laO @@ -95761,15 +95030,15 @@ xSz pEB jUY qwp -sUE -jmY +pSM +olG iwW dCr oSq sTm tdT -qyo -tsy +pQj +xnG qwp pZS jHh @@ -95964,15 +95233,15 @@ jnD wsD jUY qwp -iiZ -jmY +lQH +olG rHc lAy wjq wjq -rHc -qyo -tsy +xfJ +pQj +xnG qwp vGA uwN @@ -96168,13 +95437,13 @@ rTk nRH awz awz -fRr -dmv -cHE -dmv -dmv -dmv -olU +lzS +hIs +eIm +hIs +hIs +hIs +xxq awz awz vSN @@ -97297,7 +96566,7 @@ baI baI baI baI -baI +iAa bGH bHB btO @@ -97402,8 +96671,8 @@ qnh aKa rrB aGr -eDu -tKr +aGr +nXR uNg cLN aES @@ -97605,8 +96874,8 @@ gtp qfA tYX tpD -xfO -iTD +tpD +hPu vCO vCO jxB @@ -97996,11 +97265,11 @@ sEp wVW wVW wVW -swH -ayy wVW -aBV -sEM +utl +bJV +aDw +wVW wVW wVW wVW @@ -98199,11 +97468,11 @@ fHh wVW lZs gHl -sni -ayz -dAX -aQg -vpV +wVW +iLr +iLr +iLr +wVW eSV aGp wVW @@ -98390,7 +97659,7 @@ aew bCO hvH hvH -hvH +nkP kcN cod oqA @@ -98402,11 +97671,11 @@ alX auQ awm avS -nwD -asR -pbs -pbV -aPB +wVW +wVW +mtq +wVW +wVW aJG aGq auQ @@ -98421,7 +97690,7 @@ aRq bHG ceK sxD -bhJ +xvj bHG ayP aES @@ -98600,16 +97869,16 @@ oqA aic aov wVW -arG +asc alX lQG oPE alZ -auT -aBR -awD -bZJ -aRt +alX +alX +alX +alX +alX axp aPI lQG @@ -99026,11 +98295,11 @@ aKq aKz mKq ceK -lcy -iTw +liE +wUa ceK sxD -bhJ +xvj bHG nis aES @@ -99418,9 +98687,9 @@ aqN alX asc abk -azV -aAB -aBZ +dpF +fwQ +ooj avY awk alX @@ -99616,14 +98885,14 @@ aic aov wVW awA -ayr +iLu awH aPD asc azW -aqN -aAC -aCa +gxQ +gnj +iLD bPs xUB gkK @@ -99635,11 +98904,11 @@ aKn aKz mKq ceK -wVB -psa +vgh +cuu ceK sxD -bhJ +xvj bHG brS aES @@ -99727,7 +98996,7 @@ pcl fNi aYt xyw -vAq +uSd hYG aYt gGs @@ -99824,9 +99093,9 @@ wVW wVW rOC soX -azX -aAD -aCb +krq +jRc +eHc aDv aEC wVW @@ -99838,8 +99107,8 @@ aKn aKz mKq ceK -lcy -iTw +liE +wUa ceK aES tJi @@ -99930,7 +99199,7 @@ pcl oRJ fTm fPu -vAq +uSd hYG hYG aYt @@ -100248,7 +99517,7 @@ jUb qjz ceK sxD -bhJ +xvj bHG gCP aES @@ -100336,7 +99605,7 @@ pcl xNb aYt fPu -leg +uot hYG hYG aYt @@ -100447,8 +99716,8 @@ aKn aKz mKq oKx -tVh -psa +cuZ +cuu ceK aES mhm @@ -100539,7 +99808,7 @@ pcl uuu fTm xyw -lqK +fyC hYG hYG hYG @@ -100636,9 +99905,9 @@ ato wVW aKF alX -hxm +iXw deD -tUo +qQa aIf aEB wVW @@ -100857,7 +100126,7 @@ aXb aGr ceK sxD -bhJ +xvj bHG cWy aES @@ -101040,7 +100309,7 @@ atx jvX ato wVW -vTu +qUs alX alX avY @@ -101653,7 +100922,7 @@ aCj ayK aAd aAP -hvv +eJs ayu aCj bYY @@ -102267,7 +101536,7 @@ wVW wVW wVW lgK -aGZ +xXM awF cST aTz @@ -102546,7 +101815,7 @@ hJp dpy uNL acZ -aeN +aeJ azl ahS ajA @@ -102749,7 +102018,7 @@ hJp fkW uNL vhw -khD +aeh azw xWp aAK @@ -102878,10 +102147,10 @@ aGY rvA aKO awF -aRx -aRx -aUo -aVi +fWB +fWB +fwd +cQR pbp pMj awS @@ -102952,7 +102221,7 @@ fpd nVS uNL eXq -eXq +sDE eXq eXq eXq @@ -103154,13 +102423,13 @@ nXP hJp dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +vrg +eTv +kSU +dgY +eMe +jbF +lIe aXj bHB aZW @@ -103357,13 +102626,13 @@ nXP mGL dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +cMq +jVF +nzm +nzm +nzm +oxd +lIe xyw bHB aZX @@ -103487,10 +102756,10 @@ aHk rvA aLp awF -jss -aTB -aUq -aVk +rPv +spZ +gMm +aUu ldC vkb aET @@ -103560,13 +102829,13 @@ nXP mGL fJX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +dVB +hPn +bTS +bTS +bTS +gZK +lIe hmy bHB aZL @@ -103763,13 +103032,13 @@ nXP tRV dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +uoq +xcy +bTS +bTS +bTS +uag +kcp xyw bHB wqh @@ -103966,14 +103235,14 @@ nXP nun vJM uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -bGQ +mnT +kKl +lty +dmn +lbY +gZK +lGV +xyw bHB tdc rOc @@ -104169,13 +103438,13 @@ nXP hJp qNG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +kcp +kcp +uIB +cHV +kcp +kcp +kcp bGR bHB xyw @@ -104372,14 +103641,14 @@ nXP mGL kKG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -xyw +jXq +dTV +dTV +pLv +dTV +cnF +kcp +bGQ bHB xyw bkA @@ -104574,14 +103843,14 @@ hJp mGL mGL eKO -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +lvc +opr +uXV +pnA +uVt +uXV +vwH +kcp aYu wTg bGq @@ -104778,13 +104047,13 @@ cmk xJi cIi uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +gnP +thz +qZF +vFC +mBQ +mtZ +kcp aZZ aYC aZZ @@ -106196,9 +105465,9 @@ wfE fHz opD aGn -nTZ +wfq wFR -lah +uwI vnD iRy esM @@ -107032,7 +106301,7 @@ vVW vhX unU rlZ -twq +wPj vhX jCK nyj @@ -107230,7 +106499,7 @@ knH kan kan oKv -rHo +gOR kan kan kan @@ -107239,7 +106508,7 @@ kan kan kan cbu -quT +wDV kan kan iXW @@ -108048,7 +107317,7 @@ rlZ tiI hDR oZV -rlZ +guB rlZ xMj biA @@ -109792,8 +109061,8 @@ iBt iBt iUZ awE -pQu -kmL +jZU +srx qVM csz qVM @@ -109995,7 +109264,7 @@ iBt iBt iBt awE -jZU +cvj rjH qVM vGk @@ -110198,8 +109467,8 @@ iBt iBt iBt awE -cvj -iiz +oZG +eho qVM oLw qVM @@ -110792,7 +110061,7 @@ aCC kXw vtm emK -fGu +tSi hPe sdu btC @@ -110995,7 +110264,7 @@ hec gNp hVf dVu -rmc +rRj lON dVu oDR @@ -111198,7 +110467,7 @@ kBo kBP naR vOy -hrn +vrN vOy aRd aIo @@ -111401,7 +110670,7 @@ lou eBO pRn vOy -ayZ +tok aCD hFC qmy @@ -111604,10 +110873,10 @@ wdo vOy vOy vOy -qqQ +szr aoM aoM -vgB +hLp kgs ayT aii @@ -111807,10 +111076,10 @@ mWs lmw vOy dyb -tsM -prx -fpT -eVT +vkp +lfd +aoM +pjn kgs ayT aii @@ -112009,9 +111278,9 @@ rDr usy nDo vOy -glB +tgK vkp -ger +sfC aoM aFf mmN @@ -112419,7 +111688,7 @@ hRa vti vti vti -aEZ +uyk vOy ayT akU @@ -112788,7 +112057,7 @@ bdH aaa aaa lYA -aiH +cVD aao aar awi @@ -114130,19 +113399,19 @@ bdg bqZ beH aLJ -bmr -beH -beH -beH +sBj +wTm +wTm +wTm eGB jMR ufh mEE sTw -beH -beH -beH -rJK +fDD +fDD +fDD +fAB gBo beH bqZ @@ -114161,7 +113430,7 @@ oqS nsY hxZ rsM -iMm +dHD gzV bJt oDf @@ -114332,21 +113601,21 @@ beB bCx bqZ beH -bgO +cRQ boq boq boq boq -wNT +euy pVB hsg iPv -kbV +mhJ uMk uMk uMk uMk -bgO +mTr beH bqZ bCx @@ -114535,21 +113804,21 @@ aLG nyw bqZ beH -bgO +cRQ boq boq boq boq -wNT +euy vBp kNl nhi -kbV +mhJ uMk uMk uMk uMk -tmB +kxi eBg vKe eVv @@ -114738,21 +114007,21 @@ aLG bdg bqZ beH -bgO +cRQ boq boq boq boq -wNT +euy vBp hWs nhi -kbV +mhJ uMk uMk uMk uMk -bgO +mTr beH bqZ bdg @@ -114928,12 +114197,12 @@ hfk aLf nsY tUS -bNh -wNl +ddu +awP nGh -fPp -lqN -kjV +qCW +pDx +cKm nsY aLG awb @@ -114941,21 +114210,21 @@ aLG iuy bqZ beH -bgO +cRQ boq boq boq boq -wNT +euy pUA wga mfM -kbV +mhJ uMk uMk uMk uMk -bgO +mTr beH bqZ bdg @@ -114963,12 +114232,12 @@ buH hOR buH nsY -aaq -lEL -tuv +htK +sRY +geA eYv -iQt -uZo +wzR +uBQ xmJ nsY hTf @@ -115131,12 +114400,12 @@ lQu aSm nsY lru -sJY -qJY +ogb +iWS qLH -xTW -oGP -cnM +cxO +fhC +cjj nsY aLG awb @@ -115145,19 +114414,19 @@ bdg bqZ bqZ bgO -beH -beH -duv -beH +fvj +fvj +jey +fvj htI cCD shp oAB gyv -beH -duv -beH -beH +kwa +lgZ +kwa +kwa bgO bqZ bqZ @@ -115166,12 +114435,12 @@ buH hOR buH nsY -mKJ -tIb -uAC +tCX +ntz +tkU rhQ -pyc -uMn +nIC +kkU ivz nsY gKB @@ -115334,7 +114603,7 @@ ugV vUi nsY weB -axc +vLv juD twW vHh @@ -115348,19 +114617,19 @@ bdd bdd bDQ bgO -vGG -vGG +tpC +tpC bgO -xRJ -xRJ +bDP +bDP xRw bPO whA -xAt -xAt +iXb +iXb bgO -gAj -gAj +uMk +uMk bgO cab bdd @@ -115537,7 +114806,7 @@ qce aSm nsY wpz -oEX +lFh irT tyb xxm @@ -115551,19 +114820,19 @@ beB bdd bqZ bgO -vGG -vGG +tpC +tpC bgO -xRJ -xRJ +bDP +bDP viO gMU ksN -xAt -xAt +iXb +iXb bgO -gAj -gAj +uMk +uMk bgO bqZ bdd @@ -115572,12 +114841,12 @@ bJz bHT bJz nsY -kzK -lFh -uzP +nLS +dtI +mcf pVA -mzV -pML +uQZ +ekV ivz nsY pEl @@ -115754,19 +115023,19 @@ aLG bdg bqZ qMR -rwv -rwv +iiO +iiO dRT -dqD -dqD -bUb +eYI +eYI +jDJ dRT -eWp -eWp -eWp +pOc +pOc +pOc dRT -tXb -tXb +iZe +iZe fOk bqZ bdg @@ -115775,12 +115044,12 @@ buH bHL buH nsY -tXT -kOH -wLG +oLP +eww +sKo tyb -sZH -tHc +eEg +bMs ivz nsY pcO @@ -115957,19 +115226,19 @@ aLG bdg bqZ beH -vGG -vGG +boq +boq beH -xRJ -xRJ -xRJ +bDP +bDP +bDP beH -xAt -xAt -xAt +iXb +iXb +iXb beH -gAj -gAj +uMk +uMk beH bqZ bdg @@ -116139,18 +115408,18 @@ akX akX cqa bdp -dRG -yiq -sBp -aMV -aMV +nia +rLf +nVT +akX +akX bBh -tCN -tCN -kNQ +akX +akX +pvD awb -iLQ -lDJ +iBA +uND bBh aLG aLG @@ -116182,18 +115451,18 @@ bHL buH buH cbD -iZH -sDQ +nSm +kFK hOR -xMK -njL -njL +fwb +eWz +eWz cbD -bUM -bUM -mYw -iAT -rdY +eXE +eXE +odl +yhh +wVk clR eXE gte @@ -116342,9 +115611,9 @@ aNO uYO xqg bdq +vLV aQt -aQt -aQt +bhn aQt aQt sOm @@ -116394,7 +115663,7 @@ buI rpd buI buI -buI +bCE buI buI feC @@ -116545,18 +115814,18 @@ aQt bbJ csw bdp -aMM -aNG -bga -taA -aSr -bBh -gyC -wbh -bsX -bAa -bKE -eBj +eMv +aLG +eBU +aLG +oXt +wkJ +abo +vrK +tiG +bAV +oXt +sik bBh aLG aNO @@ -116574,12 +115843,12 @@ wCI moQ flW fvf -rgW -vUe -vUe -vUe -vUe -kuw +rAb +sCA +sCA +sCA +sCA +bVw cab bdd bGe @@ -116588,18 +115857,18 @@ bHT bHa buH cbD -bMt -bMt -bOv -bOX -jLK -vUU -cbD -ciU -rOj -bUd -bUF -bUR +pUF +pUF +kcV +eHJ +lPI +fmJ +ykm +cHj +cbv +iEb +srP +jOy clR uqr xkw @@ -116746,21 +116015,21 @@ jUx aLG aNO cmc -jeb -jeb -jeb -uIT -lKb -jeb -jeb -jeb -jeb -jeb -uIT -mWy -jeb -jeb -jeb +aLT +aLT +aLT +tyJ +fMi +aLT +aLT +aLT +bSJ +bSJ +moM +amt +bSJ +bSJ +bSJ aLG aNO aYT @@ -116777,12 +116046,12 @@ cQc nlB ugu oQH -wHo -uWc -wka -tTp -veu -mDW +mnI +qnC +nHw +gew +vSK +dVe bqZ bdg buH @@ -116790,21 +116059,21 @@ bHa bHT bHa buH -vra -vra -vra -mDT -cgl -vra -vra -vra -vra -vra -mDT -rJx -vra -vra -vra +bGb +bGb +bGb +cbz +lyL +bGb +bGb +bGb +bGb +uIM +wqj +uIM +bGb +bGb +bGb jJe bHa buH @@ -116949,21 +116218,21 @@ aLB dEC aNO qHl -jeb -vlX -aNx -qGc -jhD -jeb -osc -cMV -osc -jeb -aIq -xHp -hmF -vlX -jeb +aLT +nVP +aLT +ooH +aOz +cUq +gJD +eQq +gTu +sDM +bTy +mtz +bSJ +qxe +bSJ aNn aNO aYT @@ -116980,12 +116249,12 @@ cQc nlB ugu oQH -wHo -uWc -duw -uWc -fIZ -mDW +mnI +qnC +sJC +qnC +umK +dVe bqZ bdg buH @@ -116993,21 +116262,21 @@ bHa bHT bHa deH -vra -asX -chf -wDJ -tJz -vra -ukV -oNj -ukV -vra -gll -lpt -mgF -asX -vra +bGb +iHm +rRr +exN +lAv +bGb +hxg +bGb +txw +cci +glD +lij +gtF +gtF +bGb tfw bHa sVf @@ -117152,21 +116421,21 @@ aLB udF aNO nVU -jeb -obE -tdE -qGc -rth -rth -oef -oef -oef -nny -rth -xHp -xwl -rHf -jeb +aLT +vok +vLU +bdr +bdr +rGj +rlj +rlj +rQA +ckX +clg +clg +tgB +ngB +bSJ jgU aNO aYT @@ -117183,12 +116452,12 @@ nBw moQ hGO fvf -uNM -xAt -xAt -xAt -xAt -nNH +vrW +iXb +iXb +iXb +iXb +pzV bqZ bdg buH @@ -117196,21 +116465,21 @@ bHa bHT bHa bKc -vra -bMq -qUq -wDJ -nyQ -nyQ -xJH -xJH -xJH -miV -nyQ -lpt -qYQ -ptj -vra +bGb +oQm +byy +exN +buH +rhT +whr +bGb +ydJ +rQE +cbS +thq +dLi +hXC +bGb lSO bHa haT @@ -117355,21 +116624,21 @@ aLB rlG aNO nFy -jeb -vlX -thA -gAA -gAA -bfn -oMH -coB -rSj -bfn -gAA -gAA -fFD -vlX -jeb +aLT +gmE +aMz +bdC +bdC +rGj +wSd +vok +dcZ +ckX +clK +clK +bTA +tOT +bSJ kEb aNO aYT @@ -117399,21 +116668,21 @@ bHa bHT bHa rKy -vra -asX -drj -cgo -cgo -hyk -qyW -khd -kaI -hyk -cgo -cgo -hQc -asX -vra +bGb +iHm +pdI +bHa +bHa +bJz +dGt +bGb +rDk +hHT +cbS +buH +pjL +jcj +bGb hNL bHa rLF @@ -117558,21 +116827,21 @@ aLB enx aQt xPg -jeb -vlX -tdE -qGc -rth -rth -hNM -vxX -uBO -rth -rth -xHp -xwl -vlX -jeb +bwe +vYZ +aMz +bdC +bdC +rGj +wSd +vok +dcZ +ckX +clK +clK +nER +mUy +hfQ pGM aNO aYT @@ -117580,12 +116849,12 @@ aNO bad bdd bDQ -lnm -iLh -iLh -iLh -iLh -grR +mng +bCu +bCu +bCu +bCu +wCI moQ ovp fvf @@ -117602,21 +116871,21 @@ bHa bHT bHa bIR -vra -asX -qUq -wDJ -nyQ -lrT -bqW -xaC -qeY -nyQ -nyQ -lpt -qYQ -asX -vra +bGb +iHm +byy +exN +buH +cVf +tAg +bGb +xuf +jHj +jnK +osi +hTQ +hXC +bGb mYZ buI lQQ @@ -117761,21 +117030,21 @@ aLB ewo aNO jJs -jeb -obE -thA -qGc -rth -rth -rth -aTW -aTW -rth -rth -xHp -diJ -rHf -jeb +jmH +ooH +aMz +bdr +bdr +rGj +qZw +qZw +lgg +ckX +clg +clg +bTA +kyu +kDX aLG aNO aYT @@ -117783,12 +117052,12 @@ aNO aLG bCx bqZ -cNf -dll -dll -lRs -dll -rJu +udi +ddk +ddk +npE +ddk +cQc nlB ugu oQH @@ -117805,21 +117074,21 @@ bHa rrV bHa buH -vra -bMq -drj -wDJ -nyQ -nyQ -nyQ -obQ -obQ -nyQ -nyQ -lpt -eBV -ptj -vra +bGb +oQm +pdI +exN +buH +buH +pis +bGb +jmo +bJz +cbS +bJz +ffi +hXC +bGb fsH bHa pBn @@ -117964,21 +117233,21 @@ cmC aLG aNO jJs -jeb -vlX -tdE -qGc -rth -rth -tPI -tPI -iXT -rth -rth -xHp -xwl -vlX -jeb +fKd +mGl +aMz +aMz +aMz +rGj +gJD +fyJ +gTu +ckX +bTA +bTA +bTA +oND +eMJ aLG aNO aYV @@ -117986,12 +117255,12 @@ bai bbg bCy bDS -cNf -dll -qSE -nff -dll -rJu +udi +ddk +roc +pkM +ddk +cQc nlB ugu oQH @@ -118008,21 +117277,21 @@ bHb bHV bHa rbX -vra -asX -qUq -wDJ -nyQ -nyQ -pHA -pHA -nyQ -nyQ -nyQ -lpt -qYQ -asX -vra +bGb +iHm +byy +exN +buH +buH +dGt +bGb +aYb +bJz +vLf +bJz +ffi +oUQ +bGb mqc ybV buH @@ -118167,21 +117436,21 @@ aLB fTU bbO cmg -jeb -jeb -hfa -jwK -wnY -cLC -eGh -rtA -uKv -nFK -lEO -xWd -oSL -jeb -jeb +bwe +jzb +dwL +rEG +eHg +lgw +aLT +aLT +bSJ +mTs +qgQ +fay +bTA +xKH +hfQ aLG aNO aYW @@ -118189,12 +117458,12 @@ sLE bbh bdd bDT -tHv -xRJ -xRJ -xRJ -xRJ -tSB +ngI +bDP +bDP +bDP +bDP +nBw moQ caO fvf @@ -118211,21 +117480,21 @@ iEb bHW bHa buH -vra -vra -eUh -jTI -lzq -nyQ -nhx -eiq -teu -wXH -xBQ -mSU -wVy -vra -vra +bGb +bGb +eYE +nvi +bIS +buH +uqv +bGb +hIE +bJz +cbS +bJz +ffi +anQ +bGb cmd cmh wAR @@ -118370,21 +117639,21 @@ aLB ahj ahj ahj -jeb -tkN -qHg -gAA -beP -bfn -pkz -qfh -ipE -bfn -moI -gAA -cGV -tkN -jeb +aLT +eLf +bdC +bfy +aMz +rGj +pKk +fod +njR +oeE +ckX +cIr +clK +vNe +bSJ aWM aNO aYX @@ -118414,21 +117683,21 @@ bHd bHX bHa buH -vra -gNq -hXb -cgo -fwY -hyk -nNV -hyk -mBc -hyk -fwY -cgo -skF -gNq -vra +bGb +jyL +pkI +bHa +bHY +bJz +uYq +bGb +spu +hCB +spB +xgu +qhV +oSY +bGb ajX ajX ajX @@ -118573,21 +117842,21 @@ aKW wdb ahj ahj -jeb -aMx -qHg -qGc -hxe -aPf -rth -rth -rth -rth -hxe -xHp -cGV -nBa -jeb +aLT +sQy +aMz +bfy +aMz +rGj +vok +vok +ngB +oeE +ckX +cIr +bTA +rPn +bSJ beB beB aYW @@ -118617,21 +117886,21 @@ cbS bHW bJz bJz -vra -bMu -hXb -wDJ -ivs -nyQ -nyQ -pHA -nyQ -nyQ -ivs -lpt -skF -pQF -vra +bGb +kxO +pkI +exN +bIT +buH +buH +bGb +kVm +bJz +cbS +bJz +ffi +nxG +bGb ajX ajX hBC @@ -118776,21 +118045,21 @@ cno ahj ahj ahj -jeb -iow -aMO -qGc -hxe -rth -hXd -guW -aQM -rth -hxe -xHp -aUi -iow -jeb +aLT +tqM +cLF +cPR +lpi +lNh +pKk +ixW +njR +ljn +uMS +wPy +tVe +bJm +bSJ aLG aNO aYY @@ -118820,21 +118089,21 @@ iEb bHW bHa vMx -vra -wTw -bNE -wDJ -ivs -nyQ -gZr -vWB -bSK -nyQ -ivs -bUi -bUT -wTw -vra +bGb +pce +udm +exN +bIT +eHJ +tUn +bGb +fMw +bJz +mPo +bJz +ffi +fjB +bGb ajX ajX ajX @@ -118980,20 +118249,20 @@ ahj ahj ahj aLT +aPK +tyJ +scG aLT aLT aLT -ozq -ueZ -aPK aLT -aQN -wsR -dAq -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +hSq +nYs +bSL +bSJ pGM aNO aYW @@ -119023,21 +118292,21 @@ iEb bHW bHa bIR -bJC -bJC -bJC -bJC -cib -xvE -bQZ -bJC -bSL -moM -rXS -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +ccu +lyL +uLc +bGb +jrG +bJz +cbS +wdm +ffi +pBj +bGb ajX ajX ajX @@ -119183,20 +118452,20 @@ ahj ahj ahj aLT -kaB -vVb +ocI +ooH +uDs aLT -aOy -aOz -mKb -aLT -vbM -aRP -aSH -aQL -mJP -bSn -aQL +oTs +bPw +uYp +jha +lVE +bSJ +ahA +kyu +nEv +bSJ aLG aNO aYZ @@ -119226,21 +118495,21 @@ iEb bHY bHa buH -bJC -jSp -lAQ -bJC -bOZ -bPa -vhR -bJC -mWQ -bTy -bUf -bSJ -hII -iJS -bSJ +bGb +jUV +grx +bGb +nZN +fwb +nXA +bGb +iFk +kBB +ltD +oov +cWj +imL +bGb ajX ajX ajX @@ -119386,20 +118655,20 @@ aKW aKW hhw aLT -sXt -aMQ -aNI -bfy +ois aMz -sHY -aLT -msm -aRT -xMR -aTw -aUj -kLk -aQL +bfy +pKU +aMQ +reN +jcA +iPk +bUU +sKx +cIr +bTA +bVb +bSJ aWN aLG aYZ @@ -119429,22 +118698,22 @@ iEb bHY buH fBx -bJC -ojF -bNG -bOx -chR -bJD -mzg -bJC -ycZ -bTA -cIr -gHo -bUU -uDW -bSJ -bSJ +bGb +cHH +mDe +bpP +bHY +buH +tOL +bGb +mmL +lzf +iPF +hXC +hXC +dmO +bGb +bGb fiq yhQ yhQ @@ -119586,24 +118855,24 @@ aaF aaF aaF aKW -hhw -aLT +aSm +bPV aLT +fHx +cLF +jON aLT aLT aLT -tNR -aMP -eAg aLT -qoJ -aRZ -aSI -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +jGF +tVe +xAS +bSJ +bSJ aLG aYZ sLE @@ -119631,23 +118900,23 @@ bGi iEb bHY buH -bJC -bJC -bJC -bJC -bJC -mjS -bNF -szM -bJC -qrc -bTE -syH -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +cPb +buH +lms +bGb +tBp +hXC +hJs +hXC +bGb +bGb +bGb +bGb fiq yhQ anm @@ -119789,24 +119058,24 @@ aaF aaF aaF aKW -hhw +aSm aLT -bbY +aLT +vWW +tCz +oZN bdr bdz bdr -bft -bgU -bhG -aLT -bjs -blA -bno -bpC -brn -aRT -buM -aQL +uYp +clg +qWN +clg +pEr +wuX +xqb +bSJ +bSJ aLG aYZ sLE @@ -119834,23 +119103,23 @@ bGj iEb bHY buH -bJC -cdT -cfo -cgq -cfo -chM -cjd -cjA -bJC -ckr -ckQ -clh -clg -clI -clg -clW -bSJ +bGb +tGG +bHa +bpP +bHa +faP +buJ +qhf +bGb +bGb +bGb +cnh +bGb +bGb +nRI +nRI +bGb fiq yhQ anm @@ -119992,24 +119261,24 @@ aaF aaF aaF aKW -hhw -aLT -bca -aMC +aSm aLT -avv -bfu -rGj -aQT +kvM +nhY +nTl +cPR +oot aLT -aTv -blB -bnp -aTx -aQL -aUY -buN -aQL +hOT +fGm +wxF +bSJ +raM +wPy +bVb +fuo +jbi +bSJ aLG aYZ sLE @@ -120037,23 +119306,23 @@ bGk iEb bHY buH -bJC -cdU -bMy -bJC -cog -chN -mzg -cdP -bJC -dpO -ckX -cli -coj -bSJ -bVo -clX -bSJ +bGb +kNA +lPI +bGb +sCs +vBn +buH +oSe +kea +bGb +cXE +glD +bSd +xzJ +bHa +bHa +bGb fiq yhQ anm @@ -120195,24 +119464,24 @@ aKW aKW aKW aKW -hhw -aLT +aSm aLT +kvM +nhY +nTl +aQD aLT aLT aLT -bfx -rGj -aQT aLT -aTv -blB -kiU -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +ygU +bVb +fuo +jbi +bSJ pGM aYZ sLE @@ -120240,23 +119509,23 @@ bGl iEb bHY bIR -bJC -bJC -bJC -bJC -bJC -chO -mzg -cdP -bJC -dpO -ckX -clj -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +iGC +buH +oSe +kea +bGb +rmR +tiZ +woR +buH +bHa +gDX +bGb fiq yhQ yhQ @@ -120398,24 +119667,24 @@ bPV aaz bPT eko -bPV -aLT -bco -aMB -bdA +aSm aLT -ial -rGj -aPl +kvM +nhY +rHA +uif aLT -aPn -aRU -bnr -aQL -brr -aUZ -buO -aQL +cOB +xSW +vJq +vNs +sHs +bSJ +jAX +hcz +fuo +jbi +bSJ aLG aYZ sLE @@ -120427,11 +119696,11 @@ bri bLX bdl rTY -bNP +dlb bmD -bNP +tmI bmD -bNP +cvR bmD mYv doP @@ -120443,23 +119712,23 @@ bII iEb bHY buH -bJC -cdV -bMx -cgr -bJC -raK -mzg -bgW -bJC -ckR -ckX -iyS -bSJ -clJ -bVn -clY -bSJ +bGb +fEH +iov +aHL +bGb +cHI +buH +oSe +kea +bGb +pde +whr +jxf +gDT +dSC +whr +bGb fiq iFm anb @@ -120601,24 +119870,24 @@ aSm aLf bbx eko -lLV -aLT -bco -bdr -bdA +aLf aLT -bfw -rGj -aQT +kvM +nhY +nTl +kDo aLT -aTv -blB -vJV -aQL -brr -aRT -buO -aQL +vgy +bdr +nng +clg +dkr +bSJ +hYY +dUq +fuo +jbi +bSJ aLG aYZ sLE @@ -120632,9 +119901,9 @@ bdl bEt bNP bmD -bNP +yjA bmD -bNP +bil byu obo tiE @@ -120646,23 +119915,23 @@ rqw iEb bHY buH -bJC -cdV -cfo -cgr -bJC -chQ -mzg -cdP -bJC -dpO -ckX -clk -bSJ -clJ -clg -clY -bSJ +bGb +fEH +bHa +aHL +bGb +nPY +buH +oSe +kea +bGb +bGb +lCX +bGb +bGb +eNZ +bGb +bGb fiq wUS tbK @@ -120804,24 +120073,24 @@ aSm aLf aSm aSm -eko +aLf aLT -bcZ -bdr -bdC +kvM +nhY +nTl +xJw beR -bfy -rGj -aQT -aLT -aTv -blB -bnt -bpG -brs -aRT -bew -aQL +bdC +bdr +kBU +clg +clK +clE +cIr +dUq +fuo +jbi +bSJ beB aYW bzV @@ -120835,9 +120104,9 @@ pWA pXV bNP bmD -bNP +azu bmD -bNP +mQT bmD lyk bOR @@ -120849,23 +120118,23 @@ bJz cbS bHW bJz -bJC -bKX -cfo -cgs -chk -chR -mzg -cdP -bJC -dpO -ckX -cll -clE -clK -clg -bVy -bSJ +bGb +tIX +bHa +bJz +bpP +bHY +buH +oSe +kea +bGb +oRa +oRa +oRa +qTF +vQo +vQo +bGb fiq fiq fiq @@ -121009,22 +120278,22 @@ bzF aSm aLf aLT -bco -bdr -bdA -aLT -bfD -aPj -aPl +kvM +nhY +nTl +nIe aLT -aPn -blB -sNb -aQL -brr -aRT -buO -aQL +vgy +bdr +nUZ +clg +dkr +bSJ +wPy +dUq +fuo +jbi +bSJ aXS aYZ kfP @@ -121052,23 +120321,23 @@ qLp lYi bIb mHm -bJC -cdV -cfo -cgr -bJC -foL -mzg -bgW -bJC -ckR -ckX -loS -bSJ -clJ -clg -clY -bSJ +bGb +fEH +bHa +aHL +bGb +nsB +buH +oSe +kea +bGb +dzU +gXD +gXD +xyy +bHa +bHa +bGb iGK tbK tbK @@ -121212,22 +120481,22 @@ aSm aSm aLf aLT -bco -aMC -bdA -aLT -bfx -bgY -aQT +kvM +nhY +nTl +dsB aLT -aTv -blB -nCp -aQL -brr -aUY -buO -aQL +wmA +vlT +hzO +hXY +cfh +bSJ +jAX +dUq +fuo +jbi +bSJ aLG aYZ sLE @@ -121255,23 +120524,23 @@ pJJ iEb bHY buH -bJC -cdV -bMy -cgr -bJC -chP -mzg -cdP -bJC -dpO -ckX -cln -bSJ -clJ -bVo -clY -bSJ +bGb +fEH +lPI +aHL +bGb +vWj +buH +oSe +kea +bGb +gXD +gXD +gXD +xyy +bHa +bHa +bGb pNG oed oed @@ -121415,28 +120684,28 @@ aKW ycV ktP aLT +kvM +nhY +nTl +iwn aLT aLT aLT aLT -hQW -bgY -aQT -aLT -aTv -blB -qhU -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +uOY +dUq +fuo +jbi +bSJ aLG aYZ sLE qFb bdl -bEi +eFO bZr bmD ngw @@ -121458,23 +120727,23 @@ lgX iEb bHY buH -bJC -bJC -bJC -bJC -bJC -uUo -mzg -cdP -bJC -dpO -ckX -sUO -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +oqe +buH +oSe +kea +bGb +oRa +oRa +oRa +qTF +nRI +nRI +bGb scI oed yhQ @@ -121618,28 +120887,28 @@ wVb eFH hlz aLT -bcE -aMB -bdD -aLT -bfz -bgY -aPl +kvM +nhY +nTl +mVM aLT -aPn -blB -bnu -aQL -brt -aUZ -buS -aQL +bdD +xSW +edX +vNs +clL +bSJ +oSG +dUq +fuo +jbi +bSJ aLG aYZ sLE jJs bdl -brp +sZX bZr bmD xId @@ -121661,23 +120930,23 @@ cbw iEb bHY buH -bJC -cdX -bMx -cgt -bJC -chS -bQA -bgW -bJC -ckR -ckX -meu -bSJ -clL -bVn -clZ -bSJ +bGb +jut +iov +noH +bGb +tha +jDx +oSe +kea +bGb +qTF +qTF +qTF +nll +eNZ +bGb +bGb dGz cAH vTK @@ -121821,22 +121090,22 @@ wVb iDm hlz aLT +kvM +nhY +nTl +miF +aLT bcE bdr -bdD -aLT -rrq -bgY -aQT -aLT -aTv -blB -mtr -aQL -brt -bpC -buS -aQL +gYJ +clg +clZ +bSJ +lur +dUq +fuo +jbi +bSJ aNn aYZ sLE @@ -121864,23 +121133,23 @@ buH iEb bHY buH -bJC -cdX -cfo -cgt -bJC -chQ -cjf -cdP -bJC -dpO -ckX -xoe -bSJ -clL -clg -clZ -bSJ +bGb +jut +bHa +noH +bGb +nPY +jph +oSe +kea +bGb +oRa +oRa +oRa +qTF +vQo +vQo +bGb xRE ebO vTK @@ -122024,28 +121293,28 @@ wVb eFH hlz aLT -abS -bdr -bdC +kvM +nhY +nTl +xJw beS -bfy -bgY -aQT -aLT -aTv -blB -bnt -bpH -brs -bpC -abT -aQL +bdC +bdr +wzS +clg +clK +clF +cIr +dUq +fuo +jbi +bSJ beB aYW bzV beB bdl -buz +jmS bZr bmD dmE @@ -122067,23 +121336,23 @@ cbv cbS bHW bJz -bJC -ack -cfo -cgs -chl -chR -cjf -cdP -bJC -dpO -ckX -cll -clF -clK -clg -acp -bSJ +bGb +qsS +bHa +bJz +bpP +bHY +jph +oSe +kea +bGb +gXD +gXD +gXD +xyy +bHa +bHa +bGb vMn vuR vTK @@ -122227,28 +121496,28 @@ wVb hlz eFH aLT -bcE -aMC -bdD -aLT -bfC -bgY -aPl +kvM +nhY +mnq +jTs aLT -aPn -aRX -cSQ -aQL -brt -aUY -buS -aQL +bdD +vlT +msC +hXY +clL +bSJ +vQH +dUq +fuo +jbi +bSJ aLG aYZ sLE uBw bdl -bEm +eFO bZr bmD hAc @@ -122270,23 +121539,23 @@ iRr iEb bHY buH -bJC -cdX -bMy -cgt -bJC -chV -cjf -bgW -bJC -ckR -bTC -mvl -bSJ -clL -bVo -clZ -bSJ +bGb +jut +lPI +noH +bGb +krh +jph +oSe +kea +bGb +gXD +gXD +gXD +xyy +bHa +bHa +bGb bob emG vTK @@ -122430,22 +121699,22 @@ wVb qnP jPf aLT +kvM +nhY +nTl +hmA aLT aLT aLT aLT -bfx -bgY -aQT -aLT -aTv -blB -sNb -aQL -aQL -aQL -aQL -aQL +bSJ +bSJ +bSJ +tXR +rJm +fuo +jbi +bSJ bxx byF bzW @@ -122473,23 +121742,23 @@ cbz cbU ccu cbz -bJC -bJC -bJC -bJC -bJC -chW -rvT -cdP -bJC -dpO -ckX -hAZ -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +bGb +qhp +xWV +oSe +kea +bGb +oRa +oRa +oRa +qTF +nRI +nRI +bGb cJP vuR vTK @@ -122633,22 +121902,22 @@ wVb hlz moE aLT -bdJ -bds -aLT -bpL -bfE -njd -aQT +kvM +nhY +nTl +pXs +xSW aLT -aTv -blB -uvu -aUZ -aQL -bsS -mqK -aQL +vIl +tyM +mIP +bSJ +vNs +hYY +dUq +fuo +jbi +bSJ aLG aYZ sLE @@ -122676,23 +121945,23 @@ ttM iEb ccv bIS -bJC -cfp -cgu -bJC -bMx -chQ -cjf -cdP -bJC -dpO -ckX -clo -bVn -bSJ -clM -clS -bSJ +bGb +eSr +prW +bGb +iov +nPY +jph +oSe +kea +bGb +qTF +qTF +qTF +nll +eNZ +bGb +bGb nOG vuR vTK @@ -122836,22 +122105,22 @@ wVb hlz eFH aLT -beT -bdr -bkg +kvM +nhY +nTl +xJw aMz -bfy -bgY -aPl -aLT -aPn -blB -bnt -aRT -ihY -bpC -dnE -aQL +bkg +bdr +kus +clg +clG +bTA +cIr +dUq +fuo +jbi +bSJ kgr aYW bzV @@ -122879,23 +122148,23 @@ bJz cbS bJz bHW -bJC -bMA -cfo -chm -bJD -chR -cjf -bgW -bJC -ckR -ckX -cll -bTA -clG -clg -bVq -bSJ +bGb +kSx +bHa +bpP +buH +bHY +jph +oSe +kea +bGb +oRa +oRa +oRa +qTF +vQo +vQo +bGb njT ydx vTK @@ -123039,22 +122308,22 @@ wVb tAi eFH aLT +kvM +nhY +nTl +xJw +fgu aLT aLT aLT -brv -nuA -bgY -aQT -aLT -aTv -blB -oiQ -lml -aQL -aQL -aQL -aQL +bSJ +bSJ +iLI +cIr +dUq +fuo +jbi +bSJ pGM aYZ sLE @@ -123082,23 +122351,23 @@ qYt iEb bHa bIT -bJC -bJC -bJC -bJC -cdf -jxx -cjf -cdP -bJC -dpO -ckX -rXj -gfo -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +jyB +bIT +jph +oSe +kea +bGb +gXD +gXD +gXD +xyy +bHa +bHa +bGb nOG cAH vTK @@ -123242,22 +122511,22 @@ wVb hlz eFH aLT -beT -bdr -bpK +kvM +nhY +nTl +xJw aMz -bfy -bgY -aQT -aLT -aTv -blB -bnt -aRT -mUx -bpC -dnE -aQL +bpK +bdr +lKG +clg +clH +bTA +cIr +dUq +fuo +jbi +bSJ aLG aYZ sLE @@ -123285,23 +122554,23 @@ pJJ iEb bHa bIT -bJC -bMA -cfo -chn -bJD -chR -cjf -cdP -bJC -dpO -ckX -cll -bTA -clH -oFV -bVq -bSJ +bGb +kSx +bHa +bpP +buH +bHY +jph +oSe +kea +bGb +dzU +gXD +gXD +xyy +bHa +bHa +bGb fTx lGr vTK @@ -123445,22 +122714,22 @@ wVb eFH hlz aLT -beU -bdv -aLT -bry -bfu -bgY -jVr +kvM +nhY +nTl +bGS +vlT aLT -kXa -blB -chL -lAl -aQL -bsW -xvX -aQL +mES +btd +gqu +bSJ +jST +wPy +dUq +kOO +jbi +bSJ aLG txe baq @@ -123488,23 +122757,23 @@ pJJ vzu vYi bIT -bJC -cfq -cgv -bJC -wqc -chN -cjf -lok -bJC -ihM -ckX -clm -hXY -bSJ -clN -clT -bSJ +bGb +uKH +pnc +bGb +iDK +vBn +jph +kjH +kea +bGb +gXD +gXD +gXD +qTF +nRI +nRI +bGb cJP vuR vTK @@ -123650,20 +122919,20 @@ hlz aLT aLT aLT -aLT +rtF +uDI bwe -cuY -aPo aLT aLT -aQL -aSa -bnA -xhQ -aQL -aQL -aQL -aQL +aLT +bSJ +bSJ +hfQ +uSr +iqO +bSJ +bSJ +bSJ aLG aYO aLG @@ -123691,23 +122960,23 @@ pJJ buH iEb bIT -bJC -bJC -bJC -bJC -qFG -pvJ -bQD -bJC -bJC -bSJ -hss -clp -hfQ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +bGb +bGb +wpu +cGj +izg +bGb +bGb +bGb +mwp +mwp +mwp +bGb +bGb +bGb +haq wGi woG vTK @@ -123842,7 +123111,7 @@ aaa aaa aaa aaa -aaa +wVb wVb wVb wVb @@ -123851,28 +123120,28 @@ wVb eFH eFH aLT -vZb +bdr tnY -rAN -tIQ -cic -ceg -mdo -mJj -tDZ -nYc -bnB -aVd -aUZ -uqA -bES -kcl +ybD +fyQ +bjA +aMB +fPd +tah +sDM +vNs +rPO +xWM +bMd +mts +clg +rjU aLG aYO aLG bAX bdl -wIr +dSh aQy jAB iYt @@ -123894,23 +123163,23 @@ dhU buH iEb bIT -hNw -wos -bMC -fcB -rUh -jLj -wPC -xZU -hNw -hmC -rQA -hjs -ivM -hcI -hcI -vPK -bSJ +xdC +dqi +fdt +eWz +flH +hTF +vow +dWL +xdC +sKI +whr +buH +buH +eMb +buH +fwi +haq nOG vuR vTK @@ -124045,8 +123314,8 @@ aaa aaa aaa aaa -aaa wVb +vjx fTR qaD jeU @@ -124054,22 +123323,22 @@ dHk hlz eFH aWT -aMH -beV -gWE -udG -aOK -dRv +bdr +dnM +xhf +kEs +pDG +nXE +rGj mdo -mJj -ljs -hsW -mFO -bJE -aSE -aVf -bES -kcl +ckX +xTa +sMT +noX +bbG +kaM +clg +rjU aLG aZg bar @@ -124097,23 +123366,23 @@ bdl cbV fpO bIT -hNw -sZq -jZv -cgy -nrw -spS -lBv -pXZ -hNw -bNC -sDM -clr -nvT -aMI -wGE -erG -ewO +xdC +pJf +exN +chy +oZz +uEn +cNR +bHa +xdC +sKI +whr +pkI +chy +buH +cuv +rNd +rST bWb cAH luk @@ -124248,31 +123517,31 @@ aaa aaa aaa aaa -aaa wVb -vjx +hlz +hlz eFH eFH eFH eFH eFH aLT -aZf -duV -duV -eUA -bfx -bgY +bdr +ehx +rgw +xJw +yic +owI +rGj mdo -mJj -byn -gip -bnt -bJH -iIR -aVf -bES -kcl +ckX +jqz +rGI +cIr +dUq +cqp +clg +rjU aLG aYO bZK @@ -124281,12 +123550,12 @@ xfc bCH vZA bCH -bCH -uIp +wce +mQk +bHm bHm bHm bHm -wNm bCH bCH bHm @@ -124300,23 +123569,23 @@ qic cbW iEb bIT -hNw -sZq -jZv -gnu -bOQ -chR -cjg -urN -hNw -bNC -ckX -vuL -fDh -jGR -jGR -oqu -bSJ +xdC +pJf +exN +aMe +rsv +bHY +wpM +bHa +xdC +sKI +whr +buH +mND +buH +bIT +lOk +haq vuR vuR vuR @@ -124451,48 +123720,48 @@ aaa aaa aaa aaa -aaa wVb -ilZ -eFH -aLT -aLT -aLT -aLT -aLT -aLT -mhI -bjA -xSW -bAd -bCS -aLT +hlz +kOl +nKe +kOl +kOl +kOl +kOl +kOl +kOl +wMG +rgw +xJw +rgx +rgx +rGj aLT -ksp -gip -brH -chp -chp -aVf -aQL -aQL +aUT +iXP +iXP +cIr +uVI +kPJ +clg +bSJ beB aYT bzY aLd aLd bvS -aLd -aLd -aLd -aLd vub vub vub -owW +wtp vub vub vub +kcO +aLd +aLd +aLd aLd aLd aLd @@ -124503,27 +123772,27 @@ aLd cbX cbS ccO -bJC -bJC -bMD -vND -vND -chR -cjg -kIP -bJC -bSJ -bTJ -pUf -hji -rPO -ixD -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +bGb +bGb +nvq +pdX +pdX +bHY +etb +nRI +bGb +bGb +kSx +buH +vxn +buH +bIT +xYH +xYH +xYH +xYH +xYH +xYH vuR ydx vTK @@ -124654,41 +123923,37 @@ aaa aaa aaa aaa -aaa wVb hlz -eFH +kOl +lDA +lDA +lDA +wvn +aGA +lDA +kOl aLT -bBg -vPv -oTA -vPv -rAN -tIQ -vme -aNQ -aOL -uIJ -hRd -aLT -aQL -bmh -bnX -aRo -brA -aVf -lQz -aQL +eRH +waB +euo +xMm +rGj +bdC +ckX +xTa +xTa +cwi +uHz +bSJ +clg +bSJ aLG aZi aLG bbs cbh xYP -bbs -gsm -bCM -rbF cJE bOT dLt @@ -124696,7 +123961,11 @@ bRe iFD vRa vub -bPL +mtY +mtY +tZK +bbs +dwN bCM xSM tez @@ -124706,27 +123975,27 @@ bbr buH iEb bIT -bJC -jht -jZv -cgy -cgy -lbX -uxp -bJC -bJC -bSZ -ckX -bUp -bUN -bVb -ivM -mAV -hzu -qNd -hzu -hcI -bSJ +bGb +nrZ +exN +chy +chy +bxq +kLR +bGb +bGb +kmb +kNV +buH +buH +buH +bIT +cYg +lYy +xHn +lYy +lYy +xYH cAH cAH vTK @@ -124857,49 +124126,49 @@ aaa aaa aaa aaa -aaa wVb hlz -hlz -aLT -nuN -nuN -rfa -ehx -ehx -tVq -vme -mLF -tig -uIJ -aPi -aLT -tDZ -gip -uTv -bKC -bOG -aVf -iaq -aQL +kOl +kPu +kPu +xpr +kPu +giq +kPu +kOl +tnY +rgw +hwp +vhQ +vdq +rGj +bdC +ckX +sBs +iQa +vZh +uVI +hcI +clg +bSJ aLG aZi aLG bbs bKD vTS -bbs -ccQ -bCN -rbF -qlz +vub xYf skn bQX ijQ cLl qlz -tez +cgE +cgE +cgE +uSh +ccQ bCN ccQ tez @@ -124909,27 +124178,27 @@ bbr buH iEb bIT -bJC -cjC -jZv -lLC -nEo -nZy -cjg -lbf -bJC -bTa -ckX -iWc -cqz -bVb -wty -pWb -pWb -rYp -oEo -oEo -bSJ +bGb +iMQ +exN +bvB +aYo +gnr +etb +vQo +bGb +oaB +kcV +buH +bGb +bGb +bIT +pjQ +hKS +hKS +hKS +rXA +xYH cAH cea vTK @@ -125060,49 +124329,49 @@ aaa aaa aaa aaa -aaa wVb -rVo hlz +kOl +kPu +kPu +kPu +kPu +giq +kPu +kOl +lvM +rgw +iNU +vYj +pAA +rGj aLT -vug -vug -muy -vug -vug -tVq -vme -lJO -uRo -uIJ -aLT -aLT -hWr -gip -xlk -uuj -bRg -aVf -aQL -aQL +aVc +vQF +bHS +dpR +uVI +mKU +clg +bSJ fvK aZi aLG bbs ydM xYP -bbs -ccQ -cdn -rbF -qlz +vub gYe skn bTx bKQ tXM qlz -tez +xYR +xYR +cgE +cgE +ccQ bpV ccQ tez @@ -125112,27 +124381,27 @@ bbr buH iEb bIT -bJC -bJC -kGF -chq -bRf -onN -cjg -qki -bJC -bSJ -bTM -bUq -rPE -bVb -wty -wWX -wWX -yle -wWX -wWX -bSJ +bGb +bGb +xzx +dHF +gQy +oJy +etb +bHa +bGb +bGb +kSx +buH +bGb +gmM +bIT +pjQ +hKS +hKS +hKS +hKS +xYH cAH bpJ vTK @@ -125263,49 +124532,49 @@ aaa aaa aaa aaa -aaa wVb -qnP -uia -aLT -iPS -vAE -iKw -vAE -wMG -tIQ -nTl -efK -aMz +hlz +kOl +kPu +xpr +kPu +kPu +giq +kPu +gpP +okC +lyf +fqA +fqA +fXX rGj mdo -mJj -bHp -bIU -tAN -tAN -jOi -aVf -bES -kcl +djk +haF +rqG +jyC +edE +qtz +clg +rjU aLG aZi aLG bbs dvs xYP -bbs -cdm -bCM -rbF -qlz +vub fOz skn bTx bTx dFF qlz -tez +jpT +gEQ +cgE +cgE +ccQ bCM ccQ tez @@ -125315,27 +124584,27 @@ bbr buH iEb bIT -hNw -sZq -lef -xRj -wJD -cjE -ozT -pDB -hNw -bNC -ckX -qgN -bTN -sdC -ivM -gEo -scy -vSW -scy -kPJ -bSJ +xdC +pJf +mgK +cZP +lZf +wry +sAN +lCN +xdC +sKI +whr +buH +bGb +gmM +bIT +pjQ +hKS +rXA +hKS +hKS +xYH cAH ubd vTK @@ -125466,79 +124735,79 @@ aaa aaa aaa aaa -aaa wVb -tAi -moE -aLT -aLT -aLT -aLT -aLT -aLT -fbb -nTl -bwf -aMP -bEG +hlz +hqb +cuw +cuw +cuw +cuw +oxA +cuw +ssw +ehx +ehx +vug +vug +mRT +rGj mdo -mJj -fIM -fIM -sXw -sXw -vfx -aVf -bES -kcl +mjl +rWv +wWX +wWX +pWb +pWb +clg +rjU beB byI beB kFY jmK bDL -bbs -iit -bCN -rbF vub odN odN -gcN +nso odN odN vub -tez +gNf +cgE +cgE +cgE +iit bCN ccQ tez -ccQ +kLQ bCN jhb jiw cbS bHW -hNw -sZq -ltI -vfa -wdz -wdz -nCf -nCf -hNw -bNC -uMS -qmk -rtV -sgR -tvN -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +xdC +pJf +hJd +lVt +bHa +bHa +bHa +bHa +xdC +sKI +whr +pkI +bGb +pXN +unP +pjQ +hKS +hKS +hKS +hKS +xYH pUY emG vTK @@ -125669,31 +124938,31 @@ aaa aaa aaa aaa -aaa wVb -wzg -eFH -aLT -bBg -vPv -oTA -vPv -rAN -tIQ -aNc -aNT -rGj -bdC +hlz +kOl +fCs +cya +cya +cya +kSr +cya +gpP +iKw +vAE +iPS +xdK +jsS +bEG mdo -mJj -sEd -wDK -iMr -wuq -bRV -bSe -bES -kcl +viw +oOp +vSW +scy +vSW +scy +clg +rjU aLG aZi aLG @@ -125701,18 +124970,18 @@ bBd aPr bfl bSb -byw -bkU -bAY -pur bxm -bPM -jmK -bRa bxm +jmK pur +bxm +bxm +fYs +bxm +bxm +bxm byw -bzI +lIz bAY bSb bEa @@ -125721,27 +124990,27 @@ bBd buH iEb bIT -hNw -sZq -lwJ -cgA -oaW -yiW -oaW -yiW -hNw -bNC -clK -jdm -pQN -snR -ivM -qNd -hzu -mAV -hzu -hcI -bSJ +xdC +pJf +pQf +vOb +eOj +bvi +eOj +bvi +xdC +sKI +whr +buH +bGb +gmM +hOR +pjQ +hKS +hKS +hKS +rXA +xYH jea cAH vTK @@ -125872,79 +125141,79 @@ aaa aaa aaa aaa -aaa wVb -jMi -eFH +hlz +kOl +cya +cya +cya +cya +kSr +cya +kOl +aLT aLT -cjc -cjc -vUb -nuN -nuN -cBs -kiV -iSZ -uIJ -kJi aLT aLT -aQL -aQL -aQL -aQL -csZ -odB -aQL -aQL +rSA +nsA +aLT +ctT +uyx +bSJ +bSJ +bSJ +bSJ +bSJ +bSJ aLG -aZg -tBF -bBe -bFq -bfm -bhg -bvF -cdo -bvF -bvF +cGC +tzf +aEs +xoZ +cgR +nIH +lpU +njY +jyY +lpU +lpU +lpU +aMf bvF -bRa -bRc -bPM bvF bvF bvF cdo bvF bCD -bEb +gUE bFq bBe bFu fpO bIT -bJC -bJC -rbH -cEC -bJC -bJC -bJC -bJC -bJC -bSJ -hTc -bUr -ycd -sAc -wty -oEo -oEo -yfm -fXN -fXN -bSJ +bGb +bGb +hKP +xtW +bGb +bGb +bGb +bGb +bGb +bGb +buH +buH +bGb +gmM +hOR +pjQ +hKS +hKS +hKS +hKS +xYH vuR cAH vTK @@ -126075,79 +125344,79 @@ aaa aaa aaa aaa -aaa wVb -pQG -eFH -aLT -cjc -cjc -vUb -cjc -cjc -cBs -bsU -bwg -bCP -bdC -aLT +hlz +kOl +cya +fCs +cya +cya +kSr +cya +kOl +vPv bBg -uAW -pqK -uAW -tDZ -vil -bpC -qZX -aQL +vPv +tnY +kUs +bdr +rAN +eyk +tOw +mAV +hzu +qNd +hzu +hcI +bSJ kEb aZi bad bbs -cdp -cdp -cdp -cdp bbs -bJf -bJf -bJf -bJf -xba -dNt -dNt -dNt -dNt bbs -fJO -fJO -fJO -fJO +pdC +iEn +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +sJg +iEn +bbs +bbs bbs nmD iEb twT -bJC -lbf -cft -rQV -ohj -wwr -cDs -wwr -lbf -bSJ -gGf -qyi -hXY -sSC -wty -fXN -fXN -yfm -fXN -fXN -bSJ +bGb +vQo +iEb +uFZ +ssi +bpc +qCY +bpc +vQo +bGb +bJz +bJz +bGb +bGb +bHT +pjQ +hKS +hKS +rXA +hKS +xYH cAH ydx vTK @@ -126278,79 +125547,79 @@ aaa aaa aaa aaa -aaa wVb -fhA -eFH -aLT -iPS -vAE -iKw -vAE -wMG -tIQ -btc -bwh -uMl -bdC -dII -oLi -fZZ -viS -sXw -sXw -vil -bpC -qDq -kbc +hlz +gXy +blD +blD +blD +jYZ +cOR +blD +kOl +nuN +muy +vug +vug +kUs +bdr +hPp +eyk +tOw +wWX +wWX +yle +oEo +oEo +kBn aLG aYO aLG bbs -bdw -bfo -rWL -wLm -nHJ -wLm -wLm -wLm -bSa -xba -bSa -wLm -wLm -wLm -nHJ -wLm -lJu -bEd -bFs +gof +toJ +roV +cgE +rVs +anY +bbs +fdu +fdu +cdD +fdu +fdu +bbs +anY +rVs +cgE +cgE +kQW +gof bbs buH iEb bIT -fzq -oXb -cft -rQV -wdz -wdz -fDJ -bKM -bKM -bZU -clK -qFK -pmq -sUj -ivM -vSW -scy -gEo -scy -kPJ -bSJ +qJP +bHa +iEb +uFZ +bHa +bHa +bJz +bHa +bHa +iSR +bHa +bHa +bHa +bHa +bHL +cYg +wiQ +sfX +wiQ +wiQ +xYH vuR ebO vTK @@ -126481,79 +125750,79 @@ aaa aaa aaa aaa -aaa wVb -vjx -eFH -aLT -aLT -aLT -aLT -aLT -aLT -sCD -pXl -bxB -uWY -wEd -jvp +hlz +kOl +nKe +kOl +kOl +kOl +kOl +kOl +kOl +bdC +bdC +bdC +bdC +oVb +sbG izG -gBc -gBc -gBc -gBc -ngA -koC -koC -xGE +wZf +gmw +ePw +ePw +ePw +ePw +ePw +vGl aem mUa aLG -lgy -ccb -xYP -bGn -mlm -mlm -mlm -bxn -mlm -mlm -xba -mlm -mlm -bxn -mlm -mlm -mlm -rXk -xYP -jew -laU +bbs +gof +toJ +roV +cgE +cgE +cgE +uSh +kyS +kyS +jmK +kyS +kyS +uSh +cgE +cgE +cgE +cgE +kQW +gof +bbs buH jGN bJb -uCM -lNw -eFj -iQi -lNw -lNw -lNw -lNw -lNw -erh -rqE -qWt -fXN -rEv -rll -bSJ -bSJ -bSJ -bSJ -bSJ -bSJ +qDh +fWF +erP +lRV +fWF +fWF +fWF +fWF +fWF +fHo +sWH +sWH +sWH +sWH +nxS +xYH +xYH +xYH +xYH +xYH +xYH vuR tAR vTK @@ -126684,74 +125953,74 @@ aaa aaa aaa aaa -aaa wVb -fTR hlz hlz hlz hlz -fTR hlz -aLT -cjc -cjc -uJU +hlz +fTR +rdK +nuN +nuN +rfa cjc cjc -aLT -lDV -fZZ -hEb -qDq -qDq -jOx -bpC -qDq -aQL +xGb +bdr +hPp +clg +sZi +fXN +fXN +rYp +oEo +oEo +bSJ jKA aYT beB -lgy -bsG -xYP -rWL -dMB -dMB -dMB -dMB -dMB -fsV -xba -fsV -dMB -dMB -dMB -dMB -dMB -lJu -xYP -hLI -laU +bbs +gof +toJ +boR +kex +kex +kex +kex +kex +kex +nqL +cgE +cgE +cgE +cgE +cgE +cgE +cgE +kQW +gof +bbs drt rZF bJz -bJC -oXb -cfo -lkM -oXb -oXb -oka -bKM -tEO -bSJ -fXN -fXN -kPJ -fXN -fXN -bSJ +bGb +bHa +bHa +dDP +bHa +bHa +bJz +bHa +bHa +bGb +jin +jin +odf +jin +jin +bGb rHs ngs vuR @@ -126810,7 +126079,7 @@ bNM iEr fhH eNi -ueG +nxn rPt jyE eNi @@ -126887,74 +126156,74 @@ aaa aaa aaa aaa -aaa wVb wVb wVb wVb wVb -hlz -eFH -hlz -aLT +wVb +uia +wiA +rdK iPS vAE -meY iPS vAE -aLT -iPS -wDK -iMr -wDK -rou -jOx -bpC -ksp -aQL -aLG -bSY -aWR -cau -bCG -cgE -bJe -jmK -xYP -xYP -xYP -xYP -jmK -xba -jmK -xYP -xYP -xYP -xYP -jmK -hcw -cgE -hLI -blq -bIT -jHe -bIS -bJC -kIP -cfo -lkM -oaW -yiW -oaW -yiW -kIP -bSJ +uJU +xGb +bdr +wMG +clg +sZi vSW scy -oer vSW scy +kPJ bSJ +aLG +aYO +aLG +dus +rOh +jyY +hhh +ofW +jyY +ofW +ofW +ofW +jyY +ofW +ofW +ofW +jyY +ofW +ofW +jyY +exT +jyY +cRH +bbs +bIT +jHe +bIS +bGb +nRI +bHa +dDP +eOj +bvi +eOj +bvi +nRI +bGb +kFU +dHF +oZA +hCJ +dHF +bGb tSr pUY lGr @@ -127098,66 +126367,66 @@ aaa wVb rVo eFH -hlz +rdK +aLT +aLT aLT -meY -meY -meY -meY -meY -meY aLT -aQL -aQL -aQL -aQL -pyl -pDt -aQL -aQL +aLT +ixx +dzO +aLT +nAf +jBA +bSJ +bSJ +bSJ +bSJ +bSJ +bSJ aLG aYO aLG -lgy -ccN -xYP -rWL -wLm -wLm -wLm -wLm -wLm -bSa -xba -bSa -wLm -wLm -wLm -wLm -wLm -lJu -xYP -hLI -laU +bbs +bbs +krY +bbs +bbs +krY +bbs +bbs +bbs +krY +bbs +bbs +bbs +krY +bbs +bbs +krY +bbs +krY +bbs +bbs eUz iEb bIT -bJC -bJC -vLA -oHc -bJC -bJC -bJC -bJC -bJC -oer -oer -oer -oer -oer -oer -oer +bGb +bGb +wkr +dpr +bGb +bGb +bGb +bGb +bGb +oZA +oZA +oZA +oZA +oZA +oZA +oZA ybr vuR ebO @@ -127302,57 +126571,57 @@ wVb cbZ eFH eFH -eFH -eFH -eFH -eFH -eFH hlz +aLT +rAN +rAN +tnY +xGb +bdr +rAN +clg +sZi +hcI +hcI +hcI +bSJ eFH -hlz -aQL -qZX -qZX -tDZ -jOx -bpC -qZX -aQL +rdK aLG aYO aLG -lgy -ccb -xYP -bGn -mlm -mlm -mlm -bxn -mlm -mlm -xba -mlm -mlm -bxn -mlm -mlm -mlm -rXk -xYP -jew -laU +bbs +gjz +cgE +bbs +tGr +cgE +txb +bbs +xPD +cgE +oqd +bbs +hCe +cgE +bbs +nYu +cgE +bbs +cgE +cJt +bbs buH iEb bIT -bJC -lbf -cfo -lkM -lbf -lbf -lbf -bJC +bGb +vQo +bHa +dDP +vQo +vQo +vQo +bGb vuR oyG vuR @@ -127506,56 +126775,56 @@ bbv hJb hlz hlz -hlz -hlz -wZH -hlz -hlz -hlz -hlz -aQL -qDq -qDq -qDq -jOx -bpC -qDq -bTb +aLT +cjc +cjc +cjc +xGb +bdr +une +clg +sZi +fXN +fXN +fXN +bSJ +eFH +mEI aLG aYO aLG bbs -ccd -ccN -rWL -dMB -uVD -dMB -dMB -dMB -fsV -xba -fsV -dMB -dMB -dMB -uVD -dMB -lJu -huK -jeQ +wUW +gix +bbs +tGr +gix +txb +bbs +xPD +gix +gxG +bbs +pum +gix +bbs +mnX +gix +bbs +gix +puU bbs buH iEb bIT -xSw -oXb -cfo -lkM -oXb -oXb -oXb -bJC +eHS +bHa +bHa +dDP +bHa +bHa +bHa +bGb vuR cAH vuR @@ -127708,57 +126977,57 @@ wVb wVb wVb wVb -wVb -wVb -wVb -wVb -wVb -wVb -eFH -rdK -aQL -qDq -qDq -qDq -osA -cHl -cHl -bTb +hlz +aLT +cjc +cjc +cjc +pGx +iJO +fUX +upF +oLa +fXN +fXN +fXN +bSJ +hlz +mEI beB aYT beB bbs -cdp -cdp -jks -cdp bbs -bJf -bJf -bJf -bJf -xba -dNt -dNt -dNt -dNt bbs -fJO -fJO -fJO -fJO +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs +bbs bbs bJz cbS bHW -xSw -ejo -ejo -niY -oXb -oXb -oXb -bJC +eHS +jMP +jMP +kSw +bHa +bHa +bHa +bGb cAH vuR vuR @@ -127887,220 +127156,115 @@ aaa aaa aaa aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -wVb -iDm -fTR -aQL -ksp -ksp -rou -qDq -qDq -qDq -bTb -aLG -aYO -aLG -bBh -aLG -aLG -aLG -aLG -byC -aLG -beB -aLG -aLG -bsT -buH -buH -bJz -buH -bSd -buH -buH -buH -buH -cbD -buH -iEb -bIT -xSw -oXb -oXb -oXb -kIP -qer -kIP -bJC -cAH -pFP -ebO -vTK -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(240,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -hzc -hzc -hzc -cuC -dbw -uGQ -bNM -rtd -owg -eNi -fcM -uzE -qsL -nim -qhc -ajP -apd -alR -amA -atq -cSm -alO -elf -amA -atq -aDE -asT -aHw -iWR -iWR -kbx -alR -alG -aYj -apd -jWh -jWh -jlQ -jlQ -jWh -lhJ -fCL -uIv -oXJ -kPR -bYn -hzc -hzc -hzc -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aaa +aaa +aKQ aaa aaa aab aaa aaa -aKQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +wVb +hlz +aLT +wMG +wMG +uJU +cjc +cjc +hPp +fXN +fXN +kPJ +jcI +kPJ +bSJ +hlz +mEI +aLG +aYO +aLG +bBh +aLG +aLG +aLG +aLG +byC +aLG +beB +aLG +aLG +bsT +buH +buH +bJz +buH +bSd +buH +buH +buH +buH +cbD +buH +iEb +bIT +eHS +bHa +bHa +bHa +nRI +lDD +nRI +bGb +cAH +pFP +ebO +vTK +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aab aaa aaa +"} +(240,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -128117,19 +127281,124 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +hzc +hzc +hzc +cuC +dbw +uGQ +bNM +rtd +owg +eNi +fcM +uzE +qsL +nim +qhc +ajP +apd +alR +amA +atq +cSm +alO +elf +amA +atq +aDE +asT +aHw +iWR +iWR +kbx +alR +alG +aYj +apd +jWh +jWh +jlQ +jlQ +jWh +lhJ +fCL +uIv +oXJ +kPR +bYn +hzc +hzc +hzc +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aab +aaa +aaa +aKQ +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa wVb -eFH hlz -aQL -aQL -aQL -aQL -ksp -rou -rou -aQL +aLT +aLT +aLT +aLT +wMG +uJU +wMG +jcI +kPJ +bSJ +bSJ +bSJ +bSJ +eFH +rdK aLG aZl tBF @@ -128157,17 +127426,17 @@ cbE bFu bIl bIX -bJC -kIP -qer -kIP -bJC -bJC -bJC -bJC -vuR +bGb +nRI +lDD +nRI +bGb +bGb +bGb +bGb vuR vuR +oHV vTK aaa aaa @@ -128316,14 +127585,7 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa wVb -eFH hlz hlz gjN @@ -128333,6 +127595,13 @@ rdK rdK rdK rdK +rdK +rdK +hlz +hlz +hlz +eFH +rdK tfl aZm aWR @@ -128360,11 +127629,11 @@ cdZ buJ buJ jMb -bJC -bJC -bJC -bJC -bJC +bGb +bGb +bGb +bGb +bGb cAH cAH cAH @@ -128519,16 +127788,16 @@ aaa aaa aaa bdH -aaa -aaa -aaa -aaa -aaa -aaa wVb -jmg +wVb +wVb +wVb +hlz +hlz hlz eFH +fTR +iIr eFH hlz hlz @@ -128725,11 +127994,11 @@ bdH aaa aaa aaa -aaa -aaa -aaa wVb -epA +hlz +hlz +hlz +xmf wDm hlz hlz @@ -128928,13 +128197,13 @@ bdH aaa aaa aaa -aaa -aaa -aaa +wVb +wVb +wVb wVb pIk -bNT -wul +ePS +sLu eFH eFH eFH @@ -129041,7 +128310,7 @@ aag uMc vFv wOt -odl +vrs jhx keR jhx @@ -129050,21 +128319,21 @@ dwI aTS wqq agJ -hal -uYg -nau -uYg -uYg -bXf +gZI +gdE +izL +gdE +gdE +ciH aDO aDO aDO -gQO -uYg -uYg -nau -uYg -hal +ieU +gdE +gdE +izL +gdE +gZI aGC wqq aTS @@ -129243,8 +128512,8 @@ aaa aad uMc bNM -rmf -uZH +oYm +kNH bFt kPG kPG @@ -129255,17 +128524,17 @@ anR lNl aqq eky -aNl +hXL eky eky -nCT -vsh -vsh -vsh -ydY +qGS +pyZ +pyZ +pyZ +jze eky eky -aNl +hXL eky aqq aIe @@ -129276,8 +128545,8 @@ tim uWV ttd nLk -rCD -eYR +fjx +sMe uIv pql ajZ @@ -129445,8 +128714,8 @@ bdH aac aag cuC -htb -pfc +wIw +gga ptK ptK ucp @@ -129457,8 +128726,8 @@ psm dKm psm aHe -jlT -exi +vEv +kib eky eky eAC @@ -129468,8 +128737,8 @@ aBu eAC eky eky -ins -wRP +fTC +oqV aHe vuv vuv @@ -129480,8 +128749,8 @@ olk jWh jWh jWh -jAJ -lAu +jYl +oNh bYn aag ajY @@ -129649,7 +128918,7 @@ cuC cuC cuC bNM -ofK +txH ptK uXL gPc @@ -129661,7 +128930,7 @@ psm psm eky eky -aNl +hXL eky uNV aHe @@ -129671,7 +128940,7 @@ aDQ aHe uNV eky -aNl +hXL eky rqj vuv @@ -129683,7 +128952,7 @@ xjw pfA xAC jWh -lbB +ucV uIv bYn bYn @@ -129851,8 +129120,8 @@ bdH cuC uiG tfb -rFy -ofK +eTC +txH ptK uXL eet @@ -129864,7 +129133,7 @@ xlX hSu aMT aMT -dPm +rlP qeF aHe aHe @@ -129874,7 +129143,7 @@ aEm aHe aHe okg -dPm +rlP aMT aMT iEs @@ -129886,10 +129155,10 @@ rsW rsW fnQ jWh -lbB +ucV cKL xXa -xoO +cLW bYn aaa aaa @@ -130053,9 +129322,9 @@ bdH bdH cuC bNM -rmf -luY -ncp +oYm +jOh +xnK ptK cQg wxj @@ -130067,7 +129336,7 @@ jBB psm svf arV -wZX +cKh eky aDQ ayi @@ -130077,7 +129346,7 @@ eky jlX aDQ eky -wZX +cKh arV vUh vuv @@ -130089,9 +129358,9 @@ rsW naQ fnQ jWh -xPZ -pcv -eYR +fhD +mRZ +sMe uIv bYn aaa @@ -130255,8 +129524,8 @@ bdH bdH bdH cuC -aeM -ofK +xic +txH ptK ptK ptK @@ -130270,7 +129539,7 @@ psm psm eky arV -wZX +cKh eky aDQ pyy @@ -130280,7 +129549,7 @@ eky dLc aDQ eky -wZX +cKh arV eky vuv @@ -130294,8 +129563,8 @@ jWh jWh jWh jWh -lbB -oCf +ucV +bmS bYn aaa aaa @@ -130459,21 +129728,21 @@ bdH bdH uMc bNM -ofK +txH psm kSd dmQ -tZm +uQb dmQ xlX -hWU +vQC dmQ aeq psm aNe eky arV -wZX +cKh eky aHe jMQ @@ -130483,7 +129752,7 @@ eky dEn aHe eky -wZX +cKh arV eky aNe @@ -130495,9 +129764,9 @@ boC cxo iwh kfv -vGr +aji vuv -lbB +ucV uIv pql bdH @@ -130662,31 +129931,31 @@ bdH bdH uMc bNM -ofK +txH psm kSd dmQ nwu dmQ xlX -rwb +ihB dmQ jXY psm atY aMT aMT -svl -pzJ -qDt -uYg -vsh -oPf -vsh -uYg -qDt -pzJ -sQO +gDa +xBy +odk +gdE +pyZ +qge +pyZ +gdE +odk +xBy +rRJ aMT aMT atY @@ -130698,9 +129967,9 @@ boC cxo qMf wUN -jgC +foc vuv -lbB +ucV uIv pql bdH @@ -130879,17 +130148,17 @@ psm psm aRp aRp -jBX +lJb akS aHe oxU bsy -oir +chx gzw shh aHe tKf -jBX +lJb aRp edx vuv @@ -131067,8 +130336,8 @@ bdH bdH bdH cuC -htb -pfc +wIw +gga psm psm psm @@ -131082,7 +130351,7 @@ xlX hSu qYG atM -bGc +jvw atK aHe aHe @@ -131092,7 +130361,7 @@ aHe aHe aHe atM -bGc +jvw atK qYG iEs @@ -131106,8 +130375,8 @@ vuv vuv vuv vuv -jAJ -lAu +jYl +oNh bYn bdH bdH @@ -131271,10 +130540,10 @@ aaa bdH cuC bNM -tgK +vLu tfb -skg -eaX +tzJ +pLw pVZ pVZ pVZ @@ -131285,17 +130554,17 @@ pVZ pVZ aPw avu -mhG -cFn -cYu +mtU +fAq +qgI aHe fdX wcR xJh aHe -qYu -dxK -dPC +wBU +idJ +nmy aMU aPw qMu @@ -131306,10 +130575,10 @@ qMu qMu qMu qMu -euY -vME -jHL -wOK +adN +tge +wEf +ubx uIv bYn bdH @@ -131474,10 +130743,10 @@ bdH bdH cuC riJ -kHY -uhM +aXX +mBq fcP -xJn +cAN cuC aag aag @@ -131489,7 +130758,7 @@ aag aPw aqJ aBu -odu +iHi aMT aEg aDO @@ -131497,7 +130766,7 @@ aDO aDO aEg aMT -odV +bHf aBu aqp aPw @@ -131509,10 +130778,10 @@ aag aag aag bYn -tAh +roi thV -rDb -qjV +xxk +itd rID bYn bdH @@ -131677,9 +130946,9 @@ bdH bdH cuC cuC -umy -iKZ -tiw +cpF +oUB +xFC cuC cuC mNX @@ -131692,7 +130961,7 @@ cus aPw aPw atM -bGc +jvw atK avu aMT @@ -131700,7 +130969,7 @@ arV aMT aMU atM -bGc +jvw atK aPw aPw @@ -131713,8 +130982,8 @@ mNX qOk bYn bYn -tjj -kHS +ahD +lBq rID bYn bYn @@ -131880,7 +131149,7 @@ bdH bdH aad cuC -mkH +kwI rtd fcP cuC @@ -131895,15 +131164,15 @@ xVk aad aPw vgD -mhG -had -eAL -pzJ -oPf -pzJ -had -eAL -dPC +mtU +dDF +ths +xBy +qge +xBy +dDF +ths +nmy ihX aPw ajZ @@ -131916,7 +131185,7 @@ xVk xVk aad bYn -kcA +nHD uWV uIv bYn @@ -132083,9 +131352,9 @@ bdH bdH aad cuC -vRu -ngU -ssU +qtw +vdu +dDw cuC ajZ xVk @@ -132102,7 +131371,7 @@ aBA aqp avu eky -dPm +rlP eky aMU aqJ @@ -132286,9 +131555,9 @@ bdH bdH aad uMc -gbs +bfi iEr -hFw +hcx uMc ajZ xVk @@ -132305,7 +131574,7 @@ aHe aHe mtD eky -wZX +cKh eky nKq aHe @@ -132489,7 +131758,7 @@ bdH bdH aad uMc -nrO +sbh iEr fcP uMc @@ -132508,7 +131777,7 @@ aHe aHe avu eky -wZX +cKh eky aMU aHe @@ -132692,7 +131961,7 @@ bdH bdH aad uMc -aVC +saM iEr fcP uMc @@ -132711,7 +131980,7 @@ jcZ aDO qqu eky -aNl +hXL eky dFk aDO @@ -132895,9 +132164,9 @@ bdH bdH aad cuC -oIm +dLk rtd -odb +mHP cuC ajZ xVk @@ -132914,7 +132183,7 @@ avu eky eky nJu -aNl +hXL eky eky eky @@ -132933,7 +132202,7 @@ aad bYn thV uWV -oCf +bmS bYn ajZ bdH @@ -133098,11 +132367,11 @@ bdH bdH cuC cuC -pLv +laf rtd fcP cuC -cOK +kje xVk xVk xVk @@ -133117,7 +132386,7 @@ dnJ eky eky eky -aNl +hXL eky eky eky @@ -133132,7 +132401,7 @@ xVk xVk xVk xVk -wZv +mCS bYn thV uWV @@ -133300,12 +132569,12 @@ bdH aaa aaa uMc -iKc -iVY -cMN +hKY +bcH +iBe trB -nVX -jcP +jfp +uUW xVk xVk xVk @@ -133314,13 +132583,13 @@ xVk xVk xVk etf -ohH +miH atM aDO atK eky eky -aNl +hXL eky eky atM @@ -133335,12 +132604,12 @@ xVk xVk xVk xVk -dbq -xBn -vME -hSt -xoO -rjG +cDT +ews +tge +qFF +cLW +qNi pql bdH bdH @@ -133503,12 +132772,12 @@ bdH aaa aaa uMc -cIG -vqD +nhw +tHm iEr fcP -blJ -jcP +biJ +uUW xVk xVk xVk @@ -133521,11 +132790,11 @@ aPz avu arV aMU -ssX -vsh -iPD -vsh -fCp +gRu +pyZ +kcU +pyZ +pfl avu arV aMU @@ -133538,12 +132807,12 @@ xVk xVk xVk xVk -dbq +cDT gIJ thV fCL -lne -wEI +fCY +fxm pql bdH bdH @@ -133706,12 +132975,12 @@ bdH aaa aaa uMc -dfg -rAP -vqK +waz +vlO +kYq lht -blJ -jcP +biJ +uUW xVk xVk xVk @@ -133724,11 +132993,11 @@ aPz aqJ aBu aqp -nkn +xsg lyw iZg lyw -nkn +xsg aqJ aBu aqp @@ -133741,12 +133010,12 @@ xVk xVk xVk xVk -dbq +cDT gIJ -tjj -ofH -gms -ydh +ahD +jTL +fgZ +mZG pql bdH bdH @@ -133910,11 +133179,11 @@ aaa aaa cuC ptK -bSD +wrW iEr -xKM +tiD cuC -uiR +vwn xVk xVk xVk @@ -133944,11 +133213,11 @@ xVk xVk xVk xVk -kMK +erm bYn -gEv +spw fCL -lol +xIt jWh bYn aaa @@ -134113,11 +133382,11 @@ aaa aaa cuC ptK -new +sgK iEr -paI +wPs cuC -cOK +kje xVk xVk xVk @@ -134147,11 +133416,11 @@ xVk xVk xVk xVk -wZv +mCS bYn vVw fCL -tNP +dVI jWh bYn aaa @@ -134315,12 +133584,12 @@ bdH aaa aaa uMc -jMG +hCD uiG -iUW +uus trB -ozN -jcP +pMl +uUW xVk xVk xVk @@ -134329,7 +133598,7 @@ xVk xVk xVk etf -gZP +gJQ atM aDO atK @@ -134350,12 +133619,12 @@ xVk xVk xVk xVk -dbq -diz -vME -hSt -xoO -adC +cDT +eBn +tge +qFF +cLW +ruI pql bdH bdH @@ -134518,12 +133787,12 @@ bdH aaa aaa uMc -msP -ugJ -kNk -cXY -blJ -jcP +hrQ +xvo +wWF +wQy +biJ +uUW xVk xVk xVk @@ -134553,12 +133822,12 @@ xVk xVk xVk xVk -dbq +cDT gIJ thV fCL -lne -wWq +fCY +ofi pql bdH bdH @@ -134721,12 +133990,12 @@ bdH aaa aaa uMc -spK -nlW -uZH +wtA +waq +kNH lht -blJ -jcP +biJ +uUW xVk xVk xVk @@ -134756,12 +134025,12 @@ xVk xVk xVk xVk -dbq +cDT gIJ -tjj -jRC -gms -qeK +ahD +uBp +fgZ +gyn pql bdH bdH @@ -134925,11 +134194,11 @@ aaa aaa cuC cuC -jPq -xgm -aqK +hpU +bKF +jgH cuC -uiR +vwn xVk xVk xVk @@ -134959,11 +134228,11 @@ xVk xVk xVk xVk -kMK +erm bYn -hTF -rTJ -tAq +igS +gXV +xOC bYn bYn bdH @@ -137219,7 +136488,7 @@ lmz lmz lmz daz -acJ +tMr ubA cck wyQ diff --git a/maps/map_files/USS_Runtime/USS_Runtime.dmm b/maps/map_files/USS_Runtime/USS_Runtime.dmm index aec89c5882dd..0371f7bad0c9 100644 --- a/maps/map_files/USS_Runtime/USS_Runtime.dmm +++ b/maps/map_files/USS_Runtime/USS_Runtime.dmm @@ -193,6 +193,12 @@ icon_state = "plating" }, /area/event) +"Z" = ( +/obj/effect/landmark/start/tank_crew, +/turf/open/floor/almayer{ + icon_state = "plating" + }, +/area/event) (1,1,1) = {" a @@ -289,7 +295,7 @@ a A l L -b +Z b b b diff --git a/maps/shuttles/escape_shuttle_e.dmm b/maps/shuttles/escape_shuttle_e.dmm index d8e14b742701..0ba589df217e 100644 --- a/maps/shuttles/escape_shuttle_e.dmm +++ b/maps/shuttles/escape_shuttle_e.dmm @@ -10,7 +10,7 @@ }, /area/shuttle/escape_pod) "e" = ( -/obj/docking_port/mobile/escape_shuttle/e, +/obj/docking_port/mobile/crashable/escape_shuttle/e, /turf/closed/shuttle/escapepod{ icon_state = "wall9" }, diff --git a/maps/shuttles/escape_shuttle_e_cl.dmm b/maps/shuttles/escape_shuttle_e_cl.dmm index fb35b994891d..df10125c3a3a 100644 --- a/maps/shuttles/escape_shuttle_e_cl.dmm +++ b/maps/shuttles/escape_shuttle_e_cl.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/docking_port/mobile/escape_shuttle/cl, +/obj/docking_port/mobile/crashable/escape_shuttle/cl, /turf/closed/shuttle/escapepod{ icon_state = "wall9" }, diff --git a/maps/shuttles/escape_shuttle_n.dmm b/maps/shuttles/escape_shuttle_n.dmm index ff00ef6d3117..71f8515daba8 100644 --- a/maps/shuttles/escape_shuttle_n.dmm +++ b/maps/shuttles/escape_shuttle_n.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/shuttle/escapepod{ - icon_state = "wall6"; + icon_state = "wall6" }, /area/shuttle/escape_pod) "c" = ( -/obj/docking_port/mobile/escape_shuttle/n, +/obj/docking_port/mobile/crashable/escape_shuttle/n, /turf/closed/shuttle/escapepod{ icon_state = "wall9" }, diff --git a/maps/shuttles/escape_shuttle_s.dmm b/maps/shuttles/escape_shuttle_s.dmm index f3e4c74b480e..82391a5218d5 100644 --- a/maps/shuttles/escape_shuttle_s.dmm +++ b/maps/shuttles/escape_shuttle_s.dmm @@ -76,7 +76,7 @@ }, /area/shuttle/escape_pod) "U" = ( -/obj/docking_port/mobile/escape_shuttle/s, +/obj/docking_port/mobile/crashable/escape_shuttle/s, /turf/closed/shuttle/escapepod{ icon_state = "wall9" }, diff --git a/maps/shuttles/escape_shuttle_w.dmm b/maps/shuttles/escape_shuttle_w.dmm index d10d5fdfc1c8..8f81c83b500b 100644 --- a/maps/shuttles/escape_shuttle_w.dmm +++ b/maps/shuttles/escape_shuttle_w.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/docking_port/mobile/escape_shuttle/w, +/obj/docking_port/mobile/crashable/escape_shuttle/w, /turf/closed/shuttle/escapepod{ icon_state = "wall9" }, diff --git a/maps/shuttles/lifeboat-port-archive.dmm b/maps/shuttles/lifeboat-port-archive.dmm index cba75c63cc02..7279e78237b6 100644 --- a/maps/shuttles/lifeboat-port-archive.dmm +++ b/maps/shuttles/lifeboat-port-archive.dmm @@ -186,7 +186,7 @@ }, /area/shuttle/lifeboat) "xG" = ( -/obj/docking_port/mobile/lifeboat/port, +/obj/docking_port/mobile/crashable/lifeboat/port, /obj/structure/prop/invuln/dropship_parts/lifeboat{ icon_state = "0,0" }, diff --git a/maps/shuttles/lifeboat-port.dmm b/maps/shuttles/lifeboat-port.dmm index 4d58661e8e82..0117730f6971 100644 --- a/maps/shuttles/lifeboat-port.dmm +++ b/maps/shuttles/lifeboat-port.dmm @@ -191,7 +191,7 @@ }, /area/shuttle/lifeboat) "xG" = ( -/obj/docking_port/mobile/lifeboat/port, +/obj/docking_port/mobile/crashable/lifeboat/port, /obj/structure/prop/invuln/dropship_parts/lifeboat{ icon_state = "0,0" }, diff --git a/maps/shuttles/lifeboat-starboard-archive.dmm b/maps/shuttles/lifeboat-starboard-archive.dmm index b1857064804c..5094315b7b6f 100644 --- a/maps/shuttles/lifeboat-starboard-archive.dmm +++ b/maps/shuttles/lifeboat-starboard-archive.dmm @@ -160,7 +160,7 @@ /turf/template_noop, /area/shuttle/lifeboat) "vG" = ( -/obj/docking_port/mobile/lifeboat/starboard, +/obj/docking_port/mobile/crashable/lifeboat/starboard, /obj/structure/prop/invuln/dropship_parts/lifeboat{ icon_state = "0,0" }, diff --git a/maps/shuttles/lifeboat-starboard.dmm b/maps/shuttles/lifeboat-starboard.dmm index 05b128e0e2cb..57e302923131 100644 --- a/maps/shuttles/lifeboat-starboard.dmm +++ b/maps/shuttles/lifeboat-starboard.dmm @@ -169,7 +169,7 @@ }, /area/shuttle/lifeboat) "vG" = ( -/obj/docking_port/mobile/lifeboat/starboard, +/obj/docking_port/mobile/crashable/lifeboat/starboard, /obj/structure/prop/invuln/dropship_parts/lifeboat{ icon_state = "0,0" }, diff --git a/sound/bullets/bullet_vulture_impact.ogg b/sound/bullets/bullet_vulture_impact.ogg new file mode 100644 index 000000000000..8ccf6c77deac Binary files /dev/null and b/sound/bullets/bullet_vulture_impact.ogg differ diff --git a/sound/effects/bang-bang.ogg b/sound/effects/bang-bang.ogg new file mode 100644 index 000000000000..636bac6cfdf4 Binary files /dev/null and b/sound/effects/bang-bang.ogg differ diff --git a/sound/misc/lobby.ogg b/sound/misc/lobby.ogg new file mode 100644 index 000000000000..e8392f1e6e14 Binary files /dev/null and b/sound/misc/lobby.ogg differ diff --git a/sound/weapons/gun_vulture_fire.ogg b/sound/weapons/gun_vulture_fire.ogg new file mode 100644 index 000000000000..156127cb5a14 Binary files /dev/null and b/sound/weapons/gun_vulture_fire.ogg differ diff --git a/sound/weapons/gun_vulture_report.ogg b/sound/weapons/gun_vulture_report.ogg new file mode 100644 index 000000000000..16cb5eae9e32 Binary files /dev/null and b/sound/weapons/gun_vulture_report.ogg differ diff --git a/sound/weapons/handling/gun_vulture_bolt_close.ogg b/sound/weapons/handling/gun_vulture_bolt_close.ogg new file mode 100644 index 000000000000..1417782295d5 Binary files /dev/null and b/sound/weapons/handling/gun_vulture_bolt_close.ogg differ diff --git a/sound/weapons/handling/gun_vulture_bolt_eject.ogg b/sound/weapons/handling/gun_vulture_bolt_eject.ogg new file mode 100644 index 000000000000..a0a1dc7d0904 Binary files /dev/null and b/sound/weapons/handling/gun_vulture_bolt_eject.ogg differ diff --git a/tgui/packages/tgui/interfaces/VultureScope.tsx b/tgui/packages/tgui/interfaces/VultureScope.tsx new file mode 100644 index 000000000000..10c73df2ba65 --- /dev/null +++ b/tgui/packages/tgui/interfaces/VultureScope.tsx @@ -0,0 +1,244 @@ +import { BooleanLike } from '../../common/react'; +import { useBackend } from '../backend'; +import { Box, Button, Flex, Stack, Icon, Section, ProgressBar } from '../components'; +import { Window } from '../layouts'; + +type ScopeData = { + offset_x: Number; + offset_y: Number; + valid_offset_dirs: Array; + valid_adjust_dirs: Array; + scope_cooldown: BooleanLike; + breath_cooldown: BooleanLike; + breath_recharge: Number; + current_scope_drift: Number; + time_to_fire_remaining: Number; +}; + +enum Direction { + North = 1, + NorthEast = 5, + East = 4, + SouthEast = 6, + South = 2, + SouthWest = 10, + West = 8, + NorthWest = 9, +} + +const DirectionAbbreviation: Record = { + [Direction.North]: 'N', + [Direction.NorthEast]: 'NE', + [Direction.East]: 'E', + [Direction.SouthEast]: 'SE', + [Direction.South]: 'S', + [Direction.SouthWest]: 'SW', + [Direction.West]: 'W', + [Direction.NorthWest]: 'NW', +}; + +const OffsetAdjuster = (props, context) => { + const { act, data } = useBackend(context); + return ( +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+ ); +}; + +const OffsetDirection = (props, context) => { + const { dir } = props; + const { data, act } = useBackend(context); + return ( + + + + + + + + + + + + + +
+ ); +}; + +const ScopePosition = (props, context) => { + const { dir } = props; + const { data, act } = useBackend(context); + return ( + +